mirror of
https://github.com/Macrame-App/Macrame
synced 2025-12-29 15:29:26 +00:00
UIX update for alpha release
This commit is contained in:
parent
510e22d82d
commit
cf0ef8bd92
5 changed files with 9 additions and 13 deletions
|
|
@ -6,7 +6,7 @@
|
|||
<MainMenu />
|
||||
<RouterView />
|
||||
<AlertComp
|
||||
v-if="!isLocal() && !handshake && route.fullPath !== '/devices'"
|
||||
v-if="!isLocal && !handshake && route.fullPath !== '/devices'"
|
||||
variant="warning"
|
||||
:page-wide="true"
|
||||
href="/devices"
|
||||
|
|
|
|||
|
|
@ -16,10 +16,7 @@
|
|||
</h4>
|
||||
<template v-if="Object.keys(remote.devices).length > 0">
|
||||
<template v-for="(remoteDevice, id) in remote.devices" :key="id">
|
||||
<div
|
||||
v-if="id !== device.uuid()"
|
||||
class="mcrm-block block__dark block-size__sm w-64 grid !gap-4 content-start"
|
||||
>
|
||||
<div class="mcrm-block block__dark block-size__sm w-64 grid !gap-4 content-start">
|
||||
<div class="grid gap-2">
|
||||
<h5 class="grid grid-cols-[auto_1fr] gap-2">
|
||||
<IconDeviceUnknown v-if="remoteDevice.settings.type == 'unknown'" />
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@ import { useDeviceStore } from '@/stores/device'
|
|||
import CryptoJS from 'crypto-js'
|
||||
|
||||
export const appUrl = () => {
|
||||
return window.location.port !== import.meta.env.VITE_MCRM__PORT
|
||||
? `http://${window.location.hostname}:${import.meta.env.VITE_MCRM__PORT}`
|
||||
: ''
|
||||
const port = window.location.port == 5173 ? import.meta.env.VITE_MCRM__PORT : window.location.port
|
||||
|
||||
return `http://${window.location.hostname}:${port}`
|
||||
}
|
||||
|
||||
export const isLocal = () => {
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
{{ isLocal() ? 'Remote devices' : 'Server' }}
|
||||
</h1>
|
||||
<div class="grid gap-8 pr-2 panel__content">
|
||||
<ServerView v-if="isLocal()" />
|
||||
<RemoteView v-else />
|
||||
<ServerView />
|
||||
<RemoteView />
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue