Версия 0.2.0 (finally)

Author: qqpayne

.eslintrc.json

@@ -23,8 +23,8 @@
         "react/prop-types": 0,
         "require-jsdoc": 0,
         "react/button-has-type": 0,
-        "react/jsx-props-no-spreading": ["error", { "html": "ignore" }],
-        "jsx-a11y/label-has-associated-control": [2, {"controlComponents": ["Input"]}],
+        "react/jsx-props-no-spreading": 0,
+        "jsx-a11y/label-has-associated-control": [2, { "controlComponents": ["Input"] }],
         "no-param-reassign": ["error", { "props": false }],
         "prettier/prettier": ["error", { "endOfLine": "auto" }],
         "no-unused-vars": "warn"

.github/workflows/deploy-dev.yml

@@ -0,0 +1,46 @@
+name: deploy-dev
+
+on:
+    push:
+        branches: [dev]
+
+jobs:
+    update:
+        runs-on: [self-hosted, linux, X64]
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+              with:
+                  path: dev
+            - name: Install dependencies
+              working-directory: dev
+              run: |
+                  npm ci
+
+    deploy:
+        needs: update
+        runs-on: [self-hosted, linux, X64]
+        steps:
+            - name: Build
+              working-directory: dev
+              run: |
+                  npm run build
+            - name: Transfer new version to web-server
+              working-directory: dev
+              run: |
+                  rm -rf /var/www/dev/*  
+                  cp -r build/. /var/www/dev/
+
+    deploy-storybook:
+        needs: update
+        runs-on: [self-hosted, linux, X64]
+        steps:
+            - name: Build
+              working-directory: dev
+              run: |
+                  npm run build-storybook
+            - name: Transfer new version to web-server
+              working-directory: dev
+              run: |
+                  rm -rf /var/www/storybook/dev/*  
+                  cp -r storybook-static/. /var/www/storybook/dev/

.github/workflows/deploy-prod.yml

@@ -5,7 +5,7 @@ on:
         branches: [main]
 
 jobs:
-    build:
+    update:
         runs-on: [self-hosted, linux, X64]
         defaults:
             run:
@@ -21,9 +21,19 @@ jobs:
                   npm ci
 
     deploy:
-        needs: build
-        runs-on: [self-hosted, linux, X64]
-        steps:
+            needs: update
+            runs-on: [self-hosted, linux, X64]
+            steps:
+            - name: Set production API
+              working-directory: prod/src/API
+              run: |
+                  python3 -c "with open('http.js', 'r+') as f:
+                      d = f.read()
+                      d = d.replace('https://api.cyberdas.net/next', 'https://api.cyberdas.net/v1')
+                      f.seek(0)
+                      f.write(d)
+                      f.truncate()
+                      f.close()"
             - name: Build
               working-directory: prod
               run: |
@@ -33,3 +43,17 @@ jobs:
               run: |
                   rm -rf /var/www/html/*  
                   cp -r build/. /var/www/html/
+
+    deploy-storybook:
+        needs: update
+        runs-on: [self-hosted, linux, X64]
+        steps:
+            - name: Build
+              working-directory: prod
+              run: |
+                  npm run build-storybook
+            - name: Transfer new version to web-server
+              working-directory: prod
+              run: |
+                  rm -rf /var/www/storybook/main/*  
+                  cp -r storybook-static/. /var/www/storybook/main/

.github/workflows/run-tests.yml

@@ -2,7 +2,7 @@ name: run-tests
 
 on:
     pull_request:
-        branches: [main]
+        branches: [main, dev]
 
 jobs:
     build:
@@ -29,6 +29,10 @@ jobs:
               working-directory: test
               run: |
                   npm run lint:style
+            - name: Run tests
+              working-directory: test
+              run: |
+                  npm test
             - name: Wipe files
               run: |
                   rm -rf test

.gitignore

@@ -175,3 +175,5 @@ yarn-error.log*
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+storybook-static

.storybook/main.js

@@ -0,0 +1,20 @@
+const path = require('path')
+
+module.exports = {
+    stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
+    addons: [
+        '@storybook/addon-links',
+        '@storybook/addon-essentials',
+        '@storybook/preset-create-react-app',
+    ],
+    webpackFinal: async (config) => {
+        config.resolve.modules = [...(config.resolve.modules || []), path.resolve(__dirname, '../')]
+
+        config.resolve.alias = {
+            ...config.resolve.alias,
+            '@': path.resolve(__dirname, '../src'),
+        }
+
+        return config
+    },
+}

.storybook/preview.js

@@ -0,0 +1,11 @@
+import '@/styles/index.scss'
+
+export const parameters = {
+  actions: { argTypesRegex: "^on[A-Z].*" },
+  controls: {
+    matchers: {
+      color: /(background|color)$/i,
+      date: /Date$/,
+    },
+  },
+}

.stylelintrc.json

@@ -6,7 +6,6 @@
     "rules": {
       "at-rule-no-unknown": null,
       "scss/at-rule-no-unknown": true,
-      "scss/dollar-variable-pattern": "^foo",
       "scss/selector-no-redundant-nesting-selector": true,
       "selector-pseudo-class-no-unknown": [
         true,

README.md

@@ -8,6 +8,8 @@
   <p align="center">
     Сайт общежития ДАС МГУ, работающий на базе <a href="https://github.com/CyberDAS-Dev/API">CyberDAS API</a>
     <br />
+    <a href="https://cyberdas.net/storybook"><strong>Сторибук »</strong></a>
+    <br />
     <br />
     <a href="https://github.com/CyberDAS-Dev/Frontend/issues">Сообщить об ошибке</a>
     ·
@@ -96,33 +98,21 @@
     ```bash
     npm i
     ```
-    или
-    ```bash
-    yarn
-    ```
 3. Запустите локальный сервер для разработки, приложение будет доступно по адресу [http://localhost:3000](http://localhost:3000)
     ```bash
     npm start
     ```
-    или
-    ```bash
-    yarn start
-    ```
 
 ### Развертывание
 
 1. Соберите приложение, готовое к установке на сервер, все нужные файлы находятся в директории build
     ```bash
     npm run build
     ```
-    или
-    ```bash
-    yarn build
-    ```
 
 ## Дорожная карта
 
-Смотрите [open issues](https://github.com/CyberDAS-Dev/Frontend/issues) для информации о планируемых улучшениях и известных проблемах.
+Смотрите [milestones](https://github.com/CyberDAS-Dev/Frontend/milestones) для информации о планируемых релизах и долгосрочных планов.
 
 ## Содействие