From a4983ac6bc35efee5b10de0768203dec9110b866 Mon Sep 17 00:00:00 2001 From: Amruth Pillai Date: Sat, 5 Mar 2022 10:08:28 +0100 Subject: [PATCH] fix(i18n): load locales from file system, instead of http-backend --- apps/client/.env | 8 --- apps/client/.eslintrc.json | 3 ++ .../build/Center/ArtboardController.tsx | 48 ++++++++++-------- .../build/RightSidebar/RightSidebar.tsx | 2 +- apps/client/i18n/index.ts | 11 ++-- apps/client/modals/auth/LoginModal.tsx | 2 +- apps/client/next.config.js | 9 +++- apps/client/project.json | 3 +- .../public/images}/covers/cover-0ee139.jpeg | Bin .../public/images}/covers/cover-1ab08.jpeg | Bin .../public/images}/covers/cover-1f8c9.jpeg | Bin .../public/images}/covers/cover-1fe54f.jpeg | Bin .../public/images}/covers/cover-253f4a.jpeg | Bin .../public/images}/covers/cover-33aec.jpeg | Bin .../public/images}/covers/cover-3sc.jpeg | Bin .../public/images}/covers/cover-466cb.jpeg | Bin .../public/images}/covers/cover-478b3.jpeg | Bin .../public/images}/covers/cover-4d9.jpeg | Bin .../public/images}/covers/cover-4ed.jpeg | Bin .../public/images}/covers/cover-4fd88.jpeg | Bin .../public/images}/covers/cover-50f3f3.jpeg | Bin .../public/images}/covers/cover-6b8ae.jpeg | Bin .../public/images}/covers/cover-6fa09.jpeg | Bin .../public/images}/covers/cover-713b2f.jpeg | Bin .../public/images}/covers/cover-737f2.jpeg | Bin .../public/images}/covers/cover-73dab8.jpeg | Bin .../public/images}/covers/cover-79df42.jpeg | Bin .../public/images}/covers/cover-7b601.jpeg | Bin .../public/images}/covers/cover-7dh.jpeg | Bin .../public/images}/covers/cover-7e6ae.jpeg | Bin .../public/images}/covers/cover-94b.jpeg | Bin .../public/images}/covers/cover-96bdd.jpeg | Bin .../public/images}/covers/cover-98afd.jpeg | Bin .../public/images}/covers/cover-9hk.jpeg | Bin .../public/images}/covers/cover-b26e75.jpeg | Bin .../public/images}/covers/cover-b6ea6.jpeg | Bin .../public/images}/covers/cover-c219f2.jpeg | Bin .../public/images}/covers/cover-c3642.jpeg | Bin .../public/images}/covers/cover-c584b.jpeg | Bin .../public/images}/covers/cover-c682cb.jpeg | Bin .../public/images}/covers/cover-c82a8.jpeg | Bin .../public/images}/covers/cover-d312a7.jpeg | Bin .../public/images}/covers/cover-dcbd8.jpeg | Bin .../public/images}/covers/cover-df274.jpeg | Bin .../public/images}/covers/cover-e26ee.jpeg | Bin .../public/images}/covers/cover-f3034.jpeg | Bin .../public/images}/covers/cover-fec87.jpeg | Bin .../images/templates/castform.jpg} | Bin .../images/templates/gengar.jpg} | Bin .../images/templates/glalie.jpg} | Bin .../images/templates/kakuna.jpg} | Bin .../images/templates/onyx.jpg} | Bin .../images/templates/pikachu.jpg} | Bin apps/client/services/axios.ts | 4 +- .../templates/Castform/widgets/Masthead.tsx | 4 +- .../templates/Gengar/widgets/Masthead.tsx | 4 +- .../templates/Glalie/widgets/Masthead.tsx | 8 ++- .../templates/Kakuna/widgets/Masthead.tsx | 32 ++++++------ .../templates/Onyx/widgets/Masthead.tsx | 4 +- .../templates/Pikachu/widgets/Masthead.tsx | 9 +--- apps/client/templates/templateMap.tsx | 12 ++--- apps/client/types/environment.d.ts | 5 -- apps/client/utils/template.ts | 1 + apps/server/.env | 1 - apps/server/src/assets/resumes/.gitkeep | 0 apps/server/src/assets/templates/.gitkeep | 0 apps/server/src/assets/uploads/.gitkeep | 0 apps/server/src/database/database.module.ts | 3 -- apps/server/src/main.ts | 4 +- apps/server/src/resume/data/sampleData.ts | 2 +- apps/server/src/resume/resume.service.ts | 9 ++-- docker-compose.yml | 24 ++++----- package.json | 3 +- pnpm-lock.yaml | 32 +++--------- 74 files changed, 105 insertions(+), 142 deletions(-) delete mode 100644 apps/client/.env rename apps/{server/src/assets => client/public/images}/covers/cover-0ee139.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-1ab08.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-1f8c9.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-1fe54f.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-253f4a.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-33aec.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-3sc.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-466cb.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-478b3.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-4d9.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-4ed.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-4fd88.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-50f3f3.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-6b8ae.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-6fa09.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-713b2f.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-737f2.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-73dab8.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-79df42.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-7b601.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-7dh.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-7e6ae.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-94b.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-96bdd.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-98afd.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-9hk.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-b26e75.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-b6ea6.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-c219f2.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-c3642.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-c584b.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-c682cb.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-c82a8.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-d312a7.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-dcbd8.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-df274.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-e26ee.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-f3034.jpeg (100%) rename apps/{server/src/assets => client/public/images}/covers/cover-fec87.jpeg (100%) rename apps/client/{templates/Castform/preview.jpg => public/images/templates/castform.jpg} (100%) rename apps/client/{templates/Gengar/preview.jpg => public/images/templates/gengar.jpg} (100%) rename apps/client/{templates/Glalie/preview.jpg => public/images/templates/glalie.jpg} (100%) rename apps/client/{templates/Kakuna/preview.jpg => public/images/templates/kakuna.jpg} (100%) rename apps/client/{templates/Onyx/preview.jpg => public/images/templates/onyx.jpg} (100%) rename apps/client/{templates/Pikachu/preview.jpg => public/images/templates/pikachu.jpg} (100%) delete mode 100644 apps/server/.env create mode 100644 apps/server/src/assets/resumes/.gitkeep create mode 100644 apps/server/src/assets/templates/.gitkeep create mode 100644 apps/server/src/assets/uploads/.gitkeep diff --git a/apps/client/.env b/apps/client/.env deleted file mode 100644 index c4677403..00000000 --- a/apps/client/.env +++ /dev/null @@ -1,8 +0,0 @@ -NEXT_PUBLIC_APP_VERSION=$npm_package_version - -# App & Server URLs -NEXT_PUBLIC_APP_URL=$APP_URL -NEXT_PUBLIC_SERVER_URL=$SERVER_URL - -# Google OAuth -NEXT_PUBLIC_GOOGLE_CLIENT_ID=$GOOGLE_CLIENT_ID \ No newline at end of file diff --git a/apps/client/.eslintrc.json b/apps/client/.eslintrc.json index 518bfc81..ce7e5f4e 100644 --- a/apps/client/.eslintrc.json +++ b/apps/client/.eslintrc.json @@ -19,5 +19,8 @@ ], "env": { "jest": true + }, + "rules": { + "@next/next/no-img-element": "off" } } diff --git a/apps/client/components/build/Center/ArtboardController.tsx b/apps/client/components/build/Center/ArtboardController.tsx index d6f53589..400b1149 100644 --- a/apps/client/components/build/Center/ArtboardController.tsx +++ b/apps/client/components/build/Center/ArtboardController.tsx @@ -9,7 +9,7 @@ import { ZoomIn, ZoomOut, } from '@mui/icons-material'; -import { ButtonBase, Divider, Tooltip } from '@mui/material'; +import { ButtonBase, Divider, Tooltip, useMediaQuery, useTheme } from '@mui/material'; import clsx from 'clsx'; import { get } from 'lodash'; import { useTranslation } from 'next-i18next'; @@ -28,9 +28,11 @@ import styles from './ArtboardController.module.scss'; const ArtboardController: React.FC = ({ zoomIn, zoomOut, centerView }) => { const { t } = useTranslation(); + const theme = useTheme(); const dispatch = useAppDispatch(); const resume = useAppSelector((state) => state.resume); + const isDesktop = useMediaQuery(theme.breakpoints.up('sm')); const { left, right } = useAppSelector((state) => state.build.sidebar); const orientation = useAppSelector((state) => state.build.page.orientation); @@ -92,29 +94,33 @@ const ArtboardController: React.FC = ({ zoomIn, zoomOut, c - - - {orientation === 'vertical' ? ( - - ) : ( - - )} - - + {isDesktop && ( + <> + + + {orientation === 'vertical' ? ( + + ) : ( + + )} + + - - - - - + + + + + - - - - - + + + + + - + + + )} diff --git a/apps/client/components/build/RightSidebar/RightSidebar.tsx b/apps/client/components/build/RightSidebar/RightSidebar.tsx index 76d29939..90a53636 100644 --- a/apps/client/components/build/RightSidebar/RightSidebar.tsx +++ b/apps/client/components/build/RightSidebar/RightSidebar.tsx @@ -72,7 +72,7 @@ const RightSidebar = () => {