build(app): directory refactor

not-byte · May 6, 2024 · 2b300bf · 2b300bf
1 parent 16418c7
commit 2b300bf
Show file tree

Hide file tree

Showing 87 changed files with 35 additions and 16 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,6 +1,6 @@
 version: 2
 updates:
   - package-ecosystem: "npm"
-    directory: "/"
+    directory: "/app"
     schedule:
       interval: "weekly"
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -38,11 +38,14 @@ jobs:
       - name: Push Docker image
         uses: docker/build-push-action@v5
         with:
-          context: .
-          platforms: linux/amd64,linux/arm64
           push: true
+          context: ./config/app
+          file: ./config/app/Dockerfile
+          platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            "NUXT_MAIL_URL=${{ secrets.MAIL_URL }}"
   deploy:
     name: Deploy Docker to a Linux instance
     runs-on: ubuntu-latest
@@ -57,4 +60,4 @@ jobs:
           password: ${{ secrets.SERVER_PASSWORD }}
           port: ${{ secrets.SERVER_PORT }}
           key: ${{ secrets.SERVER_KEY }}
-          script: ${{ vars.SCRIPT }} ${{ github.repository }} ${{ secrets.APP_NAME }} ${{ secrets.APP_PORT }}
+          script: ${{ vars.SCRIPT }} ${{ github.repository }} ${{ secrets.APP_NAME }} ${{ secrets.APP_PORT }}
diff --git a/.gitignore b/.gitignore
@@ -14,9 +14,6 @@ logs
 *.log
 
 # Misc
-.DS_Store
-.fleet
-.idea
 
 # Local env files
 .env
@@ -30,3 +27,6 @@ sw.*
 # Development
 
 .vscode
+.DS_Store
+.fleet
+.idea
diff --git a/app.vue → app/app.vue b/app.vue → app/app.vue
diff --git a/app/router.options.ts → app/app_/router.options.ts b/app/router.options.ts → app/app_/router.options.ts
diff --git a/assets/css/tailwind.css → app/assets/css/tailwind.css b/assets/css/tailwind.css → app/assets/css/tailwind.css
diff --git a/.../font/inter-v13-latin_latin-ext-300.woff2 → .../font/inter-v13-latin_latin-ext-300.woff2 b/.../font/inter-v13-latin_latin-ext-300.woff2 → .../font/inter-v13-latin_latin-ext-300.woff2
diff --git a/.../font/inter-v13-latin_latin-ext-700.woff2 → .../font/inter-v13-latin_latin-ext-700.woff2 b/.../font/inter-v13-latin_latin-ext-700.woff2 → .../font/inter-v13-latin_latin-ext-700.woff2
diff --git a/...t/inter-v13-latin_latin-ext-regular.woff2 → ...t/inter-v13-latin_latin-ext-regular.woff2 b/...t/inter-v13-latin_latin-ext-regular.woff2 → ...t/inter-v13-latin_latin-ext-regular.woff2
diff --git a/assets/font/mnt_b.woff → app/assets/font/mnt_b.woff b/assets/font/mnt_b.woff → app/assets/font/mnt_b.woff
diff --git a/assets/font/mnt_l.woff → app/assets/font/mnt_l.woff b/assets/font/mnt_l.woff → app/assets/font/mnt_l.woff
diff --git a/components/button/Account.vue → app/components/button/Account.vue b/components/button/Account.vue → app/components/button/Account.vue
diff --git a/components/button/Base.vue → app/components/button/Base.vue b/components/button/Base.vue → app/components/button/Base.vue
diff --git a/components/button/Link.vue → app/components/button/Link.vue b/components/button/Link.vue → app/components/button/Link.vue
diff --git a/components/header/Dashboard.vue → app/components/header/Dashboard.vue b/components/header/Dashboard.vue → app/components/header/Dashboard.vue
diff --git a/components/header/Form.vue → app/components/header/Form.vue b/components/header/Form.vue → app/components/header/Form.vue
diff --git a/components/icon/Header.vue → app/components/icon/Header.vue b/components/icon/Header.vue → app/components/icon/Header.vue
diff --git a/components/icon/Instagram.vue → app/components/icon/Instagram.vue b/components/icon/Instagram.vue → app/components/icon/Instagram.vue
diff --git a/components/icon/Logo.vue → app/components/icon/Logo.vue b/components/icon/Logo.vue → app/components/icon/Logo.vue
diff --git a/components/icon/Logout.vue → app/components/icon/Logout.vue b/components/icon/Logout.vue → app/components/icon/Logout.vue
diff --git a/components/icon/User.vue → app/components/icon/User.vue b/components/icon/User.vue → app/components/icon/User.vue
diff --git a/components/input/Base.vue → app/components/input/Base.vue b/components/input/Base.vue → app/components/input/Base.vue
diff --git a/components/match/Controls.vue → app/components/match/Controls.vue b/components/match/Controls.vue → app/components/match/Controls.vue
diff --git a/components/select/Locale.vue → app/components/select/Locale.vue b/components/select/Locale.vue → app/components/select/Locale.vue
diff --git a/crowdin.yml → app/crowdin.yml b/crowdin.yml → app/crowdin.yml
diff --git a/error.vue → app/error.vue b/error.vue → app/error.vue
diff --git a/i18n.config.ts → app/i18n.config.ts b/i18n.config.ts → app/i18n.config.ts
diff --git a/middleware/auth.ts → app/middleware/auth.ts b/middleware/auth.ts → app/middleware/auth.ts
diff --git a/middleware/query.ts → app/middleware/query.ts b/middleware/query.ts → app/middleware/query.ts
diff --git a/nuxt.config.ts → app/nuxt.config.ts b/nuxt.config.ts → app/nuxt.config.ts
@@ -9,12 +9,7 @@ export default defineNuxtConfig({
     dirs: ["types"],
   },
   runtimeConfig: {
-    apiKey: "",
-    token: "",
-    mailHost: "",
-    mailPort: "",
-    mailUser: "",
-    mailPassword: "",
+    mailUlrl: "",
     public: {
       name: "Knury Knurów",
       version: "0.1.0",

diff --git a/package-lock.json → app/package-lock.json b/package-lock.json → app/package-lock.json
diff --git a/package.json → app/package.json b/package.json → app/package.json
diff --git a/pages/index.vue → app/pages/index.vue b/pages/index.vue → app/pages/index.vue
@@ -151,8 +151,7 @@ const register = async () => {
         </aside>
         <h1 class="text-center">Rejestracja drużyny</h1>
         <p class="text-justify">
-          Aby zapisać swoją drużynę na turniej koszykówki ulicznej Knurowski Streetball Kapitan musi wypełnienić
-          formularz, a następnie potwierdzić go drogą e-mail.
+          Turniej odbędzie się 25 Maja 2024 na Kompleksie Boisk "Orlik" przy ulicy Ułanów 8 w Knurowie. Aby zapisać swoją drużynę na turniej koszykówki ulicznej Knurowski Streetball Kapitan musi wypełnienić formularz, a następnie potwierdzić go drogą e-mail. 
           <span>
             Wymogiem rejestracji jest akceptacja
             <NuxtLink

diff --git a/pages_disabled/auth.vue → app/pages_disabled/auth.vue b/pages_disabled/auth.vue → app/pages_disabled/auth.vue
diff --git a/pages_disabled/auth/index.vue → app/pages_disabled/auth/index.vue b/pages_disabled/auth/index.vue → app/pages_disabled/auth/index.vue
diff --git a/pages_disabled/auth/login.vue → app/pages_disabled/auth/login.vue b/pages_disabled/auth/login.vue → app/pages_disabled/auth/login.vue
diff --git a/pages_disabled/auth/recovery.vue → app/pages_disabled/auth/recovery.vue b/pages_disabled/auth/recovery.vue → app/pages_disabled/auth/recovery.vue
diff --git a/pages_disabled/auth/register.vue → app/pages_disabled/auth/register.vue b/pages_disabled/auth/register.vue → app/pages_disabled/auth/register.vue
diff --git a/pages_disabled/auth/reset.vue → app/pages_disabled/auth/reset.vue b/pages_disabled/auth/reset.vue → app/pages_disabled/auth/reset.vue
diff --git a/pages_disabled/dashboard.vue → app/pages_disabled/dashboard.vue b/pages_disabled/dashboard.vue → app/pages_disabled/dashboard.vue
diff --git a/pages_disabled/dashboard/account/index.vue → ...ages_disabled/dashboard/account/index.vue b/pages_disabled/dashboard/account/index.vue → ...ages_disabled/dashboard/account/index.vue
diff --git a/...s_disabled/dashboard/account/settings.vue → ...s_disabled/dashboard/account/settings.vue b/...s_disabled/dashboard/account/settings.vue → ...s_disabled/dashboard/account/settings.vue
diff --git a/...isabled/dashboard/admin/matches/index.vue → ...isabled/dashboard/admin/matches/index.vue b/...isabled/dashboard/admin/matches/index.vue → ...isabled/dashboard/admin/matches/index.vue
diff --git a/pages_disabled/dashboard/index.vue → app/pages_disabled/dashboard/index.vue b/pages_disabled/dashboard/index.vue → app/pages_disabled/dashboard/index.vue
diff --git a/pages_disabled/dashboard/invite/index.vue → ...pages_disabled/dashboard/invite/index.vue b/pages_disabled/dashboard/invite/index.vue → ...pages_disabled/dashboard/invite/index.vue
diff --git a/..._disabled/dashboard/leaderboard/index.vue → ..._disabled/dashboard/leaderboard/index.vue b/..._disabled/dashboard/leaderboard/index.vue → ..._disabled/dashboard/leaderboard/index.vue
diff --git a/pages_disabled/dashboard/live/index.vue → app/pages_disabled/dashboard/live/index.vue b/pages_disabled/dashboard/live/index.vue → app/pages_disabled/dashboard/live/index.vue
diff --git a/...sabled/dashboard/players/[name]/index.vue → ...sabled/dashboard/players/[name]/index.vue b/...sabled/dashboard/players/[name]/index.vue → ...sabled/dashboard/players/[name]/index.vue
diff --git a/pages_disabled/dashboard/players/index.vue → ...ages_disabled/dashboard/players/index.vue b/pages_disabled/dashboard/players/index.vue → ...ages_disabled/dashboard/players/index.vue
diff --git a/pages_disabled/dashboard/schedule/index.vue → ...ges_disabled/dashboard/schedule/index.vue b/pages_disabled/dashboard/schedule/index.vue → ...ges_disabled/dashboard/schedule/index.vue
diff --git a/pages_disabled/dashboard/standings/index.vue → ...es_disabled/dashboard/standings/index.vue b/pages_disabled/dashboard/standings/index.vue → ...es_disabled/dashboard/standings/index.vue
diff --git a/...disabled/dashboard/teams/[team]/index.vue → ...disabled/dashboard/teams/[team]/index.vue b/...disabled/dashboard/teams/[team]/index.vue → ...disabled/dashboard/teams/[team]/index.vue
diff --git a/pages_disabled/dashboard/teams/index.vue → app/pages_disabled/dashboard/teams/index.vue b/pages_disabled/dashboard/teams/index.vue → app/pages_disabled/dashboard/teams/index.vue
diff --git a/pages_disabled/match/[match].vue → app/pages_disabled/match/[match].vue b/pages_disabled/match/[match].vue → app/pages_disabled/match/[match].vue
diff --git a/pages_disabled/match/index.vue → app/pages_disabled/match/index.vue b/pages_disabled/match/index.vue → app/pages_disabled/match/index.vue
diff --git a/pages_disabled/support.vue → app/pages_disabled/support.vue b/pages_disabled/support.vue → app/pages_disabled/support.vue
diff --git a/postcss.config.ts → app/postcss.config.ts b/postcss.config.ts → app/postcss.config.ts
diff --git a/public/favicon/apple-touch-icon.png → app/public/favicon/apple-touch-icon.png b/public/favicon/apple-touch-icon.png → app/public/favicon/apple-touch-icon.png
diff --git a/public/favicon/favicon-16x16.png → app/public/favicon/favicon-16x16.png b/public/favicon/favicon-16x16.png → app/public/favicon/favicon-16x16.png
diff --git a/public/favicon/favicon-192x192.png → app/public/favicon/favicon-192x192.png b/public/favicon/favicon-192x192.png → app/public/favicon/favicon-192x192.png
diff --git a/public/favicon/favicon-32x32.png → app/public/favicon/favicon-32x32.png b/public/favicon/favicon-32x32.png → app/public/favicon/favicon-32x32.png
diff --git a/public/favicon/favicon-512x512-maskable.png → ...blic/favicon/favicon-512x512-maskable.png b/public/favicon/favicon-512x512-maskable.png → ...blic/favicon/favicon-512x512-maskable.png
diff --git a/public/favicon/favicon-512x512.png → app/public/favicon/favicon-512x512.png b/public/favicon/favicon-512x512.png → app/public/favicon/favicon-512x512.png
diff --git a/public/favicon/favicon.ico → app/public/favicon/favicon.ico b/public/favicon/favicon.ico → app/public/favicon/favicon.ico
diff --git a/public/favicon/favicon.svg → app/public/favicon/favicon.svg b/public/favicon/favicon.svg → app/public/favicon/favicon.svg
diff --git a/public/robots.txt → app/public/robots.txt b/public/robots.txt → app/public/robots.txt
diff --git a/public/sitemap.xml → app/public/sitemap.xml b/public/sitemap.xml → app/public/sitemap.xml
diff --git a/server/api/form.post.ts → app/server/api/form.post.ts b/server/api/form.post.ts → app/server/api/form.post.ts
diff --git a/server/api_disabled/auth/index.get.ts → app/server/api_disabled/auth/index.get.ts b/server/api_disabled/auth/index.get.ts → app/server/api_disabled/auth/index.get.ts
diff --git a/server/api_disabled/auth/login.post.ts → app/server/api_disabled/auth/login.post.ts b/server/api_disabled/auth/login.post.ts → app/server/api_disabled/auth/login.post.ts
diff --git a/server/api_disabled/auth/recovery.post.ts → ...server/api_disabled/auth/recovery.post.ts b/server/api_disabled/auth/recovery.post.ts → ...server/api_disabled/auth/recovery.post.ts
diff --git a/server/api_disabled/auth/register.post.ts → ...server/api_disabled/auth/register.post.ts b/server/api_disabled/auth/register.post.ts → ...server/api_disabled/auth/register.post.ts
diff --git a/server/api_disabled/auth/reset.post.ts → app/server/api_disabled/auth/reset.post.ts b/server/api_disabled/auth/reset.post.ts → app/server/api_disabled/auth/reset.post.ts
diff --git a/server/api_disabled/auth/verify.get.ts → app/server/api_disabled/auth/verify.get.ts b/server/api_disabled/auth/verify.get.ts → app/server/api_disabled/auth/verify.get.ts
diff --git a/server/tsconfig.json → app/server/tsconfig.json b/server/tsconfig.json → app/server/tsconfig.json
diff --git a/tailwind.config.ts → app/tailwind.config.ts b/tailwind.config.ts → app/tailwind.config.ts
diff --git a/tsconfig.json → app/tsconfig.json b/tsconfig.json → app/tsconfig.json
diff --git a/types/index.d.ts → app/types/index.d.ts b/types/index.d.ts → app/types/index.d.ts
diff --git a/utils/errorRedirect.ts → app/utils/errorRedirect.ts b/utils/errorRedirect.ts → app/utils/errorRedirect.ts
diff --git a/utils/formatHours.ts → app/utils/formatHours.ts b/utils/formatHours.ts → app/utils/formatHours.ts
diff --git a/utils/formatMinutes.ts → app/utils/formatMinutes.ts b/utils/formatMinutes.ts → app/utils/formatMinutes.ts
diff --git a/utils/formatTime.ts → app/utils/formatTime.ts b/utils/formatTime.ts → app/utils/formatTime.ts
diff --git a/utils/getInputType.ts → app/utils/getInputType.ts b/utils/getInputType.ts → app/utils/getInputType.ts
diff --git a/utils/getPath.ts → app/utils/getPath.ts b/utils/getPath.ts → app/utils/getPath.ts
diff --git a/utils/validateData.ts → app/utils/validateData.ts b/utils/validateData.ts → app/utils/validateData.ts
diff --git a/Dockerfile → config/app/Dockerfile b/Dockerfile → config/app/Dockerfile
@@ -2,7 +2,13 @@ FROM node:current-alpine
 
 LABEL authors = "botprzemek,pawelos231,akolt19d,nozowymrozon"
 
-WORKDIR /app
+ARG NUXT_MAIL_URL
+
+ENV HOST="127.0.0.1"
+ENV PORT="3000"
+ENV NUXT_MAIL_URL ${NUXT_MAIL_URL}
+
+WORKDIR /var/www/html/tournament-app
 
 COPY . .
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,16 @@
+name: tournament
+version: 3.7
+services:
+  app:
+    container_name: tournament-app
+    ports:
+      - 60002:3000
+    user: node
+    build:
+      dockerfile: Dockerfile
+      context: ./config/app
+    working_dir: /var/www/html/avantage
+    volumes:
+      - ./app:/var/www/html/avantage
+    networks:
+      - default