feat: defguard-ui (#304)

DefGuard · Aug 14, 2023 · 67a7ace · 67a7ace
1 parent 9633b8f
commit 67a7ace
Show file tree

Hide file tree

Showing 474 changed files with 7,494 additions and 15,680 deletions.
diff --git a/.github/workflows/lint-web.yml b/.github/workflows/lint-web.yml
@@ -15,6 +15,8 @@ jobs:
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: 'recursive'
       - uses: actions/setup-node@v3
         with:
           node-version: 19
@@ -25,4 +27,4 @@ jobs:
           pnpm i --frozen-lockfile
       - name: Lint
         working-directory: ./web
-        run: pnpm lint
+        run: pnpm lint
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "proto"]
 	path = proto
 	url = ../proto.git
+[submodule "web/src/shared/defguard-ui"]
+	path = web/src/shared/defguard-ui
+	url = git@github.com:DefGuard/ui.git
diff --git a/Dockerfile b/Dockerfile
@@ -14,7 +14,7 @@ COPY model-derive model-derive
 COPY proto proto
 RUN cargo chef prepare --recipe-path recipe.json
 
-FROM chef AS builder 
+FROM chef AS builder
 # build deps from recipe & cache as docker layer
 COPY --from=planner /build/recipe.json recipe.json
 RUN cargo chef cook --release --recipe-path recipe.json
@@ -30,7 +30,7 @@ COPY migrations migrations
 ENV SQLX_OFFLINE true
 RUN cargo install --locked --path . --root /build
 
-FROM node:19-alpine3.16 as web
+FROM node:20.5-alpine3.17 as web
 
 WORKDIR /app
 COPY web/package.json .

diff --git a/Dockerfile.ci b/Dockerfile.ci
@@ -1,4 +1,4 @@
-FROM node:19-alpine3.15 as web
+FROM node:20.5-alpine3.17 as web
 WORKDIR /app
 COPY web/package.json .
 COPY web/pnpm-lock.yaml .

diff --git a/proto b/proto
diff --git a/web/.eslintignore b/web/.eslintignore
@@ -7,3 +7,4 @@
 *.js
 /src/i18n/formatters.ts
 /src/i18n/i18n-react.tsx
+svg/
diff --git a/web/.eslintrc b/web/.eslintrc
diff --git a/web/.eslintrc.cjs b/web/.eslintrc.cjs
@@ -0,0 +1,82 @@
+module.exports = {
+  root: true,
+  env: { browser: true, es2020: true },
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:react-hooks/recommended',
+    'plugin:react/recommended',
+    'plugin:react/jsx-runtime',
+    'plugin:prettier/recommended',
+    'plugin:import/recommended',
+    'plugin:import/typescript',
+  ],
+  ignorePatterns: ['dist', '.eslintrc.cjs'],
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    ecmaVersion: 'latest',
+    sourceType: 'module',
+    project: ['./tsconfig.json', './tsconfig.node.json'],
+    tsconfigRootDir: __dirname,
+  },
+  plugins: ['react-refresh', 'react-hooks', 'simple-import-sort'],
+  rules: {
+    'react-refresh/only-export-components': [
+      'error',
+      {
+        allowConstantExport: true,
+      },
+    ],
+    'max-len': [
+      'error',
+      {
+        code: 90,
+        comments: 140,
+        tabWidth: 2,
+        ignorePattern: '^import .* |.*LL\\..*|.*d=.* | *from .*',
+        ignoreComments: true,
+        ignoreRegExpLiterals: true,
+        ignoreTemplateLiterals: true,
+      },
+    ],
+    'react-hooks/rules-of-hooks': 'error',
+    'react-hooks/exhaustive-deps': 'error',
+    'react/prop-types': 'off',
+    'react/display-name': 'off',
+    semi: [
+      'error',
+      'always',
+      {
+        omitLastInOneLineBlock: false,
+      },
+    ],
+    'prettier/prettier': [
+      'error',
+      {
+        semi: true,
+      },
+    ],
+    'simple-import-sort/imports': 'error',
+    'react/react-in-jsx-scope': 'off',
+    '@typescript-eslint/no-unused-vars': 'error',
+    '@typescript-eslint/no-explicit-any': 'error',
+    '@typescript-eslint/no-non-null-assertion': 'error',
+    'import/no-unresolved': [
+      'error',
+      {
+        ignore: ['@ladle/react', '.md', 'typesafe-i18n/detectors', '@hookform/devtools'],
+      },
+    ],
+  },
+  overrides: [
+    {
+      extends: ['plugin:@typescript-eslint/disable-type-checked'],
+      files: ['./**/*.js'],
+    },
+  ],
+  settings: {
+    react: {
+      version: '18.2',
+    },
+  },
+};
diff --git a/web/.nvmrc b/web/.nvmrc
@@ -1 +1 @@
-v19.9
+v20.5
diff --git a/web/.typesafe-i18n.json b/web/.typesafe-i18n.json
@@ -1,5 +1,5 @@
 {
    "adapter": "react",
-   "$schema": "https://unpkg.com/typesafe-i18n@5.24.3/schema/typesafe-i18n.json",
-  "baseLocale": "en"
-}
+   "$schema": "https://unpkg.com/typesafe-i18n@5.26.1/schema/typesafe-i18n.json",
+   "baseLocale": "en"
+}
diff --git a/web/index.html b/web/index.html
@@ -1,5 +1,5 @@
-<!DOCTYPE html>
-<html lang="en">
+<!doctype html>
+<html lang="en" data-theme="light">
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />