Skip to content
This repository has been archived by the owner on Dec 15, 2021. It is now read-only.

Commit

Permalink
feat(ui): Moved all ui into ui package (heybereket#272)
Browse files Browse the repository at this point in the history
  • Loading branch information
@HenryLeC
HenryLeC authored May 22, 2021
1 parent ceaa516 commit 6dd6f71
Show file tree
Hide file tree
Showing 72 changed files with 5,730 additions and 936 deletions.
15 changes: 9 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
"build:dev": "yarn run build:api && yarn build:ui",
"build:api": "yarn workspace @oasis-sh/api run build && yarn workspace @oasis-sh/client-gql run build",
"build:ui": "yarn workspace @oasis-sh/ui run build",
"build:web": "yarn workspace @oasis-sh/web run build",
"commit": "git add . && cz && git push",
"dev": "yarn workspace @oasis-sh/web dev",
"dev": "concurrently \"yarn workspace @oasis-sh/web dev\" \"yarn workspace @oasis-sh/ui build:watch\"",
"dev:api": "yarn workspaces foreach --include @oasis-sh/client-gql,@oasis-sh/api -p run dev",
"start": "yarn workspace @oasis-sh/web run start",
"deploy:prod": "git add . && git commit -m 'chore(deploy): Merge staging -> prod' && git checkout prod && git merge staging && git push origin prod --force && git checkout staging",
Expand All @@ -24,12 +25,14 @@
"reinstall": "yarn clean && rimraf packages/**/*.sqlite || yarn install"
},
"devDependencies": {
"@commitlint/cli": "^12.1.4",
"@commitlint/config-conventional": "^12.1.4",
"@types/eslint": "^7.2.11",
"@commitlint/cli": "^12.1.2",
"@commitlint/config-conventional": "^12.1.2",
"@types/concurrently": "^6",
"@types/eslint": "^7.2.10",
"@types/jest": "^26.0.23",
"@types/node": "^15.6.0",
"commitizen": "^4.2.4",
"@types/node": "^15.3.1",
"commitizen": "^4.2.3",
"concurrently": "^6.1.0",
"cz-conventional-changelog": "3.3.0",
"jest": "^26.6.3",
"npm-run-all": "^4.1.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/api/src/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import authRouter from '@modules/auth';
import expressSession from 'express-session';
import { createClient } from 'redis';
import connectRedis from 'connect-redis';
import { ormconfig } from '@root/ormconfig';
import ormconfig from '@root/ormconfig';
import passport from 'passport';
import checkEnv from '@utils/common/checkEnv';
import { isProduction } from '@lib/constants';
Expand Down
10 changes: 0 additions & 10 deletions packages/api/src/test-utils/graphqlCall.ts
View file

This file was deleted.

3 changes: 0 additions & 3 deletions packages/api/src/test-utils/setup.ts
View file

This file was deleted.

16 changes: 0 additions & 16 deletions packages/api/src/test-utils/testConn.ts
View file

This file was deleted.

288 changes: 20 additions & 268 deletions packages/ui/.eslintrc.json
View file
Original file line number Diff line number Diff line change
@@ -1,289 +1,41 @@
{
"env": {
"es6": true,
"browser": true,
"es2021": true,
"jest": true,
"node": true
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:react-hooks/recommended",
"plugin:@typescript-eslint/recommended",
"plugin:prettier/recommended"
"plugin:@typescript-eslint/recommended"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 12,
"sourceType": "module"
},
"plugins": ["react", "@typescript-eslint/eslint-plugin", "react-hooks"],
"plugins": ["react", "react-hooks", "@typescript-eslint"],
"settings": {
"react": {
"pragma": "React",
"version": "detect"
},
"import/resolver": "parcel2",
"html/xml-extensions": [".html"],
"html/indent": "+2"
}
},
"rules": {
"prettier/prettier": ["error"],
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-unused-vars": "off",
"@typescript-eslint/no-var-requires": "off",
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/explicit-module-boundary-types": "off",
"@typescript-eslint/member-delimiter-style": "off",
"@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/no-shadow": "error",
"@typescript-eslint/no-magic-numbers": "off",
"@typescript-eslint/no-use-before-define": "error",
"@typescript-eslint/semi": [
"error",
"always",
{
"omitLastInOneLineBlock": true
}
],
"@typescript-eslint/ban-types": ["warn"],
"no-empty-pattern": "off",
"react/prop-types": "off",
"accessor-pairs": "error",
"array-bracket-newline": "off",
"array-bracket-spacing": "error",
"array-callback-return": "off",
"array-element-newline": ["error", "consistent"],
"arrow-body-style": "off",
"arrow-parens": "off",
"arrow-spacing": "error",
"block-scoped-var": "error",
"block-spacing": "error",
"brace-style": "error",
"camelcase": "error",
"comma-dangle": "off",
"comma-spacing": "error",
"comma-style": "error",
"complexity": "off",
"computed-property-spacing": "error",
"consistent-this": "error",
"default-case-last": "error",
"default-param-last": "error",
"dot-location": ["error", "property"],
"dot-notation": "error",
"eol-last": "error",
"eqeqeq": "error",
"func-call-spacing": "off",
"func-name-matching": "error",
"func-names": "error",
"func-style": [
"error",
"declaration",
{
"allowArrowFunctions": true
}
],
"function-call-argument-newline": ["error", "consistent"],
"function-paren-newline": "off",
"generator-star-spacing": "error",
"global-require": "error",
"grouped-accessor-pairs": "error",
"guard-for-in": "error",
"handle-callback-err": "error",
"id-blacklist": "error",
"id-denylist": "error",
"id-match": "error",
"indent": [
"off",
"react/react-in-jsx-scope": 0,
"react/no-unknown-property": 0,
"react/display-name": 0,
"react/prop-types": 0,
"@typescript-eslint/explicit-function-return-type": 0,
"@typescript-eslint/explicit-member-accessibility": 0,
"@typescript-eslint/indent": 0,
"@typescript-eslint/member-delimiter-style": 0,
"@typescript-eslint/no-explicit-any": 0,
"@typescript-eslint/no-var-requires": 0,
"@typescript-eslint/no-use-before-define": 0,
"react/jsx-wrap-multilines": "off",
"@typescript-eslint/no-unused-vars": [
2,
{
"offsetTernaryExpressions": true
}
],
"init-declarations": "off",
"jsx-quotes": "error",
"key-spacing": ["error"],
"keyword-spacing": "off",
"line-comment-position": "off",
"linebreak-style": "error",
"lines-around-comment": "off",
"lines-around-directive": "error",
"lines-between-class-members": "error",
"max-classes-per-file": "off",
"max-depth": "error",
"max-len": "off",
"max-lines": "off",
"max-lines-per-function": "off",
"max-nested-callbacks": "error",
"max-statements": "off",
"max-statements-per-line": "off",
"multiline-comment-style": "off",
"multiline-ternary": "off",
"new-cap": "off",
"new-parens": "error",
"newline-after-var": "off",
"newline-before-return": "off",
"newline-per-chained-call": "off",
"no-alert": "error",
"no-array-constructor": "error",
"no-await-in-loop": "off",
"no-bitwise": "off",
"no-buffer-constructor": "error",
"no-caller": "error",
"no-catch-shadow": "error",
"no-console": "off",
"no-constructor-return": "error",
"no-continue": "error",
"no-div-regex": "error",
"no-duplicate-imports": "error",
"no-eq-null": "error",
"no-eval": "error",
"no-extend-native": "error",
"no-extra-bind": "error",
"no-extra-label": "error",
"no-extra-parens": "off",
"no-floating-decimal": "error",
"no-implicit-coercion": "off",
"no-implicit-globals": "error",
"no-implied-eval": "error",
"no-inline-comments": "off",
"no-invalid-this": "error",
"no-iterator": "error",
"no-label-var": "error",
"no-labels": "error",
"no-lone-blocks": "error",
"no-lonely-if": "error",
"no-loop-func": "error",
"no-loss-of-precision": "error",
"no-mixed-operators": "off",
"no-mixed-requires": "error",
"no-multi-assign": "error",
"no-multi-spaces": "error",
"no-multi-str": "error",
"no-multiple-empty-lines": "error",
"no-native-reassign": "error",
"no-negated-condition": "off",
"no-negated-in-lhs": "error",
"no-nested-ternary": "error",
"no-new": "error",
"no-new-func": "error",
"no-new-object": "error",
"no-new-require": "error",
"no-new-wrappers": "error",
"no-nonoctal-decimal-escape": "error",
"no-octal-escape": "error",
"no-param-reassign": "error",
"no-path-concat": "error",
"no-plusplus": "off",
"no-process-env": "off",
"no-process-exit": "error",
"no-promise-executor-return": "off",
"no-proto": "error",
"no-restricted-exports": "error",
"no-restricted-globals": "error",
"no-restricted-imports": "error",
"no-restricted-modules": "error",
"no-restricted-properties": "error",
"no-restricted-syntax": "error",
"no-script-url": "error",
"no-self-compare": "error",
"no-sequences": "error",
"no-spaced-func": "off",
"no-sync": "error",
"no-tabs": "error",
"no-template-curly-in-string": "error",
"no-throw-literal": "error",
"no-trailing-spaces": "error",
"no-undef-init": "off",
"no-undefined": "off",
"no-underscore-dangle": "off",
"no-unmodified-loop-condition": "error",
"no-unneeded-ternary": "error",
"no-unreachable-loop": "error",
"no-unsafe-optional-chaining": "error",
"no-unused-expressions": "error",
"no-useless-backreference": "error",
"no-useless-call": "error",
"no-useless-computed-key": "error",
"no-useless-concat": "error",
"no-useless-constructor": "error",
"no-useless-rename": "error",
"no-useless-return": "error",
"no-var": "error",
"no-void": "error",
"no-warning-comments": "error",
"no-whitespace-before-property": "error",
"nonblock-statement-body-position": "error",
"object-curly-newline": "error",
"object-curly-spacing": ["error", "always"],
"object-property-newline": [
"error",
{
"allowAllPropertiesOnSameLine": true
}
],
"object-shorthand": "error",
"one-var": ["error", "never"],
"operator-assignment": "error",
"operator-linebreak": "error",
"padded-blocks": ["error", "never"],
"padding-line-between-statements": "off",
"prefer-arrow-callback": "error",
"prefer-const": "error",
"prefer-destructuring": "off",
"prefer-exponentiation-operator": "error",
"prefer-named-capture-group": "off",
"prefer-numeric-literals": "error",
"prefer-object-spread": "error",
"prefer-promise-reject-errors": "error",
"prefer-reflect": "error",
"prefer-regex-literals": "error",
"prefer-rest-params": "error",
"prefer-spread": "error",
"prefer-template": "off",
"quote-props": "off",
"quotes": "off",
"radix": "off",
"require-atomic-updates": "error",
"require-await": "off",
"require-unicode-regexp": "off",
"rest-spread-spacing": "error",
"semi-spacing": "error",
"semi-style": "error",
"no-extra-semi": "error",
"space-before-blocks": "error",
"space-before-function-paren": [
"error",
{
"anonymous": "never",
"named": "never",
"asyncArrow": "always"
}
],
"space-in-parens": ["error", "never"],
"space-infix-ops": "error",
"space-unary-ops": [
"error",
{
"words": true,
"nonwords": false
"argsIgnorePattern": "^_"
}
],
"spaced-comment": "error",
"strict": "error",
"switch-colon-spacing": "error",
"symbol-description": "error",
"template-curly-spacing": "error",
"template-tag-spacing": "error",
"unicode-bom": "error",
"valid-jsdoc": "error",
"vars-on-top": "error",
"wrap-iife": "error",
"wrap-regex": "error",
"yield-star-spacing": "error",
"yoda": "error",
"react/react-in-jsx-scope": "off"
"no-console": "off"
}
}
Loading

0 comments on commit 6dd6f71

Please sign in to comment.