diff --git a/frontend/Dockerfile b/Dockerfile similarity index 64% rename from frontend/Dockerfile rename to Dockerfile index 835a295..1e75a82 100644 --- a/frontend/Dockerfile +++ b/Dockerfile @@ -1,26 +1,27 @@ # build stage FROM node:lts-alpine as build-stage +ARG CONTAINER_APP_ROOT="/app" RUN npm update npm -g RUN npm config set "@fortawesome:registry" https://npm.fontawesome.com/ RUN npm config set "//npm.fontawesome.com/:_authToken" 58624E90-2685-43C6-BF0F-0BFECCE11CD2 RUN npm install -g http-server -WORKDIR /app +WORKDIR ${CONTAINER_APP_ROOT} -COPY package*.json ./ +COPY frontend/package*.json ./ RUN npm install -COPY *.js ./ -COPY *.html ./ -COPY src ./src -COPY public ./public +COPY frontend/*.js ./ +COPY frontend/*.html ./ +COPY frontend/src ./src +COPY frontend/public ./public RUN npm run build # production stage FROM nginx:1.25.2 as production-stage COPY --from=build-stage /app/dist /usr/share/nginx/html -COPY nginx_docker.conf /etc/nginx/conf.d/default.conf +COPY frontend/nginx_docker.conf /etc/nginx/conf.d/default.conf EXPOSE 8080 CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/frontend/frontend b/frontend/frontend deleted file mode 120000 index 39fc200..0000000 --- a/frontend/frontend +++ /dev/null @@ -1 +0,0 @@ -../freeleaps2-frontend/frontend \ No newline at end of file diff --git a/frontend/src/assets/styles/inputs.scss b/frontend/src/assets/styles/inputs.scss index ef21bca..3ac96b2 100644 --- a/frontend/src/assets/styles/inputs.scss +++ b/frontend/src/assets/styles/inputs.scss @@ -6,11 +6,25 @@ @extend .form-control; } -.form-input-back { display: flex; align-items: center; height: 32px; overflow: hidden; cursor: pointer; margin-bottom: 5px; color: $primary; - .input-back-icon {font-size: 32px;} - p {margin: 0; font-weight: 500;} +.form-input-back { + display: flex; + align-items: center; + height: 32px; + overflow: hidden; + cursor: pointer; + margin-bottom: 5px; + color: $primary; + .input-back-icon { + font-size: 32px; + } + p { + margin: 0; + font-weight: 500; + } &:hover { - .input-back-icon {font-size: 35px;} + .input-back-icon { + font-size: 35px; + } } } diff --git a/frontend/src/components/EmptyContent.vue b/frontend/src/components/EmptyContent.vue index d3996e1..c80b5e5 100644 --- a/frontend/src/components/EmptyContent.vue +++ b/frontend/src/components/EmptyContent.vue @@ -26,12 +26,22 @@ export default { flex-direction: column; &.auto-fit { - width: 100%; + width: 100%; height: 100%; } - .loading-big {width: 188px; height: 188px;} - .empty-img {width: 188px; height: 188px; margin-bottom: 15px;} - .empty-text {font-size: 26px; color: #6E7387;} + .loading-big { + width: 188px; + height: 188px; + } + .empty-img { + width: 188px; + height: 188px; + margin-bottom: 15px; + } + .empty-text { + font-size: 26px; + color: #6e7387; + } } diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 7a53429..89854a1 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -13,7 +13,7 @@ export default { Duration: 'Duration', days: 'days', Update: 'Update', - "Quote From": 'From', + 'Quote From': 'From', reject: 'reject', accept: 'accept', Note: 'Note', @@ -66,7 +66,7 @@ export default { 'invalid code': 'invalid code', Password: 'Password', 'Forget password': 'Forget password', - 'Invalid password': 'Password doesn\'t match', + 'Invalid password': "Password doesn't match", 'Read More': 'Read More', 'Total earning': 'Total earning', Payable: 'Payable', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 1f5a9fc..e7d5d62 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -13,7 +13,7 @@ export default { Duration: '工期', days: '天', Update: '更新', - "Quote From": '需求方', + 'Quote From': '需求方', reject: '拒绝', accept: '接受', Note: '标注', diff --git a/frontend/src/pages/guest/FrontDoor.vue b/frontend/src/pages/guest/FrontDoor.vue index 8b4897c..f5c2f18 100644 --- a/frontend/src/pages/guest/FrontDoor.vue +++ b/frontend/src/pages/guest/FrontDoor.vue @@ -32,11 +32,11 @@ import gql from 'graphql-tag' const GET_USERS = gql` query Users { users { - firstName - lastName + firstName + lastName } } -`; +` export default { name: 'FrontDoor', diff --git a/frontend/src/pages/guest/SigninWithEmailAndCode.vue b/frontend/src/pages/guest/SigninWithEmailAndCode.vue index 610360b..b65fd6e 100644 --- a/frontend/src/pages/guest/SigninWithEmailAndCode.vue +++ b/frontend/src/pages/guest/SigninWithEmailAndCode.vue @@ -143,13 +143,14 @@ export default { &:disabled { color: $primary; - opacity: .78; + opacity: 0.78; } } .countdown { color: $primary; } + .msg-center { display: flex; align-items: center; diff --git a/frontend/src/pages/guest/SigninWithEmailAndPassword.vue b/frontend/src/pages/guest/SigninWithEmailAndPassword.vue index 270edea..33e4932 100644 --- a/frontend/src/pages/guest/SigninWithEmailAndPassword.vue +++ b/frontend/src/pages/guest/SigninWithEmailAndPassword.vue @@ -3,7 +3,7 @@