diff --git a/packages/create-inula/.prettierrc.js b/packages/create-inula/.prettierrc.js new file mode 100644 index 00000000..da8f33e7 --- /dev/null +++ b/packages/create-inula/.prettierrc.js @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2020 Huawei Technologies Co.,Ltd. + * + * InulaJS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * + * http://license.coscl.org.cn/MulanPSL2 + * + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +'use strict'; + +module.exports = { + printWidth: 120, // 一行120字符数,如果超过会进行换行 + tabWidth: 2, // tab等2个空格 + useTabs: false, // 用空格缩进行 + semi: true, // 行尾使用分号 + singleQuote: true, // 字符串使用单引号 + quoteProps: 'as-needed', // 仅在需要时在对象属性添加引号 + jsxSingleQuote: false, // 在JSX中使用双引号 + trailingComma: 'es5', // 使用尾逗号(对象、数组等) + bracketSpacing: true, // 对象的括号间增加空格 + bracketSameLine: false, // 将多行JSX元素的>放在最后一行的末尾 + arrowParens: 'avoid', // 在唯一的arrow函数参数周围省略括号 + vueIndentScriptAndStyle: false, // 不缩进Vue文件中的 diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/mock/_utils.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/mock/_utils.js similarity index 51% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/mock/_utils.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/mock/_utils.js index 1a1e2358..e1b2c368 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/mock/_utils.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/mock/_utils.js @@ -12,31 +12,6 @@ export function queryArray(array, key, value) { return array.filter(_ => _[key] === value); } -export function randomNumber(min, max) { - return Math.floor(Math.random() * (max - min) + min); -} - -export function randomAvatar() { - const avatarList = [ - 'photo-1549492864-2ec7d66ffb04.jpeg', - 'photo-1480535339474-e083439a320d.jpeg', - 'photo-1523419409543-a5e549c1faa8.jpeg', - 'photo-1519648023493-d82b5f8d7b8a.jpeg', - 'photo-1523307730650-594bc63f9d67.jpeg', - 'photo-1522962506050-a2f0267e4895.jpeg', - 'photo-1489779162738-f81aed9b0a25.jpeg', - 'photo-1534308143481-c55f00be8bd7.jpeg', - 'photo-1519336555923-59661f41bb45.jpeg', - 'photo-1551438632-e8c7d9a5d1b7.jpeg', - 'photo-1525879000488-bff3b1c387cf.jpeg', - 'photo-1487412720507-e7ab37603c6f.jpeg', - 'photo-1510227272981-87123e259b17.jpeg', - ]; - return `//image.zuiidea.com/${ - avatarList[randomNumber(0, avatarList.length - 1)] - }?imageView2/1/w/200/h/200/format/webp/q/75|imageslim`; -} - export const Constant = { ApiPrefix: '/api/v1', NotFound: { diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/mock/dashboard.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/mock/dashboard.js new file mode 100644 index 00000000..983bcdee --- /dev/null +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/mock/dashboard.js @@ -0,0 +1,58 @@ +import { Constant } from './_utils'; +import Mock from 'mockjs'; + +const { ApiPrefix, Color } = Constant; + +const Dashboard = Mock.mock({ + 'sales|8': [ + { + 'name|+1': 2008, + 'Clothes|200-500': 1, + 'Food|180-400': 1, + 'Electronics|300-550': 1, + }, + ], + quote: { + name: 'Joho Doe', + title: 'Graphic Designer', + content: + "I'm selfish, impatient and a little insecure. I make mistakes, I am out of control and at times hard to handle. But if you can't handle me at my worst, then you sure as hell don't deserve me at my best.", + avatar: '//cdn.antd-admin.zuiidea.com/bc442cf0cc6f7940dcc567e465048d1a8d634493198c4-sPx5BR_fw236', + }, + numbers: [ + { + icon: 'pay-circle-o', + color: Color.green, + title: 'Online Review', + number: 2781, + }, + { + icon: 'team', + color: Color.blue, + title: 'New Customers', + number: 3241, + }, + { + icon: 'message', + color: Color.purple, + title: 'Active Projects', + number: 253, + }, + { + icon: 'shopping-cart', + color: Color.red, + title: 'Referrals', + number: 4324, + }, + ], +}); + +export default [ + { + url: `${ApiPrefix}/dashboard`, + method: 'get', + response: () => { + return Dashboard; + }, + }, +]; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/mock/route.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/mock/route.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/mock/route.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/mock/route.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/mock/user.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/mock/user.js similarity index 57% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/mock/user.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/mock/user.js index a0756109..986da934 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/mock/user.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/mock/user.js @@ -1,22 +1,21 @@ -import { Constant } from './_utils'; -import Mock from 'mockjs'; -import { randomAvatar } from './_utils'; -import url from 'url'; +import { Constant } from "./_utils"; +import Mock from "mockjs"; +import url from "url"; const { ApiPrefix } = Constant; let usersListData = Mock.mock({ - 'data|80-100': [ + "data|80-100": [ { - id: '@id', - name: '@name', - nickName: '@last', + id: "@id", + name: "@name", + nickName: "@last", phone: /^1[34578]\d{9}$/, - 'age|11-99': 1, - address: '@county(true)', - isMale: '@boolean', - email: '@email', - createTime: '@datetime', + "age|11-99": 1, + address: "@county(true)", + isMale: "@boolean", + email: "@email", + createTime: "@datetime", }, ], }); @@ -24,14 +23,14 @@ let usersListData = Mock.mock({ let database = usersListData.data; const EnumRoleType = { - ADMIN: 'admin', - DEFAULT: 'guest', - DEVELOPER: 'developer', + ADMIN: "admin", + DEFAULT: "guest", + DEVELOPER: "developer", }; const userPermission = { DEFAULT: { - visit: ['1', '2', '21', '7', '5', '51', '52', '53'], + visit: ["1", "2", "21", "7", "5", "51", "52", "53"], role: EnumRoleType.DEFAULT, }, ADMIN: { @@ -45,28 +44,13 @@ const userPermission = { const adminUsers = [ { id: 0, - username: 'admin', - password: 'admin', + username: "admin", + password: "admin", permissions: userPermission.ADMIN, - avatar: randomAvatar(), - }, - { - id: 1, - username: 'guest', - password: 'guest', - permissions: userPermission.DEFAULT, - avatar: randomAvatar(), - }, - { - id: 2, - username: '吴彦祖', - password: '123456', - permissions: userPermission.DEVELOPER, - avatar: randomAvatar(), }, ]; -const queryArray = (array, key, keyAlias = 'key') => { +const queryArray = (array, key, keyAlias = "key") => { if (!(array instanceof Array)) { return null; } @@ -86,14 +70,14 @@ const queryArray = (array, key, keyAlias = 'key') => { }; const NOTFOUND = { - message: 'Not Found', - documentation_url: 'http://localhost:8000/request', + message: "Not Found", + documentation_url: "http://localhost:8000/request", }; export default [ { url: `${ApiPrefix}/user`, - method: 'get', + method: "get", response: () => { return { success: true, @@ -103,29 +87,29 @@ export default [ }, { url: `${ApiPrefix}/users`, - method: 'get', - response: req => { + method: "get", + response: (req) => { const { query } = url.parse(req.url, true); let { pageSize, page, ...other } = query; - if (other['address[]']) { - other['address'] = other['address[]']; - delete other['address[]']; + if (other["address[]"]) { + other["address"] = other["address[]"]; + delete(other["address[]"]); } pageSize = pageSize || 10; page = page || 1; let newData = database; for (let key in other) { - newData = newData.filter(item => { + newData = newData.filter((item) => { if ({}.hasOwnProperty.call(item, key)) { - if (key === 'address') { + if (key === "address") { for (const addr of other[key]) { if (item[key].indexOf(addr) === -1) { return false; } } return true; - } else if (key === 'createTime') { + } else if (key === "createTime") { const start = new Date(other[key][0]).getTime(); const end = new Date(other[key][1]).getTime(); const now = new Date(item[key]).getTime(); @@ -135,7 +119,10 @@ export default [ } return true; } - return String(item[key]).trim().indexOf(decodeURI(other[key]).trim()) > -1; + return ( + String(item[key]).trim().indexOf(decodeURI(other[key]).trim()) > + -1 + ); } return false; }); @@ -148,10 +135,10 @@ export default [ }, { url: `${ApiPrefix}/users/delete`, - method: 'post', - response: req => { + method: "post", + response: (req) => { const { ids = [] } = req.body; - database = database.filter(item => !ids.some(_ => _ === item.id)); + database = database.filter((item) => !ids.some((_) => _ === item.id)); }, }, {}, diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/package.json b/packages/create-inula/lib/generators/Inula-antd/templates/vite/package.json similarity index 95% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/package.json rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/package.json index 56545b79..246bdcf4 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/package.json +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/package.json @@ -1,5 +1,5 @@ { - "name": "my-react-app", + "name": "inula-vite-app", "private": true, "version": "0.0.0", "type": "module", @@ -12,22 +12,20 @@ "@babel/plugin-proposal-export-default-from": "^7.18.6", "@babel/plugin-transform-react-jsx": "^7.21.0", "@babel/runtime": "7.6.2", - "inulajs": "^0.0.8", "antd": "^4.0.0", "axios": "^0.21.0", "classnames": "^2.2.6", "echarts": "^5.0.0", "history": "^5.3.0", + "@cloudsop/horizon": "^0.0.58", "lodash": "^4.17.11", "moment": "2.24.0", "nprogress": "^0.2.0", "path-to-regexp": "^6.1.0", "prop-types": "^15.7.0", "qs": "^6.10.0", - "react-countup": "^4.2.0", "react-dom": "17.0.2", "react-draft-wysiwyg": "^1.13.0", - "react-helmet": "^6.0.0", "react-intl": "^6.3.2", "react-perfect-scrollbar": "^1.5.0", "react-router": "^6.10.0", diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/favicon.ico b/packages/create-inula/lib/generators/Inula-antd/templates/vite/public/favicon.ico similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/favicon.ico rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/public/favicon.ico diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/logo.svg b/packages/create-inula/lib/generators/Inula-antd/templates/vite/public/logo.svg similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/logo.svg rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/public/logo.svg diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/logo/logo@128.png b/packages/create-inula/lib/generators/Inula-antd/templates/vite/public/logo/logo@128.png similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/logo/logo@128.png rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/public/logo/logo@128.png diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/logo/logo@144.png b/packages/create-inula/lib/generators/Inula-antd/templates/vite/public/logo/logo@144.png similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/logo/logo@144.png rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/public/logo/logo@144.png diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/logo/logo@152.png b/packages/create-inula/lib/generators/Inula-antd/templates/vite/public/logo/logo@152.png similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/logo/logo@152.png rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/public/logo/logo@152.png diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/logo/logo@192.png b/packages/create-inula/lib/generators/Inula-antd/templates/vite/public/logo/logo@192.png similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/logo/logo@192.png rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/public/logo/logo@192.png diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/logo/logo@384.png b/packages/create-inula/lib/generators/Inula-antd/templates/vite/public/logo/logo@384.png similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/logo/logo@384.png rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/public/logo/logo@384.png diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/logo/logo@512.png b/packages/create-inula/lib/generators/Inula-antd/templates/vite/public/logo/logo@512.png similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/logo/logo@512.png rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/public/logo/logo@512.png diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/logo/logo@72.png b/packages/create-inula/lib/generators/Inula-antd/templates/vite/public/logo/logo@72.png similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/logo/logo@72.png rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/public/logo/logo@72.png diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/logo/logo@96.png b/packages/create-inula/lib/generators/Inula-antd/templates/vite/public/logo/logo@96.png similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/logo/logo@96.png rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/public/logo/logo@96.png diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/vite.svg b/packages/create-inula/lib/generators/Inula-antd/templates/vite/public/vite.svg similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/vite.svg rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/public/vite.svg diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/DropOption/DropOption.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/DropOption/DropOption.js similarity index 95% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/DropOption/DropOption.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/DropOption/DropOption.js index 345e231a..4b6691ef 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/DropOption/DropOption.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/DropOption/DropOption.js @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import PropTypes from 'prop-types'; import { BarsOutlined, DownOutlined } from '@ant-design/icons'; import { Dropdown, Button, Menu } from 'antd'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/DropOption/package.json b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/DropOption/package.json similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/DropOption/package.json rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/DropOption/package.json diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Ellipsis/index.d.ts b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Ellipsis/index.d.ts similarity index 93% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Ellipsis/index.d.ts rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Ellipsis/index.d.ts index 57fc2b2d..c0a21953 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Ellipsis/index.d.ts +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Ellipsis/index.d.ts @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import { TooltipProps } from 'antd/lib/tooltip'; export interface EllipsisTooltipProps extends TooltipProps { diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Ellipsis/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Ellipsis/index.js similarity index 99% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Ellipsis/index.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Ellipsis/index.js index 99ba6fb8..aa3849a8 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Ellipsis/index.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Ellipsis/index.js @@ -1,4 +1,4 @@ -import Inula, { Component } from 'inulajs'; +import Inula, { Component } from '@cloudsop/horizon'; import { Tooltip } from 'antd'; import classNames from 'classnames'; import styles from './index.module.less'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Ellipsis/index.md b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Ellipsis/index.md similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Ellipsis/index.md rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Ellipsis/index.md diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Ellipsis/index.module.less b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Ellipsis/index.module.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Ellipsis/index.module.less rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Ellipsis/index.module.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Ellipsis/index.test.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Ellipsis/index.test.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Ellipsis/index.test.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Ellipsis/index.test.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/FilterItem/FilterItem.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/FilterItem/FilterItem.js similarity index 94% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/FilterItem/FilterItem.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/FilterItem/FilterItem.js index 03bbb0d8..c53d5a80 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/FilterItem/FilterItem.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/FilterItem/FilterItem.js @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import PropTypes from 'prop-types'; import styles from './FilterItem.module.less'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/FilterItem/FilterItem.module.less b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/FilterItem/FilterItem.module.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/FilterItem/FilterItem.module.less rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/FilterItem/FilterItem.module.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/FilterItem/package.json b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/FilterItem/package.json similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/FilterItem/package.json rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/FilterItem/package.json diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/GlobalFooter/index.d.ts b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/GlobalFooter/index.d.ts similarity index 89% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/GlobalFooter/index.d.ts rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/GlobalFooter/index.d.ts index 5fb3a1cd..6411c837 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/GlobalFooter/index.d.ts +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/GlobalFooter/index.d.ts @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; export interface GlobalFooterProps { links?: Array<{ key?: string; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/GlobalFooter/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/GlobalFooter/index.js similarity index 94% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/GlobalFooter/index.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/GlobalFooter/index.js index ee2176af..88bfaf9d 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/GlobalFooter/index.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/GlobalFooter/index.js @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import classNames from 'classnames'; import styles from './index.module.less'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/GlobalFooter/index.md b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/GlobalFooter/index.md similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/GlobalFooter/index.md rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/GlobalFooter/index.md diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/GlobalFooter/index.module.less b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/GlobalFooter/index.module.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/GlobalFooter/index.module.less rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/GlobalFooter/index.module.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Layout/Bread.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Bread.js similarity index 96% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Layout/Bread.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Bread.js index 4d27ceff..bce14abb 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Layout/Bread.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Bread.js @@ -1,4 +1,4 @@ -import Inula, { Fragment } from 'inulajs'; +import Inula, { Fragment } from '@cloudsop/horizon'; import { Breadcrumb } from 'antd'; import { Link } from 'react-router-dom'; import { t } from 'utils/intl'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Layout/Bread.module.less b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Bread.module.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Layout/Bread.module.less rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Bread.module.less diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Header.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Header.js new file mode 100644 index 00000000..81e3d4e5 --- /dev/null +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Header.js @@ -0,0 +1,63 @@ +import Inula from '@cloudsop/horizon'; +import { Menu, Layout } from 'antd'; +import { MenuFoldOutlined, MenuUnfoldOutlined } from '@ant-design/icons'; +import { Trans } from 'utils/intl'; +import { getLocale, setLocale } from 'utils'; +import classnames from 'classnames'; +import config from 'config'; +import styles from './Header.module.less'; + +const { SubMenu } = Menu; + +function Header({ fixed, username, collapsed, notifications, onCollapseChange, onAllNotificationsRead }) { + const rightContent = [ +
+ + Hi, + + {username} +
+ ]; + + if (config.i18n) { + const { languages } = config.i18n; + const language = getLocale(); + const currentLanguage = languages.find(item => item.key === language); + + rightContent.unshift( + { + setLocale(data.key); + }} + mode="horizontal" + > + + {languages.map(item => ( + + {item.title} + + ))} + + + ); + } + + return ( + +
+ {collapsed ? : } +
+
{rightContent}
+
+ ); +} + +export default Header; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Layout/Header.module.less b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Header.module.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Layout/Header.module.less rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Header.module.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Layout/Sider.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Sider.js similarity index 97% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Layout/Sider.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Sider.js index 766b52ac..8ef27de0 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Layout/Sider.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Sider.js @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import { Switch, Layout } from 'antd'; import { t } from 'utils/intl'; import { Trans } from 'utils/intl'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Layout/Sider.module.less b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Sider.module.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Layout/Sider.module.less rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/Sider.module.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Layout/SiderMenu.tsx b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/SiderMenu.tsx similarity index 97% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Layout/SiderMenu.tsx rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/SiderMenu.tsx index 7df130a3..03789dda 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Layout/SiderMenu.tsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/SiderMenu.tsx @@ -1,4 +1,4 @@ -import Inula, { useState, Fragment } from 'inulajs'; +import Inula, { useState, Fragment } from '@cloudsop/horizon'; import PropTypes from 'prop-types'; import { Menu } from 'antd'; import { NavLink } from 'react-router-dom'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Layout/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/index.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Layout/index.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Layout/index.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Loader/Loader.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Loader/Loader.js similarity index 93% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Loader/Loader.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Loader/Loader.js index cbd7ccf8..3edf71ae 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Loader/Loader.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Loader/Loader.js @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import PropTypes from 'prop-types'; import classNames from 'classnames'; import styles from './Loader.module.less'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Loader/Loader.module.less b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Loader/Loader.module.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Loader/Loader.module.less rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Loader/Loader.module.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Loader/package.json b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Loader/package.json similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Loader/package.json rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Loader/package.json diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Page/Page.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Page/Page.js similarity index 93% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Page/Page.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Page/Page.js index 5c6926a1..e605c083 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Page/Page.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Page/Page.js @@ -1,4 +1,4 @@ -import Inula, { Component } from 'inulajs'; +import Inula, { Component } from '@cloudsop/horizon'; import PropTypes from 'prop-types'; import classnames from 'classnames'; import Loader from '../Loader'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Page/Page.module.less b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Page/Page.module.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Page/Page.module.less rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Page/Page.module.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Page/package.json b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Page/package.json similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Page/package.json rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/Page/package.json diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/ScrollBar/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/ScrollBar/index.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/ScrollBar/index.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/ScrollBar/index.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/ScrollBar/index.less b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/ScrollBar/index.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/ScrollBar/index.less rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/ScrollBar/index.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/index.js similarity index 68% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/index.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/index.js index 81a96eb2..f94f4ef5 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/index.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/components/index.js @@ -1,4 +1,3 @@ -import Editor from './Editor'; import FilterItem from './FilterItem'; import DropOption from './DropOption'; import Loader from './Loader'; @@ -8,4 +7,4 @@ import Ellipsis from './Ellipsis'; import * as MyLayout from './Layout'; import Page from './Page'; -export { MyLayout, Editor, GlobalFooter, Ellipsis, FilterItem, DropOption, Loader, Page, ScrollBar }; +export { MyLayout, GlobalFooter, Ellipsis, FilterItem, DropOption, Loader, Page, ScrollBar }; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/layouts/BaseLayout.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/BaseLayout.js similarity index 78% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/layouts/BaseLayout.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/BaseLayout.js index 415adce5..59dd1b0d 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/layouts/BaseLayout.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/BaseLayout.js @@ -1,5 +1,4 @@ -import Inula, { Fragment } from 'inulajs'; -import { Helmet } from 'react-helmet'; +import Inula, { Fragment } from '@cloudsop/horizon'; import { queryLayout } from 'utils'; import config from 'utils/config'; @@ -18,9 +17,6 @@ function BaseLayout({ children, location }) { return ( - - {config.siteName} - {children} ); diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/layouts/BaseLayout.less b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/BaseLayout.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/layouts/BaseLayout.less rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/BaseLayout.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/layouts/PrimaryLayout.module.less b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/PrimaryLayout.module.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/layouts/PrimaryLayout.module.less rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/PrimaryLayout.module.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/layouts/PrimaryLayout.tsx b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/PrimaryLayout.tsx similarity index 97% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/layouts/PrimaryLayout.tsx rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/PrimaryLayout.tsx index 13fdca1f..89e4c07c 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/layouts/PrimaryLayout.tsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/PrimaryLayout.tsx @@ -1,4 +1,4 @@ -import Inula, { useEffect, Fragment } from 'inulajs'; +import Inula, { useEffect, Fragment } from '@cloudsop/horizon'; import PropTypes from 'prop-types'; import { MyLayout, GlobalFooter } from '../components'; import { BackTop, Layout, Drawer } from 'antd'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/layouts/PublicLayout.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/PublicLayout.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/layouts/PublicLayout.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/PublicLayout.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/layouts/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/index.js similarity index 94% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/layouts/index.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/index.js index 6d9f4a15..f39188bc 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/layouts/index.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/layouts/index.js @@ -1,4 +1,4 @@ -import Inula, { Suspense } from 'inulajs'; +import Inula, { Suspense } from '@cloudsop/horizon'; import { ConfigProvider } from 'antd'; import { IntlProvider } from 'react-intl'; import { getLocale } from '../utils'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/locales/en/messages.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/locales/en/messages.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/locales/en/messages.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/locales/en/messages.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/locales/pt-br/messages.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/locales/pt-br/messages.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/locales/pt-br/messages.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/locales/pt-br/messages.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/locales/zh/messages.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/locales/zh/messages.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/locales/zh/messages.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/locales/zh/messages.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/main.jsx b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/main.jsx similarity index 68% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/main.jsx rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/main.jsx index bac2925a..5a3462d6 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/main.jsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/main.jsx @@ -1,10 +1,12 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import { BrowserRouter } from 'react-router-dom'; - +import config from './utils/config'; import 'antd/dist/antd.css'; import Layout from './layouts'; +document.title = config.siteName; + Inula.render( diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/models/app-model.ts b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/models/app-model.ts similarity index 93% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/models/app-model.ts rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/models/app-model.ts index 012ef5ca..f58d11e6 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/models/app-model.ts +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/models/app-model.ts @@ -1,14 +1,11 @@ -import { stringify } from 'qs'; import store from 'store'; import { pathToRegexp } from 'path-to-regexp'; import { ROLE_TYPE } from '../utils/constant'; -import { queryLayout } from '../utils'; import api from '../services'; -import config from '../utils/config'; // @ts-ignore const { queryRouteList, queryUserInfo } = api; -import { createStore } from 'inulajs'; +import { createStore } from '@cloudsop/horizon'; const goDashboard = history => { if (pathToRegexp(['/', '/login']).exec(window.location.pathname)) { diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/404.jsx b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/404.jsx similarity index 88% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/404.jsx rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/404.jsx index 4c13bb00..e6a31acd 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/404.jsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/404.jsx @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import { FrownOutlined } from '@ant-design/icons'; import { Page } from 'components'; import styles from './404.module.less'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/404.module.less b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/404.module.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/404.module.less rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/404.module.less diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/index.js new file mode 100644 index 00000000..36274900 --- /dev/null +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/index.js @@ -0,0 +1,6 @@ +import NumberCard from './numberCard'; +import Quote from './quote'; +import Sales from './sales'; +import Weather from './weather'; + +export { NumberCard, Quote, Sales, Weather }; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/numberCard.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/numberCard.js similarity index 74% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/numberCard.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/numberCard.js index aaa08a57..ff7b83f3 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/numberCard.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/numberCard.js @@ -1,11 +1,10 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import PropTypes from 'prop-types'; import { Card } from 'antd'; -import CountUp from 'react-countup'; import iconMap from 'utils/iconMap'; import styles from './numberCard.module.less'; -function NumberCard({ icon, color, title, number, countUp }) { +function NumberCard({ icon, color, title, number }) { return ( @@ -14,7 +13,7 @@ function NumberCard({ icon, color, title, number, countUp }) {

{title || 'No Title'}

- + {number}

diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/numberCard.module.less b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/numberCard.module.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/numberCard.module.less rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/numberCard.module.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/quote.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/quote.js similarity index 94% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/quote.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/quote.js index 6427e999..6e9ad8b8 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/quote.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/quote.js @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import PropTypes from 'prop-types'; import styles from './quote.module.less'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/quote.module.less b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/quote.module.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/quote.module.less rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/quote.module.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/sales.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/sales.js similarity index 98% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/sales.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/sales.js index fe8c7732..be66ecff 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/sales.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/sales.js @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import PropTypes from 'prop-types'; import classnames from 'classnames'; import Color from '../../../utils/theme'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/sales.module.less b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/sales.module.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/sales.module.less rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/sales.module.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/weather.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/weather.js similarity index 96% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/weather.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/weather.js index c674e572..845f83a2 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/weather.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/weather.js @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import PropTypes from 'prop-types'; import { Spin } from 'antd'; import styles from './weather.module.less'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/weather.module.less b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/weather.module.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/weather.module.less rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/components/weather.module.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/index.module.less b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/index.module.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/index.module.less rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/index.module.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/index.tsx b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/index.tsx similarity index 92% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/index.tsx rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/index.tsx index 3db32ea3..85fc05b6 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/index.tsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/index.tsx @@ -1,10 +1,9 @@ -import Inula, { useEffect } from 'inulajs'; +import Inula, { useEffect } from '@cloudsop/horizon'; import { Row, Col, Card } from 'antd'; import Color from '../../utils/theme'; import { Page, ScrollBar } from '../../components'; import { NumberCard, Quote, Sales, Weather } from './components'; import styles from './index.module.less'; -import store from 'store'; import { getStore } from './model'; const bodyStyle = { @@ -21,9 +20,6 @@ function Dashboard() { st.query(); }, []); - const userDetail = store.get('user'); - const { avatar, username } = userDetail; - const weather = st.weather; const sales = st.sales; const quote = st.quote; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/model.ts b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/model.ts similarity index 97% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/model.ts rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/model.ts index df35178b..4ad463f9 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/model.ts +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/model.ts @@ -1,6 +1,6 @@ import { parse } from 'qs'; import api from '../../services'; -import { createStore } from 'inulajs'; +import { createStore } from '@cloudsop/horizon'; const { queryDashboard, queryWeather } = api; const avatar = '//cdn.antd-admin.zuiidea.com/bc442cf0cc6f7940dcc567e465048d1a8d634493198c4-sPx5BR_fw236.jpeg'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/services/dashboard.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/services/dashboard.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/services/dashboard.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/services/dashboard.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/services/weather.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/services/weather.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/services/weather.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/dashboard/services/weather.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/index.js similarity index 77% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/index.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/index.js index 4005019e..9135bf8c 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/index.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/index.js @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import { Redirect } from 'react-router-dom'; function Index() { diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/routes.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/routes.js similarity index 93% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/routes.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/routes.js index 6be8211f..801702ca 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/routes.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/routes.js @@ -1,4 +1,4 @@ -import Inula, { lazy } from 'inulajs'; +import Inula, { lazy } from '@cloudsop/horizon'; export function getRoutes() { const routes = [ diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/components/Filter.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/components/Filter.js similarity index 98% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/components/Filter.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/components/Filter.js index 41d34da1..6c8e5015 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/components/Filter.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/components/Filter.js @@ -1,4 +1,4 @@ -import Inula, { useRef } from 'inulajs'; +import Inula, { useRef } from '@cloudsop/horizon'; import moment from 'moment'; import { FilterItem } from 'components'; import { Button, Row, Col, DatePicker, Form, Input, Cascader } from 'antd'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/components/Filter.module.less b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/components/Filter.module.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/components/Filter.module.less rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/components/Filter.module.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/components/List.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/components/List.js similarity index 98% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/components/List.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/components/List.js index 412774ae..a6a2743a 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/components/List.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/components/List.js @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import { Table, Modal } from 'antd'; import { DropOption } from 'components'; import { t } from 'utils/intl'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/components/List.module.less b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/components/List.module.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/components/List.module.less rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/components/List.module.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/components/Modal.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/components/Modal.js similarity index 98% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/components/Modal.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/components/Modal.js index e7969575..d85cdcf8 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/components/Modal.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/components/Modal.js @@ -1,4 +1,4 @@ -import Inula, { useRef } from 'inulajs'; +import Inula, { useRef } from '@cloudsop/horizon'; import { Form, Input, InputNumber, Radio, Modal, Cascader } from 'antd'; import { t, Trans } from 'utils/intl'; import city from 'utils/city'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/id/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/id/index.js similarity index 92% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/id/index.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/id/index.js index 9b3a862f..b72f59f7 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/id/index.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/id/index.js @@ -1,4 +1,4 @@ -import Inula, { PureComponent } from 'inulajs'; +import Inula, { PureComponent } from '@cloudsop/horizon'; import PropTypes from 'prop-types'; import { Page } from 'components'; import styles from './index.module.less'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/id/index.module.less b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/id/index.module.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/id/index.module.less rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/id/index.module.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/id/models/detail.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/id/models/detail.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/id/models/detail.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/id/models/detail.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/index.tsx b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/index.tsx similarity index 98% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/index.tsx rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/index.tsx index e2461885..8b936316 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/index.tsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/index.tsx @@ -1,4 +1,4 @@ -import Inula, { useEffect } from 'inulajs'; +import Inula, { useEffect } from '@cloudsop/horizon'; import { Row, Col, Button, Popconfirm } from 'antd'; import { Page } from '../../components'; import { stringify } from 'qs'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/model.ts b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/model.ts similarity index 97% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/model.ts rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/model.ts index fd2b883c..9c4552f1 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/model.ts +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/pages/user/model.ts @@ -1,5 +1,5 @@ import api from '../../services'; -import { createStore } from 'inulajs'; +import { createStore } from '@cloudsop/horizon'; const { queryUserList, createUser, removeUser, updateUser, removeUserList } = api; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/plugins/onError.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/plugins/onError.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/plugins/onError.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/plugins/onError.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/services/api.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/services/api.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/services/api.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/services/api.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/services/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/services/index.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/services/index.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/services/index.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/themes/default.less b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/themes/default.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/themes/default.less rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/themes/default.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/themes/index.less b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/themes/index.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/themes/index.less rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/themes/index.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/themes/mixin.less b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/themes/mixin.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/themes/mixin.less rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/themes/mixin.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/themes/vars.less b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/themes/vars.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/themes/vars.less rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/themes/vars.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/utils/city.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/city.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/utils/city.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/city.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/utils/config.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/config.js similarity index 90% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/utils/config.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/config.js index 24f8d999..f92e7975 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/utils/config.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/config.js @@ -21,17 +21,14 @@ const config = { { key: 'pt-br', title: 'Português', - flag: '/portugal.svg', }, { key: 'en', title: 'English', - flag: '/america.svg', }, { key: 'zh', title: '中文', - flag: '/china.svg', }, ], defaultLanguage: 'en', diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/utils/constant.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/constant.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/utils/constant.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/constant.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/utils/iconMap.jsx b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/iconMap.jsx similarity index 94% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/utils/iconMap.jsx rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/iconMap.jsx index 58f29731..69ab35c0 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/utils/iconMap.jsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/iconMap.jsx @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import { PayCircleOutlined, ShoppingCartOutlined, diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/utils/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/index.js similarity index 98% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/utils/index.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/index.js index f6cf888b..278fd352 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/utils/index.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/index.js @@ -164,14 +164,14 @@ export function setLocale(language) { export function parseSearch(search) { const searchObj = {}; search.replace(/([^?&=]+)=([^&]+)/g, (_, k, v) => { - if (k === 'address') { + if (k === "address") { if (searchObj[k]) { searchObj[k].push(decodeURI(v)); } else { - searchObj[k] = [decodeURI(v)]; + searchObj[k] = [decodeURI(v)] } } else { - searchObj[k] = decodeURI(v); + searchObj[k] = decodeURI(v) } }); return searchObj; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/utils/index.test.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/index.test.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/utils/index.test.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/index.test.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/utils/intl.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/intl.js similarity index 97% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/utils/intl.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/intl.js index ba3aea47..20eefdd9 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/utils/intl.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/intl.js @@ -2,7 +2,7 @@ * 国际化,支持按需加载 */ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import { createIntl, createIntlCache, FormattedMessage } from 'react-intl'; import zhCN from 'antd/lib/locale-provider/zh_CN'; import enUS from 'antd/lib/locale-provider/en_US'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/utils/request.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/request.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/utils/request.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/request.js diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/theme.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/theme.js new file mode 100644 index 00000000..86d7280b --- /dev/null +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/src/admin/utils/theme.js @@ -0,0 +1,14 @@ +const Color = { + green: '#64ea91', + blue: '#8fc9fb', + purple: '#d897eb', + red: '#f69899', + yellow: '#f8c82e', + peach: '#f797d6', + borderBase: '#e5e5e5', + borderSplit: '#f4f4f4', + grass: '#d6fbb5', + sky: '#c1e0fc', +}; + +export default Color; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/vite.config.js b/packages/create-inula/lib/generators/Inula-antd/templates/vite/vite.config.js similarity index 86% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/vite.config.js rename to packages/create-inula/lib/generators/Inula-antd/templates/vite/vite.config.js index efc62a17..57005e78 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/vite.config.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/vite/vite.config.js @@ -11,9 +11,9 @@ let alias = { config: path.resolve('src/admin/utils/config'), themes: path.resolve('src/admin/themes'), utils: path.resolve('src/admin/utils'), - react: 'inulajs', // 新增 - 'react-dom': 'inulajs', // 新增 - 'react/jsx-dev-runtime': 'inulajs/jsx-dev-runtime', + react: '@cloudsop/horizon', // 新增 + 'react-dom': '@cloudsop/horizon', // 新增 + 'react/jsx-dev-runtime': '@cloudsop/horizon/jsx-dev-runtime', }; // https://vitejs.dev/config/ @@ -26,7 +26,7 @@ export default defineConfig({ "@babel/plugin-transform-react-jsx", { "runtime": "automatic", // 新增 - "importSource": "inulajs" // 新增 + "importSource": "@cloudsop/horizon" // 新增 } ], '@babel/plugin-proposal-class-properties', diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/.editorconfig b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/.editorconfig similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/.editorconfig rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/.editorconfig diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/.env b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/.env new file mode 100644 index 00000000..6c5aec02 --- /dev/null +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/.env @@ -0,0 +1,4 @@ +PROJECT_NAME=my-app +COMPILE_MODE=webpack +BUILD_PATH=./webpack/webpack.dev.js +DEBUG=true \ No newline at end of file diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/.eslintignore b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/.eslintignore similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/.eslintignore rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/.eslintignore diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/.eslintrc.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/.eslintrc.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/.eslintrc.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/.eslintrc.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/.gitignore b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/.gitignore similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/.gitignore rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/.gitignore diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/.horizon.ts b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/.horizon.ts new file mode 100644 index 00000000..7f3bb9ea --- /dev/null +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/.horizon.ts @@ -0,0 +1,4 @@ +export default { + enableMock: true, + mockPath: './mock', +}; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/.prettierignore b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/.prettierignore similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/.prettierignore rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/.prettierignore diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/.prettierrc.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/.prettierrc.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/.prettierrc.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/.prettierrc.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/README.md b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/README.md similarity index 60% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/README.md rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/README.md index 7d2b9d75..346b1237 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/README.md +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/README.md @@ -1,4 +1,4 @@ -[inula-antd](https://codehub-y.huawei.com/c00486778/inula-antd/files?ref=master)项目是借鉴[AntD Admin](https://github.com/zuiidea/antd-admin)的一个中控台项目。主要特点是使用了[inula](https://open.codehub.huawei.com/innersource/shanhai/wutong/inula/inula-core/wiki/view/doc/695491)框架,并且使用HorizonX实现状态管理。 +[inula-antd](https://codehub-y.huawei.com/c00486778/horizon-antd/files?ref=master)项目是借鉴[AntD Admin](https://github.com/zuiidea/antd-admin)的一个中控台项目。主要特点是使用了[horizon](https://open.codehub.huawei.com/innersource/shanhai/wutong/horizon/horizon-core/wiki/view/doc/695491)框架,并且使用HorizonX实现状态管理。 界面如: @@ -6,13 +6,13 @@ ## 代码特点: -1、使用了`inula`开发框架,兼容React的所有接口。 +1、使用了`horizon`开发框架,兼容React的所有接口。 2、使用`函数式组件`进行开发。 3、使用TS语言(待完成)。 -4、使用了`inulaX的状态管理`能力,每个page都会有一个store,这样可以保证每个store体积较小,使用方便,性能也更好一些。 +4、使用了`horizonX的状态管理`能力,每个page都会有一个store,这样可以保证每个store体积较小,使用方便,性能也更好一些。 5、使用了`React-router-dom`作为路由,利用Lazy动态加载组件。 @@ -38,7 +38,7 @@ ## 使用方式: -1、克隆ssh://git@codehub-dg-y.huawei.com:2222/c00486778/inula-antd.git +1、克隆ssh://git@codehub-dg-y.huawei.com:2222/c00486778/horizon-antd.git 2、执行 `npm i -f` , 如果@cloudsop/horizon无法下载,请在`.npmrc`配置 @cloudsop:registry=https://cmc.centralrepo.rnd.huawei.com/artifactory/api/npm/product_npm diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/babel.config.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/babel.config.js similarity index 89% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/babel.config.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/babel.config.js index 776576e2..6e3cfb45 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/babel.config.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/babel.config.js @@ -12,7 +12,7 @@ module.exports = { '@babel/preset-react', { runtime: 'automatic', // 新增 - importSource: 'inulajs', // 新增 + importSource: '@cloudsop/horizon', // 新增 }, ], ], diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/mock/_utils.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/mock/_utils.js similarity index 53% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/mock/_utils.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/mock/_utils.js index 483ad199..27b11221 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/mock/_utils.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/mock/_utils.js @@ -12,31 +12,6 @@ function queryArray(array, key, value) { return array.filter(_ => _[key] === value); } -function randomNumber(min, max) { - return Math.floor(Math.random() * (max - min) + min); -} - -function randomAvatar() { - const avatarList = [ - 'photo-1549492864-2ec7d66ffb04.jpeg', - 'photo-1480535339474-e083439a320d.jpeg', - 'photo-1523419409543-a5e549c1faa8.jpeg', - 'photo-1519648023493-d82b5f8d7b8a.jpeg', - 'photo-1523307730650-594bc63f9d67.jpeg', - 'photo-1522962506050-a2f0267e4895.jpeg', - 'photo-1489779162738-f81aed9b0a25.jpeg', - 'photo-1534308143481-c55f00be8bd7.jpeg', - 'photo-1519336555923-59661f41bb45.jpeg', - 'photo-1551438632-e8c7d9a5d1b7.jpeg', - 'photo-1525879000488-bff3b1c387cf.jpeg', - 'photo-1487412720507-e7ab37603c6f.jpeg', - 'photo-1510227272981-87123e259b17.jpeg', - ]; - return `//image.zuiidea.com/${ - avatarList[randomNumber(0, avatarList.length - 1)] - }?imageView2/1/w/200/h/200/format/webp/q/75|imageslim`; -} - const Constant = { ApiPrefix: '/api/v1', NotFound: { @@ -62,8 +37,6 @@ const qs = require('qs'); module.exports = { queryArray, - randomNumber, - randomAvatar, Constant, Mock, qs, diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/mock/dashboard.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/mock/dashboard.js new file mode 100644 index 00000000..7a527087 --- /dev/null +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/mock/dashboard.js @@ -0,0 +1,53 @@ +const { Mock, Constant } = require('./_utils'); + +const { ApiPrefix, Color } = Constant; + +const Dashboard = Mock.mock({ + 'sales|8': [ + { + 'name|+1': 2008, + 'Clothes|200-500': 1, + 'Food|180-400': 1, + 'Electronics|300-550': 1, + }, + ], + quote: { + name: 'Joho Doe', + title: 'Graphic Designer', + content: + "I'm selfish, impatient and a little insecure. I make mistakes, I am out of control and at times hard to handle. But if you can't handle me at my worst, then you sure as hell don't deserve me at my best.", + avatar: '//cdn.antd-admin.zuiidea.com/bc442cf0cc6f7940dcc567e465048d1a8d634493198c4-sPx5BR_fw236', + }, + numbers: [ + { + icon: 'pay-circle-o', + color: Color.green, + title: 'Online Review', + number: 2781, + }, + { + icon: 'team', + color: Color.blue, + title: 'New Customers', + number: 3241, + }, + { + icon: 'message', + color: Color.purple, + title: 'Active Projects', + number: 253, + }, + { + icon: 'shopping-cart', + color: Color.red, + title: 'Referrals', + number: 4324, + }, + ], +}); + +module.exports = { + [`get ${ApiPrefix}/dashboard`](req, res) { + res.json(Dashboard); + }, +}; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/mock/route.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/mock/route.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/mock/route.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/mock/route.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/mock/user.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/mock/user.js similarity index 76% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/mock/user.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/mock/user.js index 12e0d969..f2e34964 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/mock/user.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/mock/user.js @@ -1,4 +1,4 @@ -const { Mock, Constant, randomAvatar } = require('./_utils'); +const { Mock, Constant } = require('./_utils'); const qs = require('qs'); const { ApiPrefix } = Constant; @@ -15,9 +15,6 @@ let usersListData = Mock.mock({ isMale: '@boolean', email: '@email', createTime: '@datetime', - avatar() { - return randomAvatar(); - }, }, ], }); @@ -49,21 +46,6 @@ const adminUsers = [ username: 'admin', password: 'admin', permissions: userPermission.ADMIN, - avatar: randomAvatar(), - }, - { - id: 1, - username: 'guest', - password: 'guest', - permissions: userPermission.DEFAULT, - avatar: randomAvatar(), - }, - { - id: 2, - username: '吴彦祖', - password: '123456', - permissions: userPermission.DEVELOPER, - avatar: randomAvatar(), }, ]; @@ -115,29 +97,31 @@ module.exports = { let { pageSize, page, ...other } = query; pageSize = pageSize || 10; page = page || 1; - let newData = database; for (let key in other) { - if ({}.hasOwnProperty.call(other, key)) { - newData = newData.filter(item => { - if ({}.hasOwnProperty.call(item, key)) { - if (key === 'address') { - return other[key].every(iitem => item[key].indexOf(iitem) > -1); - } else if (key === 'createTime') { - const start = new Date(other[key][0]).getTime(); - const end = new Date(other[key][1]).getTime(); - const now = new Date(item[key]).getTime(); - - if (start && end) { - return now >= start && now <= end; + newData = newData.filter(item => { + if ({}.hasOwnProperty.call(item, key)) { + if (key === 'address') { + for (const addr of other[key]) { + if (item[key].indexOf(addr) === -1) { + return false; } - return true; } - return String(item[key]).trim().indexOf(decodeURI(other[key]).trim()) > -1; + return true; + } else if (key === 'createTime') { + const start = new Date(other[key][0]).getTime(); + const end = new Date(other[key][1]).getTime(); + const now = new Date(item[key]).getTime(); + + if (start && end) { + return now >= start && now <= end; + } + return true; } - return true; - }); - } + return String(item[key]).trim().indexOf(decodeURI(other[key]).trim()) > -1; + } + return false; + }); } res.status(200).json({ diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/package.json b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/package.json similarity index 91% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/package.json rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/package.json index 03479cd6..0e920a55 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/package.json +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/package.json @@ -1,5 +1,5 @@ { - "name": "inula-antd-fun", + "name": "horizon-antd-fun", "version": "1.0.0", "description": "", "main": "index.js", @@ -42,7 +42,7 @@ "dependencies": { "@ant-design/icons": "^5.1.4", "@babel/plugin-proposal-export-default-from": "^7.18.6", - "inulajs": "^0.0.8", + "@cloudsop/horizon": "^0.0.58", "antd": "^4.0.0", "axios": "^1.4.0", "classnames": "^2.2.6", @@ -54,10 +54,6 @@ "path-to-regexp": "^6.1.0", "prop-types": "^15.7.0", "qs": "^6.10.0", - "react-countup": "^4.2.0", - "react-dom": "^18.2.0", - "react-draft-wysiwyg": "^1.13.0", - "react-helmet": "^6.0.0", "react-intl": "^6.4.4", "react-perfect-scrollbar": "^1.5.0", "react-router": "^6.12.1", diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/favicon.ico b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/public/favicon.ico similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/favicon.ico rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/public/favicon.ico diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/logo.svg b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/public/logo.svg similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/logo.svg rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/public/logo.svg diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/logo/logo@128.png b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/public/logo/logo@128.png similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/logo/logo@128.png rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/public/logo/logo@128.png diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/logo/logo@144.png b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/public/logo/logo@144.png similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/logo/logo@144.png rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/public/logo/logo@144.png diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/logo/logo@152.png b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/public/logo/logo@152.png similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/logo/logo@152.png rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/public/logo/logo@152.png diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/logo/logo@192.png b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/public/logo/logo@192.png similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/logo/logo@192.png rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/public/logo/logo@192.png diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/logo/logo@384.png b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/public/logo/logo@384.png similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/logo/logo@384.png rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/public/logo/logo@384.png diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/logo/logo@512.png b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/public/logo/logo@512.png similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/logo/logo@512.png rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/public/logo/logo@512.png diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/logo/logo@72.png b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/public/logo/logo@72.png similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/logo/logo@72.png rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/public/logo/logo@72.png diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/logo/logo@96.png b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/public/logo/logo@96.png similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/logo/logo@96.png rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/public/logo/logo@96.png diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/DropOption/DropOption.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/DropOption/DropOption.js similarity index 95% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/DropOption/DropOption.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/DropOption/DropOption.js index 345e231a..8c1fa9a5 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/DropOption/DropOption.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/DropOption/DropOption.js @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/Inula'; import PropTypes from 'prop-types'; import { BarsOutlined, DownOutlined } from '@ant-design/icons'; import { Dropdown, Button, Menu } from 'antd'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/DropOption/package.json b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/DropOption/package.json similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/DropOption/package.json rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/DropOption/package.json diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Ellipsis/index.d.ts b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Ellipsis/index.d.ts similarity index 93% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Ellipsis/index.d.ts rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Ellipsis/index.d.ts index 57fc2b2d..c0a21953 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Ellipsis/index.d.ts +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Ellipsis/index.d.ts @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import { TooltipProps } from 'antd/lib/tooltip'; export interface EllipsisTooltipProps extends TooltipProps { diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Ellipsis/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Ellipsis/index.js similarity index 99% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Ellipsis/index.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Ellipsis/index.js index 565adcfc..1264e1a7 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Ellipsis/index.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Ellipsis/index.js @@ -1,4 +1,4 @@ -import Inula, { Component } from 'inulajs'; +import Inula, { Component } from '@cloudsop/horizon'; import { Tooltip } from 'antd'; import classNames from 'classnames'; import styles from './index.less'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Ellipsis/index.less b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Ellipsis/index.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Ellipsis/index.less rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Ellipsis/index.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Ellipsis/index.md b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Ellipsis/index.md similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Ellipsis/index.md rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Ellipsis/index.md diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Ellipsis/index.test.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Ellipsis/index.test.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Ellipsis/index.test.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Ellipsis/index.test.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/FilterItem/FilterItem.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/FilterItem/FilterItem.js similarity index 94% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/FilterItem/FilterItem.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/FilterItem/FilterItem.js index 9a21e5c8..f5e33bef 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/FilterItem/FilterItem.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/FilterItem/FilterItem.js @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import PropTypes from 'prop-types'; import styles from './FilterItem.less'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/FilterItem/FilterItem.less b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/FilterItem/FilterItem.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/FilterItem/FilterItem.less rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/FilterItem/FilterItem.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/FilterItem/package.json b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/FilterItem/package.json similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/FilterItem/package.json rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/FilterItem/package.json diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/GlobalFooter/index.d.ts b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/GlobalFooter/index.d.ts similarity index 80% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/GlobalFooter/index.d.ts rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/GlobalFooter/index.d.ts index 5fb3a1cd..6af035cc 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/GlobalFooter/index.d.ts +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/GlobalFooter/index.d.ts @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; export interface GlobalFooterProps { links?: Array<{ key?: string; @@ -6,7 +6,7 @@ export interface GlobalFooterProps { href: string; blankTarget?: boolean; }>; - copyright?: Inula.ReactNode; + copyright?: Inula.InulaNode; style?: Inula.CSSProperties; className?: string; } diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/GlobalFooter/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/GlobalFooter/index.js similarity index 94% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/GlobalFooter/index.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/GlobalFooter/index.js index a75f1345..2dec57ff 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/GlobalFooter/index.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/GlobalFooter/index.js @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import classNames from 'classnames'; import styles from './index.less'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/GlobalFooter/index.less b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/GlobalFooter/index.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/GlobalFooter/index.less rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/GlobalFooter/index.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/GlobalFooter/index.md b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/GlobalFooter/index.md similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/GlobalFooter/index.md rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/GlobalFooter/index.md diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Layout/Bread.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Bread.js similarity index 96% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Layout/Bread.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Bread.js index ce40bd32..01dfef74 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Layout/Bread.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Bread.js @@ -1,4 +1,4 @@ -import Inula, { Fragment } from 'inulajs'; +import Inula, { Fragment } from '@cloudsop/horizon'; import { Breadcrumb } from 'antd'; import { Link } from 'react-router-dom'; import { t } from 'utils/intl'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Layout/Bread.less b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Bread.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Layout/Bread.less rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Bread.less diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Header.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Header.js new file mode 100644 index 00000000..18995ced --- /dev/null +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Header.js @@ -0,0 +1,71 @@ +import Inula from '@cloudsop/horizon'; +import { Menu, Layout } from 'antd'; +import { MenuFoldOutlined, MenuUnfoldOutlined } from '@ant-design/icons'; +import { Trans } from 'utils/intl'; +import { getLocale, setLocale } from 'utils'; +import classnames from 'classnames'; +import config from 'config'; +import styles from './Header.less'; + +const { SubMenu } = Menu; + +function Header({ + fixed, + username, + collapsed, + notifications, + onCollapseChange, + onAllNotificationsRead, +}) { + + const rightContent = [ +
+ + Hi, + + {username} +
+ ]; + + if (config.i18n) { + const { languages } = config.i18n; + const language = getLocale(); + const currentLanguage = languages.find(item => item.key === language); + + rightContent.unshift( + { + setLocale(data.key); + }} + mode="horizontal" + > + + {languages.map(item => ( + + {item.title} + + ))} + + + ); + } + + return ( + +
+ {collapsed ? : } +
+
{rightContent}
+
+ ); +} + +export default Header; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Layout/Header.less b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Header.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Layout/Header.less rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Header.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Layout/Sider.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Sider.js similarity index 97% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Layout/Sider.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Sider.js index b46a0261..9bd02d0c 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Layout/Sider.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Sider.js @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import { Switch, Layout } from 'antd'; import { t } from 'utils/intl'; import { Trans } from 'utils/intl'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Layout/Sider.less b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Sider.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Layout/Sider.less rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/Sider.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Layout/SiderMenu.tsx b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/SiderMenu.tsx similarity index 97% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Layout/SiderMenu.tsx rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/SiderMenu.tsx index 7df130a3..03789dda 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Layout/SiderMenu.tsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/SiderMenu.tsx @@ -1,4 +1,4 @@ -import Inula, { useState, Fragment } from 'inulajs'; +import Inula, { useState, Fragment } from '@cloudsop/horizon'; import PropTypes from 'prop-types'; import { Menu } from 'antd'; import { NavLink } from 'react-router-dom'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Layout/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/index.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Layout/index.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Layout/index.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Loader/Loader.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Loader/Loader.js similarity index 93% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Loader/Loader.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Loader/Loader.js index b52180df..053acd24 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Loader/Loader.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Loader/Loader.js @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import PropTypes from 'prop-types'; import classNames from 'classnames'; import styles from './Loader.less'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Loader/Loader.less b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Loader/Loader.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Loader/Loader.less rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Loader/Loader.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Loader/package.json b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Loader/package.json similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Loader/package.json rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Loader/package.json diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Page/Page.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Page/Page.js similarity index 93% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Page/Page.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Page/Page.js index 3680f2e5..0d704681 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Page/Page.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Page/Page.js @@ -1,4 +1,4 @@ -import Inula, { Component } from 'inulajs'; +import Inula, { Component } from '@cloudsop/horizon'; import PropTypes from 'prop-types'; import classnames from 'classnames'; import Loader from '../Loader'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Page/Page.less b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Page/Page.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Page/Page.less rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Page/Page.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Page/package.json b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Page/package.json similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Page/package.json rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/Page/package.json diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/ScrollBar/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/ScrollBar/index.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/ScrollBar/index.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/ScrollBar/index.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/ScrollBar/index.less b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/ScrollBar/index.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/ScrollBar/index.less rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/ScrollBar/index.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/index.js similarity index 68% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/index.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/index.js index 81a96eb2..f94f4ef5 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/index.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/components/index.js @@ -1,4 +1,3 @@ -import Editor from './Editor'; import FilterItem from './FilterItem'; import DropOption from './DropOption'; import Loader from './Loader'; @@ -8,4 +7,4 @@ import Ellipsis from './Ellipsis'; import * as MyLayout from './Layout'; import Page from './Page'; -export { MyLayout, Editor, GlobalFooter, Ellipsis, FilterItem, DropOption, Loader, Page, ScrollBar }; +export { MyLayout, GlobalFooter, Ellipsis, FilterItem, DropOption, Loader, Page, ScrollBar }; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/entry.tsx b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/entry.tsx similarity index 67% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/entry.tsx rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/entry.tsx index bac2925a..36130533 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/entry.tsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/entry.tsx @@ -1,10 +1,13 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import { BrowserRouter } from 'react-router-dom'; +import config from './utils/config'; import 'antd/dist/antd.css'; import Layout from './layouts'; +document.title = config.siteName; + Inula.render( diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/layouts/BaseLayout.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/BaseLayout.js similarity index 78% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/layouts/BaseLayout.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/BaseLayout.js index 415adce5..59dd1b0d 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/layouts/BaseLayout.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/BaseLayout.js @@ -1,5 +1,4 @@ -import Inula, { Fragment } from 'inulajs'; -import { Helmet } from 'react-helmet'; +import Inula, { Fragment } from '@cloudsop/horizon'; import { queryLayout } from 'utils'; import config from 'utils/config'; @@ -18,9 +17,6 @@ function BaseLayout({ children, location }) { return ( - - {config.siteName} - {children} ); diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/layouts/BaseLayout.less b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/BaseLayout.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/layouts/BaseLayout.less rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/BaseLayout.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/layouts/PrimaryLayout.less b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/PrimaryLayout.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/layouts/PrimaryLayout.less rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/PrimaryLayout.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/layouts/PrimaryLayout.tsx b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/PrimaryLayout.tsx similarity index 97% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/layouts/PrimaryLayout.tsx rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/PrimaryLayout.tsx index c4d87a18..11630d08 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/layouts/PrimaryLayout.tsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/PrimaryLayout.tsx @@ -1,4 +1,4 @@ -import Inula, { useEffect, Fragment } from 'inulajs'; +import Inula, { useEffect, Fragment } from '@cloudsop/horizon'; import { MyLayout, GlobalFooter } from '../components'; import { BackTop, Layout } from 'antd'; import { pathToRegexp } from 'path-to-regexp'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/layouts/PublicLayout.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/PublicLayout.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/layouts/PublicLayout.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/PublicLayout.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/layouts/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/index.js similarity index 93% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/layouts/index.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/index.js index 6d9f4a15..39d71f37 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/layouts/index.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/layouts/index.js @@ -1,4 +1,4 @@ -import Inula, { Suspense } from 'inulajs'; +import Inula, { Suspense } from '@cloudsop/horizon'; import { ConfigProvider } from 'antd'; import { IntlProvider } from 'react-intl'; import { getLocale } from '../utils'; @@ -21,7 +21,7 @@ function Layout() { {routes[0].childRoutes.map(item => { - return ; + return ; })} diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/locales/en/messages.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/locales/en/messages.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/locales/en/messages.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/locales/en/messages.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/locales/pt-br/messages.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/locales/pt-br/messages.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/locales/pt-br/messages.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/locales/pt-br/messages.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/locales/zh/messages.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/locales/zh/messages.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/locales/zh/messages.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/locales/zh/messages.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/models/app-model.ts b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/models/app-model.ts similarity index 98% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/models/app-model.ts rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/models/app-model.ts index 12193e0c..68d110d6 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/models/app-model.ts +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/models/app-model.ts @@ -5,7 +5,7 @@ import api from '../services'; // @ts-ignore const { queryRouteList, logoutUser, queryUserInfo } = api; -import { createStore } from 'inulajs'; +import { createStore } from '@cloudsop/horizon'; const goDashboard = history => { if (pathToRegexp(['/', '/login']).exec(window.location.pathname)) { diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/404.jsx b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/404.jsx similarity index 88% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/404.jsx rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/404.jsx index 9022fe7d..2ef5f315 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/404.jsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/404.jsx @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import { FrownOutlined } from '@ant-design/icons'; import { Page } from 'components'; import styles from './404.less'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/404.less b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/404.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/404.less rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/404.less diff --git a/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/index.js new file mode 100644 index 00000000..2bbc46c1 --- /dev/null +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/index.js @@ -0,0 +1,6 @@ +import NumberCard from './numberCard'; +import Quote from './quote'; +import Sales from './sales'; +import Weather from './weather'; + +export { NumberCard, Quote, Sales, Weather}; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/numberCard.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/numberCard.js similarity index 80% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/numberCard.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/numberCard.js index 08dd5ec7..8e523e65 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/numberCard.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/numberCard.js @@ -1,7 +1,6 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import PropTypes from 'prop-types'; import { Card } from 'antd'; -import CountUp from 'react-countup'; import iconMap from 'utils/iconMap'; import styles from './numberCard.less'; @@ -14,7 +13,7 @@ function NumberCard({ icon, color, title, number, countUp }) {

{title || 'No Title'}

- + {number}

diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/numberCard.less b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/numberCard.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/numberCard.less rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/numberCard.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/quote.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/quote.js similarity index 94% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/quote.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/quote.js index 71932083..0c6ac94b 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/quote.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/quote.js @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import PropTypes from 'prop-types'; import styles from './quote.less'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/quote.less b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/quote.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/quote.less rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/quote.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/sales.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/sales.js similarity index 98% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/sales.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/sales.js index 6bd4404d..3765308f 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/sales.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/sales.js @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import PropTypes from 'prop-types'; import classnames from 'classnames'; import { Color } from 'utils'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/sales.less b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/sales.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/sales.less rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/sales.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/weather.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/weather.js similarity index 96% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/weather.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/weather.js index 221fc30c..2a257ce5 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/weather.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/weather.js @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import PropTypes from 'prop-types'; import { Spin } from 'antd'; import styles from './weather.less'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/weather.less b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/weather.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/weather.less rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/components/weather.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/index.less b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/index.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/index.less rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/index.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/index.tsx b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/index.tsx similarity index 81% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/index.tsx rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/index.tsx index e9727dc9..3688a5b6 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/index.tsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/index.tsx @@ -1,10 +1,9 @@ -import Inula, { useEffect } from 'inulajs'; +import Inula, { useEffect } from '@cloudsop/horizon'; import { Row, Col, Card } from 'antd'; import { Color } from '../../utils'; import { Page, ScrollBar } from '../../components'; -import { NumberCard, Quote, Sales, Weather, RecentSales, Comments, Completed, Browser, Cpu, User } from './components'; +import { NumberCard, Quote, Sales, Weather} from './components'; import styles from './index.less'; -import store from 'store'; import { getStore } from './model'; const bodyStyle = { @@ -21,19 +20,10 @@ function Dashboard() { st.query(); }, []); - const userDetail = store.get('user'); - const { avatar, username } = userDetail; - const weather = st.weather; const sales = st.sales; const quote = st.quote; const numbers = st.numbers; - const recentSales = st.recentSales; - const comments = st.comments; - const completed = st.completed; - const browser = st.browser; - const cpu = st.cpu; - const user = st.user; const numberCards = numbers.map((item, key) => ( diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/model.ts b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/model.ts similarity index 89% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/model.ts rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/model.ts index 8a007500..02cb7082 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/model.ts +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/model.ts @@ -1,8 +1,6 @@ import { parse } from 'qs'; import api from '../../services'; - -import { pathToRegexp } from 'path-to-regexp'; -import { createStore } from 'inulajs'; +import { createStore } from '@cloudsop/horizon'; const { queryDashboard, queryWeather } = api; const avatar = '//cdn.antd-admin.zuiidea.com/bc442cf0cc6f7940dcc567e465048d1a8d634493198c4-sPx5BR_fw236.jpeg'; @@ -25,8 +23,6 @@ export const getStore = createStore({ recentSales: [], comments: [], completed: [], - browser: [], - cpu: {}, user: { avatar, }, @@ -38,10 +34,8 @@ export const getStore = createStore({ const data = await queryDashboard(parse(payload)); state.loading = false; - state.browser = data.browser; state.comments = data.comments; state.completed = data.completed; - state.cpu = data.cpu; state.message = data.message; state.numbers = data.numbers; state.quote = data.quote; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/services/dashboard.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/services/dashboard.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/services/dashboard.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/services/dashboard.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/services/weather.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/services/weather.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/services/weather.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/dashboard/services/weather.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/index.js similarity index 77% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/index.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/index.js index 4005019e..9135bf8c 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/index.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/index.js @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import { Redirect } from 'react-router-dom'; function Index() { diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/routes.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/routes.js similarity index 86% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/routes.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/routes.js index 2d0391de..4e9d9cb1 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/routes.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/routes.js @@ -1,10 +1,11 @@ -import Inula, { lazy } from 'inulajs'; +import Inula, { lazy } from '@cloudsop/horizon'; export function getRoutes() { const routes = [ { path: '/', component: lazy(() => import(/* webpackChunkName: 'layouts__index' */ '@/layouts/index.js')), + title: 'Inula Antd', childRoutes: [ { path: '/404', @@ -13,10 +14,12 @@ export function getRoutes() { { path: '/dashboard', component: lazy(() => import(/* webpackChunkName: 'p__dashboard__index' */ './dashboard/index.tsx')), + title: 'Inula Antd', }, { path: '/user', component: lazy(() => import(/* webpackChunkName: 'p__user__index' */ '@/pages/user/index.tsx')), + title: 'Inula Antd', }, { path: '/user/:id', diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/components/Filter.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/components/Filter.js similarity index 98% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/components/Filter.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/components/Filter.js index e0caa778..50c29c47 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/components/Filter.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/components/Filter.js @@ -1,4 +1,4 @@ -import Inula, { useRef } from 'inulajs'; +import Inula, { useRef } from '@cloudsop/horizon'; import moment from 'moment'; import { FilterItem } from 'components'; import { Button, Row, Col, DatePicker, Form, Input, Cascader } from 'antd'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/components/Filter.less b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/components/Filter.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/components/Filter.less rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/components/Filter.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/components/List.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/components/List.js similarity index 94% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/components/List.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/components/List.js index 110ea00e..1b0ca5f8 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/components/List.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/components/List.js @@ -1,9 +1,8 @@ -import Inula from 'inulajs'; -import { Table, Modal, Avatar } from 'antd'; +import Inula from '@cloudsop/horizon'; +import { Table, Modal } from 'antd'; import { DropOption } from 'components'; import { t } from 'utils/intl'; import { Trans } from 'utils/intl'; -import { Link } from 'react-router-dom'; import styles from './List.less'; const { confirm } = Modal; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/components/List.less b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/components/List.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/components/List.less rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/components/List.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/components/Modal.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/components/Modal.js similarity index 98% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/components/Modal.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/components/Modal.js index 3d98a86b..15dfd689 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/components/Modal.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/components/Modal.js @@ -1,4 +1,4 @@ -import Inula, { useRef } from 'inulajs'; +import Inula, { useRef } from '@cloudsop/horizon'; import { Form, Input, InputNumber, Radio, Modal, Cascader } from 'antd'; import { t, Trans } from 'utils/intl'; import city from 'utils/city'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/id/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/id/index.js similarity index 92% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/id/index.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/id/index.js index d270fbc5..afdc3405 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/id/index.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/id/index.js @@ -1,4 +1,4 @@ -import Inula, { PureComponent } from 'inulajs'; +import Inula, { PureComponent } from '@cloudsop/horizon'; import PropTypes from 'prop-types'; import { Page } from 'components'; import styles from './index.less'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/id/index.less b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/id/index.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/id/index.less rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/id/index.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/id/models/detail.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/id/models/detail.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/id/models/detail.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/id/models/detail.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/index.tsx b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/index.tsx similarity index 98% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/index.tsx rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/index.tsx index 92d5caee..8e6e49b9 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/user/index.tsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/index.tsx @@ -1,4 +1,4 @@ -import Inula, { useEffect } from 'inulajs'; +import Inula, { useEffect } from '@cloudsop/horizon'; import { Row, Col, Button, Popconfirm } from 'antd'; import { Page } from '../../components'; import { stringify } from 'qs'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/model.ts b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/model.ts similarity index 97% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/model.ts rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/model.ts index fd2b883c..9c4552f1 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/user/model.ts +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/pages/user/model.ts @@ -1,5 +1,5 @@ import api from '../../services'; -import { createStore } from 'inulajs'; +import { createStore } from '@cloudsop/horizon'; const { queryUserList, createUser, removeUser, updateUser, removeUserList } = api; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/plugins/onError.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/plugins/onError.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/plugins/onError.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/plugins/onError.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/services/api.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/services/api.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/services/api.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/services/api.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/services/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/services/index.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/services/index.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/services/index.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/themes/default.less b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/themes/default.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/themes/default.less rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/themes/default.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/themes/index.less b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/themes/index.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/themes/index.less rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/themes/index.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/themes/mixin.less b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/themes/mixin.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/themes/mixin.less rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/themes/mixin.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/themes/vars.less b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/themes/vars.less similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/themes/vars.less rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/themes/vars.less diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/city.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/city.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/city.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/city.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/config.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/config.js similarity index 90% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/config.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/config.js index 5e79dbbd..4977f047 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/config.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/config.js @@ -21,17 +21,14 @@ module.exports = { { key: 'pt-br', title: 'Português', - flag: '/portugal.svg', }, { key: 'en', title: 'English', - flag: '/america.svg', }, { key: 'zh', title: '中文', - flag: '/china.svg', }, ], defaultLanguage: 'en', diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/constant.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/constant.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/constant.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/constant.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/iconMap.jsx b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/iconMap.jsx similarity index 94% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/iconMap.jsx rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/iconMap.jsx index 58f29731..69ab35c0 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/iconMap.jsx +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/iconMap.jsx @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import { PayCircleOutlined, ShoppingCartOutlined, diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/index.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/index.js similarity index 98% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/index.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/index.js index 45518f15..6c87d5ec 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/index.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/index.js @@ -164,14 +164,14 @@ export function setLocale(language) { export function parseSearch(search) { const searchObj = {}; search.replace(/([^?&=]+)=([^&]+)/g, (_, k, v) => { - if (k === 'address') { + if (k === "address") { if (searchObj[k]) { searchObj[k].push(decodeURI(v)); } else { - searchObj[k] = [decodeURI(v)]; + searchObj[k] = [decodeURI(v)] } } else { - searchObj[k] = decodeURI(v); + searchObj[k] = decodeURI(v) } }); return searchObj; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/index.test.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/index.test.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/index.test.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/index.test.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/intl.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/intl.js similarity index 97% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/intl.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/intl.js index ba3aea47..20eefdd9 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/intl.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/intl.js @@ -2,7 +2,7 @@ * 国际化,支持按需加载 */ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import { createIntl, createIntlCache, FormattedMessage } from 'react-intl'; import zhCN from 'antd/lib/locale-provider/zh_CN'; import enUS from 'antd/lib/locale-provider/en_US'; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/request.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/request.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/request.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/request.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/theme.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/theme.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/utils/theme.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/src/utils/theme.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/tsconfig.json b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/tsconfig.json similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/tsconfig.json rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/tsconfig.json diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/webpack/devServer.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/webpack/devServer.js similarity index 96% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/webpack/devServer.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/webpack/devServer.js index 982d9a19..bab197c7 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/webpack/devServer.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/webpack/devServer.js @@ -17,7 +17,7 @@ const devServerOptions = { overlay: { errors: true, warnings: false, - runtimeErrors: error => { + runtimeErrors: (error) => { if (error.message.indexOf('ResizeObserver') !== -1) { return false; } diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/webpack/mockServer.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/webpack/mockServer.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/webpack/mockServer.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/webpack/mockServer.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/webpack/webpack.basic.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/webpack/webpack.basic.js similarity index 94% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/webpack/webpack.basic.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/webpack/webpack.basic.js index d6f3c62f..2abcd6df 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/webpack/webpack.basic.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/webpack/webpack.basic.js @@ -14,8 +14,8 @@ module.exports = { themes: path.resolve('src/themes'), utils: path.resolve('src/utils'), - react: 'inulajs', // 新增 - 'react-dom': 'inulajs', // 新增 + react: '@cloudsop/horizon', // 新增 + 'react-dom': '@cloudsop/horizon', // 新增 }, }, rules: [ diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/webpack/webpack.dev.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/webpack/webpack.dev.js similarity index 100% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/webpack/webpack.dev.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/webpack/webpack.dev.js diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/webpack/webpack.prod.js b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/webpack/webpack.prod.js similarity index 90% rename from packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/webpack/webpack.prod.js rename to packages/create-inula/lib/generators/Inula-antd/templates/webpack/webpack/webpack.prod.js index b2e249cb..b0798cd9 100644 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/webpack/webpack.prod.js +++ b/packages/create-inula/lib/generators/Inula-antd/templates/webpack/webpack/webpack.prod.js @@ -5,9 +5,8 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const { CleanWebpackPlugin } = require('clean-webpack-plugin'); const { rules, resolve } = require('./webpack.basic'); -const appName = 'admin'; const app_main_path = path.resolve(_ROOTPATH, `./src/entry.tsx`); -const buildOutPath = path.resolve(_ROOTPATH, `./build/${appName}`); +const buildOutPath = path.resolve(_ROOTPATH, `./dist`); const appConfig = { mode: 'production', diff --git a/packages/create-inula/lib/generators/InulaJS-antd/meta.json b/packages/create-inula/lib/generators/InulaJS-antd/meta.json deleted file mode 100644 index 40f5e08d..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/meta.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "inula-antd template." -} diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/mock/dashboard.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/mock/dashboard.js deleted file mode 100644 index 36135aea..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/mock/dashboard.js +++ /dev/null @@ -1,142 +0,0 @@ -import { Constant } from './_utils'; -import Mock from 'mockjs'; - -const { ApiPrefix, Color } = Constant; - -const Dashboard = Mock.mock({ - 'sales|8': [ - { - 'name|+1': 2008, - 'Clothes|200-500': 1, - 'Food|180-400': 1, - 'Electronics|300-550': 1, - }, - ], - cpu: { - 'usage|50-600': 1, - space: 825, - 'cpu|40-90': 1, - 'data|20': [ - { - 'cpu|20-80': 1, - }, - ], - }, - browser: [ - { - name: 'Google Chrome', - percent: 43.3, - status: 1, - }, - { - name: 'Mozilla Firefox', - percent: 33.4, - status: 2, - }, - { - name: 'Apple Safari', - percent: 34.6, - status: 3, - }, - { - name: 'Internet Explorer', - percent: 12.3, - status: 4, - }, - { - name: 'Opera Mini', - percent: 3.3, - status: 1, - }, - { - name: 'Chromium', - percent: 2.53, - status: 1, - }, - ], - user: { - name: 'github', - sales: 3241, - sold: 3556, - }, - 'completed|12': [ - { - 'name|+1': 2008, - 'Task complete|200-1000': 1, - 'Cards Complete|200-1000': 1, - }, - ], - 'comments|5': [ - { - name: '@last', - 'status|1-3': 1, - content: '@sentence', - avatar() { - return Mock.Random.image('48x48', Mock.Random.color(), '#757575', 'png', this.name.substr(0, 1)); - }, - date() { - return `2016-${Mock.Random.date('MM-dd')} ${Mock.Random.time('HH:mm:ss')}`; - }, - }, - ], - 'recentSales|36': [ - { - 'id|+1': 1, - name: '@last', - 'status|1-4': 1, - date() { - return `${Mock.Random.integer(2015, 2016)}-${Mock.Random.date('MM-dd')} ${Mock.Random.time('HH:mm:ss')}`; - }, - 'price|10-200.1-2': 1, - }, - ], - quote: { - name: 'Joho Doe', - title: 'Graphic Designer', - content: - "I'm selfish, impatient and a little insecure. I make mistakes, I am out of control and at times hard to handle. But if you can't handle me at my worst, then you sure as hell don't deserve me at my best.", - avatar: '//cdn.antd-admin.zuiidea.com/bc442cf0cc6f7940dcc567e465048d1a8d634493198c4-sPx5BR_fw236', - }, - numbers: [ - { - icon: 'pay-circle-o', - color: Color.green, - title: 'Online Review', - number: 2781, - }, - { - icon: 'team', - color: Color.blue, - title: 'New Customers', - number: 3241, - }, - { - icon: 'message', - color: Color.purple, - title: 'Active Projects', - number: 253, - }, - { - icon: 'shopping-cart', - color: Color.red, - title: 'Referrals', - number: 4324, - }, - ], -}); - -// module.exports = { -// [`get ${ApiPrefix}/dashboard`](req, res) { -// res.json(Dashboard); -// }, -// }; - -export default [ - { - url: `${ApiPrefix}/dashboard`, - method: 'get', - response: () => { - return Dashboard; - }, - }, -]; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/america.svg b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/america.svg deleted file mode 100644 index 8cab835c..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/america.svg +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/china.svg b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/china.svg deleted file mode 100644 index 4e3dbbfe..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/china.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/portugal.svg b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/portugal.svg deleted file mode 100644 index a535e696..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/public/portugal.svg +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/assets/react.svg b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/assets/react.svg deleted file mode 100644 index 6c87de9b..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/assets/react.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Editor/Editor.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Editor/Editor.js deleted file mode 100644 index 1b333aa7..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Editor/Editor.js +++ /dev/null @@ -1,17 +0,0 @@ -import Inula from 'inulajs'; -import { Editor } from 'react-draft-wysiwyg'; -import 'react-draft-wysiwyg/dist/react-draft-wysiwyg.css'; -import styles from './Editor.module.less'; - -const DraftEditor = props => { - return ( - - ); -}; - -export default DraftEditor; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Editor/Editor.module.less b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Editor/Editor.module.less deleted file mode 100644 index 2cea380a..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Editor/Editor.module.less +++ /dev/null @@ -1,106 +0,0 @@ -.wrapper { - height: 500px; - - :global { - .rdw-dropdownoption-default { - padding: 6px; - } - - .rdw-dropdown-optionwrapper { - box-sizing: content-box; - width: 100%; - border-radius: 0 0 2px 2px; - &:hover { - box-shadow: none; - } - } - - .rdw-inline-wrapper { - flex-wrap: wrap; - margin-bottom: 0; - - .rdw-option-wrapper { - margin-bottom: 6px; - } - } - - .rdw-option-active { - box-shadow: 1px 1px 0 #e8e8e8 inset; - } - - .rdw-colorpicker-option { - box-shadow: none; - } - - .rdw-colorpicker-modal, - .rdw-embedded-modal, - .rdw-emoji-modal, - .rdw-image-modal, - .rdw-link-modal { - box-shadow: 4px 4px 40px rgba(0, 0, 0, 0.05); - } - - .rdw-colorpicker-modal, - .rdw-embedded-modal, - .rdw-link-modal { - height: auto; - } - - .rdw-emoji-modal { - width: 214px; - } - - .rdw-colorpicker-modal { - width: auto; - } - - .rdw-embedded-modal-btn, - .rdw-image-modal-btn, - .rdw-link-modal-btn { - height: 32px; - margin-top: 12px; - } - - .rdw-embedded-modal-input, - .rdw-embedded-modal-size-input, - .rdw-link-modal-input { - padding: 2px 6px; - height: 32px; - } - - .rdw-dropdown-selectedtext { - color: #000; - } - - .rdw-dropdown-wrapper, - .rdw-option-wrapper { - min-width: 36px; - transition: all 0.2s ease; - height: 30px; - - &:active { - box-shadow: 1px 1px 0 #e8e8e8 inset; - } - - &:hover { - box-shadow: 1px 1px 0 #e8e8e8; - } - } - - .rdw-dropdown-wrapper { - min-width: 60px; - } - - .rdw-editor-main { - box-sizing: border-box; - } - } - - .editor { - border: 1px solid #f1f1f1; - padding: 5px; - border-radius: 2px; - height: auto; - min-height: 200px; - } -} diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Editor/package.json b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Editor/package.json deleted file mode 100644 index 3ea063e3..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Editor/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "Editor", - "version": "0.0.0", - "private": true, - "main": "Editor.js" -} diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Layout/Header.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Layout/Header.js deleted file mode 100644 index b00db379..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/components/Layout/Header.js +++ /dev/null @@ -1,116 +0,0 @@ -import Inula, { Fragment } from 'inulajs'; -import { Menu, Layout, Avatar, Popover, List } from 'antd'; -import { Ellipsis } from 'components'; -import { RightOutlined, MenuFoldOutlined, MenuUnfoldOutlined } from '@ant-design/icons'; -import { Trans } from 'utils/intl'; -import { getLocale, setLocale } from 'utils'; -import moment from 'moment'; -import classnames from 'classnames'; -import config from 'config'; -import styles from './Header.module.less'; - -const { SubMenu } = Menu; - -function Header({ fixed, avatar, username, collapsed, notifications, onCollapseChange, onAllNotificationsRead }) { - const rightContent = [ - - - - Hi, - - {username} - - - } - > - , - ]; - - if (config.i18n) { - const { languages } = config.i18n; - const language = getLocale(); - const currentLanguage = languages.find(item => item.key === language); - - rightContent.unshift( - { - setLocale(data.key); - }} - mode="horizontal" - > - }> - {languages.map(item => ( - - - {item.title} - - ))} - - - ); - } - - rightContent.unshift( - document.querySelector('#primaryLayout')} - content={ -
- You have viewed all notifications., - }} - renderItem={item => ( - - - {item.title} - - } - description={moment(item.date).fromNow()} - /> - - - )} - /> - {notifications.length ? ( -
- Clear notifications -
- ) : null} -
- } - > - {/* - - */} -
- ); - - return ( - -
- {collapsed ? : } -
-
{rightContent}
-
- ); -} - -export default Header; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/browser.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/browser.js deleted file mode 100644 index 9a90e2f8..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/browser.js +++ /dev/null @@ -1,43 +0,0 @@ -import Inula from 'inulajs'; -import PropTypes from 'prop-types'; -import { Table, Tag } from 'antd'; -import Color from 'utils/theme'; -import styles from './browser.module.less'; - -const status = { - 1: { - color: Color.green, - }, - 2: { - color: Color.red, - }, - 3: { - color: Color.blue, - }, - 4: { - color: Color.yellow, - }, -}; - -function Browser({ data }) { - const columns = [ - { - title: 'name', - dataIndex: 'name', - className: styles.name, - }, - { - title: 'percent', - dataIndex: 'percent', - className: styles.percent, - render: (text, it) => {text}%, - }, - ]; - return ; -} - -Browser.propTypes = { - data: PropTypes.array, -}; - -export default Browser; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/browser.module.less b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/browser.module.less deleted file mode 100644 index 631ad64f..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/browser.module.less +++ /dev/null @@ -1,7 +0,0 @@ -.percent { - text-align: right !important; -} - -.name { - text-align: left !important; -} diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/comments.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/comments.js deleted file mode 100644 index 409cb3f5..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/comments.js +++ /dev/null @@ -1,63 +0,0 @@ -import Inula from 'inulajs'; -import PropTypes from 'prop-types'; -import { Table, Tag } from 'antd'; -import Color from '../../../utils/theme'; -import styles from './comments.module.less'; - -const status = { - 1: { - color: Color.green, - text: 'APPROVED', - }, - 2: { - color: Color.yellow, - text: 'PENDING', - }, - 3: { - color: Color.red, - text: 'REJECTED', - }, -}; - -function Comments({ data }) { - const columns = [ - { - title: 'avatar', - dataIndex: 'avatar', - width: 48, - className: styles.avatarcolumn, - render: text => , - }, - { - title: 'content', - dataIndex: 'content', - render: (text, it) => ( -
-
{it.name}
-

{it.content}

-
- {status[it.status].text} - {it.date} -
-
- ), - }, - ]; - return ( -
-
key < 3)} - /> - - ); -} - -Comments.propTypes = { - data: PropTypes.array, -}; - -export default Comments; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/comments.module.less b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/comments.module.less deleted file mode 100644 index f6fa2dec..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/comments.module.less +++ /dev/null @@ -1,43 +0,0 @@ -@import '../../../themes/vars.less'; - -.comments { - :global .ant-table-thead > tr > th { - background: #fff; - border-bottom: solid 1px @border-color-base; - } - - .avatar { - width: 48px; - height: 48px; - background-position: center; - background-size: cover; - border-radius: 50%; - background: #f8f8f8; - display: inline-block; - } - - .content { - text-align: left; - color: #757575; - } - - .date { - color: #a3a3a3; - line-height: 30px; - } - - .daterow { - display: flex; - justify-content: space-between; - } - - .name { - font-size: 14px; - color: #474747; - text-align: left; - } - - .avatarcolumn { - vertical-align: top; - } -} diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/completed.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/completed.js deleted file mode 100644 index 881b9791..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/completed.js +++ /dev/null @@ -1,86 +0,0 @@ -import Inula from 'inulajs'; -import PropTypes from 'prop-types'; -import classnames from 'classnames'; -import Color from 'utils/theme'; -import { AreaChart, Area, XAxis, YAxis, CartesianGrid, Tooltip, Legend, ResponsiveContainer } from 'recharts'; -import styles from './completed.module.less'; - -function Completed({ data }) { - return ( -
-
TEAM TOTAL COMPLETED
- - - { - const { payload } = prop; - return ( -
    - {payload.map((item, key) => ( -
  • - - {item.value} -
  • - ))} -
- ); - }} - /> - - - - { - const list = content.payload.map((item, key) => ( -
  • - - {`${item.name}:${item.value}`} -
  • - )); - return ( -
    -

    {content.label}

    - {content.payload &&
      {list}
    } -
    - ); - }} - /> - - -
    -
    -
    - ); -} - -Completed.propTypes = { - data: PropTypes.array, -}; - -export default Completed; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/completed.module.less b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/completed.module.less deleted file mode 100644 index 4dc79a16..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/completed.module.less +++ /dev/null @@ -1,49 +0,0 @@ -@import '../../../themes/vars.less'; - -.sales { - .title { - margin-left: 32px; - font-size: 16px; - } -} - -.radiusdot { - width: 12px; - height: 12px; - margin-right: 8px; - border-radius: 50%; - display: inline-block; -} - -.legend { - text-align: right; - color: #999; - font-size: 14px; - - li { - height: 48px; - line-height: 48px; - display: inline-block; - - & + li { - margin-left: 24px; - } - } -} - -.tooltip { - background: #fff; - padding: 20px; - font-size: 14px; - - .tiptitle { - font-weight: 700; - font-size: 16px; - margin-bottom: 8px; - } - - .tipitem { - height: 32px; - line-height: 32px; - } -} diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/cpu.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/cpu.js deleted file mode 100644 index dc1e7f5e..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/cpu.js +++ /dev/null @@ -1,58 +0,0 @@ -import Inula from 'inulajs'; -import PropTypes from 'prop-types'; -import Color from 'utils/theme'; -import CountUp from 'react-countup'; -import { LineChart, Line, XAxis, YAxis, CartesianGrid, ResponsiveContainer } from 'recharts'; -import styles from './cpu.module.less'; - -const countUpProps = { - start: 0, - duration: 2.75, - useEasing: true, - useGrouping: true, - separator: ',', -}; - -function Cpu({ usage = 0, space = 0, cpu = 0, data }) { - return ( -
    -
    -
    -

    usage

    -

    - -

    -
    -
    -

    space

    -

    - -

    -
    -
    -

    cpu

    -

    - -

    -
    -
    - - - - - - - - -
    - ); -} - -Cpu.propTypes = { - data: PropTypes.array, - usage: PropTypes.number, - space: PropTypes.number, - cpu: PropTypes.number, -}; - -export default Cpu; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/cpu.module.less b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/cpu.module.less deleted file mode 100644 index d23163b1..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/cpu.module.less +++ /dev/null @@ -1,40 +0,0 @@ -.cpu { - .number { - display: flex; - height: 64px; - justify-content: space-between; - margin-bottom: 32px; - - .item { - text-align: center; - height: 64px; - width: 100%; - position: relative; - - & + .item { - &::before { - content: ''; - display: block; - width: 1px; - height: 40px; - position: absolute; - background: #f5f5f5; - top: 12px; - } - } - - p { - color: #757575; - - &:first-child { - font-size: 16px; - } - - &:last-child { - font-size: 20px; - font-weight: 700; - } - } - } - } -} diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/index.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/index.js deleted file mode 100644 index f52fc524..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/index.js +++ /dev/null @@ -1,12 +0,0 @@ -import NumberCard from './numberCard'; -import Quote from './quote'; -import Sales from './sales'; -import Weather from './weather'; -import RecentSales from './recentSales'; -import Comments from './comments'; -import Completed from './completed'; -import Browser from './browser'; -import Cpu from './cpu'; -import User from './user'; - -export { NumberCard, Quote, Sales, Weather, RecentSales, Comments, Completed, Browser, Cpu, User }; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/recentSales.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/recentSales.js deleted file mode 100644 index b2774358..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/recentSales.js +++ /dev/null @@ -1,60 +0,0 @@ -import Inula from 'inulajs'; -import moment from 'moment'; -import PropTypes from 'prop-types'; -import { Table, Tag } from 'antd'; -import Color from '../../../utils/theme'; -import styles from './recentSales.module.less'; - -const status = { - 1: { - color: Color.green, - text: 'SALE', - }, - 2: { - color: Color.yellow, - text: 'REJECT', - }, - 3: { - color: Color.red, - text: 'TAX', - }, - 4: { - color: Color.blue, - text: 'EXTENDED', - }, -}; - -function RecentSales({ data }) { - const columns = [ - { - title: 'NAME', - dataIndex: 'name', - }, - { - title: 'STATUS', - dataIndex: 'status', - render: text => {status[text].text}, - }, - { - title: 'DATE', - dataIndex: 'date', - render: text => moment(text).format('YYYY-MM-DD'), - }, - { - title: 'PRICE', - dataIndex: 'price', - render: (text, it) => ${text}, - }, - ]; - return ( -
    -
    key < 5)} /> - - ); -} - -RecentSales.propTypes = { - data: PropTypes.array, -}; - -export default RecentSales; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/recentSales.module.less b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/recentSales.module.less deleted file mode 100644 index ac9aea34..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/recentSales.module.less +++ /dev/null @@ -1,8 +0,0 @@ -@import '../../../themes/vars'; - -.recentsales { - :global .ant-table-thead > tr > th { - background: #fff; - border-bottom: solid 1px @border-color-base; - } -} diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/user-background.png b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/user-background.png deleted file mode 100644 index 5f99e137..00000000 Binary files a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/user-background.png and /dev/null differ diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/user.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/user.js deleted file mode 100644 index 205780ac..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/user.js +++ /dev/null @@ -1,55 +0,0 @@ -import Inula from 'inulajs'; -import PropTypes from 'prop-types'; -import { Button, Avatar } from 'antd'; -import CountUp from 'react-countup'; -import Color from 'utils/theme'; -import styles from './user.module.less'; - -const countUpProps = { - start: 0, - duration: 2.75, - useEasing: true, - useGrouping: true, - separator: ',', -}; - -function User({ avatar, username, sales = 0, sold = 0 }) { - return ( -
    -
    -
    - -
    {username}
    -
    -
    -
    -
    -

    EARNING SALES

    -

    - -

    -
    -
    -

    ITEM SOLD

    -

    - -

    -
    -
    -
    - -
    -
    - ); -} - -User.propTypes = { - avatar: PropTypes.string, - username: PropTypes.string, - sales: PropTypes.number, - sold: PropTypes.number, -}; - -export default User; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/user.module.less b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/user.module.less deleted file mode 100644 index cfcc51b2..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/pages/dashboard/components/user.module.less +++ /dev/null @@ -1,88 +0,0 @@ -@import '../../../themes/vars'; - -.user { - .header { - display: flex; - justify-content: center; - text-align: center; - color: #fff; - height: 200px; - background-size: cover; - align-items: center; - - .headerinner { - z-index: 2; - } - - &::after { - content: ''; - background-image: url('user-background.png'); - background-size: cover; - position: absolute; - width: 100%; - height: 200px; - left: 0; - top: 0; - opacity: 0.4; - z-index: 1; - } - - .name { - font-size: 16px; - margin-top: 8px; - } - } - - .number { - display: flex; - height: 116px; - justify-content: space-between; - border-bottom: solid 1px #f5f5f5; - - .item { - text-align: center; - height: 116px; - width: 100%; - position: relative; - padding: 30px 0; - - & + .item { - &::before { - content: ''; - display: block; - width: 1px; - height: 116px; - position: absolute; - background: #f5f5f5; - top: 0; - } - } - - p { - color: #757575; - - &:first-child { - font-size: 16px; - } - - &:last-child { - font-size: 20px; - font-weight: 700; - } - } - } - } - - .footer { - height: 116px; - display: flex; - justify-content: center; - align-items: center; - - :global .ant-btn { - color: @purple; - border-color: @purple; - padding: 6px 16px; - } - } -} diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/utils/theme.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/utils/theme.js deleted file mode 100644 index 18b7728c..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/vite/src/admin/utils/theme.js +++ /dev/null @@ -1,29 +0,0 @@ -// module.exports = { -// Color: { -// green: '#64ea91', -// blue: '#8fc9fb', -// purple: '#d897eb', -// red: '#f69899', -// yellow: '#f8c82e', -// peach: '#f797d6', -// borderBase: '#e5e5e5', -// borderSplit: '#f4f4f4', -// grass: '#d6fbb5', -// sky: '#c1e0fc', -// }, -// } - -const Color = { - green: '#64ea91', - blue: '#8fc9fb', - purple: '#d897eb', - red: '#f69899', - yellow: '#f8c82e', - peach: '#f797d6', - borderBase: '#e5e5e5', - borderSplit: '#f4f4f4', - grass: '#d6fbb5', - sky: '#c1e0fc', -}; - -export default Color; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/mock/dashboard.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/mock/dashboard.js deleted file mode 100644 index 5d803437..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/mock/dashboard.js +++ /dev/null @@ -1,131 +0,0 @@ -const { Mock, Constant } = require('./_utils'); - -const { ApiPrefix, Color } = Constant; - -const Dashboard = Mock.mock({ - 'sales|8': [ - { - 'name|+1': 2008, - 'Clothes|200-500': 1, - 'Food|180-400': 1, - 'Electronics|300-550': 1, - }, - ], - cpu: { - 'usage|50-600': 1, - space: 825, - 'cpu|40-90': 1, - 'data|20': [ - { - 'cpu|20-80': 1, - }, - ], - }, - browser: [ - { - name: 'Google Chrome', - percent: 43.3, - status: 1, - }, - { - name: 'Mozilla Firefox', - percent: 33.4, - status: 2, - }, - { - name: 'Apple Safari', - percent: 34.6, - status: 3, - }, - { - name: 'Internet Explorer', - percent: 12.3, - status: 4, - }, - { - name: 'Opera Mini', - percent: 3.3, - status: 1, - }, - { - name: 'Chromium', - percent: 2.53, - status: 1, - }, - ], - user: { - name: 'github', - sales: 3241, - sold: 3556, - }, - 'completed|12': [ - { - 'name|+1': 2008, - 'Task complete|200-1000': 1, - 'Cards Complete|200-1000': 1, - }, - ], - 'comments|5': [ - { - name: '@last', - 'status|1-3': 1, - content: '@sentence', - avatar() { - return Mock.Random.image('48x48', Mock.Random.color(), '#757575', 'png', this.name.substr(0, 1)); - }, - date() { - return `2016-${Mock.Random.date('MM-dd')} ${Mock.Random.time('HH:mm:ss')}`; - }, - }, - ], - 'recentSales|36': [ - { - 'id|+1': 1, - name: '@last', - 'status|1-4': 1, - date() { - return `${Mock.Random.integer(2015, 2016)}-${Mock.Random.date('MM-dd')} ${Mock.Random.time('HH:mm:ss')}`; - }, - 'price|10-200.1-2': 1, - }, - ], - quote: { - name: 'Joho Doe', - title: 'Graphic Designer', - content: - "I'm selfish, impatient and a little insecure. I make mistakes, I am out of control and at times hard to handle. But if you can't handle me at my worst, then you sure as hell don't deserve me at my best.", - avatar: '//cdn.antd-admin.zuiidea.com/bc442cf0cc6f7940dcc567e465048d1a8d634493198c4-sPx5BR_fw236', - }, - numbers: [ - { - icon: 'pay-circle-o', - color: Color.green, - title: 'Online Review', - number: 2781, - }, - { - icon: 'team', - color: Color.blue, - title: 'New Customers', - number: 3241, - }, - { - icon: 'message', - color: Color.purple, - title: 'Active Projects', - number: 253, - }, - { - icon: 'shopping-cart', - color: Color.red, - title: 'Referrals', - number: 4324, - }, - ], -}); - -module.exports = { - [`get ${ApiPrefix}/dashboard`](req, res) { - res.json(Dashboard); - }, -}; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/america.svg b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/america.svg deleted file mode 100644 index 8cab835c..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/america.svg +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/china.svg b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/china.svg deleted file mode 100644 index 4e3dbbfe..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/china.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/portugal.svg b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/portugal.svg deleted file mode 100644 index a535e696..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/public/portugal.svg +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Editor/Editor.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Editor/Editor.js deleted file mode 100644 index ffbc043c..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Editor/Editor.js +++ /dev/null @@ -1,17 +0,0 @@ -import Inula from 'inulajs'; -import { Editor } from 'react-draft-wysiwyg'; -import 'react-draft-wysiwyg/dist/react-draft-wysiwyg.css'; -import styles from './Editor.less'; - -const DraftEditor = props => { - return ( - - ); -}; - -export default DraftEditor; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Editor/Editor.less b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Editor/Editor.less deleted file mode 100644 index 2cea380a..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Editor/Editor.less +++ /dev/null @@ -1,106 +0,0 @@ -.wrapper { - height: 500px; - - :global { - .rdw-dropdownoption-default { - padding: 6px; - } - - .rdw-dropdown-optionwrapper { - box-sizing: content-box; - width: 100%; - border-radius: 0 0 2px 2px; - &:hover { - box-shadow: none; - } - } - - .rdw-inline-wrapper { - flex-wrap: wrap; - margin-bottom: 0; - - .rdw-option-wrapper { - margin-bottom: 6px; - } - } - - .rdw-option-active { - box-shadow: 1px 1px 0 #e8e8e8 inset; - } - - .rdw-colorpicker-option { - box-shadow: none; - } - - .rdw-colorpicker-modal, - .rdw-embedded-modal, - .rdw-emoji-modal, - .rdw-image-modal, - .rdw-link-modal { - box-shadow: 4px 4px 40px rgba(0, 0, 0, 0.05); - } - - .rdw-colorpicker-modal, - .rdw-embedded-modal, - .rdw-link-modal { - height: auto; - } - - .rdw-emoji-modal { - width: 214px; - } - - .rdw-colorpicker-modal { - width: auto; - } - - .rdw-embedded-modal-btn, - .rdw-image-modal-btn, - .rdw-link-modal-btn { - height: 32px; - margin-top: 12px; - } - - .rdw-embedded-modal-input, - .rdw-embedded-modal-size-input, - .rdw-link-modal-input { - padding: 2px 6px; - height: 32px; - } - - .rdw-dropdown-selectedtext { - color: #000; - } - - .rdw-dropdown-wrapper, - .rdw-option-wrapper { - min-width: 36px; - transition: all 0.2s ease; - height: 30px; - - &:active { - box-shadow: 1px 1px 0 #e8e8e8 inset; - } - - &:hover { - box-shadow: 1px 1px 0 #e8e8e8; - } - } - - .rdw-dropdown-wrapper { - min-width: 60px; - } - - .rdw-editor-main { - box-sizing: border-box; - } - } - - .editor { - border: 1px solid #f1f1f1; - padding: 5px; - border-radius: 2px; - height: auto; - min-height: 200px; - } -} diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Editor/package.json b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Editor/package.json deleted file mode 100644 index 3ea063e3..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Editor/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "Editor", - "version": "0.0.0", - "private": true, - "main": "Editor.js" -} diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Layout/Header.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Layout/Header.js deleted file mode 100644 index 7e18a064..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/components/Layout/Header.js +++ /dev/null @@ -1,125 +0,0 @@ -import Inula, { Fragment } from 'inulajs'; -import { Menu, Layout, Avatar, Popover, List } from 'antd'; -import { Ellipsis } from 'components'; -import { RightOutlined, MenuFoldOutlined, MenuUnfoldOutlined } from '@ant-design/icons'; -import { Trans } from 'utils/intl'; -import { getLocale, setLocale } from 'utils'; -import moment from 'moment'; -import classnames from 'classnames'; -import config from 'config'; -import styles from './Header.less'; - -const { SubMenu } = Menu; - -function Header({ - onSignOut, - fixed, - avatar, - username, - collapsed, - notifications, - onCollapseChange, - onAllNotificationsRead, -}) { - const handleClickMenu = e => { - e.key === 'SignOut' && onSignOut(); - }; - - const rightContent = [ - - - - Hi, - - {username} - - - } - > - , - ]; - - if (config.i18n) { - const { languages } = config.i18n; - const language = getLocale(); - const currentLanguage = languages.find(item => item.key === language); - - rightContent.unshift( - { - setLocale(data.key); - }} - mode="horizontal" - > - }> - {languages.map(item => ( - - - {item.title} - - ))} - - - ); - } - - rightContent.unshift( - document.querySelector('#primaryLayout')} - content={ -
    - You have viewed all notifications., - }} - renderItem={item => ( - - - {item.title} - - } - description={moment(item.date).fromNow()} - /> - - - )} - /> - {notifications.length ? ( -
    - Clear notifications -
    - ) : null} -
    - } - >
    - ); - - return ( - -
    - {collapsed ? : } -
    -
    {rightContent}
    -
    - ); -} - -export default Header; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/browser.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/browser.js deleted file mode 100644 index 229bb159..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/browser.js +++ /dev/null @@ -1,43 +0,0 @@ -import Inula from 'inulajs'; -import PropTypes from 'prop-types'; -import { Table, Tag } from 'antd'; -import { Color } from 'utils'; -import styles from './browser.less'; - -const status = { - 1: { - color: Color.green, - }, - 2: { - color: Color.red, - }, - 3: { - color: Color.blue, - }, - 4: { - color: Color.yellow, - }, -}; - -function Browser({ data }) { - const columns = [ - { - title: 'name', - dataIndex: 'name', - className: styles.name, - }, - { - title: 'percent', - dataIndex: 'percent', - className: styles.percent, - render: (text, it) => {text}%, - }, - ]; - return
    ; -} - -Browser.propTypes = { - data: PropTypes.array, -}; - -export default Browser; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/browser.less b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/browser.less deleted file mode 100644 index 631ad64f..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/browser.less +++ /dev/null @@ -1,7 +0,0 @@ -.percent { - text-align: right !important; -} - -.name { - text-align: left !important; -} diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/comments.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/comments.js deleted file mode 100644 index 05bab8b1..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/comments.js +++ /dev/null @@ -1,63 +0,0 @@ -import Inula from 'inulajs'; -import PropTypes from 'prop-types'; -import { Table, Tag } from 'antd'; -import { Color } from 'utils'; -import styles from './comments.less'; - -const status = { - 1: { - color: Color.green, - text: 'APPROVED', - }, - 2: { - color: Color.yellow, - text: 'PENDING', - }, - 3: { - color: Color.red, - text: 'REJECTED', - }, -}; - -function Comments({ data }) { - const columns = [ - { - title: 'avatar', - dataIndex: 'avatar', - width: 48, - className: styles.avatarcolumn, - render: text => , - }, - { - title: 'content', - dataIndex: 'content', - render: (text, it) => ( -
    -
    {it.name}
    -

    {it.content}

    -
    - {status[it.status].text} - {it.date} -
    -
    - ), - }, - ]; - return ( -
    -
    key < 3)} - /> - - ); -} - -Comments.propTypes = { - data: PropTypes.array, -}; - -export default Comments; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/comments.less b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/comments.less deleted file mode 100644 index 979d81bd..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/comments.less +++ /dev/null @@ -1,43 +0,0 @@ -@import '~themes/vars'; - -.comments { - :global .ant-table-thead > tr > th { - background: #fff; - border-bottom: solid 1px @border-color-base; - } - - .avatar { - width: 48px; - height: 48px; - background-position: center; - background-size: cover; - border-radius: 50%; - background: #f8f8f8; - display: inline-block; - } - - .content { - text-align: left; - color: #757575; - } - - .date { - color: #a3a3a3; - line-height: 30px; - } - - .daterow { - display: flex; - justify-content: space-between; - } - - .name { - font-size: 14px; - color: #474747; - text-align: left; - } - - .avatarcolumn { - vertical-align: top; - } -} diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/completed.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/completed.js deleted file mode 100644 index 657687ba..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/completed.js +++ /dev/null @@ -1,86 +0,0 @@ -import Inula from 'inulajs'; -import PropTypes from 'prop-types'; -import classnames from 'classnames'; -import { Color } from 'utils'; -import { AreaChart, Area, XAxis, YAxis, CartesianGrid, Tooltip, Legend, ResponsiveContainer } from 'recharts'; -import styles from './completed.less'; - -function Completed({ data }) { - return ( -
    -
    TEAM TOTAL COMPLETED
    - - - { - const { payload } = prop; - return ( -
      - {payload.map((item, key) => ( -
    • - - {item.value} -
    • - ))} -
    - ); - }} - /> - - - - { - const list = content.payload.map((item, key) => ( -
  • - - {`${item.name}:${item.value}`} -
  • - )); - return ( -
    -

    {content.label}

    - {content.payload &&
      {list}
    } -
    - ); - }} - /> - - -
    -
    -
    - ); -} - -Completed.propTypes = { - data: PropTypes.array, -}; - -export default Completed; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/completed.less b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/completed.less deleted file mode 100644 index 0ce886f1..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/completed.less +++ /dev/null @@ -1,49 +0,0 @@ -@import '~themes/vars'; - -.sales { - .title { - margin-left: 32px; - font-size: 16px; - } -} - -.radiusdot { - width: 12px; - height: 12px; - margin-right: 8px; - border-radius: 50%; - display: inline-block; -} - -.legend { - text-align: right; - color: #999; - font-size: 14px; - - li { - height: 48px; - line-height: 48px; - display: inline-block; - - & + li { - margin-left: 24px; - } - } -} - -.tooltip { - background: #fff; - padding: 20px; - font-size: 14px; - - .tiptitle { - font-weight: 700; - font-size: 16px; - margin-bottom: 8px; - } - - .tipitem { - height: 32px; - line-height: 32px; - } -} diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/cpu.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/cpu.js deleted file mode 100644 index ccc0378a..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/cpu.js +++ /dev/null @@ -1,58 +0,0 @@ -import Inula from 'inulajs'; -import PropTypes from 'prop-types'; -import { Color } from 'utils'; -import CountUp from 'react-countup'; -import { LineChart, Line, XAxis, YAxis, CartesianGrid, ResponsiveContainer } from 'recharts'; -import styles from './cpu.less'; - -const countUpProps = { - start: 0, - duration: 2.75, - useEasing: true, - useGrouping: true, - separator: ',', -}; - -function Cpu({ usage = 0, space = 0, cpu = 0, data }) { - return ( -
    -
    -
    -

    usage

    -

    - -

    -
    -
    -

    space

    -

    - -

    -
    -
    -

    cpu

    -

    - -

    -
    -
    - - - - - - - - -
    - ); -} - -Cpu.propTypes = { - data: PropTypes.array, - usage: PropTypes.number, - space: PropTypes.number, - cpu: PropTypes.number, -}; - -export default Cpu; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/cpu.less b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/cpu.less deleted file mode 100644 index d23163b1..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/cpu.less +++ /dev/null @@ -1,40 +0,0 @@ -.cpu { - .number { - display: flex; - height: 64px; - justify-content: space-between; - margin-bottom: 32px; - - .item { - text-align: center; - height: 64px; - width: 100%; - position: relative; - - & + .item { - &::before { - content: ''; - display: block; - width: 1px; - height: 40px; - position: absolute; - background: #f5f5f5; - top: 12px; - } - } - - p { - color: #757575; - - &:first-child { - font-size: 16px; - } - - &:last-child { - font-size: 20px; - font-weight: 700; - } - } - } - } -} diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/index.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/index.js deleted file mode 100644 index f52fc524..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/index.js +++ /dev/null @@ -1,12 +0,0 @@ -import NumberCard from './numberCard'; -import Quote from './quote'; -import Sales from './sales'; -import Weather from './weather'; -import RecentSales from './recentSales'; -import Comments from './comments'; -import Completed from './completed'; -import Browser from './browser'; -import Cpu from './cpu'; -import User from './user'; - -export { NumberCard, Quote, Sales, Weather, RecentSales, Comments, Completed, Browser, Cpu, User }; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/recentSales.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/recentSales.js deleted file mode 100644 index c62bde87..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/recentSales.js +++ /dev/null @@ -1,60 +0,0 @@ -import Inula from 'inulajs'; -import moment from 'moment'; -import PropTypes from 'prop-types'; -import { Table, Tag } from 'antd'; -import { Color } from 'utils'; -import styles from './recentSales.less'; - -const status = { - 1: { - color: Color.green, - text: 'SALE', - }, - 2: { - color: Color.yellow, - text: 'REJECT', - }, - 3: { - color: Color.red, - text: 'TAX', - }, - 4: { - color: Color.blue, - text: 'EXTENDED', - }, -}; - -function RecentSales({ data }) { - const columns = [ - { - title: 'NAME', - dataIndex: 'name', - }, - { - title: 'STATUS', - dataIndex: 'status', - render: text => {status[text].text}, - }, - { - title: 'DATE', - dataIndex: 'date', - render: text => moment(text).format('YYYY-MM-DD'), - }, - { - title: 'PRICE', - dataIndex: 'price', - render: (text, it) => ${text}, - }, - ]; - return ( -
    -
    key < 5)} /> - - ); -} - -RecentSales.propTypes = { - data: PropTypes.array, -}; - -export default RecentSales; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/recentSales.less b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/recentSales.less deleted file mode 100644 index 7a091476..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/recentSales.less +++ /dev/null @@ -1,8 +0,0 @@ -@import '~themes/vars'; - -.recentsales { - :global .ant-table-thead > tr > th { - background: #fff; - border-bottom: solid 1px @border-color-base; - } -} diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/user-background.png b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/user-background.png deleted file mode 100644 index 5f99e137..00000000 Binary files a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/user-background.png and /dev/null differ diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/user.js b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/user.js deleted file mode 100644 index dca86705..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/user.js +++ /dev/null @@ -1,55 +0,0 @@ -import Inula from 'inulajs'; -import PropTypes from 'prop-types'; -import { Button, Avatar } from 'antd'; -import CountUp from 'react-countup'; -import { Color } from 'utils'; -import styles from './user.less'; - -const countUpProps = { - start: 0, - duration: 2.75, - useEasing: true, - useGrouping: true, - separator: ',', -}; - -function User({ avatar, username, sales = 0, sold = 0 }) { - return ( -
    -
    -
    - -
    {username}
    -
    -
    -
    -
    -

    EARNING SALES

    -

    - -

    -
    -
    -

    ITEM SOLD

    -

    - -

    -
    -
    -
    - -
    -
    - ); -} - -User.propTypes = { - avatar: PropTypes.string, - username: PropTypes.string, - sales: PropTypes.number, - sold: PropTypes.number, -}; - -export default User; diff --git a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/user.less b/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/user.less deleted file mode 100644 index a6dd51b8..00000000 --- a/packages/create-inula/lib/generators/InulaJS-antd/templates/webpack/src/pages/dashboard/components/user.less +++ /dev/null @@ -1,88 +0,0 @@ -@import '~themes/vars'; - -.user { - .header { - display: flex; - justify-content: center; - text-align: center; - color: #fff; - height: 200px; - background-size: cover; - align-items: center; - - .headerinner { - z-index: 2; - } - - &::after { - content: ''; - background-image: url('user-background.png'); - background-size: cover; - position: absolute; - width: 100%; - height: 200px; - left: 0; - top: 0; - opacity: 0.4; - z-index: 1; - } - - .name { - font-size: 16px; - margin-top: 8px; - } - } - - .number { - display: flex; - height: 116px; - justify-content: space-between; - border-bottom: solid 1px #f5f5f5; - - .item { - text-align: center; - height: 116px; - width: 100%; - position: relative; - padding: 30px 0; - - & + .item { - &::before { - content: ''; - display: block; - width: 1px; - height: 116px; - position: absolute; - background: #f5f5f5; - top: 0; - } - } - - p { - color: #757575; - - &:first-child { - font-size: 16px; - } - - &:last-child { - font-size: 20px; - font-weight: 700; - } - } - } - } - - .footer { - height: 116px; - display: flex; - justify-content: center; - align-items: center; - - :global .ant-btn { - color: @purple; - border-color: @purple; - padding: 6px 16px; - } - } -} diff --git a/packages/create-inula/lib/generators/Simple-app/index.js b/packages/create-inula/lib/generators/Simple-app/index.js index 7510c343..c9d34e92 100644 --- a/packages/create-inula/lib/generators/Simple-app/index.js +++ b/packages/create-inula/lib/generators/Simple-app/index.js @@ -1,5 +1,4 @@ const BasicGenerator = require('../../BasicGenerator'); -const fs = require('fs'); class Generator extends BasicGenerator { prompting() { diff --git a/packages/create-inula/lib/generators/Simple-app/templates/vite/package.json b/packages/create-inula/lib/generators/Simple-app/templates/vite/package.json index 2143aaf9..e1802c19 100644 --- a/packages/create-inula/lib/generators/Simple-app/templates/vite/package.json +++ b/packages/create-inula/lib/generators/Simple-app/templates/vite/package.json @@ -1,5 +1,5 @@ { - "name": "vite", + "name": "horizon-vite-app", "version": "1.0.0", "description": "", "main": "index.js", @@ -11,7 +11,7 @@ "author": "", "license": "ISC", "dependencies": { - "inulajs": "^0.0.8" + "@cloudsop/horizon": "^0.0.58" }, "devDependencies": { "@babel/core": "^7.21.4", @@ -20,6 +20,6 @@ "@vitejs/plugin-react": "^3.1.0", "@vitejs/plugin-react-refresh": "^1.3.6", "babel-plugin-import": "^1.13.6", - "vite": "^4.4.9" + "vite": "^4.2.1" } } diff --git a/packages/create-inula/lib/generators/Simple-app/templates/vite/src/index.jsx b/packages/create-inula/lib/generators/Simple-app/templates/vite/src/index.jsx index 62fa6c96..967b82db 100644 --- a/packages/create-inula/lib/generators/Simple-app/templates/vite/src/index.jsx +++ b/packages/create-inula/lib/generators/Simple-app/templates/vite/src/index.jsx @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import './index.css'; function App() { @@ -19,9 +19,7 @@ function App() {

    了解更多

    要了解 Inula,查看{' '} - - Inula 文档 - + Inula 官网

    diff --git a/packages/create-inula/lib/generators/Simple-app/templates/vite/vite.config.js b/packages/create-inula/lib/generators/Simple-app/templates/vite/vite.config.js index f267f2a2..3aeed4b2 100644 --- a/packages/create-inula/lib/generators/Simple-app/templates/vite/vite.config.js +++ b/packages/create-inula/lib/generators/Simple-app/templates/vite/vite.config.js @@ -1,9 +1,9 @@ import react from '@vitejs/plugin-react'; let alias = { - react: 'inulajs', // 新增 - 'react-dom': 'inulajs', // 新增 - 'react/jsx-dev-runtime': 'inulajs/jsx-dev-runtime', + react: '@cloudsop/horizon', // 新增 + 'react-dom': '@cloudsop/horizon', // 新增 + 'react/jsx-dev-runtime': '@cloudsop/horizon/jsx-dev-runtime', }; export default { diff --git a/packages/create-inula/lib/generators/Simple-app/templates/webpack/package.json b/packages/create-inula/lib/generators/Simple-app/templates/webpack/package.json index 4af944f9..2b240e77 100644 --- a/packages/create-inula/lib/generators/Simple-app/templates/webpack/package.json +++ b/packages/create-inula/lib/generators/Simple-app/templates/webpack/package.json @@ -1,5 +1,5 @@ { - "name": "inula-init", + "name": "horizon-webpack-app", "version": "1.0.0", "description": "", "main": "index.js", @@ -10,7 +10,7 @@ "author": "", "license": "ISC", "dependencies": { - "inulajs": "^0.0.8" + "@cloudsop/horizon": "^0.0.58" }, "devDependencies": { "@babel/core": "^7.21.4", diff --git a/packages/create-inula/lib/generators/Simple-app/templates/webpack/src/App.js b/packages/create-inula/lib/generators/Simple-app/templates/webpack/src/App.js index 29b7fa48..1d3f6830 100644 --- a/packages/create-inula/lib/generators/Simple-app/templates/webpack/src/App.js +++ b/packages/create-inula/lib/generators/Simple-app/templates/webpack/src/App.js @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import './styles.css'; class App extends Inula.Component { @@ -18,12 +18,10 @@ class App extends Inula.Component {

    了解更多

    -

    - 要了解 Inula,查看{' '} - - Inula 文档 - -

    +

    + 要了解 Inula,查看{' '} + Inula 官网 +

    diff --git a/packages/create-inula/lib/generators/Simple-app/templates/webpack/src/index.js b/packages/create-inula/lib/generators/Simple-app/templates/webpack/src/index.js index aa84a3bf..5a5b1787 100644 --- a/packages/create-inula/lib/generators/Simple-app/templates/webpack/src/index.js +++ b/packages/create-inula/lib/generators/Simple-app/templates/webpack/src/index.js @@ -1,4 +1,4 @@ -import Inula from 'inulajs'; +import Inula from '@cloudsop/horizon'; import App from './App'; Inula.render(, document.getElementById('root')); diff --git a/packages/create-inula/lib/generators/Simple-app/templates/webpack/webpack.config.js b/packages/create-inula/lib/generators/Simple-app/templates/webpack/webpack.config.js index 90a3e802..fc122d86 100644 --- a/packages/create-inula/lib/generators/Simple-app/templates/webpack/webpack.config.js +++ b/packages/create-inula/lib/generators/Simple-app/templates/webpack/webpack.config.js @@ -21,7 +21,7 @@ module.exports = { '@babel/preset-react', { runtime: 'automatic', // 新增 - importSource: 'inulajs', // 新增 + importSource: '@cloudsop/horizon', // 新增 }, ], ], @@ -61,6 +61,6 @@ module.exports = { static: path.join(__dirname, 'dist'), compress: true, port: 9000, - open: true + open: true, }, }; diff --git a/packages/create-inula/package.json b/packages/create-inula/package.json index c720a17e..d9991b75 100644 --- a/packages/create-inula/package.json +++ b/packages/create-inula/package.json @@ -1,21 +1,29 @@ { - "name": "create-inula", - "version": "1.0.10", + "name": "@cloudsop/create-horizon", + "version": "1.0.22", "description": "", "main": "index.js", "bin": { "create-inula": "bin/cli.js" }, + "files": [ + "bin", + "lib", + "index.js", + "package.json" + ], "author": "", "license": "ISC", "dependencies": { - "chalk": "^4.1.2", "glob": "^10.3.3", "inquirer": "^8.0.0", - "lodash": "^4.17.21", "mkdirp": "^3.0.1", "yargs-parser": "^21.1.1", "yeoman-environment": "^3.15.0", "yeoman-generator": "^5.8.0" + }, + "devDependencies": { + "chalk": "^4.1.2", + "lodash": "^4.17.21" } } diff --git a/packages/inula-cli/.eslintrc.cjs b/packages/inula-cli/.eslintrc.cjs new file mode 100644 index 00000000..4d26a918 --- /dev/null +++ b/packages/inula-cli/.eslintrc.cjs @@ -0,0 +1,50 @@ +module.exports = { + 'parser': 'babel-eslint', + 'env': { + 'amd': true, + 'es6': true, + 'browser': true, + 'node': false + }, + 'parserOptions': { + 'ecmaVersion': 6, + 'sourceType': 'module', + 'ecmaFeatures': { + 'jsx': true + } + }, + 'ignorePatterns': [ + "src/template" + ], + 'rules': { + 'indent': [ + 'error', + 4, + { + SwitchCase: 1, + flatTernaryExpressions: true + } + ], + 'no-unused-vars': 'off', // 允许变量声明后未使用 + 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', + "no-underscore-dangle": ["off", "always"], // 允许私有变量 _xxx的变量命名方式 + "react/jsx-indent-props": [2, 4], // 验证JSX中的props缩进 + "react/prop-types": 0, // 防止在React组件定义中丢失props验证 + 'react/jsx-indent': [ // 解决react里面的缩进问题 + 'error', + 4 + ], + 'filenames/match-exported': 0, + 'react/jsx-one-expression-per-line': 0, // 关闭一个表达式必须换行设定 + 'react/jsx-filename-extension': [1, { 'extensions': [".js", '.jsx'] }], // 允许在 .js 和 .jsx 文件中使用 jsx + 'consistent-return': 0, + "comma-dangle": [2, "never"], // 组和对象键值对最后一个逗号, never参数:不能带末尾的逗号, always参数:必须带末尾的逗号 + 'react/button-has-type': 0, // button无需强制声明类型 + 'react/no-array-index-key': 0, // 允许使用数组index作为组件的key + 'global-require': 0, // 允许require语句不出现在顶层中 + 'no-nested-ternary': 0, // 允许嵌套三元表达式 + 'no-unused-expressions': 0, // 允许使用未执行的表达式。比如fn是一个函数,允许 fn && fn() + 'no-throw-literal': 0, // 允许throw抛出对象格式 + '@typescript-eslint/member-ordering': 0 // 禁用TypeScript声明规范 + } +} diff --git a/packages/inula-cli/.prettierignore b/packages/inula-cli/.prettierignore new file mode 100644 index 00000000..fee8a6ae --- /dev/null +++ b/packages/inula-cli/.prettierignore @@ -0,0 +1,3 @@ +node_modules/ +webpack/ +public/ diff --git a/packages/inula-cli/.prettierrc.js b/packages/inula-cli/.prettierrc.js new file mode 100644 index 00000000..b30250ac --- /dev/null +++ b/packages/inula-cli/.prettierrc.js @@ -0,0 +1,15 @@ +export default { + printWidth: 120, // 一行120字符数,如果超过会进行换行 + tabWidth: 2, // tab等2个空格 + useTabs: false, // 用空格缩进行 + semi: true, // 行尾使用分号 + singleQuote: true, // 字符串使用单引号 + quoteProps: 'as-needed', // 仅在需要时在对象属性添加引号 + jsxSingleQuote: false, // 在JSX中使用双引号 + trailingComma: 'es5', // 使用尾逗号(对象、数组等) + bracketSpacing: true, // 对象的括号间增加空格 + jsxBracketSameLine: false, // 将多行JSX元素的>放在最后一行的末尾 + arrowParens: 'avoid', // 在唯一的arrow函数参数周围省略括号 + vueIndentScriptAndStyle: false, // 不缩进Vue文件中的