diff --git a/.gitignore b/.gitignore index f166428..092300f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,5 @@ ythe.sh /logs/ *build* package-lock.json -.vite \ No newline at end of file +.vite +.idea 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/package.json b/frontend/package.json index dced95c..7c61e00 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -19,6 +19,7 @@ "echarts": "^5.5.1", "graphql": "^16.9.0", "graphql-tag": "^2.12.6", + "jwt-decode": "^4.0.0", "pdfjs-dist": "^4.3.136", "pinia": "^2.1.6", "vue": "^3.3.4", @@ -41,4 +42,4 @@ "vite-plugin-svg-icons": "^2.0.1", "webpack": "^5.88.2" } -} +} \ No newline at end of file diff --git a/frontend/src/components/CustomChart.vue b/frontend/src/components/CustomChart.vue new file mode 100644 index 0000000..34b0539 --- /dev/null +++ b/frontend/src/components/CustomChart.vue @@ -0,0 +1,72 @@ + + + + + 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/components/LineChart.vue b/frontend/src/components/LineChart.vue new file mode 100644 index 0000000..b7a3daf --- /dev/null +++ b/frontend/src/components/LineChart.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/headers/HeaderUser.vue b/frontend/src/headers/HeaderUser.vue index f8b67ae..8b66684 100644 --- a/frontend/src/headers/HeaderUser.vue +++ b/frontend/src/headers/HeaderUser.vue @@ -2,38 +2,61 @@