diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b698e42..3909696 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,24 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 + uses: actions/setup-node@v3 + with: + node-version: 14 + env: + host: 'ubuntu@en.dtm.pub' + dest: '/data/dtm-admin/' + run: | + cd admin + npm install -g yarn + yarn + VITE_ADMIN_VERSION=${GITHUB_REF#refs/*/} yarn build + echo "${{secrets.DEPLOY_KEY}}" > deploy_key + chmod 600 ./deploy_key + tar -cvzf dist.tar.gz dist + scp -i ../../deploy_key -o StrictHostKeyChecking=no dist.tar.gz ${{env.host}}:${{env.dest}} + ssh -i ../../deploy_key -o StrictHostKeyChecking=no ${{env.host}} 'cd ${{env.dest}} && tar -zvxf dist.tar.gz' + cd .. - name: Validates GO releaser config uses: docker://goreleaser/goreleaser:v1.7.0 diff --git a/.gitignore b/.gitignore index f0476cb..135fe3c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ conf.yml *.out *.log -dist +# dist .idea/** .vscode default.etcd diff --git a/admin/.env b/admin/.env new file mode 100644 index 0000000..fde6533 --- /dev/null +++ b/admin/.env @@ -0,0 +1 @@ +VITE_ADMIN_VERSION="v0.0.0-dev" diff --git a/dashboard/.eslintrc.js b/admin/.eslintrc.js similarity index 100% rename from dashboard/.eslintrc.js rename to admin/.eslintrc.js diff --git a/dashboard/.gitignore b/admin/.gitignore similarity index 100% rename from dashboard/.gitignore rename to admin/.gitignore diff --git a/dashboard/README.md b/admin/README.md similarity index 100% rename from dashboard/README.md rename to admin/README.md diff --git a/admin/dist/placeholder b/admin/dist/placeholder new file mode 100644 index 0000000..48cdce8 --- /dev/null +++ b/admin/dist/placeholder @@ -0,0 +1 @@ +placeholder diff --git a/dashboard/index.html b/admin/index.html similarity index 100% rename from dashboard/index.html rename to admin/index.html diff --git a/dashboard/package.json b/admin/package.json similarity index 100% rename from dashboard/package.json rename to admin/package.json diff --git a/dashboard/postcss.config.js b/admin/postcss.config.js similarity index 100% rename from dashboard/postcss.config.js rename to admin/postcss.config.js diff --git a/dashboard/public/favicon.ico b/admin/public/favicon.ico similarity index 100% rename from dashboard/public/favicon.ico rename to admin/public/favicon.ico diff --git a/dashboard/src/App.vue b/admin/src/App.vue similarity index 100% rename from dashboard/src/App.vue rename to admin/src/App.vue diff --git a/admin/src/api/api_dtm.ts b/admin/src/api/api_dtm.ts new file mode 100644 index 0000000..b0b52d6 --- /dev/null +++ b/admin/src/api/api_dtm.ts @@ -0,0 +1,22 @@ +import { AxiosResponse } from 'axios' +import request from '/@/utils/request' + +export interface IListAllTransactionsReq { + limit: number + position?: number +} + +export function listAllTransactions(payload: IListAllTransactionsReq): Promise> { + return request({ + url: '/api/dtmsvr/all', + method: 'get', + params: payload + }) +} + +export function getDtmVersion(): Promise> { + return request({ + url: '/api/dtmsvr/version', + method: 'get', + }) +} diff --git a/dashboard/src/assets/css/index.css b/admin/src/assets/css/index.css similarity index 100% rename from dashboard/src/assets/css/index.css rename to admin/src/assets/css/index.css diff --git a/dashboard/src/components.d.ts b/admin/src/components.d.ts similarity index 100% rename from dashboard/src/components.d.ts rename to admin/src/components.d.ts diff --git a/dashboard/src/components/SvgIcon/index.vue b/admin/src/components/SvgIcon/index.vue similarity index 100% rename from dashboard/src/components/SvgIcon/index.vue rename to admin/src/components/SvgIcon/index.vue diff --git a/dashboard/src/icons/readme.md b/admin/src/icons/readme.md similarity index 100% rename from dashboard/src/icons/readme.md rename to admin/src/icons/readme.md diff --git a/dashboard/src/icons/svg/logo.svg b/admin/src/icons/svg/logo.svg similarity index 100% rename from dashboard/src/icons/svg/logo.svg rename to admin/src/icons/svg/logo.svg diff --git a/dashboard/src/layout/aside.vue b/admin/src/layout/aside.vue similarity index 74% rename from dashboard/src/layout/aside.vue rename to admin/src/layout/aside.vue index 050369a..77d7c74 100644 --- a/dashboard/src/layout/aside.vue +++ b/admin/src/layout/aside.vue @@ -4,6 +4,7 @@ +
!!! admin version: {{dashVer}} != dtm version: {{layout.dtmVersion}}.
{{ mainNav }} {{ subNav }} @@ -26,18 +27,21 @@ import { useLayoutStore } from '../store/modules/layout' import { IMenubarList } from '../type/store/layout' import { findCurrentMenubar } from '../utils/util' import { computed, onMounted, ref } from 'vue' +import { getDtmVersion } from '../api/api_dtm' + +const dashVer = import.meta.env.VITE_ADMIN_VERSION const route = useRoute() -const { getMenubar } = useLayoutStore() +const layout = useLayoutStore() const mainNav = computed(() => { - const currentMenubar = findCurrentMenubar(getMenubar.menuList, true) + const currentMenubar = findCurrentMenubar(layout.getMenubar.menuList, true) return currentMenubar?.meta.title }) const subNav = computed(() => { let subNav = '' - const currentMenubar = findCurrentMenubar(getMenubar.menuList, true) + const currentMenubar = findCurrentMenubar(layout.getMenubar.menuList, true) currentMenubar.children?.forEach(v => { if (route.path.indexOf(v.path) !== -1) { subNav = v.meta.title @@ -49,17 +53,22 @@ const subNav = computed(() => { const page = computed(() => { let page = '' - const currentMenubar = findCurrentMenubar(getMenubar.menuList, true) + const currentMenubar = findCurrentMenubar(layout.getMenubar.menuList, true) currentMenubar.children?.forEach(v => { v.children?.forEach(vv => { if (route.path == vv.path) { page = vv.meta.title } }) - }) + }) return page }) + +onMounted(() => { + layout.loadDtmVersion() +}) +