From 53728d478481d0baebbb84d44b348fd924636a99 Mon Sep 17 00:00:00 2001
From: Luca Spinosi <131857082+lucaspinosi@users.noreply.github.com>
Date: Fri, 26 Jan 2024 12:41:10 +0100
Subject: [PATCH] TG-1074 Maintenance - Reorganize core project files to use
 the src folder pattern (#34)

* Move all project core files into a src folder

* Adapt docker files to properly handle the src folder

---------

Co-authored-by: Luca <luca@macbook.local>
Co-authored-by: Luca <luca@macbook.lan>
---
 {{cookiecutter.project_dirname}}/docker-compose/test.yaml  | 7 +------
 {{cookiecutter.project_dirname}}/docker/remote.Dockerfile  | 7 +------
 .../{ => src}/components/Navbar.tsx                        | 0
 .../{ => src}/components/ThemeSwitch.tsx                   | 0
 .../{ => src}/components/commons/Button.tsx                | 0
 .../{ => src}/components/commons/Input.tsx                 | 0
 .../{ => src}/components/commons/Typography.tsx            | 0
 .../{ => src}/components/layout/Base.tsx                   | 0
 {{cookiecutter.project_dirname}}/{ => src}/models/Api.ts   | 0
 {{cookiecutter.project_dirname}}/{ => src}/models/Utils.ts | 0
 {{cookiecutter.project_dirname}}/{ => src}/pages/_app.tsx  | 0
 .../{ => src}/pages/_document.tsx                          | 0
 .../{ => src}/pages/api/health.ts                          | 0
 {{cookiecutter.project_dirname}}/{ => src}/pages/index.tsx | 0
 {{cookiecutter.project_dirname}}/{ => src}/store/index.ts  | 0
 .../{ => src}/store/reducers.ts                            | 0
 .../{ => src}/store/utilsSlice.ts                          | 0
 .../{ => src}/styles/GlobalStyle.tsx                       | 0
 .../{ => src}/styles/themes/dark.ts                        | 0
 .../{ => src}/styles/themes/index.ts                       | 0
 .../{ => src}/styles/themes/light.ts                       | 0
 .../{ => src}/utils/api/auth.ts                            | 0
 .../{ => src}/utils/api/axios.ts                           | 0
 .../{ => src}/utils/api/index.ts                           | 0
 {{cookiecutter.project_dirname}}/tsconfig.json             | 2 +-
 25 files changed, 3 insertions(+), 13 deletions(-)
 rename {{cookiecutter.project_dirname}}/{ => src}/components/Navbar.tsx (100%)
 rename {{cookiecutter.project_dirname}}/{ => src}/components/ThemeSwitch.tsx (100%)
 rename {{cookiecutter.project_dirname}}/{ => src}/components/commons/Button.tsx (100%)
 rename {{cookiecutter.project_dirname}}/{ => src}/components/commons/Input.tsx (100%)
 rename {{cookiecutter.project_dirname}}/{ => src}/components/commons/Typography.tsx (100%)
 rename {{cookiecutter.project_dirname}}/{ => src}/components/layout/Base.tsx (100%)
 rename {{cookiecutter.project_dirname}}/{ => src}/models/Api.ts (100%)
 rename {{cookiecutter.project_dirname}}/{ => src}/models/Utils.ts (100%)
 rename {{cookiecutter.project_dirname}}/{ => src}/pages/_app.tsx (100%)
 rename {{cookiecutter.project_dirname}}/{ => src}/pages/_document.tsx (100%)
 rename {{cookiecutter.project_dirname}}/{ => src}/pages/api/health.ts (100%)
 rename {{cookiecutter.project_dirname}}/{ => src}/pages/index.tsx (100%)
 rename {{cookiecutter.project_dirname}}/{ => src}/store/index.ts (100%)
 rename {{cookiecutter.project_dirname}}/{ => src}/store/reducers.ts (100%)
 rename {{cookiecutter.project_dirname}}/{ => src}/store/utilsSlice.ts (100%)
 rename {{cookiecutter.project_dirname}}/{ => src}/styles/GlobalStyle.tsx (100%)
 rename {{cookiecutter.project_dirname}}/{ => src}/styles/themes/dark.ts (100%)
 rename {{cookiecutter.project_dirname}}/{ => src}/styles/themes/index.ts (100%)
 rename {{cookiecutter.project_dirname}}/{ => src}/styles/themes/light.ts (100%)
 rename {{cookiecutter.project_dirname}}/{ => src}/utils/api/auth.ts (100%)
 rename {{cookiecutter.project_dirname}}/{ => src}/utils/api/axios.ts (100%)
 rename {{cookiecutter.project_dirname}}/{ => src}/utils/api/index.ts (100%)

diff --git a/{{cookiecutter.project_dirname}}/docker-compose/test.yaml b/{{cookiecutter.project_dirname}}/docker-compose/test.yaml
index 5befcc4..3fe3889 100644
--- a/{{cookiecutter.project_dirname}}/docker-compose/test.yaml
+++ b/{{cookiecutter.project_dirname}}/docker-compose/test.yaml
@@ -10,12 +10,7 @@ services:
       dockerfile: ${SERVICE_DOCKER_FILE:-docker/test.Dockerfile}
     volumes:
       - ./__tests__:/app/__tests__:ro
-      - ./components:/app/components:ro
       - ./declarations:/app/declarations:ro
-      - ./models:/app/models:ro
-      - ./pages:/app/pages:ro
       - ./public:/app/public:ro
-      - ./store:/app/store:ro
-      - ./styles:/app/styles:ro
-      - ./utils:/app/utils:ro
+      - ./src:/app/src:ro
     user: ${USER:-nextjs}
diff --git a/{{cookiecutter.project_dirname}}/docker/remote.Dockerfile b/{{cookiecutter.project_dirname}}/docker/remote.Dockerfile
index 44cfe2c..c6aa7b9 100644
--- a/{{cookiecutter.project_dirname}}/docker/remote.Dockerfile
+++ b/{{cookiecutter.project_dirname}}/docker/remote.Dockerfile
@@ -10,14 +10,9 @@ RUN \
   elif [ -f pnpm-lock.yaml ]; then yarn global add pnpm && pnpm i; \
   else echo "Lockfile not found." && exit 1; \
   fi
-COPY components ./components
 COPY declarations ./declarations
-COPY models ./models
-COPY pages ./pages
 COPY public ./public
-COPY store ./store
-COPY styles ./styles
-COPY utils ./utils
+COPY src ./src
 COPY tsconfig.json next.config.js sentry.client.config.js sentry.server.config.js middleware.ts ./
 ARG SENTRY_AUTH_TOKEN \
   SENTRY_ORG \
diff --git a/{{cookiecutter.project_dirname}}/components/Navbar.tsx b/{{cookiecutter.project_dirname}}/src/components/Navbar.tsx
similarity index 100%
rename from {{cookiecutter.project_dirname}}/components/Navbar.tsx
rename to {{cookiecutter.project_dirname}}/src/components/Navbar.tsx
diff --git a/{{cookiecutter.project_dirname}}/components/ThemeSwitch.tsx b/{{cookiecutter.project_dirname}}/src/components/ThemeSwitch.tsx
similarity index 100%
rename from {{cookiecutter.project_dirname}}/components/ThemeSwitch.tsx
rename to {{cookiecutter.project_dirname}}/src/components/ThemeSwitch.tsx
diff --git a/{{cookiecutter.project_dirname}}/components/commons/Button.tsx b/{{cookiecutter.project_dirname}}/src/components/commons/Button.tsx
similarity index 100%
rename from {{cookiecutter.project_dirname}}/components/commons/Button.tsx
rename to {{cookiecutter.project_dirname}}/src/components/commons/Button.tsx
diff --git a/{{cookiecutter.project_dirname}}/components/commons/Input.tsx b/{{cookiecutter.project_dirname}}/src/components/commons/Input.tsx
similarity index 100%
rename from {{cookiecutter.project_dirname}}/components/commons/Input.tsx
rename to {{cookiecutter.project_dirname}}/src/components/commons/Input.tsx
diff --git a/{{cookiecutter.project_dirname}}/components/commons/Typography.tsx b/{{cookiecutter.project_dirname}}/src/components/commons/Typography.tsx
similarity index 100%
rename from {{cookiecutter.project_dirname}}/components/commons/Typography.tsx
rename to {{cookiecutter.project_dirname}}/src/components/commons/Typography.tsx
diff --git a/{{cookiecutter.project_dirname}}/components/layout/Base.tsx b/{{cookiecutter.project_dirname}}/src/components/layout/Base.tsx
similarity index 100%
rename from {{cookiecutter.project_dirname}}/components/layout/Base.tsx
rename to {{cookiecutter.project_dirname}}/src/components/layout/Base.tsx
diff --git a/{{cookiecutter.project_dirname}}/models/Api.ts b/{{cookiecutter.project_dirname}}/src/models/Api.ts
similarity index 100%
rename from {{cookiecutter.project_dirname}}/models/Api.ts
rename to {{cookiecutter.project_dirname}}/src/models/Api.ts
diff --git a/{{cookiecutter.project_dirname}}/models/Utils.ts b/{{cookiecutter.project_dirname}}/src/models/Utils.ts
similarity index 100%
rename from {{cookiecutter.project_dirname}}/models/Utils.ts
rename to {{cookiecutter.project_dirname}}/src/models/Utils.ts
diff --git a/{{cookiecutter.project_dirname}}/pages/_app.tsx b/{{cookiecutter.project_dirname}}/src/pages/_app.tsx
similarity index 100%
rename from {{cookiecutter.project_dirname}}/pages/_app.tsx
rename to {{cookiecutter.project_dirname}}/src/pages/_app.tsx
diff --git a/{{cookiecutter.project_dirname}}/pages/_document.tsx b/{{cookiecutter.project_dirname}}/src/pages/_document.tsx
similarity index 100%
rename from {{cookiecutter.project_dirname}}/pages/_document.tsx
rename to {{cookiecutter.project_dirname}}/src/pages/_document.tsx
diff --git a/{{cookiecutter.project_dirname}}/pages/api/health.ts b/{{cookiecutter.project_dirname}}/src/pages/api/health.ts
similarity index 100%
rename from {{cookiecutter.project_dirname}}/pages/api/health.ts
rename to {{cookiecutter.project_dirname}}/src/pages/api/health.ts
diff --git a/{{cookiecutter.project_dirname}}/pages/index.tsx b/{{cookiecutter.project_dirname}}/src/pages/index.tsx
similarity index 100%
rename from {{cookiecutter.project_dirname}}/pages/index.tsx
rename to {{cookiecutter.project_dirname}}/src/pages/index.tsx
diff --git a/{{cookiecutter.project_dirname}}/store/index.ts b/{{cookiecutter.project_dirname}}/src/store/index.ts
similarity index 100%
rename from {{cookiecutter.project_dirname}}/store/index.ts
rename to {{cookiecutter.project_dirname}}/src/store/index.ts
diff --git a/{{cookiecutter.project_dirname}}/store/reducers.ts b/{{cookiecutter.project_dirname}}/src/store/reducers.ts
similarity index 100%
rename from {{cookiecutter.project_dirname}}/store/reducers.ts
rename to {{cookiecutter.project_dirname}}/src/store/reducers.ts
diff --git a/{{cookiecutter.project_dirname}}/store/utilsSlice.ts b/{{cookiecutter.project_dirname}}/src/store/utilsSlice.ts
similarity index 100%
rename from {{cookiecutter.project_dirname}}/store/utilsSlice.ts
rename to {{cookiecutter.project_dirname}}/src/store/utilsSlice.ts
diff --git a/{{cookiecutter.project_dirname}}/styles/GlobalStyle.tsx b/{{cookiecutter.project_dirname}}/src/styles/GlobalStyle.tsx
similarity index 100%
rename from {{cookiecutter.project_dirname}}/styles/GlobalStyle.tsx
rename to {{cookiecutter.project_dirname}}/src/styles/GlobalStyle.tsx
diff --git a/{{cookiecutter.project_dirname}}/styles/themes/dark.ts b/{{cookiecutter.project_dirname}}/src/styles/themes/dark.ts
similarity index 100%
rename from {{cookiecutter.project_dirname}}/styles/themes/dark.ts
rename to {{cookiecutter.project_dirname}}/src/styles/themes/dark.ts
diff --git a/{{cookiecutter.project_dirname}}/styles/themes/index.ts b/{{cookiecutter.project_dirname}}/src/styles/themes/index.ts
similarity index 100%
rename from {{cookiecutter.project_dirname}}/styles/themes/index.ts
rename to {{cookiecutter.project_dirname}}/src/styles/themes/index.ts
diff --git a/{{cookiecutter.project_dirname}}/styles/themes/light.ts b/{{cookiecutter.project_dirname}}/src/styles/themes/light.ts
similarity index 100%
rename from {{cookiecutter.project_dirname}}/styles/themes/light.ts
rename to {{cookiecutter.project_dirname}}/src/styles/themes/light.ts
diff --git a/{{cookiecutter.project_dirname}}/utils/api/auth.ts b/{{cookiecutter.project_dirname}}/src/utils/api/auth.ts
similarity index 100%
rename from {{cookiecutter.project_dirname}}/utils/api/auth.ts
rename to {{cookiecutter.project_dirname}}/src/utils/api/auth.ts
diff --git a/{{cookiecutter.project_dirname}}/utils/api/axios.ts b/{{cookiecutter.project_dirname}}/src/utils/api/axios.ts
similarity index 100%
rename from {{cookiecutter.project_dirname}}/utils/api/axios.ts
rename to {{cookiecutter.project_dirname}}/src/utils/api/axios.ts
diff --git a/{{cookiecutter.project_dirname}}/utils/api/index.ts b/{{cookiecutter.project_dirname}}/src/utils/api/index.ts
similarity index 100%
rename from {{cookiecutter.project_dirname}}/utils/api/index.ts
rename to {{cookiecutter.project_dirname}}/src/utils/api/index.ts
diff --git a/{{cookiecutter.project_dirname}}/tsconfig.json b/{{cookiecutter.project_dirname}}/tsconfig.json
index 08a63af..425207d 100644
--- a/{{cookiecutter.project_dirname}}/tsconfig.json
+++ b/{{cookiecutter.project_dirname}}/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "allowJs": true,
-    "baseUrl": ".",
+    "baseUrl": "./src",
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "incremental": true,