Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions src/App.vue
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
<template>
<anakin-header />

<div id="container">
<anakin-nav class="console-sidebar" />
<router-view class="console-content" />

<dialog-wrapper />
<div>
<router-view />
</div>
</template>

<script lang="ts" setup>
import AnakinNav from '@/components/AnakinNav.vue';
import AnakinHeader from '@/components/AnakinHeader.vue';
import { DialogWrapper } from '@dao-style/extend';
</script>
51 changes: 34 additions & 17 deletions src/components/AnakinHeader.vue
Original file line number Diff line number Diff line change
@@ -1,28 +1,37 @@
<script setup lang="ts">

import { noop } from '@vueuse/core';
// import { noop } from '@vueuse/core';
import { i18n } from '@/plugins';
import AnakinHeaderButton from '@/components/AnakinHeaderButton.vue';
import Avatar from '@/assets/avatar.webp';
import { useNamespaceStore } from '@/stores/namespace';
import { useUserStore } from '@/stores/user';

const userStore = useUserStore();
const router = useRouter();

const logout = async () => {
await userStore.logout();
router.push('/');
};

const userOperation = computed(() => [
{
label: i18n.t('components.AnakinHeader.user.personal-center'),
icon: 'icon-user',
href: './profile',
operate: noop,
},
{
label: i18n.t('components.AnakinHeader.user.setting'),
icon: 'icon-setting',
href: './settings',
operate: noop,
},
// {
// label: i18n.t('components.AnakinHeader.user.personal-center'),
// icon: 'icon-user',
// href: './profile',
// operate: noop,
// },
// {
// label: i18n.t('components.AnakinHeader.user.setting'),
// icon: 'icon-setting',
// href: './settings',
// operate: noop,
// },
{
label: i18n.t('components.AnakinHeader.user.logout'),
icon: 'icon-logout',
operate: noop,
operate: logout,
},
]);

