TG-1074 Maintenance - Reorganize core project files to use the src fo…

…lder pattern (#34) * Move all project core files into a src folder * Adapt docker files to properly handle the src folder --------- Co-authored-by: Luca <[email protected]> Co-authored-by: Luca <[email protected]>
20tab · Jan 26, 2024 · 53728d4 · 53728d4
1 parent ac397a7
commit 53728d4
Show file tree

Hide file tree

Showing 25 changed files with 3 additions and 13 deletions.
diff --git 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
@@ -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/...r.project_dirname}}/components/Navbar.tsx → ...oject_dirname}}/src/components/Navbar.tsx b/...r.project_dirname}}/components/Navbar.tsx → ...oject_dirname}}/src/components/Navbar.tsx
diff --git a/...ject_dirname}}/components/ThemeSwitch.tsx → ..._dirname}}/src/components/ThemeSwitch.tsx b/...ject_dirname}}/components/ThemeSwitch.tsx → ..._dirname}}/src/components/ThemeSwitch.tsx
diff --git a/...t_dirname}}/components/commons/Button.tsx → ...rname}}/src/components/commons/Button.tsx b/...t_dirname}}/components/commons/Button.tsx → ...rname}}/src/components/commons/Button.tsx
diff --git a/...ct_dirname}}/components/commons/Input.tsx → ...irname}}/src/components/commons/Input.tsx b/...ct_dirname}}/components/commons/Input.tsx → ...irname}}/src/components/commons/Input.tsx
diff --git a/...rname}}/components/commons/Typography.tsx → ...e}}/src/components/commons/Typography.tsx b/...rname}}/components/commons/Typography.tsx → ...e}}/src/components/commons/Typography.tsx
diff --git a/...ject_dirname}}/components/layout/Base.tsx → ..._dirname}}/src/components/layout/Base.tsx b/...ject_dirname}}/components/layout/Base.tsx → ..._dirname}}/src/components/layout/Base.tsx
diff --git a/...kiecutter.project_dirname}}/models/Api.ts → ...utter.project_dirname}}/src/models/Api.ts b/...kiecutter.project_dirname}}/models/Api.ts → ...utter.project_dirname}}/src/models/Api.ts
diff --git a/...ecutter.project_dirname}}/models/Utils.ts → ...ter.project_dirname}}/src/models/Utils.ts b/...ecutter.project_dirname}}/models/Utils.ts → ...ter.project_dirname}}/src/models/Utils.ts
diff --git a/...iecutter.project_dirname}}/pages/_app.tsx → ...tter.project_dirname}}/src/pages/_app.tsx b/...iecutter.project_dirname}}/pages/_app.tsx → ...tter.project_dirname}}/src/pages/_app.tsx
diff --git a/...ter.project_dirname}}/pages/_document.tsx → ...project_dirname}}/src/pages/_document.tsx b/...ter.project_dirname}}/pages/_document.tsx → ...project_dirname}}/src/pages/_document.tsx
diff --git a/...ter.project_dirname}}/pages/api/health.ts → ...project_dirname}}/src/pages/api/health.ts b/...ter.project_dirname}}/pages/api/health.ts → ...project_dirname}}/src/pages/api/health.ts
diff --git a/...ecutter.project_dirname}}/pages/index.tsx → ...ter.project_dirname}}/src/pages/index.tsx b/...ecutter.project_dirname}}/pages/index.tsx → ...ter.project_dirname}}/src/pages/index.tsx
diff --git a/...iecutter.project_dirname}}/store/index.ts → ...tter.project_dirname}}/src/store/index.ts b/...iecutter.project_dirname}}/store/index.ts → ...tter.project_dirname}}/src/store/index.ts
diff --git a/...utter.project_dirname}}/store/reducers.ts → ...r.project_dirname}}/src/store/reducers.ts b/...utter.project_dirname}}/store/reducers.ts → ...r.project_dirname}}/src/store/reducers.ts
diff --git a/...ter.project_dirname}}/store/utilsSlice.ts → ...project_dirname}}/src/store/utilsSlice.ts b/...ter.project_dirname}}/store/utilsSlice.ts → ...project_dirname}}/src/store/utilsSlice.ts
diff --git a/....project_dirname}}/styles/GlobalStyle.tsx → ...ject_dirname}}/src/styles/GlobalStyle.tsx b/....project_dirname}}/styles/GlobalStyle.tsx → ...ject_dirname}}/src/styles/GlobalStyle.tsx
diff --git a/...r.project_dirname}}/styles/themes/dark.ts → ...oject_dirname}}/src/styles/themes/dark.ts b/...r.project_dirname}}/styles/themes/dark.ts → ...oject_dirname}}/src/styles/themes/dark.ts
diff --git a/....project_dirname}}/styles/themes/index.ts → ...ject_dirname}}/src/styles/themes/index.ts b/....project_dirname}}/styles/themes/index.ts → ...ject_dirname}}/src/styles/themes/index.ts
diff --git a/....project_dirname}}/styles/themes/light.ts → ...ject_dirname}}/src/styles/themes/light.ts b/....project_dirname}}/styles/themes/light.ts → ...ject_dirname}}/src/styles/themes/light.ts
diff --git a/...utter.project_dirname}}/utils/api/auth.ts → ...r.project_dirname}}/src/utils/api/auth.ts b/...utter.project_dirname}}/utils/api/auth.ts → ...r.project_dirname}}/src/utils/api/auth.ts
diff --git a/...tter.project_dirname}}/utils/api/axios.ts → ....project_dirname}}/src/utils/api/axios.ts b/...tter.project_dirname}}/utils/api/axios.ts → ....project_dirname}}/src/utils/api/axios.ts
diff --git a/...tter.project_dirname}}/utils/api/index.ts → ....project_dirname}}/src/utils/api/index.ts b/...tter.project_dirname}}/utils/api/index.ts → ....project_dirname}}/src/utils/api/index.ts
diff --git 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,