Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BIGTOP-4255: Refactor layout page #94

Merged
merged 41 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
5ee6248
feat: init layout
FU-design Oct 11, 2024
9d57b09
merge repeating styles
FU-design Oct 11, 2024
7442bf1
revert scss
FU-design Oct 14, 2024
2b82ad6
change less to scss
FU-design Oct 14, 2024
4b5ee37
Init theme config
FU-design Oct 15, 2024
3e16f2e
add theme store
FU-design Oct 16, 2024
9f45ca7
add scss variable
FU-design Oct 16, 2024
384f8f3
add scss varibales from ant design vue
FU-design Oct 16, 2024
84158aa
init theme-switch component
FU-design Oct 16, 2024
e070d88
refactor routes config
FU-design Oct 16, 2024
64c19d3
init header menu
FU-design Oct 16, 2024
70b97dd
remove type field in package.json
FU-design Oct 17, 2024
5fa36cf
init header menu and sider menu
FU-design Oct 17, 2024
c461060
rename files to use kebab-case naming convention
FU-design Oct 17, 2024
e09600e
improve useMenuStore
FU-design Oct 17, 2024
e8d08b2
refactor layout
FU-design Oct 17, 2024
3f7acd7
Merge remote-tracking branch 'origin/main' into bigtop-ui-refactor
FU-design Oct 17, 2024
cd3af2a
extract sidebar menu helpers to menuStore
FU-design Oct 18, 2024
55470f0
reomvo invaible file and improve routes
FU-design Oct 18, 2024
016e592
fix route into menu
FU-design Oct 21, 2024
8c6fffd
revert header and sider
FU-design Oct 22, 2024
98a2f10
refact menuStore
FU-design Oct 22, 2024
d16b8c8
init layout
FU-design Oct 23, 2024
65c3d0c
Add check for undefined siderMenus in menuStore
FU-design Oct 23, 2024
8963091
revert env
FU-design Oct 23, 2024
e5b04e4
refactor menuStore
FU-design Oct 24, 2024
976cebd
rename ant-desing-vue.scss to ant-design-vue.scss
FU-design Oct 24, 2024
c53a8c8
fix no license and remove invaible args
FU-design Oct 24, 2024
2f4dc1a
fix svg-icon.test error
FU-design Oct 24, 2024
3b55e00
add icon into siderMenu
FU-design Oct 24, 2024
5397cbe
fix highlight for icon of menu
FU-design Oct 24, 2024
42f3fa8
fix eslint error
FU-design Oct 24, 2024
7e63233
rename actived to activated
FU-design Oct 25, 2024
89d4a06
refactor style for sider menu
FU-design Oct 25, 2024
85e28b6
remove emjoy in cluster data
FU-design Oct 25, 2024
8a60818
update language files in locales
FU-design Oct 28, 2024
3f57f89
update language files in locales
FU-design Oct 28, 2024
5df4f91
add transition in layout
FU-design Oct 28, 2024
b781b0b
change style of sider
FU-design Oct 28, 2024
9768e5f
provide menu.ts in locale
FU-design Oct 28, 2024
b451827
update menu in locales
FU-design Oct 28, 2024
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
1 change: 1 addition & 0 deletions bigtop-manager-ui/.env.development
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ NODE_ENV=development
VITE_APP_BASE='/'
VITE_APP_BASE_URL='http://localhost:8080'
VITE_APP_BASE_API='/api'
VITE_GITHUB_URL='https://github.com/apache/bigtop-manager'
1 change: 1 addition & 0 deletions bigtop-manager-ui/.env.production
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ NODE_ENV=production
VITE_APP_BASE='/ui/'
VITE_APP_BASE_URL=''
VITE_APP_BASE_API='/api'
VITE_GITHUB_URL='https://github.com/apache/bigtop-manager'
18 changes: 11 additions & 7 deletions bigtop-manager-ui/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,22 @@
-->

<script setup lang="ts">
import { useLocaleStore } from '@/store/locale'
import { storeToRefs } from 'pinia'

import { onMounted } from 'vue'
import { useLocaleStore } from '@/store/locale'
import { useTheme } from './store/theme'
const themeStore = useTheme()
const localeStore = useLocaleStore()
const { antd } = storeToRefs(localeStore)
const { themeConfig } = storeToRefs(themeStore)

onMounted(() => {
themeStore.initTheme()
})
</script>

<template>
<a-config-provider :locale="antd">
<a-config-provider :locale="antd" :theme="themeConfig">
<a-app class="app">
<router-view />
</a-app>
Expand All @@ -35,9 +42,6 @@

<style scoped lang="scss">
.app {
height: 100%;
> section {
height: 100%;
}
overflow: hidden;
}
</style>
26 changes: 26 additions & 0 deletions bigtop-manager-ui/src/assets/images/svg/avatar.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
189 changes: 189 additions & 0 deletions bigtop-manager-ui/src/assets/images/svg/big-manager-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 0 additions & 23 deletions bigtop-manager-ui/src/assets/images/svg/carbon-language.svg

This file was deleted.

44 changes: 44 additions & 0 deletions bigtop-manager-ui/src/assets/images/svg/clusters.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
44 changes: 44 additions & 0 deletions bigtop-manager-ui/src/assets/images/svg/clusters_activated.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 37 additions & 0 deletions bigtop-manager-ui/src/assets/images/svg/communication.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions bigtop-manager-ui/src/assets/images/svg/github.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading