diff --git a/src/web/components/IpAlert.vue b/src/web/components/IpAlert.vue index 87ef639..4813703 100644 --- a/src/web/components/IpAlert.vue +++ b/src/web/components/IpAlert.vue @@ -25,22 +25,13 @@ import { ref, onMounted } from 'vue' import { trpc } from '../trpc' -const netInfo = ref<{ - ip: string - name?: string | undefined - shortName?: string | undefined - isSupported?: boolean -}>({ ip: '', name: '', shortName: '' }) -const loadingIpAddress = ref(false) - -onMounted(async () => { - try { - loadingIpAddress.value = true - netInfo.value = await trpc.myIp.query() - } catch (error: any) { - netInfo.value = error.message - } finally { - loadingIpAddress.value = false +const props = defineProps<{ + loadingIpAddress: boolean + netInfo: { + ip: string + name?: string | undefined + shortName?: string | undefined + isSupported?: boolean | undefined } -}) +}>() diff --git a/src/web/views/Login.vue b/src/web/views/Login.vue index 5cdd0e1..54a8696 100644 --- a/src/web/views/Login.vue +++ b/src/web/views/Login.vue @@ -3,10 +3,16 @@ - - +
+ + +
- +
@@ -17,12 +23,33 @@ import LoginForm from '../components/LoginForm.vue' import IpAlert from '../components/IpAlert.vue' import Logo from '../components/Logo.vue' import LoggedCard from '../components/LoggedCard.vue' -import { ref } from 'vue' +import { onMounted, ref } from 'vue' import { LoginResult } from '@/server/schemas/LoginResult' +import { trpc } from '../trpc' const loginResult = ref(null) function onLogin(event: LoginResult) { loginResult.value = event } + +const netInfo = ref<{ + ip: string + name?: string | undefined + shortName?: string | undefined + isSupported?: boolean +}>({ ip: '', name: '', shortName: '' }) + +const loadingIpAddress = ref(false) + +onMounted(async () => { + try { + loadingIpAddress.value = true + netInfo.value = await trpc.myIp.query() + } catch (error: any) { + netInfo.value = error.message + } finally { + loadingIpAddress.value = false + } +})