feat(upgrade): changes to code to support new template

AmruthPillai · Apr 8, 2022 · 1df7810 · 1df7810
1 parent 9cd36fc
commit 1df7810
Show file tree

Hide file tree

Showing 14 changed files with 2,917 additions and 1,908 deletions.
diff --git a/.env.example b/.env.example
@@ -4,13 +4,15 @@ PUBLIC_URL=http://localhost
 PUBLIC_SERVER_URL=http://localhost/api
 PUBLIC_GOOGLE_CLIENT_ID=
 
+# Database
+POSTGRES_DB=postgres
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres
+
 # Server
 SECRET_KEY=
 POSTGRES_HOST=postgres
 POSTGRES_PORT=5432
-POSTGRES_USER=postgres
-POSTGRES_PASSWORD=postgres
-POSTGRES_DATABASE=postgres
 POSTGRES_SSL_CERT=
 JWT_SECRET=
 JWT_EXPIRY_TIME=604800

diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
@@ -17,13 +17,10 @@ jobs:
         name: Get Version
         run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
 
-      # https://github.com/docker/setup-qemu-action#usage
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1.2.0
-
-      # https://github.com/marketplace/actions/docker-setup-buildx
+
       - name: Set up Docker Buildx
-        id: buildx
         uses: docker/setup-buildx-action@v1.6.0
 
       - name: Login to Docker
@@ -38,8 +35,7 @@ jobs:
           context: .
           push: true
           file: client/Dockerfile
-          #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
-          platforms: linux/amd64,linux/arm/v7,linux/arm/v6,linux/arm64
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
           tags: |
             amruthpillai/reactive-resume:client-latest
             amruthpillai/reactive-resume:client-${{ steps.version.outputs.tag }}
@@ -56,13 +52,10 @@ jobs:
         name: Get Version
         run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
 
-      # https://github.com/docker/setup-qemu-action#usage
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1.2.0
-
-      # https://github.com/marketplace/actions/docker-setup-buildx
+
       - name: Set up Docker Buildx
-        id: buildx
         uses: docker/setup-buildx-action@v1.6.0
 
       - name: Login to Docker
@@ -77,8 +70,7 @@ jobs:
           context: .
           push: true
           file: server/Dockerfile
-          #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
-          platforms: linux/amd64,linux/arm/v7,linux/arm/v6,linux/arm64
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
           tags: |
             amruthpillai/reactive-resume:server-latest
             amruthpillai/reactive-resume:server-${{ steps.version.outputs.tag }}
@@ -95,13 +87,10 @@ jobs:
         name: Get Version
         run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
 
-      # https://github.com/docker/setup-qemu-action#usage
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1.2.0
-
-      # https://github.com/marketplace/actions/docker-setup-buildx
+
       - name: Set up Docker Buildx
-        id: buildx
         uses: docker/setup-buildx-action@v1.6.0
 
       - name: Login to GitHub Container Registry
@@ -117,8 +106,7 @@ jobs:
           context: .
           push: true
           file: client/Dockerfile
-          #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
-          platforms: linux/amd64,linux/arm/v7,linux/arm/v6,linux/arm64
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
           tags: |
             ghcr.io/amruthpillai/reactive-resume:client-latest
             ghcr.io/amruthpillai/reactive-resume:client-${{ steps.version.outputs.tag }}
@@ -135,13 +123,10 @@ jobs:
         name: Get Version
         run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
 
-      # https://github.com/docker/setup-qemu-action#usage
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1.2.0
-
-      # https://github.com/marketplace/actions/docker-setup-buildx
+
       - name: Set up Docker Buildx
-        id: buildx
         uses: docker/setup-buildx-action@v1.6.0
 
       - name: Login to GitHub Container Registry
@@ -157,8 +142,7 @@ jobs:
           context: .
           push: true
           file: server/Dockerfile
-          #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
-          platforms: linux/amd64,linux/arm/v7,linux/arm/v6,linux/arm64
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
           tags: |
             ghcr.io/amruthpillai/reactive-resume:server-latest
             ghcr.io/amruthpillai/reactive-resume:server-${{ steps.version.outputs.tag }}
diff --git a/client/package.json b/client/package.json
@@ -9,15 +9,15 @@
   },
   "dependencies": {
     "@beam-australia/react-env": "^3.1.1",
-    "@emotion/css": "^11.7.1",
-    "@emotion/react": "^11.8.2",
+    "@emotion/css": "^11.9.0",
+    "@emotion/react": "^11.9.0",
     "@emotion/styled": "^11.8.1",
     "@hookform/resolvers": "2.8.8",
-    "@monaco-editor/react": "^4.3.1",
-    "@mui/icons-material": "^5.5.1",
-    "@mui/lab": "^5.0.0-alpha.74",
-    "@mui/material": "^5.5.2",
-    "@reduxjs/toolkit": "^1.8.0",
+    "@monaco-editor/react": "^4.4.1",
+    "@mui/icons-material": "^5.6.0",
+    "@mui/lab": "^5.0.0-alpha.76",
+    "@mui/material": "^5.6.0",
+    "@reduxjs/toolkit": "^1.8.1",
     "axios": "^0.26.1",
     "clsx": "^1.1.1",
     "dayjs": "^1.11.0",
@@ -26,23 +26,23 @@
     "lodash": "^4.17.21",
     "md5-hex": "^4.0.0",
     "monaco-editor": "^0.33.0",
-    "nanoid": "^3.3.1",
-    "next": "12.1.0",
-    "next-i18next": "^10.5.0",
-    "react": ">=17",
+    "nanoid": "^3.3.2",
+    "next": "12.1.4",
+    "next-i18next": "^11.0.0",
+    "react": "^17.0.0",
     "react-beautiful-dnd": "^13.1.0",
     "react-colorful": "^5.5.1",
-    "react-dnd": "^15.1.1",
+    "react-dnd": "^15.1.2",
     "react-dnd-html5-backend": "^15.1.2",
-    "react-dom": ">=17",
+    "react-dom": "^17.0.0",
     "react-google-login": "^5.2.2",
-    "react-hook-form": "^7.28.1",
+    "react-hook-form": "^7.29.0",
     "react-hot-toast": "2.2.0",
     "react-hotkeys-hook": "^3.4.4",
     "react-icons": "^4.3.1",
-    "react-markdown": "^8.0.1",
-    "react-query": "^3.34.16",
-    "react-redux": "^7.2.6",
+    "react-markdown": "^8.0.2",
+    "react-query": "^3.34.19",
+    "react-redux": "^7.2.8",
     "react-zoom-pan-pinch": "^2.1.3",
     "redux": "^4.1.2",
     "redux-persist": "^6.0.0",
@@ -53,26 +53,27 @@
     "webfontloader": "^1.6.28"
   },
   "devDependencies": {
-    "@babel/core": "^7.17.8",
+    "@babel/core": "^7.17.9",
     "@reactive-resume/schema": "workspace:*",
     "@tailwindcss/typography": "^0.5.2",
     "@types/downloadjs": "^1.4.3",
-    "@types/lodash": "^4.14.180",
+    "@types/lodash": "^4.14.181",
     "@types/node": "17.0.23",
-    "@types/react": "17.0.42",
+    "@types/react": "18.0.0",
     "@types/react-beautiful-dnd": "^13.1.2",
     "@types/react-redux": "^7.1.23",
-    "@types/tailwindcss": "^3.0.9",
+    "@types/tailwindcss": "^3.0.10",
     "@types/uuid": "^8.3.4",
     "@types/webfontloader": "^1.6.34",
     "autoprefixer": "^10.4.4",
-    "eslint": "^8.11.0",
-    "eslint-config-next": "12.1.0",
-    "next-sitemap": "^2.5.13",
+    "csstype": "^3.0.11",
+    "eslint": "^8.12.0",
+    "eslint-config-next": "12.1.4",
+    "next-sitemap": "^2.5.19",
     "postcss": "^8.4.12",
-    "prettier": "^2.6.0",
-    "sass": "^1.49.9",
+    "prettier": "^2.6.2",
+    "sass": "^1.50.0",
     "tailwindcss": "^3.0.23",
-    "typescript": "<4.6.0"
+    "typescript": "^4.6.3"
   }
 }
diff --git a/client/public/images/templates/leafish.jpg b/client/public/images/templates/leafish.jpg
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,14 +7,17 @@ x-env-shared: &env-shared
     - PUBLIC_SERVER_URL=http://localhost/api
     - PUBLIC_GOOGLE_CLIENT_ID=
 
