[incubator-apisix-dashboard] 02/04: feat: update layout

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a commit to branch feat-layout
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-dashboard.git

commit 55e0d6b292ed2c36b3ec9310e5868769315390db
Author: juzhiyuan <jj...@gmail.com>
AuthorDate: Thu May 21 11:48:10 2020 +0800

    feat: update layout
---
 config/config.ts          |  2 +-
 config/defaultSettings.ts | 21 ++++++++-------------
 src/services/login.ts     |  2 +-
 src/services/user.ts      |  1 +
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/config/config.ts b/config/config.ts
index 8339d2f..f2cfca2 100644
--- a/config/config.ts
+++ b/config/config.ts
@@ -44,7 +44,7 @@ export default defineConfig({
       routes: [
         {
           path: '/',
-          authority: ['admin', 'user'],
+          access: 'canAdmin',
           routes: [
             {
               path: '/',
diff --git a/config/defaultSettings.ts b/config/defaultSettings.ts
index a98401c..6b6349a 100644
--- a/config/defaultSettings.ts
+++ b/config/defaultSettings.ts
@@ -1,26 +1,21 @@
-import { Settings as ProSettings } from '@ant-design/pro-layout';
+import { Settings as LayoutSettings } from '@ant-design/pro-layout';
 
-type DefaultSettings = ProSettings & {
-  pwa: boolean;
-};
-
-const defaultSettings: DefaultSettings = {
-  navTheme: 'dark',
+export default {
+  navTheme: 'light',
   // 拂晓蓝
   primaryColor: '#1890ff',
-  layout: 'side',
+  layout: 'mix',
   contentWidth: 'Fluid',
   fixedHeader: false,
+  autoHideHeader: false,
   fixSiderbar: false,
   colorWeak: false,
   menu: {
     locale: true,
   },
-  title: 'APISIX',
+  title: 'APISIX Dashboard',
   pwa: false,
   iconfontUrl: '',
+} as LayoutSettings & {
+  pwa: boolean;
 };
-
-export { DefaultSettings };
-
-export default defaultSettings;
diff --git a/src/services/login.ts b/src/services/login.ts
index a4e081e..e5c918d 100644
--- a/src/services/login.ts
+++ b/src/services/login.ts
@@ -12,7 +12,7 @@ export async function fakeAccountLogin() {
   return {
     status: 'ok',
     type: 'account',
-    currentAuthority: 'admin',
+    access: 'admin',
   };
 }
 
diff --git a/src/services/user.ts b/src/services/user.ts
index 870c4c7..a0589ba 100644
--- a/src/services/user.ts
+++ b/src/services/user.ts
@@ -11,6 +11,7 @@ export async function queryCurrent() {
     avatar:
       'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxzdmcgdmlld0JveD0iMCAwIDUwMCA1MDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+DQogIDxkZWZzPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0iaWQwIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjI1MTE5LjgiIHkxPSIxMTA1Mi41IiB4Mj0iMjE3MjUuNyIgeTI9IjIxNTUxLjciIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMC4wMjgwOTUsIDAsIDAsIDAuMDI4MDk1LCAtNDkyLjg2NzA5NiwgLTE0NC43Njk4MjEpIj4NCiAgICAgIDxzdG9wIG9mZnNldD0iMCIgc3R5bGU9InN0b3AtY29 [...]
     userid: '00000001',
+    access: 'admin',
   });
 }