From 2f73d454bb280e778dff7d90af91f122907a4488 Mon Sep 17 00:00:00 2001 From: Jet Li Date: Fri, 6 Sep 2024 08:21:12 -0700 Subject: [PATCH] Test passed for local zoom call making --- Dockerfile | 9 + frontend/frontend | 1 + frontend/src/components/EmptyContent.vue | 8 +- frontend/src/headers/HeaderUser.vue | 4 +- frontend/src/lang/en.js | 4 +- frontend/src/lang/zh.js | 2 +- .../pages/guest/SigninWithEmailAndCode.vue | 24 +- frontend/src/pages/public/About.vue | 12 +- frontend/src/pages/public/Blogs.vue | 13 +- frontend/src/pages/public/Career.vue | 6 +- frontend/src/pages/user/messages/Home.vue | 20 +- frontend/src/pages/user/providers/Home.vue | 12 +- frontend/src/pages/user/requests/Home.vue | 147 +++-------- frontend/src/pages/user/workspace/Home.vue | 240 +++++++++++++----- frontend/src/types/projectUtils.js | 4 +- frontend/src/utils/backend/workspace.js | 27 ++ 16 files changed, 299 insertions(+), 234 deletions(-) create mode 120000 frontend/frontend diff --git a/Dockerfile b/Dockerfile index 31fdab5..3aad092 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,10 @@ FROM node:lts-alpine as build-stage ARG CONTAINER_APP_ROOT="/app" ARG FRONTEND_PORT=8080 +# TODO: further testing before turning on +# ARG ZOOM_CLIENT_ID +# ARG ZOOM_REDIRECT_URI +# ARG ZOOM_SCOPE 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 @@ -17,6 +21,11 @@ COPY frontend/*.html ./ COPY frontend/src ./src COPY frontend/public ./public +# TODO: further testing before turning on +# RUN echo "VUE_APP_ZOOM_CLIENT_ID=${ZOOM_CLIENT_ID}" >> .env +# RUN echo "VUE_APP_ZOOM_REDIRECT_URI=${ZOOM_REDIRECT_URI}" >> .env +# RUN echo "VUE_APP_ZOOM_SCOPE=${ZOOM_SCOPE}" >> .env + RUN npm run build # production stage diff --git a/frontend/frontend b/frontend/frontend new file mode 120000 index 0000000..39fc200 --- /dev/null +++ b/frontend/frontend @@ -0,0 +1 @@ +../freeleaps2-frontend/frontend \ No newline at end of file diff --git a/frontend/src/components/EmptyContent.vue b/frontend/src/components/EmptyContent.vue index c80b5e5..52b49ac 100644 --- a/frontend/src/components/EmptyContent.vue +++ b/frontend/src/components/EmptyContent.vue @@ -1,7 +1,7 @@ @@ -34,11 +34,13 @@ export default { 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/headers/HeaderUser.vue b/frontend/src/headers/HeaderUser.vue index f8b67ae..e7f8230 100644 --- a/frontend/src/headers/HeaderUser.vue +++ b/frontend/src/headers/HeaderUser.vue @@ -45,8 +45,8 @@