+x-env-database: &env-database
+  environment:
+    - POSTGRES_DB=postgres
+    - POSTGRES_USER=postgres
+    - POSTGRES_PASSWORD=postgres
+
 x-env-server: &env-server
   environment:
     - SECRET_KEY=
     - POSTGRES_HOST=postgres
     - POSTGRES_PORT=5432
-    - POSTGRES_USER=postgres
-    - POSTGRES_PASSWORD=postgres
-    - POSTGRES_DATABASE=postgres
     - POSTGRES_SSL_CERT=
     - JWT_SECRET=
     - JWT_EXPIRY_TIME=604800
@@ -34,6 +37,9 @@ services:
   postgres:
     image: postgres:14.2-alpine
     container_name: postgres
+    <<: *env-database
+    ports:
+      - 5432:5432
     volumes:
       - pgdata:/var/lib/postgresql/data
     healthcheck:
@@ -60,7 +66,8 @@ services:
     image: amruthpillai/reactive-resume:server-latest
     container_name: server
     <<: *env-shared
-    <<: *env-server 
+    <<: *env-server
+    <<: *env-database
     depends_on:
       - traefik
       - postgres

diff --git a/docs/docs/source-code/env-vars.mdx b/docs/docs/source-code/env-vars.mdx
@@ -65,6 +65,12 @@ This URL is used when export PDF functionality is used within the app and has to
 **Default Value:** `5432`  
 **Description:** Port of the PostgreSQL Server
 
+### `POSTGRES_DB`
+
+**Required**: `yes`  
+**Default Value:** `postgres`  
+**Description:** Name of the Database in PostgreSQL Server
+
 ### `POSTGRES_USER`
 
 **Required**: `yes`  
@@ -77,12 +83,6 @@ This URL is used when export PDF functionality is used within the app and has to
 **Default Value:** `postgres`  
 **Description:** Password of the PostgreSQL Server
 
-### `POSTGRES_DATABASE`
-
-**Required**: `yes`  
-**Default Value:** `reactive_resume`  
-**Description:** Name of the Database in PostgreSQL Server
-
 ### `POSTGRES_SSL_CERT`
 
 **Required**: `no`  

diff --git a/docs/package.json b/docs/package.json
@@ -15,13 +15,13 @@
   },
   "dependencies": {
     "@algolia/client-search": "^4.13.0",
-    "@docusaurus/core": "2.0.0-beta.17",
-    "@docusaurus/preset-classic": "2.0.0-beta.17",
-    "@mdx-js/react": "^1.6.22",
+    "@docusaurus/core": "2.0.0-beta.18",
+    "@docusaurus/preset-classic": "2.0.0-beta.18",
+    "@mdx-js/react": "^2.1.1",
     "clsx": "^1.1.1",
     "prism-react-renderer": "^1.3.1",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^17.0.0",
+    "react-dom": "^17.0.0"
   },
   "browserslist": {
     "production": [
@@ -36,6 +36,6 @@
     ]
   },
   "devDependencies": {
-    "@types/react": "17.0.42"
+    "@types/react": "^17.0.0"
   }
 }
diff --git a/package.json b/package.json
@@ -34,22 +34,22 @@
     "start": "env-cmd --silent concurrently --kill-others \"pnpm run start:*\""
   },
   "dependencies": {
-    "concurrently": "^7.0.0",
+    "concurrently": "^7.1.0",
     "env-cmd": "^10.1.0"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^5.16.0",
-    "@typescript-eslint/parser": "^5.16.0",
+    "@typescript-eslint/eslint-plugin": "^5.18.0",
+    "@typescript-eslint/parser": "^5.18.0",
     "cz-conventional-changelog": "^3.3.0",
-    "eslint": "^8.11.0",
+    "eslint": "^8.12.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-simple-import-sort": "^7.0.0",
     "eslint-plugin-unused-imports": "^2.0.0",
     "husky": "^7.0.4",
-    "prettier": "^2.6.0",
+    "prettier": "^2.6.2",
     "standard-version": "^9.3.2",
-    "typescript": "^4.5.5"
+    "typescript": "^4.6.3"
   }
 }