Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split client into separate app #708

Merged
merged 3 commits into from
Dec 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .browserslistrc

This file was deleted.

4 changes: 3 additions & 1 deletion .depcheckrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
ignores: [
"swagger-ui-express"
"swagger-ui-express",
"supertest",
"typescript"
]
2 changes: 0 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
BROWSER=none
DB_URI=mongodb://localhost:27017/artyom-ganev-node
JWT_SECRET=
NEXT_PUBLIC_API_URL=http://localhost:3000/api
PORT=3000
2 changes: 0 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
.next
build
dist
node_modules
34 changes: 5 additions & 29 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"env": {
"browser": true,
"commonjs": true,
"es6": true,
"jest/globals": true,
Expand All @@ -12,32 +11,21 @@
"eslint:recommended",
"plugin:import/typescript",
"plugin:@typescript-eslint/recommended",
"prettier",
"plugin:@tanstack/eslint-plugin-query/recommended"
"prettier"
],
"root": true,
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 2018,
"sourceType": "module"
},
"plugins": [
"@typescript-eslint/eslint-plugin",
"react",
"react-hooks",
"jest",
"import",
"prettier",
"@tanstack/query"
"prettier"
],
"settings": {
"import/extensions": [".ts", ".tsx"],
"react": {
"pragma": "React",
"version": "detect"
}
"import/extensions": [".ts"]
},
"rules": {
"@typescript-eslint/interface-name-prefix": "off",
Expand All @@ -48,30 +36,18 @@
{
"alphabetize": { "order": "asc", "caseInsensitive": true },
"groups": [["builtin", "external"], ["internal", "unknown", "object"], ["parent"], ["sibling", "index"]],
"newlines-between": "always",
"pathGroups": [
{
"pattern": "react*",
"group": "builtin",
"position": "before"
}
],
"pathGroupsExcludedImportTypes": ["react"]
"newlines-between": "always"
}
],
"no-unused-vars": "off",
"prettier/prettier": [
"error",
{
"arrowParens": "always",
"endOfLine": "lf",
"jsxSingleQuote": true,
"printWidth": 120,
"singleQuote": true,
"trailingComma": "es5"
}
],
"react/jsx-uses-react": "off",
"react/react-in-jsx-scope": "off"
]
}
}
12 changes: 8 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
version: 2
updates:
- directory: "/"
- directory: '/'
open-pull-requests-limit: 5
package-ecosystem: "npm"
package-ecosystem: 'npm'
schedule:
interval: "weekly"
versioning-strategy: "increase-if-necessary"
interval: 'weekly'
versioning-strategy: 'increase-if-necessary'
- directory: '/'
package-ecosystem: 'github-actions'
schedule:
interval: 'weekly'
6 changes: 3 additions & 3 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ jobs:
- name: Install dependencies
run: pnpm install --frozen-lockfile
- name: Lint
run: pnpm run lint
run: pnpm lint
- name: Test
run: pnpm run test
run: pnpm test
- name: Build
run: pnpm run build
run: pnpm build
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
.env
.env.local
.idea
.next
build
coverage
dist
node_modules
1 change: 0 additions & 1 deletion .npmrc

This file was deleted.

2 changes: 0 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
.next
build
dist
node_modules/
1 change: 0 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"arrowParens": "always",
"endOfLine": "lf",
"jsxSingleQuote": true,
"printWidth": 120,
"singleQuote": true,
"trailingComma": "es5"
Expand Down
2 changes: 1 addition & 1 deletion Procfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
web: pnpm server:start:prod
web: pnpm start:prod
2 changes: 1 addition & 1 deletion nest-cli.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"collection": "@nestjs/schematics",
"sourceRoot": "src",
"entryFile": "./server/main"
"entryFile": "./main"
}
5 changes: 0 additions & 5 deletions next-env.d.ts

This file was deleted.

3 changes: 0 additions & 3 deletions next.config.js

This file was deleted.

80 changes: 20 additions & 60 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"author": "Artem Ganev",
"license": "GPL-3.0",
"name": "artemganev-be",
"version": "2.0.0",
"homepage": "https://artemganev.site",
"version": "3.0.0",
"homepage": "https://artyom-88.github.io",
"repository": {
"type": "git",
"url": "git+https://github.com/artyom-88/artemganev-be.git"
Expand All @@ -13,128 +13,88 @@
"pnpm": "8.x"
},
"cacheDirectories": [
"node_modules",
".next/cache"
"node_modules"
],
"scripts": {
"build": "pnpm client:build && pnpm server:build",
"client:build": "next build",
"client:dev": "next dev --port 8080",
"client:start": "next start --port 8080",
"build": "nest build --path ./tsconfig.server.json",
"depcheck": "pnpm dlx depcheck",
"lint": "eslint 'src/**/*.{tsx,ts}' --quiet --max-warnings 1",
"lint:fix": "eslint 'src/**/*.{tsx,ts}' --fix ",
"lint:warn": "eslint 'src/**/*.{tsx,ts}'",
"postinstall": "pnpm build",
"lint": "eslint 'src/**/*.{js,ts}' --quiet --max-warnings 1",
"lint:fix": "eslint 'src/**/*.{js,ts}' --fix ",
"lint:warn": "eslint 'src/**/*.{js,ts}'",
"prebuild": "rimraf dist",
"precommit": "lint-staged",
"prepare": "husky install",
"server:build": "nest build --path ./tsconfig.server.json",
"server:start": "NODE_ENV=development nest start --path ./tsconfig.server.json",
"server:start:debug": "NODE_ENV=development nest start --path ./tsconfig.server.json --debug --watch",
"server:start:dev": "NODE_ENV=development nest start --path ./tsconfig.server.json --watch",
"server:start:prod": "node dist/server/main.js",
"start": "NODE_ENV=development nest start --path ./tsconfig.server.json",
"start:debug": "NODE_ENV=development nest start --path ./tsconfig.server.json --debug --watch",
"start:dev": "NODE_ENV=development nest start --path ./tsconfig.server.json --watch",
"start:prod": "node dist/main.js",
"test": "echo 'Tests are not implemented yet'",
"update": "pnpm dlx npm-check -u -E -s"
},
"dependencies": {
"@nestjs/class-transformer": "0.4.0",
"@nestjs/class-validator": "0.13.4",
"@nestjs/cli": "10.2.1",
"@nestjs/common": "10.2.10",
"@nestjs/common": "10.3.0",
"@nestjs/config": "3.1.1",
"@nestjs/core": "10.2.10",
"@nestjs/core": "10.3.0",
"@nestjs/jwt": "10.2.0",
"@nestjs/mapped-types": "2.0.4",
"@nestjs/mongoose": "10.0.2",
"@nestjs/passport": "10.0.3",
"@nestjs/platform-express": "10.2.10",
"@nestjs/platform-express": "10.3.0",
"@nestjs/schematics": "10.0.3",
"@nestjs/swagger": "7.1.17",
"@nestjs/testing": "10.2.10",
"@nextui-org/react": "2.2.9",
"@nextui-org/system": "2.0.15",
"@nextui-org/theme": "2.1.17",
"@tanstack/react-query": "5.15.0",
"dayjs": "1.11.10",
"debounce": "2.0.0",
"@nestjs/testing": "10.3.0",
"express": "4.18.2",
"formik": "2.4.5",
"framer-motion": "10.16.16",
"ky-universal": "0.12.0",
"lint-staged": "15.2.0",
"lodash": "4.17.21",
"mongoose": "6.12.3",
"nest-next": "10.1.0",
"next": "13.5.6",
"node-sass": "9.0.0",
"passport": "0.7.0",
"passport-jwt": "4.0.1",
"passport-local": "1.0.0",
"react": "18.2.0",
"react-datepicker": "4.25.0",
"react-dom": "18.2.0",
"reflect-metadata": "0.1.14",
"rimraf": "5.0.5",
"rxjs": "7.5.7",
"sass": "1.69.5",
"swagger-ui-express": "5.0.0",
"ts-jest": "29.1.1",
"ts-loader": "9.5.1",
"ts-node": "10.9.2",
"tsconfig-paths": "4.2.0",
"yup": "1.3.3",
"zustand": "4.4.7"
"tsconfig-paths": "4.2.0"
},
"devDependencies": {
"@babel/core": "^7.23.6",
"@babel/plugin-syntax-flow": "^7.16.7",
"@babel/plugin-transform-react-jsx": "^7.23.4",
"@tanstack/eslint-plugin-query": "^5.12.1",
"@types/express": "^4.17.21",
"@types/jest": "^29.5.11",
"@types/lodash": "^4.14.202",
"@types/node": "^18.18.10",
"@types/passport": "^1.0.16",
"@types/passport-jwt": "^3.0.13",
"@types/passport-local": "^1.0.38",
"@types/react": "^18.2.43",
"@types/react-dom": "^18.2.17",
"@types/react-router-dom": "^5.3.3",
"@types/supertest": "^2.0.16",
"@typescript-eslint/eslint-plugin": "^6.14.0",
"@typescript-eslint/parser": "^6.14.0",
"autoprefixer": "10.4.16",
"eslint": "^8.55.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-jest": "^27.6.0",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"husky": "^8.0.3",
"jest": "^29.7.0",
"postcss": "8.4.32",
"prettier": "^3.1.1",
"supertest": "^6.3.3",
"tailwindcss": "3.4.0",
"typescript": "^5.2.2",
"webpack": "^5.89.0"
"typescript": "^5.2.2"
},
"pnpm": {
"overrides": {
"@babel/traverse": ">=7.23.2",
"lodash": "$lodash",
"node-sass": "$node-sass",
"react": "$react",
"react-dom": "$react-dom"
"lodash": "$lodash"
}
},
"lint-staged": {
"src/**/*.{scss,css,json,yml,html}": [
"*.{json,yml,html}": [
"prettier --write"
],
"*.{js,ts,tsx}": [
"*.{js,ts}": [
"eslint --fix --quiet --max-warnings 1",
"prettier --write"
]
Expand Down
Loading