Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
kastnerorz committed Apr 1, 2020
2 parents ab8df5f + 67c7f82 commit 8498a28
Show file tree
Hide file tree
Showing 19 changed files with 1,304 additions and 320 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Run tests
working-directory: ./service
working-directory: ./backend
run: |
if [ -f docker-compose.test.yml ]; then
docker-compose --file docker-compose.test.yml build
Expand All @@ -47,7 +47,7 @@ jobs:
- uses: actions/checkout@v2

- name: Build image
working-directory: ./service
working-directory: ./backend
run: docker build . --file Dockerfile --tag image

- name: Log into registry
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
![Docker Image Size (latest by date)](https://img.shields.io/docker/image-size/kastnerorz/animal-crossing-trading-system?logo=docker&sort=date)
![Docker Image Version (latest semver)](https://img.shields.io/docker/v/kastnerorz/animal-crossing-trading-system?sort=semver&logo=docker)
![Docker Pulls](https://img.shields.io/docker/pulls/kastnerorz/animal-crossing-trading-system?logo=docker)

## Api Doc
Please go to [wiki](https://github.com/kastnerorz/animal-crossing-trading-system/wiki).
79 changes: 73 additions & 6 deletions app/assets/css/main.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
@import './base';
@import './pages/index';
@import './pages/sell';
@import './pages/buy';
@import './pages/login';
@import './pages/register';
@import "./base";
@import "./pages/index";
@import "./pages/sell";
@import "./pages/buy";
@import "./pages/login";
@import "./pages/register";

* {
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-webkit-tap-highlight-color: transparent;
}

.lr-block {
display: flex;
Expand All @@ -15,9 +20,25 @@
.control {
margin-right: 20px;
}
span.control{
width: calc(100% - 20px);
}
}
}

.form-wrapper-null{
background: #fcf9f2;
margin: 5%;
box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
border-radius: 27px;
padding: 5%;
color: #a0a0a0;
font-weight: bold;
font-size: 20px;
text-align: center;
line-height: 10;
}

.form-wrapper {
@include control-card;
.field {
Expand All @@ -33,6 +54,28 @@
box-shadow: none;
border: none;
}
.friendCode-wrap{
position: relative;
&-title {
position: absolute;
color: #67654a;
top: 9px;
left: 11px;
font-size: 17px;
font-weight: bolder;
font-family: BlinkMacSystemFont, -apple-system, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
}
&-title-gray {
color: #d9d6cb;
}
}
.friendCode {
text-transform: uppercase;
input {
text-transform: uppercase;
padding-left: 45px;
}
}
label {
color: $txt-clr;
font-weight: bold;
Expand All @@ -52,3 +95,27 @@ body {
width: 100vw;
overflow: hidden;
}
.select select,
.verified-show {
border-radius: 11px;
background-color: #fffcf5;
font-weight: bold;
font-size: 18px;
line-height: 25px;
color: #a0a0a0;
box-shadow: none;
border: none;
}

.default-color {
color: #67654a;
}
.invalid-color {
color: #f98d63;
}
.valid-color {
color: #86c587;
}
.input::-webkit-input-placeholder {
color: #d9d6cb;
}
59 changes: 59 additions & 0 deletions app/assets/css/pages/_buy.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,23 @@
.buy-page {
section{
position: relative;
margin-top: 1rem;
padding-top: 2rem;
}
.section-title{
position: absolute;
left: 50%;
transform: translateX(-50%);
top: 0;
display: inline-block;
padding: 0.2rem 2rem;
font-weight: bold;
background-color: #F88D65;
border-radius: 44px;
color: #F7F0E2;
font-size: 16px;
text-align: center;
}
.field {
width: 100%;
}
Expand All @@ -17,4 +36,44 @@
}
}
}
input, input[disabled] {
background-color: $bg-clr-lighter;
color: $txt-clr;
box-shadow: none;
border: none;
}
.sell-wrapper {
.input-icon {
position: absolute;
left: 5px;
z-index: 10;
top: 7px;
& ~ input {
padding-left: 32px;
}
}
}
.btn-req{
background: $btn-clr-g !important;
height: 50px;
width: 100%;
margin-top: 8px;
border-radius: 11px;
}
.two-btn-block{
display: flex;
justify-content: space-between;
.button{
width: 48%;
height: 48px;
margin-top: 8px;
border-radius: 11px;
}
.btn-devalue{
background: #f98d63;
}
.btn-value{
background: #86C587;
}
}
}
4 changes: 4 additions & 0 deletions app/assets/css/pages/_register.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
.reg-page {
.form-wrapper {
box-shadow:
inset 0px 4px 4px rgba(0, 0, 0, 0.25),0px 4px 4px rgba(0, 0, 0, 0.25);
}
.btn-reg {
background: $btn-clr-g !important;
height: 58px;
Expand Down
47 changes: 24 additions & 23 deletions app/assets/css/pages/_sell.scss
Original file line number Diff line number Diff line change
@@ -1,26 +1,9 @@
.sell-page {
.counter-block {
display: flex;
flex-direction: row;
button {
outline: none;
border: none;
width: 40px;
height: 40px;
background: $btn-clr-r;
font-size: 24px;
font-weight: bold;
&:first-child {
border-radius: 8px 0 0 8px;
}
&:last-child {
border-radius: 0 8px 8px 0;
}
}
.input {
border-radius: 0;
width: 60px;
}
input[disabled] {
background-color: $bg-clr-lighter;
color: $txt-clr;
box-shadow: none;
border: none;
}
.control {
display: flex;
Expand All @@ -30,9 +13,27 @@
position: absolute;
left: 5px;
z-index: 10;
margin-top: 3px;
top: 7px;
& ~ input {
padding-left: 32px;
}
}
.choose-open-type{
select {
width: 9rem;
&:not(.is-multiple):not(.is-loading)::after{
top: 54%;
}
}
.select.is-empty select {
color: #d9d6cb;
}
}
.btn-reg {
background: $btn-clr-g !important;
height: 58px;
width: 100%;
margin-top: 8px;
border-radius: 11px;
}
}
37 changes: 21 additions & 16 deletions app/components/TopMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,34 @@
<ICON type="github" />
</div>
<div class="opts">
<a href="/buy">
<ICON v-bind:type="opt === 'buy' ? 'buyOn' : 'buy'" />
</a>
<a href="/sell">
<ICON v-bind:type="opt === 'sell' ? 'sellOn' : 'sell'" />
</a>
<a href="/login">
<ICON v-bind:type="opt === 'login' ? 'loginOn' : 'login'" />
</a>
<a href="/register">
<ICON v-bind:type="opt === 'reg' ? 'regOn' : 'reg'" />
</a>
<n-link to="/">
<ICON :type="gennerateIcon('buy')" />
</n-link>
<n-link to="/sell">
<ICON :type="gennerateIcon('sell')" />
</n-link>
<n-link to="/login">
<ICON :type="gennerateIcon('login')" />
</n-link>
<n-link to="/register">
<ICON :type="gennerateIcon('reg')" />
</n-link>
</div>
</div>
</template>

<script>
import ICON from '../components/ICON'
import ICON from "./ICON";
export default {
components: {ICON},
props: {opt: {type: String, required: true}},
}
components: { ICON },
props: { opt: { type: String, required: true } },
methods: {
gennerateIcon(type) {
return this.opt === type ? `${type}On` : type;
}
}
};
</script>

<style lang="scss" scoped>
Expand Down
18 changes: 9 additions & 9 deletions app/nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,6 @@ export default {
** Global CSS
*/
css: ['@/assets/css/main.scss'],
/*
** Plugins to load before mounting the App
*/
plugins: [],
/*
** Nuxt.js dev-modules
*/
buildModules: [],
/*
** Nuxt.js modules
*/
Expand All @@ -46,12 +38,20 @@ export default {
'@nuxtjs/axios',
'@nuxtjs/pwa',
],
/*
** Plugins to load before mounting the App
*/
plugins: ['~plugins/axios'],
/*
** Nuxt.js dev-modules
*/
buildModules: [],
/*
** Axios module configuration
** See https://axios.nuxtjs.org/options
*/
axios: {
baseURL: 'http://192.168.50.91:8080/api/v1',
baseURL: 'http://ac.kastner.cn/api/v1',
},
/*
** Build configuration
Expand Down
5 changes: 5 additions & 0 deletions app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"dependencies": {
"@nuxtjs/axios": "^5.3.6",
"@nuxtjs/pwa": "^3.0.0-0",
"async-validator": "^3.2.4",
"js-sha256": "^0.9.0",
"nuxt": "^2.0.0",
"nuxt-buefy": "^0.3.2"
Expand Down
6 changes: 0 additions & 6 deletions app/pages/README.md

This file was deleted.

Loading

0 comments on commit 8498a28

Please sign in to comment.