From 3edfd80e90eea936e128d0ca9f50235736773485 Mon Sep 17 00:00:00 2001 From: moonrailgun Date: Tue, 20 Jun 2023 15:45:46 +0800 Subject: [PATCH] refactor: move admin-next to admin --- docker/admin-next.yml | 20 ------------------ package.json | 4 +--- server/{admin-next => admin}/index.html | 0 server/{admin-next => admin}/nodemon.json | 0 server/{admin-next => admin}/package.json | 2 +- .../{admin-next => admin}/public/favicon.ico | Bin .../{admin-next => admin}/src/client/App.tsx | 0 .../{admin-next => admin}/src/client/auth.ts | 0 .../src/client/components/Dashboard.tsx | 0 .../src/client/components/TagItems.tsx | 0 .../src/client/components/TailchatImage.tsx | 0 .../src/client/components/field/filesize.tsx | 0 .../src/client/components/field/user.tsx | 0 .../src/client/fields.ts | 0 .../{admin-next => admin}/src/client/i18n.ts | 0 .../{admin-next => admin}/src/client/main.tsx | 0 .../src/client/request.ts | 0 .../src/client/resources/user.tsx | 0 .../src/client/routes/cache.tsx | 0 .../src/client/routes/network/index.tsx | 0 .../src/client/routes/socketio.tsx | 0 .../src/client/routes/system/index.tsx | 0 .../{admin-next => admin}/src/client/utils.ts | 0 .../src/client/vite-env.d.ts | 0 .../src/server/broker.ts | 0 .../{admin-next => admin}/src/server/index.ts | 0 .../src/server/middleware/auth.ts | 0 .../express-mongoose-ra-json-server/README.md | 0 .../express-mongoose-ra-json-server/index.ts | 0 .../statusMessages.ts | 0 .../utils/baseModel.interface.ts | 0 .../utils/castFilter.ts | 0 .../utils/convertId.ts | 0 .../utils/filterGetList.ts | 0 .../utils/filterReadOnly.ts | 0 .../utils/parseQuery.ts | 0 .../utils/virtualId.ts | 0 .../src/server/router/api.ts | 0 .../src/server/router/cache.ts | 0 .../src/server/router/config.ts | 0 .../src/server/router/file.ts | 0 .../src/server/router/network.ts | 0 server/{admin-next => admin}/tsconfig.json | 0 .../tsconfig.server.json | 0 server/{admin-next => admin}/vite.config.ts | 0 45 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 docker/admin-next.yml rename server/{admin-next => admin}/index.html (100%) rename server/{admin-next => admin}/nodemon.json (100%) rename server/{admin-next => admin}/package.json (97%) rename server/{admin-next => admin}/public/favicon.ico (100%) rename server/{admin-next => admin}/src/client/App.tsx (100%) rename server/{admin-next => admin}/src/client/auth.ts (100%) rename server/{admin-next => admin}/src/client/components/Dashboard.tsx (100%) rename server/{admin-next => admin}/src/client/components/TagItems.tsx (100%) rename server/{admin-next => admin}/src/client/components/TailchatImage.tsx (100%) rename server/{admin-next => admin}/src/client/components/field/filesize.tsx (100%) rename server/{admin-next => admin}/src/client/components/field/user.tsx (100%) rename server/{admin-next => admin}/src/client/fields.ts (100%) rename server/{admin-next => admin}/src/client/i18n.ts (100%) rename server/{admin-next => admin}/src/client/main.tsx (100%) rename server/{admin-next => admin}/src/client/request.ts (100%) rename server/{admin-next => admin}/src/client/resources/user.tsx (100%) rename server/{admin-next => admin}/src/client/routes/cache.tsx (100%) rename server/{admin-next => admin}/src/client/routes/network/index.tsx (100%) rename server/{admin-next => admin}/src/client/routes/socketio.tsx (100%) rename server/{admin-next => admin}/src/client/routes/system/index.tsx (100%) rename server/{admin-next => admin}/src/client/utils.ts (100%) rename server/{admin-next => admin}/src/client/vite-env.d.ts (100%) rename server/{admin-next => admin}/src/server/broker.ts (100%) rename server/{admin-next => admin}/src/server/index.ts (100%) rename server/{admin-next => admin}/src/server/middleware/auth.ts (100%) rename server/{admin-next => admin}/src/server/middleware/express-mongoose-ra-json-server/README.md (100%) rename server/{admin-next => admin}/src/server/middleware/express-mongoose-ra-json-server/index.ts (100%) rename server/{admin-next => admin}/src/server/middleware/express-mongoose-ra-json-server/statusMessages.ts (100%) rename server/{admin-next => admin}/src/server/middleware/express-mongoose-ra-json-server/utils/baseModel.interface.ts (100%) rename server/{admin-next => admin}/src/server/middleware/express-mongoose-ra-json-server/utils/castFilter.ts (100%) rename server/{admin-next => admin}/src/server/middleware/express-mongoose-ra-json-server/utils/convertId.ts (100%) rename server/{admin-next => admin}/src/server/middleware/express-mongoose-ra-json-server/utils/filterGetList.ts (100%) rename server/{admin-next => admin}/src/server/middleware/express-mongoose-ra-json-server/utils/filterReadOnly.ts (100%) rename server/{admin-next => admin}/src/server/middleware/express-mongoose-ra-json-server/utils/parseQuery.ts (100%) rename server/{admin-next => admin}/src/server/middleware/express-mongoose-ra-json-server/utils/virtualId.ts (100%) rename server/{admin-next => admin}/src/server/router/api.ts (100%) rename server/{admin-next => admin}/src/server/router/cache.ts (100%) rename server/{admin-next => admin}/src/server/router/config.ts (100%) rename server/{admin-next => admin}/src/server/router/file.ts (100%) rename server/{admin-next => admin}/src/server/router/network.ts (100%) rename server/{admin-next => admin}/tsconfig.json (100%) rename server/{admin-next => admin}/tsconfig.server.json (100%) rename server/{admin-next => admin}/vite.config.ts (100%) diff --git a/docker/admin-next.yml b/docker/admin-next.yml deleted file mode 100644 index ba525131..00000000 --- a/docker/admin-next.yml +++ /dev/null @@ -1,20 +0,0 @@ -version: "3.3" - -services: - # 后台应用 - tailchat-admin-next: - build: - context: ../ - image: tailchat - restart: unless-stopped - env_file: docker-compose.env - depends_on: - - mongo - - redis - labels: - - "traefik.enable=true" - - "traefik.http.routers.admin-next.rule=PathPrefix(`/admin`)" - - "traefik.http.services.admin-next.loadbalancer.server.port=3000" - networks: - - internal - command: pnpm start:admin-next diff --git a/package.json b/package.json index 86aa994b..5f39c020 100644 --- a/package.json +++ b/package.json @@ -11,13 +11,11 @@ "dev:admin": "cd server/admin && pnpm dev", "start:service": "cd server && pnpm start:service", "start:admin": "cd server/admin && pnpm start", - "start:admin-next": "cd server/admin-next && pnpm start", "start:admin-old": "cd server/admin-old && pnpm start", - "build": "concurrently npm:build:web npm:build:server npm:build:admin-old npm:build:admin-next && cp -r client/web/dist/* server/dist/public", + "build": "concurrently npm:build:web npm:build:server npm:build:admin npm:build:admin-old && cp -r client/web/dist/* server/dist/public", "build:web": "cd client/web && pnpm build", "build:server": "cd server && pnpm build && echo \"Install server side plugin:\" && pnpm run plugin:install com.msgbyte.tasks com.msgbyte.linkmeta com.msgbyte.github com.msgbyte.simplenotify com.msgbyte.topic com.msgbyte.agora com.msgbyte.wxpusher com.msgbyte.welcome && mkdir -p ./dist/public && cp -r ./public/plugins ./dist/public && cp ./public/registry-be.json ./dist/public", "build:admin": "cd server/admin && pnpm build", - "build:admin-next": "cd server/admin-next && pnpm build", "build:admin-old": "cd server/admin-old && pnpm build", "check:type": "concurrently npm:check:type:client npm:check:type:server", "check:type:client": "cd client/web && tsc --noEmit", diff --git a/server/admin-next/index.html b/server/admin/index.html similarity index 100% rename from server/admin-next/index.html rename to server/admin/index.html diff --git a/server/admin-next/nodemon.json b/server/admin/nodemon.json similarity index 100% rename from server/admin-next/nodemon.json rename to server/admin/nodemon.json diff --git a/server/admin-next/package.json b/server/admin/package.json similarity index 97% rename from server/admin-next/package.json rename to server/admin/package.json index c94df751..2e24e039 100644 --- a/server/admin-next/package.json +++ b/server/admin/package.json @@ -1,5 +1,5 @@ { - "name": "tailchat-admin-next", + "name": "tailchat-admin", "private": true, "version": "0.0.0", "author": "moonrailgun", diff --git a/server/admin-next/public/favicon.ico b/server/admin/public/favicon.ico similarity index 100% rename from server/admin-next/public/favicon.ico rename to server/admin/public/favicon.ico diff --git a/server/admin-next/src/client/App.tsx b/server/admin/src/client/App.tsx similarity index 100% rename from server/admin-next/src/client/App.tsx rename to server/admin/src/client/App.tsx diff --git a/server/admin-next/src/client/auth.ts b/server/admin/src/client/auth.ts similarity index 100% rename from server/admin-next/src/client/auth.ts rename to server/admin/src/client/auth.ts diff --git a/server/admin-next/src/client/components/Dashboard.tsx b/server/admin/src/client/components/Dashboard.tsx similarity index 100% rename from server/admin-next/src/client/components/Dashboard.tsx rename to server/admin/src/client/components/Dashboard.tsx diff --git a/server/admin-next/src/client/components/TagItems.tsx b/server/admin/src/client/components/TagItems.tsx similarity index 100% rename from server/admin-next/src/client/components/TagItems.tsx rename to server/admin/src/client/components/TagItems.tsx diff --git a/server/admin-next/src/client/components/TailchatImage.tsx b/server/admin/src/client/components/TailchatImage.tsx similarity index 100% rename from server/admin-next/src/client/components/TailchatImage.tsx rename to server/admin/src/client/components/TailchatImage.tsx diff --git a/server/admin-next/src/client/components/field/filesize.tsx b/server/admin/src/client/components/field/filesize.tsx similarity index 100% rename from server/admin-next/src/client/components/field/filesize.tsx rename to server/admin/src/client/components/field/filesize.tsx diff --git a/server/admin-next/src/client/components/field/user.tsx b/server/admin/src/client/components/field/user.tsx similarity index 100% rename from server/admin-next/src/client/components/field/user.tsx rename to server/admin/src/client/components/field/user.tsx diff --git a/server/admin-next/src/client/fields.ts b/server/admin/src/client/fields.ts similarity index 100% rename from server/admin-next/src/client/fields.ts rename to server/admin/src/client/fields.ts diff --git a/server/admin-next/src/client/i18n.ts b/server/admin/src/client/i18n.ts similarity index 100% rename from server/admin-next/src/client/i18n.ts rename to server/admin/src/client/i18n.ts diff --git a/server/admin-next/src/client/main.tsx b/server/admin/src/client/main.tsx similarity index 100% rename from server/admin-next/src/client/main.tsx rename to server/admin/src/client/main.tsx diff --git a/server/admin-next/src/client/request.ts b/server/admin/src/client/request.ts similarity index 100% rename from server/admin-next/src/client/request.ts rename to server/admin/src/client/request.ts diff --git a/server/admin-next/src/client/resources/user.tsx b/server/admin/src/client/resources/user.tsx similarity index 100% rename from server/admin-next/src/client/resources/user.tsx rename to server/admin/src/client/resources/user.tsx diff --git a/server/admin-next/src/client/routes/cache.tsx b/server/admin/src/client/routes/cache.tsx similarity index 100% rename from server/admin-next/src/client/routes/cache.tsx rename to server/admin/src/client/routes/cache.tsx diff --git a/server/admin-next/src/client/routes/network/index.tsx b/server/admin/src/client/routes/network/index.tsx similarity index 100% rename from server/admin-next/src/client/routes/network/index.tsx rename to server/admin/src/client/routes/network/index.tsx diff --git a/server/admin-next/src/client/routes/socketio.tsx b/server/admin/src/client/routes/socketio.tsx similarity index 100% rename from server/admin-next/src/client/routes/socketio.tsx rename to server/admin/src/client/routes/socketio.tsx diff --git a/server/admin-next/src/client/routes/system/index.tsx b/server/admin/src/client/routes/system/index.tsx similarity index 100% rename from server/admin-next/src/client/routes/system/index.tsx rename to server/admin/src/client/routes/system/index.tsx diff --git a/server/admin-next/src/client/utils.ts b/server/admin/src/client/utils.ts similarity index 100% rename from server/admin-next/src/client/utils.ts rename to server/admin/src/client/utils.ts diff --git a/server/admin-next/src/client/vite-env.d.ts b/server/admin/src/client/vite-env.d.ts similarity index 100% rename from server/admin-next/src/client/vite-env.d.ts rename to server/admin/src/client/vite-env.d.ts diff --git a/server/admin-next/src/server/broker.ts b/server/admin/src/server/broker.ts similarity index 100% rename from server/admin-next/src/server/broker.ts rename to server/admin/src/server/broker.ts diff --git a/server/admin-next/src/server/index.ts b/server/admin/src/server/index.ts similarity index 100% rename from server/admin-next/src/server/index.ts rename to server/admin/src/server/index.ts diff --git a/server/admin-next/src/server/middleware/auth.ts b/server/admin/src/server/middleware/auth.ts similarity index 100% rename from server/admin-next/src/server/middleware/auth.ts rename to server/admin/src/server/middleware/auth.ts diff --git a/server/admin-next/src/server/middleware/express-mongoose-ra-json-server/README.md b/server/admin/src/server/middleware/express-mongoose-ra-json-server/README.md similarity index 100% rename from server/admin-next/src/server/middleware/express-mongoose-ra-json-server/README.md rename to server/admin/src/server/middleware/express-mongoose-ra-json-server/README.md diff --git a/server/admin-next/src/server/middleware/express-mongoose-ra-json-server/index.ts b/server/admin/src/server/middleware/express-mongoose-ra-json-server/index.ts similarity index 100% rename from server/admin-next/src/server/middleware/express-mongoose-ra-json-server/index.ts rename to server/admin/src/server/middleware/express-mongoose-ra-json-server/index.ts diff --git a/server/admin-next/src/server/middleware/express-mongoose-ra-json-server/statusMessages.ts b/server/admin/src/server/middleware/express-mongoose-ra-json-server/statusMessages.ts similarity index 100% rename from server/admin-next/src/server/middleware/express-mongoose-ra-json-server/statusMessages.ts rename to server/admin/src/server/middleware/express-mongoose-ra-json-server/statusMessages.ts diff --git a/server/admin-next/src/server/middleware/express-mongoose-ra-json-server/utils/baseModel.interface.ts b/server/admin/src/server/middleware/express-mongoose-ra-json-server/utils/baseModel.interface.ts similarity index 100% rename from server/admin-next/src/server/middleware/express-mongoose-ra-json-server/utils/baseModel.interface.ts rename to server/admin/src/server/middleware/express-mongoose-ra-json-server/utils/baseModel.interface.ts diff --git a/server/admin-next/src/server/middleware/express-mongoose-ra-json-server/utils/castFilter.ts b/server/admin/src/server/middleware/express-mongoose-ra-json-server/utils/castFilter.ts similarity index 100% rename from server/admin-next/src/server/middleware/express-mongoose-ra-json-server/utils/castFilter.ts rename to server/admin/src/server/middleware/express-mongoose-ra-json-server/utils/castFilter.ts diff --git a/server/admin-next/src/server/middleware/express-mongoose-ra-json-server/utils/convertId.ts b/server/admin/src/server/middleware/express-mongoose-ra-json-server/utils/convertId.ts similarity index 100% rename from server/admin-next/src/server/middleware/express-mongoose-ra-json-server/utils/convertId.ts rename to server/admin/src/server/middleware/express-mongoose-ra-json-server/utils/convertId.ts diff --git a/server/admin-next/src/server/middleware/express-mongoose-ra-json-server/utils/filterGetList.ts b/server/admin/src/server/middleware/express-mongoose-ra-json-server/utils/filterGetList.ts similarity index 100% rename from server/admin-next/src/server/middleware/express-mongoose-ra-json-server/utils/filterGetList.ts rename to server/admin/src/server/middleware/express-mongoose-ra-json-server/utils/filterGetList.ts diff --git a/server/admin-next/src/server/middleware/express-mongoose-ra-json-server/utils/filterReadOnly.ts b/server/admin/src/server/middleware/express-mongoose-ra-json-server/utils/filterReadOnly.ts similarity index 100% rename from server/admin-next/src/server/middleware/express-mongoose-ra-json-server/utils/filterReadOnly.ts rename to server/admin/src/server/middleware/express-mongoose-ra-json-server/utils/filterReadOnly.ts diff --git a/server/admin-next/src/server/middleware/express-mongoose-ra-json-server/utils/parseQuery.ts b/server/admin/src/server/middleware/express-mongoose-ra-json-server/utils/parseQuery.ts similarity index 100% rename from server/admin-next/src/server/middleware/express-mongoose-ra-json-server/utils/parseQuery.ts rename to server/admin/src/server/middleware/express-mongoose-ra-json-server/utils/parseQuery.ts diff --git a/server/admin-next/src/server/middleware/express-mongoose-ra-json-server/utils/virtualId.ts b/server/admin/src/server/middleware/express-mongoose-ra-json-server/utils/virtualId.ts similarity index 100% rename from server/admin-next/src/server/middleware/express-mongoose-ra-json-server/utils/virtualId.ts rename to server/admin/src/server/middleware/express-mongoose-ra-json-server/utils/virtualId.ts diff --git a/server/admin-next/src/server/router/api.ts b/server/admin/src/server/router/api.ts similarity index 100% rename from server/admin-next/src/server/router/api.ts rename to server/admin/src/server/router/api.ts diff --git a/server/admin-next/src/server/router/cache.ts b/server/admin/src/server/router/cache.ts similarity index 100% rename from server/admin-next/src/server/router/cache.ts rename to server/admin/src/server/router/cache.ts diff --git a/server/admin-next/src/server/router/config.ts b/server/admin/src/server/router/config.ts similarity index 100% rename from server/admin-next/src/server/router/config.ts rename to server/admin/src/server/router/config.ts diff --git a/server/admin-next/src/server/router/file.ts b/server/admin/src/server/router/file.ts similarity index 100% rename from server/admin-next/src/server/router/file.ts rename to server/admin/src/server/router/file.ts diff --git a/server/admin-next/src/server/router/network.ts b/server/admin/src/server/router/network.ts similarity index 100% rename from server/admin-next/src/server/router/network.ts rename to server/admin/src/server/router/network.ts diff --git a/server/admin-next/tsconfig.json b/server/admin/tsconfig.json similarity index 100% rename from server/admin-next/tsconfig.json rename to server/admin/tsconfig.json diff --git a/server/admin-next/tsconfig.server.json b/server/admin/tsconfig.server.json similarity index 100% rename from server/admin-next/tsconfig.server.json rename to server/admin/tsconfig.server.json diff --git a/server/admin-next/vite.config.ts b/server/admin/vite.config.ts similarity index 100% rename from server/admin-next/vite.config.ts rename to server/admin/vite.config.ts