Merge branch 'release' into backend

codEnjoyer · Nov 16, 2023 · 7f49980 · 7f49980
2 parents e2f0150 + 7218ad2
commit 7f49980
Show file tree

Hide file tree

Showing 54 changed files with 2,949 additions and 234 deletions.
diff --git a/.github/workflows/actions-frontend.yml b/.github/workflows/actions-frontend.yml
@@ -1,21 +1,21 @@
-name: Actions Frontend
-on: [ push ]
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [ 18.x ]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Проект работает на Ноде версии ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-      - uses: ./frontend
-      - name: Установка модулей
-        run: npm install
-      - name: Сборка проекта
-        run: npm run build
-      - name: Запуск веб-приложения
-        run: npm run dev
+#name: Actions Frontend
+#on: [ push ]
+#jobs:
+#  build:
+#    runs-on: ubuntu-latest
+#    strategy:
+#      matrix:
+#        node-version: [ 18.x ]
+#    steps:
+#      - uses: actions/checkout@v3
+#      - name: Проект работает на Ноде версии ${{ matrix.node-version }}
+#        uses: actions/setup-node@v3
+#        with:
+#          node-version: ${{ matrix.node-version }}
+#      - uses: ./frontend
+#      - name: Установка модулей
+#        run: npm install
+#      - name: Сборка проекта
+#        run: npm run build
+#      - name: Запуск веб-приложения
+#        run: npm run dev
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -7,12 +7,11 @@ ENV PATH /app/node_modules/.bin:$PATH
 COPY package.json ./
 COPY package-lock.json ./
 
-RUN npm ci --silent
-RUN npm install react-scripts@3.4.1 -g --silent
+RUN npm i --silent
 
 COPY . /app/
 
 RUN npm run build
 RUN npm install -g serve
 
-CMD serve -s build -l ${FRONT_APP_PORT}
+CMD serve -s dist -l ${FRONT_APP_PORT}
diff --git a/frontend/index.html b/frontend/index.html
@@ -3,6 +3,10 @@
 <head>
     <meta charset="UTF-8"/>
     <title>Adaptify</title>
+    <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=Montserrat:wght@500&family=Oswald&display=swap"
+          rel="stylesheet">
 </head>
 <body>
 <div id="root">