Skip to content

Commit

Permalink
FIX: release fixes (#1945)
Browse files Browse the repository at this point in the history
* CHAGNE: setups pages anim

* ADD: setup color to its keys

* FIX: key setup color

* FIX: some issues

* ADD: disabled pages on no data fetched

* REMOVE: log

* FIX: server management tabs
  • Loading branch information
MaxTheGeeek authored Jul 17, 2024
1 parent 6d02ad5 commit 56164d4
Show file tree
Hide file tree
Showing 10 changed files with 212 additions and 104 deletions.
Binary file added launcher/public/animation/setup/heartcore.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 1 addition & 20 deletions launcher/public/output.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import url("https://fonts.googleapis.com/css2?family=Noto+Sans:wght@100;200;300;400;500;600;700;800;900&display=swap");

/*
! tailwindcss v3.4.4 | MIT License | https://tailwindcss.com
! tailwindcss v3.4.6 | MIT License | https://tailwindcss.com
*/

/*
Expand Down Expand Up @@ -807,10 +807,6 @@ video {
top: -90px;
}

.bottom-0{
bottom: 0px;
}

.bottom-0\.5{
bottom: 0.125rem;
}
Expand Down Expand Up @@ -2382,11 +2378,6 @@ video {
flex: none;
}

.flex-shrink{
-ms-flex-negative: 1;
flex-shrink: 1;
}

.flex-shrink-0{
-ms-flex-negative: 0;
flex-shrink: 0;
Expand Down Expand Up @@ -2708,11 +2699,6 @@ video {
flex-direction: column;
}

.flex-wrap{
-ms-flex-wrap: wrap;
flex-wrap: wrap;
}

.place-content-center{
place-content: center;
}
Expand Down Expand Up @@ -5344,11 +5330,6 @@ html body {
left: 2px;
}

.after\:top-0::after{
content: var(--tw-content);
top: 0px;
}

.after\:top-0\.5::after{
content: var(--tw-content);
top: 0.125rem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,33 @@
<router-link
:to="props.tab.path"
class="w-full h-8 col-span-2 transition-colors duration-300 min-w-[100px] transform text-gray-200 rounded-full px-4 py-1 text-center font-semibold shadow-sm shadow-[#1c3634] border border-[#4b8585]"
:class="isActiveTab ? 'bg-[#224141] hover:bg-[#224141] border-gray-600' : 'bg-[#387272] hover:bg-[#336666]'"
:class="[
isActiveTab ? 'bg-[#224141] hover:bg-[#224141] border-gray-600' : 'bg-[#387272] hover:bg-[#336666]',
pagesTabsHandler ? 'pointer-events-none opacity-45' : 'cursor-pointer',
]"
>{{ props.tab.page }}</router-link
>
</template>
<script setup>
import { useRouter } from "vue-router";
// import i18n from "@/includes/i18n";
import { computed } from "vue";
import { useServices } from "@/store/services";
const props = defineProps({
tab: {
type: Object,
required: true,
},
});
const serviceStore = useServices();
const router = useRouter();
// const t = i18n.global.t;
const pagesTabsHandler = computed(() => {
return serviceStore.installedServices.length === 0;
});
const isActiveTab = computed(() => {
return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,17 @@ import { ref, watchEffect } from 'vue';
:class="[
'col-span-1 w-8 h-8 bg-gray-500 hover:text-teal-500 border border-gray-500 hover:border-teal-200 rounded-sm shadow-md shadow-black flex justify-center items-center cursor-pointer active:scale-95 transition-all duration-200 active:shadow-none',
tab.isActive ? 'bg-teal-500 border-teal-200' : '',
isLoginRoute &&
(tab.name === 'info' ||
tab.name === 'ssh' ||
tab.name === 'update' ||
tab.name === 'settings' ||
tab.name === '2fa')
? ' opacity-30 pointer-events-none scale-90 shadow-none'
: '',
isConnectedServer && tab.name === 'login' ? ' opacity-30 pointer-events-none scale-90 shadow-none' : '',
isServerToConnect && tab.name !== 'login' ? ' opacity-30 pointer-events-none scale-90 shadow-none' : '',
isLoginRoute && tab.name !== 'login' ? ' opacity-30 pointer-events-none scale-90 shadow-none' : '',
]"
@click="isLoginRoute && (tab.name === 'info' || tab.name === 'ssh') ? null : tabPicker(tab.name)"
@click="
(isServerToConnect && tab.name !== 'login') ||
(isConnectedServer && tab.name === 'login') ||
(isLoginRoute && tab.name !== 'login')
? null
: tabPicker(tab.name)
"
@mouseenter="footerStore.cursorLocation = `${tabTooltip(tab)}`"
@mouseleave="footerStore.cursorLocation = ''"
>
Expand Down Expand Up @@ -74,6 +75,14 @@ const tabTooltip = (tab) => {
return null; // Default case if none of the conditions match
};
const isConnectedServer = computed(() => {
return serverStore.selectedServerConnection && !serverStore.selectedServerToConnect;
});
const isServerToConnect = computed(() => {
return serverStore.selectedServerToConnect;
});
const tabPicker = (tabName) => {
serverStore.setActiveTab(tabName);
emit("tabPicker", tabName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,11 @@ const serverAvatar = computed(() => {
});
const connectedServer = computed(() => {
if (serverStore.selectedServerConnection?.name === props.server.name) return true;
else return false;
return serverStore.selectedServerConnection?.name === props.server.name;
});
const sshExists = computed(() => {
if (props.server.keylocation !== "") return true;
else return false;
return props.server.keylocation !== "";
});
watchEffect(() => {
Expand Down
Loading

0 comments on commit 56164d4

Please sign in to comment.