Expand Down Expand Up @@ -66,7 +75,6 @@ const namespace = computed({
<div class="datatunerx-toolbox">
<div class="datatunerx-toolbox-item">
<dao-dropdown
v-if="false"
trigger="click"
:offset="5"
>
Expand All @@ -90,13 +98,22 @@ const namespace = computed({
:key="operate.label"
@click="operate.operate"
>
<dao-history-link
<dao-button
size="sm"
use-font
:icon-left="operate.icon"
type="ghost"
@click="operate.operate"
>
{{ operate.label }}
</dao-button>
<!-- <dao-history-link
:href="operate.href"
:icon="operate.icon"
class="datatunerx-user-drop--item"
>
{{ operate.label }}
</dao-history-link>
</dao-history-link> -->
</dao-dropdown-item>
</dao-dropdown-menu>
</template>
Expand Down
7 changes: 1 addition & 6 deletions src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import pluginInstall, { loadDayjsLanguageAsync, loadLanguageAsync } from './plug
import '@/assets/styles/common.scss';

import AppElement from './App.vue';
import { useNamespaceStore } from './stores/namespace';

const app = createApp(AppElement);

Expand All @@ -13,8 +12,4 @@ app.use(pluginInstall);
await loadLanguageAsync('');
await loadDayjsLanguageAsync('');

const namespaceStore = useNamespaceStore();

namespaceStore.fetchNamespace().then(() => {
app.mount('#app');
});
app.mount('#app');
17 changes: 16 additions & 1 deletion src/plugins/axios/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import axios from 'axios';
import { TOKEN } from '@/utils/constant';

export interface KubernetesError {
kind: string
Expand All @@ -17,9 +18,23 @@ export {

const httpClient = axios.create({
baseURL: '/',
headers: { Authorization: `Bearer ${process.env.VUE_APP_AUTH}` },
// headers: { Authorization: `Bearer ${process.env.VUE_APP_AUTH}` },
});

httpClient.interceptors.request.use(
(config) => {
const token:string|null = localStorage.getItem(TOKEN);

if (!config.headers.Authorization && token) {
// eslint-disable-next-line no-param-reassign
config.headers.Authorization = `Bearer ${token}`;
}

return config;
},
(error) => Promise.reject(error.response?.data),
);

httpClient.interceptors.response.use(
(response) => response,
(error) => Promise.reject(error.response?.data),
Expand Down
14 changes: 14 additions & 0 deletions src/router/guards/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { type Router } from 'vue-router';
import { TOKEN } from '@/utils/constant';

export default function ensureHooks(router: Router) {
router.beforeEach((to, from, next) => {
const token:string|null = localStorage.getItem(TOKEN);

if (!token && to.path !== '/login') {
next('/login');
} else {
next();
}
});
}
11 changes: 10 additions & 1 deletion src/router/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ import { App } from 'vue';
import {
createRouter, type RouteRecordRaw, type RouterHistory, type Router, createWebHistory,
} from 'vue-router';
import Guards from '@/router/guards/index';

import Login from '@/views/login/Login.vue';

import RouterContent from '@/views/RouterContent.vue';

Expand All @@ -24,9 +27,14 @@ const routes: Array<RouteRecordRaw> = [
{
path: '/',
redirect: {
name: 'FinetuneExperimentList',
name: 'Login',
},
children: [
{
path: 'login',
name: 'Login',
component: Login,
},
{
path: 'fine-tune',
component: RouterContent,
Expand Down Expand Up @@ -123,4 +131,5 @@ export default (app: App) => {
routes,
});
app.use(router);
Guards(router);
};
41 changes: 41 additions & 0 deletions src/stores/user.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import { defineStore } from 'pinia';
import { TOKEN } from '@/utils/constant';
import { useNamespaceStore } from '@/stores/namespace';
import { i18n } from '@/plugins/vue-i18n';
import { nError } from '@/utils/useNoty';
import isEmpty from 'lodash/isEmpty';

export const useUserStore = defineStore('user', {
state: () => ({
token: localStorage.getItem(TOKEN) as string,
}),
actions: {
setToken(val: string) {
localStorage.setItem(TOKEN, val);
this.token = val;
},

isLoginSuccess() {
return !isEmpty(this.token);
},

async initView() {
const namespaceStore = useNamespaceStore();

try {
await namespaceStore.fetchNamespace();
} catch (error) {
nError(i18n.t('common.fetchFailed'), error);
}
},

async login(val: string) {
this.setToken(val);
},

async logout() {
localStorage.removeItem(TOKEN);
},

},
});
2 changes: 1 addition & 1 deletion src/utils/constant.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const TOKEN = 'ANAKIN_TOKEN';
export const TOKEN = 'ACCESS_TOKEN';
export const REFRESH_TOKEN = 'ANAKIN_REFRESH_TOKEN';
export const USERNAME = 'ANAKIN_USERNAME';
export const FAVICON = 'ANAKIN_FAVICON';
Expand Down
22 changes: 20 additions & 2 deletions src/views/RouterContent.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
<template>
<router-view />
<anakin-header />

<div id="container">
<anakin-nav class="console-sidebar" />
<router-view class="console-content" />

<dialog-wrapper />
</div>
</template>

<script lang="ts" setup></script>
<script lang="ts" setup>
import AnakinNav from '@/components/AnakinNav.vue';
import AnakinHeader from '@/components/AnakinHeader.vue';
import { DialogWrapper } from '@dao-style/extend';
import { useUserStore } from '@/stores/user';

const userStore = useUserStore();

onBeforeMount(async () => {
await userStore.initView();
});
</script>
57 changes: 57 additions & 0 deletions src/views/login/Login.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<script lang="ts" setup>

import { useUserStore } from '@/stores/user';

const router = useRouter();
const token = ref<string>('');

const userStore = useUserStore();
const loginSuccess = computed(() => userStore.isLoginSuccess());

const onSubmit = async () => {
await userStore.login(token.value);
router.push({
name: 'FinetuneExperimentList',
});
};

onMounted(async () => {
if (loginSuccess.value) {
router.push({
name: 'FinetuneExperimentList',
});
}
});

</script>

<template>
<div class="login-container">
<dao-form label-width="60px">
<dao-form-item
label="Token"
>
<dao-input v-model="token" />
</dao-form-item>
<dao-form-item>
<dao-button
type="primary"
@click="onSubmit"
>
登录
</dao-button>
</dao-form-item>
</dao-form>
</div>
</template>

<style lang="scss" scoped>
.login-container {
position: absolute;
display: flex;
align-items: center;
justify-content: center;
width: 100%;
height: 100%;
}
</style>