diff --git a/core/cmd/server/conf/app.yaml b/core/cmd/server/conf/app.yaml index d216ea93f..776f6d46e 100644 --- a/core/cmd/server/conf/app.yaml +++ b/core/cmd/server/conf/app.yaml @@ -11,6 +11,7 @@ base: remote_url: repo_url: https://resource.fit2cloud.com/1panel/package app_repo: https://apps-assets.fit2cloud.com + resource_url: https://resource.fit2cloud.com/1panel/resource log: level: debug diff --git a/frontend/src/assets/images/1panel-login-bg.jpg b/frontend/src/assets/images/1panel-login-bg.jpg new file mode 100644 index 000000000..10e599198 Binary files /dev/null and b/frontend/src/assets/images/1panel-login-bg.jpg differ diff --git a/frontend/src/assets/images/1panel-login-bg.png b/frontend/src/assets/images/1panel-login-bg.png deleted file mode 100644 index abc54d4d6..000000000 Binary files a/frontend/src/assets/images/1panel-login-bg.png and /dev/null differ diff --git a/frontend/src/assets/images/1panel-login.jpg b/frontend/src/assets/images/1panel-login.jpg new file mode 100644 index 000000000..fe189bc8f Binary files /dev/null and b/frontend/src/assets/images/1panel-login.jpg differ diff --git a/frontend/src/assets/images/1panel-login.png b/frontend/src/assets/images/1panel-login.png deleted file mode 100644 index 32ae4e43d..000000000 Binary files a/frontend/src/assets/images/1panel-login.png and /dev/null differ diff --git a/frontend/src/views/login/index.vue b/frontend/src/views/login/index.vue index d4506a5cb..435bb3b3e 100644 --- a/frontend/src/views/login/index.vue +++ b/frontend/src/views/login/index.vue @@ -5,15 +5,14 @@ :style="{ backgroundImage: `url(${backgroundImage})` }" >
-
-
+
+
- - @@ -28,8 +27,8 @@ import { GlobalStore } from '@/store'; const gStore = GlobalStore(); const backgroundOpacity = ref(0.8); -const backgroundImage = ref(new URL('', import.meta.url).href); -const logoImage = ref(new URL('@/assets/images/1panel-login.png', import.meta.url).href); +const backgroundImage = ref(new URL('@/assets/images/1panel-login-bg.jpg', import.meta.url).href); +const logoImage = ref(new URL('@/assets/images/1panel-login.jpg', import.meta.url).href); const mySafetyCode = defineProps({ code: { @@ -38,8 +37,6 @@ const mySafetyCode = defineProps({ }, }); -const screenWidth = ref(null); - const getStatus = async () => { let code = mySafetyCode.code; if (code != '') { @@ -49,11 +46,31 @@ const getStatus = async () => { onMounted(() => { getStatus(); - screenWidth.value = document.body.clientWidth; - window.onresize = () => { - return (() => { - screenWidth.value = document.body.clientWidth; - })(); +}); + +const FIXED_WIDTH = 1000; +const FIXED_HEIGHT = 415; +const useWindowSize = () => { + const width = ref(window.innerWidth); + const height = ref(window.innerHeight); + + const updateSize = () => { + width.value = window.innerWidth; + height.value = window.innerHeight; }; + + onMounted(() => window.addEventListener('resize', updateSize)); + onUnmounted(() => window.removeEventListener('resize', updateSize)); + + return { width, height }; +}; +const { width } = useWindowSize(); +const showLogo = computed(() => width.value >= FIXED_WIDTH); +const containerWidth = computed(() => `${FIXED_WIDTH}px`); +const containerHeight = computed(() => `${FIXED_HEIGHT}px`); +const loginFormClass = computed(() => { + return showLogo.value + ? 'hidden md:flex items-center justify-center p-4' + : 'flex items-center justify-center p-4 w-full'; });