release

.env.development

@@ -0,0 +1,3 @@
+NEXT_PUBLIC_BASE_URL=http://localost:3000
+NEXT_PUBLIC_API_BASE_URL=https://stage.dev.lubimovka.ru/api/v1/
+NEXT_PUBLIC_API_MOCKING=false

.env.test

@@ -0,0 +1 @@
+NEXT_PUBLIC_API_BASE_URL=http://localhost/

.eslintignore

@@ -0,0 +1 @@
+**/__generated__/*

.eslintrc.json

@@ -1,102 +1,14 @@
 {
   "extends": [
+    "./config/eslint/.eslintrc.js",
     "next/core-web-vitals"
   ],
-  "plugins": [
-    "@typescript-eslint"
-  ],
-  "rules": {
-    "indent": ["error", 2],
-
-    "quotes": ["error", "single"],
-
-    "jsx-quotes": ["error", "prefer-double"],
-
-    "semi": ["error", "always"],
-
-    "semi-spacing": ["error"],
-
-    "object-curly-spacing": ["error", "always"],
-
-    "object-curly-newline": ["error", {
-      "multiline": true,
-      "consistent": true
-    }],
-
-    "no-multiple-empty-lines": ["error", {
-      "max": 1,
-      "maxEOF": 1
-    }],
-
-    "operator-linebreak":  ["error", "before"],
-
-    "quote-props": ["error", "as-needed"],
-
-    "no-trailing-spaces": ["error"],
-
-    "no-mixed-operators": ["error"],
-
-    "no-nested-ternary": ["warn"],
-
-    "no-var": ["error"],
-
-    "camelcase": ["warn"],
-
-    "eol-last": ["error", "always"],
-
-    "no-console": ["error"],
-
-    "no-else-return": ["error"],
-
-    "no-unreachable": ["error"],
-
-    "react/jsx-indent": ["error", 2],
-
-    "react/jsx-curly-spacing": ["error", {
-      "when": "never",
-      "attributes": {
-        "allowMultiline": false
-      },
-      "children": true
-    }],
-
-    "react/jsx-tag-spacing": ["error", {
-      "closingSlash": "never",
-      "beforeSelfClosing": "never",
-      "afterOpening": "never",
-      "beforeClosing": "never"
-    }],
-
-    "react/jsx-first-prop-new-line": ["error", "multiline-multiprop"],
-
-    "react/jsx-max-props-per-line": ["error", {
-      "maximum": 1,
-      "when": "multiline"
-    }],
-
-    "react/jsx-wrap-multilines": ["error", {
-      "declaration": "parens-new-line",
-      "assignment": "parens-new-line",
-      "return": "parens-new-line",
-      "arrow": "parens-new-line",
-      "condition": "parens-new-line",
-      "logical": "parens-new-line",
-      "prop": "parens-new-line"
-    }],
-
-    "react/jsx-closing-bracket-location": ["error", "line-aligned"],
-
-    "react/jsx-one-expression-per-line": ["error"],
-
-    "react/jsx-boolean-value": ["error", "never"],
-
-    "react/self-closing-comp": ["error", {
-      "component": true,
-      "html": true
-    }],
-
-    "react/no-array-index-key": ["warn"],
-
-    "@typescript-eslint/no-unused-vars": ["error"]
-  }
+  "overrides": [
+    {
+      "files": ["src/pages/**/*", "src/components/**/*.stories.*"],
+      "rules": {
+        "import/no-default-export": "off"
+      }
+    }
+  ]
 }

.github/workflows/deploy-staging.yaml

@@ -1,75 +1,43 @@
-name: Build and Deploy
+name: Deploy staging
+
 concurrency:
   group: stage_deploy
   cancel-in-progress: true
 
 on:
-  push:
-    branches:
-      - develop
+  workflow_run:
+    workflows: [Publish staging Docker image]
+    types: [completed]
 
 env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: lubimovka_frontend
   DEPLOY_PATH: /LUBIMOVKA
 
 jobs:
-  build:
-    name: Build and publish
+  deployment:
+    name: Deployment
     runs-on: ubuntu-latest
     environment: stage_deploy
-    permissions:
-      contents: read
-      packages: write
     steps:
-      - uses: actions/checkout@v2
+      - name: Check out the repo
+        uses: actions/checkout@v3
         with:
           ref: develop
-      - uses: docker/login-action@v1
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Set environment variables
-        run: |
-          echo REPOSITORY_OWNER=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
-      - name: Build and publish to Github Packages Registry
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: config/docker/Dockerfile
-          labels: runnumber=${GITHUB_RUN_ID}
-          push: true
-          build-args: |
-            BASE_URL=${{ secrets.STAGING_BASE_URL }}
-            API_BASE_URL=${{ secrets.STAGING_API_BASE_URL }}
-          tags: |
-            ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER }}/${{ env.IMAGE_NAME }}:stage
-            ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER }}/${{ env.IMAGE_NAME }}:latest
-            ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
 
-  deploy:
-    name: Deploy package
-    runs-on: ubuntu-latest
-    environment: stage_deploy
-    needs: build
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          ref: develop
-      - name: Create ssh key
-        # (SSH_KNOWN_HOSTS=ssh-keyscan -H сервер, SSH_PRIVATE_KEY - ключ с ПК, которому разрешен вход)
+      - name: Create SSH key
         run: |
           mkdir -p ~/.ssh
           chmod 700 ~/.ssh
           echo "${{ secrets.SSH_KNOWN_HOSTS }}" > ~/.ssh/known_hosts
           chmod 644 ~/.ssh/known_hosts
           echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
           chmod 600 ~/.ssh/id_rsa
+
       - name: Create application directory
         run: ssh ${{ secrets.USERNAME }}@${{ secrets.HOST }} mkdir -p ${{ env.DEPLOY_PATH }}
+
       - name: Copy configuration
         run: scp -r config/docker/staging/* ${{ secrets.USERNAME }}@${{ secrets.HOST }}:${{ env.DEPLOY_PATH }}/stage
+
       - name: Execute remote ssh commands
         uses: appleboy/ssh-action@master
         with:
@@ -82,13 +50,7 @@ jobs:
 
             # Используем переменные окружения, сохраненные от CI/CD backend
             # Создание сети вынесено отдельно для возможности независимо перезапускать контейнеры (через external networks)
-            # docker network create stage_db_network || true
             docker network create stage_swag_network || true
 
-            # Установка приложения - frontend
-            cp -rf ${{ env.DEPLOY_PATH }}/stage/lubimovka-frontend.service /etc/systemd/system/lubimovka-frontend.service
             systemctl daemon-reload
             systemctl restart lubimovka-frontend.service
-
-            # После установки удаляем файлы
-            rm ${{ env.DEPLOY_PATH }}/stage/lubimovka-frontend.service

.github/workflows/docker-publish-production.yaml

@@ -0,0 +1,63 @@
+name: Publish production Docker image
+
+concurrency:
+  group: prod_deploy
+  cancel-in-progress: true
+
+on:
+  pull_request:
+    branches:
+      - main
+    types:
+      - closed
+  workflow_dispatch:
+    inputs:
+      git-ref:
+        description: Git Ref (Optional)
+        required: false
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: lubimovka_frontend
+
+jobs:
+  push_to_registry:
+    name: Build and push Docker image
+    runs-on: ubuntu-latest
+    environment: production
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+        if: github.event.inputs.git-ref != ''
+        with:
+          ref: ${{ github.event.inputs.git-ref }}
+
+      - name: Log in to Github Packages Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set environment variables
+        run: |
+          echo REPOSITORY_OWNER=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
+
+      - name: Build and publish to Github Packages Registry
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: config/docker/Dockerfile
+          labels: runnumber=${GITHUB_RUN_ID}
+          push: true
+          build-args: |
+            BASE_URL=${{ secrets.BASE_URL }}
+            API_BASE_URL=${{ secrets.API_BASE_URL }}
+            GA_TRACKING_ID=${{ secrets.GA_TRACKING_ID }}
+          tags: |
+            ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER }}/${{ env.IMAGE_NAME }}:production
+            ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER }}/${{ env.IMAGE_NAME }}:latest
+            ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER }}/${{ env.IMAGE_NAME }}:${{ github.sha }}

.github/workflows/deploy-production.yaml → .github/workflows/docker-publish-staging.yaml

@@ -1,39 +1,40 @@
-name: Build and Deploy
+name: Publish staging Docker image
+
 concurrency:
-  group: prod_deploy
+  group: stage_deploy
   cancel-in-progress: true
 
 on:
-  pull_request:
-    branches:
-      - main
-    types: [closed]
+  push:
+    branches: [ develop ]
 
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: lubimovka_frontend
-  DEPLOY_PATH: /LUBIMOVKA
 
 jobs:
-  build:
-    name: Build and publish
+  push_to_registry:
+    name: Build and push Docker image
     runs-on: ubuntu-latest
     environment: stage_deploy
     permissions:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v2
-        with:
-          ref: main
-      - uses: docker/login-action@v1
+      - name: Check out the repo
+        uses: actions/checkout@v3
+
+      - name: Log in to Github Packages Registry
+        uses: docker/login-action@v1
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Set environment variables
         run: |
           echo REPOSITORY_OWNER=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
+
       - name: Build and publish to Github Packages Registry
         uses: docker/build-push-action@v3
         with:
@@ -42,10 +43,10 @@ jobs:
           labels: runnumber=${GITHUB_RUN_ID}
           push: true
           build-args: |
-            BASE_URL=${{ secrets.PRODUCTION_BASE_URL }}
-            API_BASE_URL=${{ secrets.PRODUCTION_API_BASE_URL }}
-            GA_TRACKING_ID=${{ secrets.GA_TRACKING_ID }}
+            BASE_URL=${{ secrets.STAGING_BASE_URL }}
+            API_BASE_URL=${{ secrets.STAGING_API_BASE_URL }}
           tags: |
-            ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER }}/${{ env.IMAGE_NAME }}:production
+            ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER }}/${{ env.IMAGE_NAME }}:stage
             ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER }}/${{ env.IMAGE_NAME }}:latest
             ${{ env.REGISTRY }}/${{ env.REPOSITORY_OWNER }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
+