Skip to content

Commit

Permalink
Merge pull request #87 from bit-ocean-studio/85-feat-locale-management
Browse files Browse the repository at this point in the history
Feat: ✨ Locale management
  • Loading branch information
recallwei authored Jan 29, 2024
2 parents a9b0fcc + 18e5888 commit 25f04d1
Show file tree
Hide file tree
Showing 112 changed files with 1,587 additions and 1,059 deletions.
File renamed without changes.
12 changes: 6 additions & 6 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ steps:
from_secret: SSH_HOST_STAGING
username:
from_secret: SSH_USERNAME
key:
password:
from_secret: SSH_PASSWORD
port: 22
target: /usr/share/nginx/html/dolphin-admin-react/dist
source:
- /dist
- ./dist
rm_target: true
strip_components: 1
debug: true
Expand Down Expand Up @@ -70,12 +70,12 @@ steps:
from_secret: SSH_HOST_STAGING
username:
from_secret: SSH_USERNAME
key:
password:
from_secret: SSH_PASSWORD
port: 22
target: /usr/share/nginx/html/dolphin-admin-react/dist
source:
- /dist
- ./dist
rm_target: true
strip_components: 1
debug: true
Expand All @@ -98,12 +98,12 @@ steps:
from_secret: SSH_HOST_PRODUCTION
username:
from_secret: SSH_USERNAME
key:
password:
from_secret: SSH_PASSWORD
port: 22
target: /usr/share/nginx/html/dolphin-admin-react/dist
source:
- /dist
- ./dist
rm_target: true
strip_components: 1
debug: true
Expand Down
12 changes: 1 addition & 11 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
{
"extends": "@brucesong/eslint-config-react",
"rules": {
"no-param-reassign": [
"error",
{
"props": true,
"ignorePropertyModificationsFor": ["draft", "req"],
"ignorePropertyModificationsForRegex": ["^item", "Item$"]
} // useImmer 需要直接修改参数值,不受此限制,尽量通过 draft = xxx 的方式修改
]
}
"extends": "@brucesong/eslint-config-react"
}
4 changes: 4 additions & 0 deletions @types/auto-imports.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ declare global {
const BasePageModel: typeof import('@/constants')['BasePageModel']
const BrowserUtils: typeof import('@dolphin-admin/utils')['BrowserUtils']
const DictionaryAPI: typeof import('../src/api/dictionary')['DictionaryAPI']
const DictionaryPageModel: typeof import('../src/api/dictionary.type')['DictionaryPageModel']
const DpAuthLayout: typeof import('../src/layouts/DpAuthLayout/index')['default']
const DpBaseLayout: typeof import('../src/layouts/DpBaseLayout/index')['default']
const DpDetailField: typeof import('../src/components/DpDetailField/index')['default']
Expand All @@ -68,12 +69,15 @@ declare global {
const LangUtils: typeof import('@dolphin-admin/utils')['LangUtils']
const Link: typeof import('react-router-dom')['Link']
const LocaleAPI: typeof import('../src/api/locale')['LocaleAPI']
const LocaleUtils: typeof import('../src/utils/locale')['LocaleUtils']
const NavLink: typeof import('react-router-dom')['NavLink']
const Navigate: typeof import('react-router-dom')['Navigate']
const OrderType: typeof import('../src/api/axios.enum')['OrderType']
const Outlet: typeof import('react-router-dom')['Outlet']
const Route: typeof import('react-router-dom')['Route']
const Routes: typeof import('react-router-dom')['Routes']
const SettingAPI: typeof import('../src/api/setting')['SettingAPI']
const StatusCode: typeof import('../src/api/axios.enum')['StatusCode']
const Suspense: typeof import('react')['Suspense']
const TemplateAPI: typeof import('../src/api/template')['TemplateAPI']
const ThemeUtils: typeof import('@dolphin-admin/utils')['ThemeUtils']
Expand Down
49 changes: 25 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"bugs": {
"url": "https://github.com/bit-ocean-studio/dolphin-admin-react/issues"
},
"type": "module",
"scripts": {
"dev": "vite",
"build:staging": "pnpm type:check && NODE_ENV=staging vite build --mode staging",
Expand All @@ -32,69 +33,69 @@
"prepare": "husky install"
},
"dependencies": {
"@ant-design/cssinjs": "1.18.2",
"@ant-design/cssinjs": "1.18.4",
"@ant-design/happy-work-theme": "^1.0.0",
"@ant-design/icons": "^5.2.6",
"@dolphin-admin/utils": "^0.0.23",
"@tanstack/react-query": "^5.15.5",
"@tanstack/react-query-devtools": "^5.15.5",
"@tanstack/react-query": "^5.17.19",
"@tanstack/react-query-devtools": "^5.17.21",
"@tauri-apps/api": "^1.5.3",
"ahooks": "^3.7.8",
"antd": "^5.12.6",
"axios": "^1.6.3",
"antd": "^5.13.2",
"axios": "^1.6.5",
"clsx": "^2.1.0",
"dayjs": "^1.11.10",
"echarts": "^5.4.3",
"i18next": "^23.7.13",
"i18next": "^23.7.18",
"immer": "^10.0.3",
"lodash-es": "^4.17.21",
"nprogress": "^0.2.0",
"qrcode": "^1.5.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-i18next": "^14.0.0",
"react-router-dom": "^6.21.1",
"socket.io-client": "^4.7.2",
"react-i18next": "^14.0.1",
"react-router-dom": "^6.21.3",
"socket.io-client": "^4.7.4",
"use-immer": "^0.9.0",
"xlsx": "https://cdn.sheetjs.com/xlsx-0.20.0/xlsx-0.20.0.tgz",
"zustand": "^4.4.7"
"zustand": "^4.5.0"
},
"devDependencies": {
"@brucesong/eslint-config-react": "^1.0.20",
"@commitlint/cli": "^18.4.3",
"@commitlint/config-conventional": "^18.4.3",
"@brucesong/eslint-config-react": "^1.0.21",
"@commitlint/cli": "^18.5.0",
"@commitlint/config-conventional": "^18.5.0",
"@dolphin-admin/auto-import": "^0.0.12",
"@dolphin-admin/bootstrap-animation": "^0.0.6",
"@iconify/json": "^2.2.163",
"@iconify/json": "^2.2.172",
"@iconify/react": "^4.1.1",
"@svgr/core": "^8.1.0",
"@svgr/plugin-jsx": "^8.1.0",
"@tauri-apps/cli": "^1.5.9",
"@types/lodash-es": "^4.17.12",
"@types/nprogress": "^0.2.3",
"@types/qrcode": "^1.5.5",
"@types/react": "^18.2.46",
"@types/react": "^18.2.48",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react-swc": "^3.5.0",
"autoprefixer": "^10.4.16",
"autoprefixer": "^10.4.17",
"commitizen": "^4.3.0",
"cspell": "^8.3.0",
"cspell": "^8.3.2",
"cz-git": "^1.8.0",
"eslint": "^8.56.0",
"husky": "^8.0.3",
"lint-staged": "^15.2.0",
"postcss": "^8.4.32",
"prettier": "^3.1.1",
"postcss": "^8.4.33",
"prettier": "^3.2.4",
"rollup-plugin-visualizer": "^5.12.0",
"sass": "^1.69.6",
"tailwindcss": "^3.4.0",
"sass": "^1.70.0",
"tailwindcss": "^3.4.1",
"typescript": "^5.3.3",
"unplugin-auto-import": "^0.17.3",
"unplugin-auto-import-ahooks": "^0.0.2",
"unplugin-auto-import-antd": "^0.0.1",
"unplugin-icons": "^0.18.1",
"unplugin-info": "^0.7.0",
"vite": "4.5.1",
"unplugin-icons": "^0.18.2",
"unplugin-info": "^0.7.1",
"vite": "5.0.12",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-progress": "^0.0.7",
"vite-plugin-version-mark": "^0.0.10"
Expand Down
Loading

0 comments on commit 25f04d1

Please sign in to comment.