Merge branch 'frontend_11' into 'frontend' from pull request #49

#11 Обновление проекта, добавление экранов авторизации и регистрации с валидацией
NikitaBuffy · Dec 17, 2024 · 3359c6d · 3359c6d
2 parents a71bd72 + 876759a
commit 3359c6d
Show file tree

Hide file tree

Showing 58 changed files with 3,160 additions and 11,744 deletions.
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -1,4 +1,4 @@
-name: Java CI
+name: Backend CI
 
 on:
   pull_request:
@@ -33,12 +33,6 @@ jobs:
           cd backend
           mvn clean verify
 
-      - name: Upload backend build artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: backend-jar
-          path: /backend/target/*.jar
-
       - name: Cache SonarQube packages
         uses: actions/cache@v4
         with:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,4 +1,4 @@
-name: Main CD
+name: CI/CD remote
 
 on:
   pull_request:
@@ -16,6 +16,12 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -25,19 +31,18 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Download Backend Artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: backend-jar
-          path: backend/target/
+      - name: Build backend
+        run: |
+          cd backend
+          mvn clean package
 
-      - name: Build and Push Backend Image
+      - name: Build and push backend image
         run: |
           cd backend
           docker build -t nickpominov/lm-backend:latest .
           docker push nickpominov/lm-backend:latest
 
-      - name: Deploy Backend to Remote Server
+      - name: Deploy backend to remote server
         uses: appleboy/[email protected]
         with:
           host: ${{ secrets.SERVER_IP }}
@@ -46,6 +51,7 @@ jobs:
           port: 22
           script: |
             cd /srv/lenka-messenger
+            docker-compose -f docker-compose.prod.yaml pull lm-backend
             docker-compose -f docker-compose.prod.yaml up -d --no-deps lm-backend
 
   cd-frontend:
@@ -95,4 +101,5 @@ jobs:
           port: 22
           script: |
             cd /srv/lenka-messenger
+            docker-compose -f docker-compose.prod.yaml pull lm-frontend
             docker-compose -f docker-compose.prod.yaml up -d --no-deps lm-frontend
diff --git a/frontend/.editorconfig b/frontend/.editorconfig
@@ -0,0 +1,5 @@
+[*.{js,jsx,ts,tsx,vue,html,css,md}]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/frontend/.gitignore b/frontend/.gitignore
@@ -1,23 +1,5 @@
-.DS_Store
-node_modules
-/dist
-
-
-# local env files
-.env.local
-.env.*.local
-
-# Log files
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-
-# Editor directories and files
-.idea
+node_modules/
+package-lock.json
+.prettierrc
 .vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
+dist/
diff --git a/frontend/babel.config.js b/frontend/babel.config.js
diff --git a/frontend/index.html b/frontend/index.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8" />
+  <link rel="icon" type="image/svg+xml" href="/favicon.ico" />
+  <link rel="preconnect" href="https://fonts.googleapis.com" />
+  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+  <link href="https://fonts.googleapis.com/css2?family=Fredoka:wght@300;500;600;700&display=swap" rel="stylesheet" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>Lenka Messenger</title>
+</head>
+
+<body>
+  <div id="app"></div>
+  <script type="module" src="/src/main.ts"></script>
+</body>
+
+</html>
diff --git a/frontend/jsconfig.json b/frontend/jsconfig.json