pull krbl

.gitea/workflows/publish.yaml

@@ -0,0 +1,56 @@
+name: publish-main
+
+on:
+  push
+
+jobs:
+  release-image:
+    runs-on: ubuntu-latest
+    container:
+      image: catthehacker/ubuntu:act-latest
+    env:
+      DOCKER_ORG: krbl
+      RUNNER_TOOL_CACHE: /toolcache
+      IMAGE_NAME: minerva-frontend
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker BuildX
+        uses: docker/setup-buildx-action@v2
+        with:
+          config-inline: |
+            [registry."gitea.unprism.ru"]                                
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          registry: gitea.unprism.ru
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Get Meta
+        id: meta
+        run: |
+          echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT
+          echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT                 
+
+      - name: Extract branch name
+        shell: bash
+        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+        id: extract_branch
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: |
+            linux/amd64
+            linux/arm64
+          push: true
+          tags: |
+            gitea.unprism.ru/${{ env.DOCKER_ORG }}/${{ env.IMAGE_NAME }}:${{ steps.extract_branch.outputs.branch }}                      

.gitignore

@@ -1,3 +1,4 @@
 dist/
 node_modules/
 package-lock.json
+.DS_Store

captain-definition

@@ -0,0 +1,12 @@
+{
+  "schemaVersion": 2,
+  "dockerfileLines": [
+    "FROM node",
+    "WORKDIR /app",
+    "COPY package*.json ./",
+    "RUN npm install",
+    "COPY . .",
+    "EXPOSE 3000",
+    "CMD [\"npm\", \"run\", \"start:dev\"]"
+  ]
+}

src/App.jsx

@@ -3,13 +3,13 @@ import { Outlet, useNavigate } from "react-router-dom";
 import { FormsData, UserData, TypeAnswerData, answersData } from "./context";
 import { useCookies } from "react-cookie";
 import { globalRender } from "./router/protectedRouting.js";
-import { verifyUserApi } from "./hooks/api/enterAccountApi.js"
+import { verifyUserApi } from "./hooks/api/enterAccountApi.js";
-import classes from "./assets/styles/app.module.scss"
+import classes from "./assets/styles/app.module.scss";
 import NavBar from "./components/NavBar.jsx";
-import 'bootstrap/dist/css/bootstrap.min.css';
+import "bootstrap/dist/css/bootstrap.min.css";
 import InputText from "./components/typeAnswer/InputText.jsx";
 import TextArea from "./components/typeAnswer/TextArea.jsx";
-import YesNo from "./components/typeAnswer/YesNo.jsx"
+import YesNo from "./components/typeAnswer/YesNo.jsx";
 import InputDate from "./components/typeAnswer/InputDate.jsx";
 import InputMultipleRadio from "./components/typeAnswer/InputMultipleRadio.jsx";
 import InputRadio from "./components/typeAnswer/InputRadio.jsx";
@@ -38,6 +38,7 @@ const App = () => {
   useEffect(() => {
     async function verifyUser() {
       const response = await verifyUserApi(cookies.token);
+      console.log("app", user);
 
             if (response.status === 200) {
                 setUser(response.data);
@@ -49,13 +50,15 @@ const App = () => {
         }
 
     verifyUser();
-    }, [])
+  }, []);
 
   return (
     <UserData.Provider value={{ user, setUser }}>
       <answersData.Provider value={{ answersList, setAnswersList }}>
         <FormsData.Provider value={{ forms, setForms }}>
-                    <TypeAnswerData.Provider value={{ listTypeAnswer, setListTypeAnswer }}>
+          <TypeAnswerData.Provider
+            value={{ listTypeAnswer, setListTypeAnswer }}
+          >
             <div className={classes.main}>
               <div className={classes.container}>
                 <div className={classes.header}>
@@ -70,7 +73,7 @@ const App = () => {
         </FormsData.Provider>
       </answersData.Provider>
     </UserData.Provider>
-    )
+  );
-}
+};
 
 export default App;

src/components/NavBar.jsx

@@ -26,7 +26,7 @@ const NavBar = ({navigate, auth, setAuth}) => {
                 </div>
             </div>
         </div>
-    )
+    );
-}
+};
 
 export default NavBar;

src/hooks/validation/enterAccountValidate.js

@@ -1,14 +1,18 @@
-const constructorAnswerValidate = (state, messageReject = "Ошибка", messageResolve = undefined) => {
+const constructorAnswerValidate = (
-    return state ? 
+  state,
-        {
+  messageReject = "Ошибка",
+  messageResolve = undefined
+) => {
+  return state
+    ? {
         status: true,
-            message: messageResolve
+        message: messageResolve,
-        } :
+      }
-        {
+    : {
         status: false,
-            message: messageReject
+        message: messageReject,
-        }
+      };
-}
+};
 
 const totalRegisterValidate = (data) => {
     const listValidation = [
@@ -24,10 +28,10 @@ const totalRegisterValidate = (data) => {
 
   for (let value of listValidation) {
     if (!value.status) {
-            return value
+      return value;
     }
   }
-    return { status: true }
+  return { status: true };
-}
+};
 
-export { totalRegisterValidate, constructorAnswerValidate }
+export { totalRegisterValidate, constructorAnswerValidate };

src/pages/EnterAccount.jsx

@@ -5,7 +5,11 @@ import classes from "../assets/styles/enterAccount.module.scss";
 import MyInput from "../components/MyInput.jsx";
 import MyButton from "../components/MyButton.jsx";
 import { UserData } from "../context";
-import { logIn, completeRegistration, verifyUserApi } from "../hooks/api/enterAccountApi.js";
+import {
+  logIn,
+  completeRegistration,
+  verifyUserApi,
+} from "../hooks/api/enterAccountApi.js";
 
 const EnterAccount = () => {
   const [enter, setEnter] = useState("login");
@@ -33,18 +37,18 @@ const EnterAccount = () => {
     setPatronymic("");
     setPassword("");
     setRepiedPassword("");
-    };
+  }
 
   function selectTag(tag) {
     setEnter(tag);
     cleanState();
-    };
+  }
 
   async function createUser() {
     const response = await completeRegistration({
       login: login,
       password: password,
-            repiedPassword: repiedPassword
+      repiedPassword: repiedPassword,
     });
 
         if (response.status === 200) {
@@ -60,7 +64,7 @@ const EnterAccount = () => {
     };
 
   async function logInToAccount() {
-        const response = await logIn(login, password)
+    const response = await logIn(login, password);
 
         if (response.status === 200) {
             setCookie("token", response.data.token);
@@ -133,14 +137,19 @@ const EnterAccount = () => {
                                 <MyInput type={'password'} placeholder={"Повторите пароль"} otherMainStyle={{width: "100%", height: "15%"}} otherInputStyle={{width: "100%"}} value={repiedPassword} change={setRepiedPassword}/>
                             </div> */}
                             <div className={classes.content__wrapper__register__footer}>
-                                <MyButton text={"Создать"} otherStyle={{height: "100%", width: "20%"}} click={() => createUser()}/>
+                                <MyButton
-                            </div>
+                                    text={"Создать"}
-                        </div>}
+                                    otherStyle={{ height: "100%", width: "20%" }}
+                                    click={() => createUser()}
+                                />
                             </div>
                         </div>
-            </div>
-        </div>
-    )
                         }
+                    </div>
+                </div>
+            </div>
+        </div>
+        );
+    };
 
 export default EnterAccount;

src/pages/Home.jsx

@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { useNavigate, useLocation, useParams } from 'react-router-dom';
+import { useNavigate, useLocation, useParams } from "react-router-dom";
 import classes from "../assets/styles/home.module.scss";
 import MyButton from "../components/MyButton.jsx";
 import MyInput from "../components/MyInput.jsx";
@@ -12,8 +12,13 @@ const Home = () => {
     <div className={classes.main}>
       <div className={classes.wrapper}>
         <div className={classes.header}>
-                    <div className={classes.header__top}>Кажется вы попали на общую страницу.</div>
+          <div className={classes.header__top}>
-                    <div className={classes.header__bottom}>Чтобы перейти к форме ввелите токен ниже или снова перейдите по ссылке.</div>
+            Кажется вы попали на общую страницу.
+          </div>
+          <div className={classes.header__bottom}>
+            Чтобы перейти к форме введите токен ниже или снова перейдите по
+            ссылке.
+          </div>
         </div>
         <div className={classes.content}>
           <div className={classes.content__title}>
@@ -23,18 +28,27 @@ const Home = () => {
           </div>
           <div className={classes.content__token}>
             <div className={classes.content__token__wrapper}>
-                            <MyInput placeholder={"Введите токен формы..."} otherMainStyle={{width: "100%"}} otherInputStyle={{width: "100%"}} value={token} change={(e) => setToken(e)}/>
+              <MyInput
+                placeholder={"Введите токен формы..."}
+                otherMainStyle={{ width: "100%" }}
+                otherInputStyle={{ width: "100%" }}
+                value={token}
+                change={(e) => setToken(e)}
+              />
             </div>
           </div>
           <div className={classes.content__search}>
             <div className={classes.content__search__wrapper}>
-                            <MyButton text={"Найти форму"} click={() => navigate(`/forms/${token}`)}/>
+              <MyButton
+                text={"Найти форму"}
+                click={() => navigate(`/forms/${token}`)}
+              />
             </div>
           </div>
         </div>
       </div>
     </div>
-    )
+  );
-}
+};
 
 export default Home;

webpack.config.js

@@ -1,50 +1,53 @@
-const HtmlWebpackPlugin = require('html-webpack-plugin');
+const HtmlWebpackPlugin = require("html-webpack-plugin");
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const MiniCssExtractPlugin = require("mini-css-extract-plugin");
-const path = require('path');
+const path = require("path");
 
 module.exports = (env) => {
-
+  const isDev = env.mode === "development";
-    const isDev = env.mode === 'development';
 
   const cssLoader = {
     loader: "css-loader",
     options: {
       modules: {
-                localIdentName: isDev ? '[path][name]__[local]' : '[hash:base64:8]'
+        localIdentName: isDev ? "[path][name]__[local]" : "[hash:base64:8]",
       },
     },
-    }
+  };
 
   const config = {
-        mode: env.mode ?? 'development',
+    mode: env.mode ?? "development",
     performance: {
       hints: false,
       maxEntrypointSize: 512000,
-            maxAssetSize: 512000
+      maxAssetSize: 512000,
     },
-        entry: './src/index.js',
+    entry: "./src/index.js",
     output: {
       // filename: '[name].[contenthash].js',
-            filename: 'bundle.js',
+      filename: "bundle.js",
-            publicPath: '/',
+      publicPath: "/",
-            path: path.resolve(__dirname, 'dist'),
+      path: path.resolve(__dirname, "dist"),
-            clean: true
+      clean: true,
     },
     plugins: [
-            new HtmlWebpackPlugin({template: path.resolve(__dirname, 'public', 'index.html')}),
+      new HtmlWebpackPlugin({
-            isDev ? undefined : new MiniCssExtractPlugin({
+        template: path.resolve(__dirname, "public", "index.html"),
-                filename: 'css/[name].[contenthash:8].css',
+      }),
-                chunkFilename: 'css/[name].[contenthash:8].css'
+      isDev
-            })
+        ? undefined
+        : new MiniCssExtractPlugin({
+            filename: "css/[name].[contenthash:8].css",
+            chunkFilename: "css/[name].[contenthash:8].css",
+          }),
     ],
     module: {
       rules: [
         {
           test: /\.(scss|css)$/,
           use: [
-                        isDev ? 'style-loader' : MiniCssExtractPlugin.loader, 
+            isDev ? "style-loader" : MiniCssExtractPlugin.loader,
             cssLoader,
-                        'sass-loader'
+            "sass-loader",
           ],
         },
         {
@@ -53,21 +56,19 @@ module.exports = (env) => {
           use: {
             loader: "babel-loader",
             options: {
-                            presets: [
+              presets: ["@babel/preset-env", "@babel/preset-react"],
-                                '@babel/preset-env',
+            },
-                                '@babel/preset-react'
+          },
-                            ]
+        },
-                        }
+      ],
-                    }
-                }
-            ]
     },
     devServer: {
       port: env.port ?? 3000,
-            open: true,
+      historyApiFallback: true,
-            historyApiFallback: true
+      host: "0.0.0.0",
-        }
+      allowedHosts: "all",
+    },
   };
 
-    return config
+  return config;
-}
+};