-
- {!isViewThemeOnly.value &&
}
+
{tabs.value.map(generateTab)}
diff --git a/src/components/base/ShutdownButton.tsx b/src/components/base/ShutdownButton.tsx
index 55c6139..f5c90cb 100644
--- a/src/components/base/ShutdownButton.tsx
+++ b/src/components/base/ShutdownButton.tsx
@@ -1,4 +1,4 @@
-import AppIcon from '@/components/app/AppIcon.vue'
+import { Power } from '@lucide/vue'
import { defineComponent } from 'vue'
import { systemActionsObject } from '@/utils/helper'
import ShutdownMenu from './ShutdownMenu'
@@ -10,7 +10,7 @@ export default defineComponent({
)
diff --git a/src/components/base/ShutdownMenu.tsx b/src/components/base/ShutdownMenu.tsx
index 1d664ad..a2273c3 100644
--- a/src/components/base/ShutdownMenu.tsx
+++ b/src/components/base/ShutdownMenu.tsx
@@ -1,8 +1,10 @@
-import AppIcon from '@/components/app/AppIcon.vue'
+import { RotateCw, Moon, Snowflake } from '@lucide/vue'
import { defineComponent, computed } from 'vue'
import { systemActionsObject } from '@/utils/helper'
import { LightdmHandler } from '@/utils/lightdm'
+const icons = { restart: RotateCw, suspend: Moon, hibernate: Snowflake }
+
export default defineComponent({
name: 'ShutdownMenu',
setup() {
@@ -16,11 +18,14 @@ export default defineComponent({
return () => (
)
}
diff --git a/src/components/base/UserAvatar.tsx b/src/components/base/UserAvatar.tsx
index c42e8a6..ad7f3d2 100644
--- a/src/components/base/UserAvatar.tsx
+++ b/src/components/base/UserAvatar.tsx
@@ -1,27 +1,20 @@
-import AppIcon from '@/components/app/AppIcon.vue'
-import { defineComponent, computed } from 'vue'
+import { User } from '@lucide/vue'
+import { defineComponent } from 'vue'
import { useAppStore } from '@/store/app'
-import { usePageStore } from '@/store/page'
-import timer from '@/utils/time'
import type { LightdmUsers } from '@/models/lightdm'
export default defineComponent({
name: 'UserAvatar',
setup() {
const appStore = useAppStore()
- const pageStore = usePageStore()
-
- const isOpenSettings = computed(() => pageStore.isOpenBlock('settings'))
- const currentTime = computed(() => isOpenSettings.value ? timer.longTime : timer.shortTime)
const buildUserAvatar = (image: string | undefined) =>
image
?
- :
+ :
const buildUser = (user: LightdmUsers) => (
-
{appStore.isSupportFullApi ? '' : currentTime.value}
{buildUserAvatar(user?.image)}
{user?.display_name}
diff --git a/src/components/base/UserInput.tsx b/src/components/base/UserInput.tsx
index b0b2a10..a223bcd 100644
--- a/src/components/base/UserInput.tsx
+++ b/src/components/base/UserInput.tsx
@@ -1,4 +1,4 @@
-import AppIcon from '@/components/app/AppIcon.vue'
+import { Settings, Eye, EyeOff, ArrowRight } from '@lucide/vue'
import { defineComponent } from 'vue'
import { useI18n } from 'vue-i18n'
import { useAppStore } from '@/store/app'
@@ -20,11 +20,10 @@ export default defineComponent({
const handleKeyup = (event: KeyboardEvent) => {
appStore.password = (event.target as HTMLInputElement)?.value || ''
}
- console.log({ appStore})
-
+
return () => (
)
diff --git a/src/components/base/settings/general/SettingsUsers.tsx b/src/components/base/settings/general/SettingsUsers.tsx
index a792c4d..1db24f2 100644
--- a/src/components/base/settings/general/SettingsUsers.tsx
+++ b/src/components/base/settings/general/SettingsUsers.tsx
@@ -1,4 +1,4 @@
-import AppIcon from '@/components/app/AppIcon.vue'
+import { User } from '@lucide/vue'
import { defineComponent } from 'vue'
import { useI18n } from 'vue-i18n'
import { useAppStore } from '@/store/app'
@@ -16,7 +16,9 @@ export default defineComponent({
return (
-
+ {user.image
+ ?
+ :
}
{user.display_name}
)
diff --git a/src/models/app.ts b/src/models/app.ts
index 9c9e582..88fc3a6 100644
--- a/src/models/app.ts
+++ b/src/models/app.ts
@@ -1,7 +1,6 @@
export interface AppSettings {
zoom: number;
currentTheme: string;
- currentOs: string;
username: string;
desktop: string;
defaultColor: string;
diff --git a/src/store/app.ts b/src/store/app.ts
index ccdf37e..8545d85 100644
--- a/src/store/app.ts
+++ b/src/store/app.ts
@@ -57,7 +57,6 @@ export const useAppStore = defineStore('app', {
desktop: state.desktop,
username: state.username,
bodyClass: state.bodyClass,
- currentOs: state.currentOs,
currentTheme: state.currentTheme,
defaultColor: state.defaultColor,
generateRandomThemes: state.generateRandomThemes
@@ -66,7 +65,6 @@ export const useAppStore = defineStore('app', {
personalInfo: (state) => ({
username: state.username,
currentTheme: state.currentTheme,
- currentOs: state.currentOs,
desktop: state.desktop,
version: state.version,
defaultColor: state.defaultColor
diff --git a/src/style/components/button.styl b/src/style/components/button.styl
index 308b7a3..08e7aba 100644
--- a/src/style/components/button.styl
+++ b/src/style/components/button.styl
@@ -22,6 +22,15 @@
flex: 1 0 auto;
width: 100%;
+.app-button__loader
+ display flex
+ .spin
+ animation spin 0.8s linear infinite
+
+@keyframes spin
+ to
+ transform rotate(360deg)
+
.app-button--fab
padding 4px
border-radius 12px
diff --git a/src/style/components/selector.styl b/src/style/components/selector.styl
index 6522a29..1719f1f 100644
--- a/src/style/components/selector.styl
+++ b/src/style/components/selector.styl
@@ -10,19 +10,14 @@
cursor pointer
&:hover
border-color rgba(255, 255, 255, .8)
- .selector-arrow
- fill rgba(255, 255, 255, .8)
&.active
border-color white
.selector-arrow
- fill white
- .selector-arrow
- transform rotate(-90deg)
+ transform rotate(0deg)
.selector-arrow
- fill var(--color-unfocus)
- transform rotate(90deg)
transition .2s
+ transform rotate(180deg)
.selector-icon
float left
diff --git a/vite.config.ts b/vite.config.ts
index 1a86647..757964a 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -13,7 +13,20 @@ export default defineConfig({
vue(),
vueJsx(),
glsl(),
- svgLoader()
+ svgLoader({
+ svgoConfig: {
+ plugins: [
+ {
+ name: 'preset-default',
+ params: {
+ overrides: {
+ removeViewBox: false
+ }
+ }
+ }
+ ]
+ }
+ })
],
resolve: {
alias: {