Skip to content

Commit

Permalink
Merge pull request #476 from skyclouds2001/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
skyclouds2001 authored Oct 6, 2023
2 parents 202a8d1 + 3833199 commit cd2734d
Show file tree
Hide file tree
Showing 118 changed files with 2,450 additions and 113,527 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 8.6.12
version: 8.8.0
- uses: actions/setup-node@v3
with:
node-version: 16
Expand Down
34 changes: 17 additions & 17 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,19 @@
"dependencies": {
"@nestjs/axios": "^3.0.0",
"@nestjs/cache-manager": "^2.1.0",
"@nestjs/common": "^10.2.5",
"@nestjs/common": "^10.2.6",
"@nestjs/config": "^3.1.1",
"@nestjs/core": "^10.2.5",
"@nestjs/core": "^10.2.6",
"@nestjs/devtools-integration": "^0.1.5",
"@nestjs/jwt": "^10.1.1",
"@nestjs/passport": "^10.0.2",
"@nestjs/platform-express": "^10.2.5",
"@nestjs/platform-socket.io": "^10.2.5",
"@nestjs/schedule": "^3.0.3",
"@nestjs/swagger": "^7.1.11",
"@nestjs/websockets": "^10.2.5",
"@nestjs/platform-express": "^10.2.6",
"@nestjs/platform-socket.io": "^10.2.6",
"@nestjs/schedule": "^3.0.4",
"@nestjs/swagger": "^7.1.12",
"@nestjs/websockets": "^10.2.6",
"@prisma/client": "5.3.1",
"axios": "^1.5.0",
"axios": "^1.5.1",
"bcryptjs": "^2.4.3",
"cache-manager": "^5.2.3",
"class-transformer": "^0.5.1",
Expand All @@ -63,7 +63,7 @@
"cookie-parser": "^1.4.6",
"express-session": "^1.17.3",
"hbs": "^4.2.0",
"joi": "^17.10.1",
"joi": "^17.10.2",
"nestjs-prisma": "^0.22.0",
"passport": "^0.6.0",
"passport-jwt": "^4.0.1",
Expand All @@ -72,18 +72,18 @@
"swagger-ui-express": "^5.0.0"
},
"devDependencies": {
"@nestjs/cli": "^10.1.17",
"@nestjs/cli": "^10.1.18",
"@nestjs/schematics": "^10.0.2",
"@nestjs/testing": "^10.2.5",
"@nestjs/testing": "^10.2.6",
"@types/bcryptjs": "^2.4.4",
"@types/compression": "^1.7.3",
"@types/cookie-parser": "^1.4.4",
"@types/express": "^4.17.17",
"@types/express-session": "^1.17.7",
"@types/multer": "^1.4.7",
"@types/node": "^20.6.2",
"@types/passport-jwt": "^3.0.9",
"@types/supertest": "^2.0.12",
"@types/express": "^4.17.18",
"@types/express-session": "^1.17.8",
"@types/multer": "^1.4.8",
"@types/node": "^20.8.0",
"@types/passport-jwt": "^3.0.10",
"@types/supertest": "^2.0.13",
"prisma": "^5.3.1",
"source-map-support": "^0.5.21",
"supertest": "^6.3.3",
Expand Down
1 change: 1 addition & 0 deletions backend/tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "https://json.schemastore.org/tsconfig",
"extends": "./tsconfig.json",
"exclude": ["node_modules", "test", "dist", "prisma", "**/*spec.ts"]
}
1 change: 0 additions & 1 deletion frontend/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
<link rel="manifest" href="/site.webmanifest" />
</head>
<body>
<div id="app"></div>
Expand Down
13 changes: 13 additions & 0 deletions frontend/jsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"$schema": "https://json.schemastore.org/jsconfig",
"extends": "./../jsconfig.json",
"compilerOptions": {
"baseUrl": ".",
"paths": {
"~/*": ["./*"],
"@/*": ["./src/*"]
}
},
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.vue", "**/*.json", "**/*.html", "**/*.md", "**/*.mdx"],
"exclude": ["node_modules", "dist"]
}
28 changes: 14 additions & 14 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.12",
"animate.css": "^4.1.1",
"axios": "^1.5.0",
"axios-retry": "^3.7.0",
"axios": "^1.5.1",
"axios-retry": "^3.8.0",
"crypto-js": "^4.1.1",
"dayjs": "^1.11.9",
"dayjs": "^1.11.10",
"echarts": "^5.4.3",
"element-plus": "^2.3.14",
"highlight.js": "^11.8.0",
Expand All @@ -71,13 +71,13 @@
"prismjs": "^1.29.0",
"qrcode": "^1.5.3",
"socket.io-client": "^4.7.2",
"three": "^0.156.0",
"three": "^0.157.0",
"three-subdivide": "^1.1.5",
"tui-color-picker": "^2.2.8",
"vue": "^3.3.4",
"vue-i18n": "^9.4.1",
"vue-router": "^4.2.4",
"web-vitals": "^3.4.0",
"vue-i18n": "^9.5.0",
"vue-router": "^4.2.5",
"web-vitals": "^3.5.0",
"xlsx": "^0.18.5",
"xterm": "^5.3.0",
"xterm-addon-fit": "^0.8.0",
Expand All @@ -86,30 +86,30 @@
},
"devDependencies": {
"@iconify/vue": "^4.1.1",
"@intlify/unplugin-vue-i18n": "^1.2.0",
"@intlify/unplugin-vue-i18n": "^1.4.0",
"@tailwindcss/aspect-ratio": "^0.4.2",
"@tailwindcss/container-queries": "^0.1.1",
"@tailwindcss/forms": "^0.5.6",
"@tailwindcss/typography": "^0.5.10",
"@types/crypto-js": "^4.1.2",
"@types/lodash-es": "^4.17.9",
"@types/mockjs": "^1.0.7",
"@types/mockjs": "^1.0.8",
"@types/qrcode": "^1.5.2",
"@types/three": "^0.156.0",
"@vitejs/plugin-legacy": "^4.1.1",
"@vitejs/plugin-vue": "^4.3.4",
"@vitejs/plugin-vue-jsx": "^3.0.2",
"cssnano": "^6.0.1",
"less": "^4.2.0",
"postcss": "^8.4.29",
"postcss": "^8.4.31",
"postcss-import": "^15.1.0",
"postcss-preset-env": "^9.1.3",
"postcss-preset-env": "^9.1.4",
"postcss-url": "^10.1.3",
"rollup-plugin-visualizer": "^5.9.2",
"sass": "^1.67.0",
"sass": "^1.68.0",
"stylus": "^0.60.0",
"tailwindcss": "^3.3.3",
"terser": "^5.19.4",
"terser": "^5.20.0",
"typescript": "^5.2.2",
"unplugin-element-plus": "^0.8.0",
"vite": "^4.4.9",
Expand All @@ -123,6 +123,6 @@
"vite-plugin-pwa": "^0.16.5",
"vite-plugin-utils": "workspace:*",
"vite-svg-loader": "^4.0.0",
"vue-tsc": "^1.8.11"
"vue-tsc": "^1.8.15"
}
}
Binary file added frontend/public/excel-preview.xlsx
Binary file not shown.
Binary file added frontend/public/pdf-preview.pdf
Binary file not shown.
Binary file added frontend/public/ppt-preview.pptx
Binary file not shown.
21 changes: 0 additions & 21 deletions frontend/public/site.webmanifest

This file was deleted.

Binary file added frontend/public/word-preview.docx
Binary file not shown.
Loading

0 comments on commit cd2734d

Please sign in to comment.