Merge branch 'nihaojob:main' into main

.dockerignore

@@ -0,0 +1,9 @@
+# path: ./.dockerignore
+
+.DS_Store
+node_modules
+dist
+.npmrc
+yarn.lock
+pnpm-lock.yaml
+package-lock.json

.env

@@ -1,2 +1,4 @@
-APP_TITLE=设计编辑器-vue-fabric-editor
-APP_REPO=https://nihaojob.github.io/vue-fabric-editor-static/
+APP_TITLE=快图设计-开源图片编辑器-vue-fabric-editor
+APP_BASE_PATH=/vue-fabric-editor/
+APP_APIHOST=https://www.kuaitu.cc
+APP_ADMINAPIHOST=https://www.kuaitu.cc/admin

.env.development

@@ -1,2 +1,2 @@
 APP_FLAG=dev
-APP_FONT_CSS_FILE=free-font-local.css
+# APP_APIHOST=http://localhost:1337

.env.production

@@ -1,2 +1 @@
-APP_FLAG=prod
-APP_FONT_CSS_FILE=free-font.css
+APP_FLAG=prod

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 node_modules
 dist
+typings/auto-imports.d.ts
 
 # local env files
 .env.local
@@ -25,3 +26,5 @@ pnpm-debug.log*
 yarn.lock
 pnpm-lock.yaml
 package-lock.json
+typings/auto-imports.d.ts
+.eslintrc-auto-import.json

.vscode/settings.json

@@ -10,5 +10,6 @@
     "i18n-ally.localesPaths": [
         "src/language"
     ],
-    "i18n-ally.sourceLanguage": "zh" // 需要Prettier的配置文件
+    "i18n-ally.sourceLanguage": "zh",
+    "i18n-ally.keystyle": "nested" // 需要Prettier的配置文件
 }

Dockerfile

@@ -0,0 +1,15 @@
+FROM node:18-alpine3.18 as build
+
+WORKDIR /app
+COPY . .
+
+RUN npm install -g pnpm --registry=https://registry.npmmirror.com
+RUN pnpm config set registry https://registry.npmmirror.com
+RUN pnpm install
+
+RUN ["pnpm", "build"]
+
+FROM nginx:1.25.3
+COPY --from=0 /app/dist /usr/share/nginx/html/
+COPY nginx.conf /etc/nginx/conf.d/
+