Ryan/drop-app
1
0
Fork 0
mirror of https://github.com/Drop-OSS/drop-app.git synced 2025-11-10 04:22:13 +10:00
Code Issues Packages Projects Releases Wiki Activity

Re-enabled closing the window and some more renaming

Browse Source
This commit is contained in:
quexeky
2024-10-16 09:23:00 +11:00
parent 1742793150
commit defba511a5
2 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
components/Header.vue
View File

@ -1,24 +1,24 @@
<template>
<div
@mousedown="() => window.startDragging()"
class="h-16 cursor-pointer bg-zinc-950 flex flex-row justify-between"
class="h-16 cursor-pointer bg-zinc-950 flex flex-row justify-between"
>
<div class="flex flex-row grow items-center justify-between pl-5 pr-2 py-3">
<div @mousedown="() => window.startDragging()"
class="flex flex-row grow items-center justify-between pl-5 pr-2 py-3">
<div class="inline-flex items-center gap-x-10">
<NuxtLink to="/">
<Wordmark class="h-8 mb-0.5" />
<Wordmark class="h-8 mb-0.5"/>
</NuxtLink>
<nav class="inline-flex items-center mt-0.5">
<ol class="inline-flex items-center gap-x-6">
<NuxtLink
v-for="(nav, navIdx) in navigation"
:class="[
v-for="(nav, navIdx) in navigation"
:class="[
'transition uppercase font-display font-semibold text-md',
navIdx === currentPageIndex
? 'text-zinc-100'
: 'text-zinc-400 hover:text-zinc-200',
]"
:href="nav.route"
:href="nav.route"
>
{{ nav.label }}
</NuxtLink>
@ -29,25 +29,25 @@
<ol class="inline-flex gap-3">
<li v-for="(item, itemIdx) in quickActions">
<HeaderWidget
@click="item.action"
:notifications="item.notifications"
@click="item.action"
:notifications="item.notifications"
>
<component class="h-5" :is="item.icon" />
<component class="h-5" :is="item.icon"/>
</HeaderWidget>
</li>
<HeaderUserWidget />
<HeaderUserWidget/>
</ol>
</div>
</div>
<WindowControl class="h-16 w-16 p-4" />
<WindowControl class="h-16 w-16 p-4"/>
</div>
</template>
<script setup lang="ts">
import { BellIcon, UserGroupIcon } from "@heroicons/vue/16/solid";
import type { NavigationItem, QuickActionNav } from "../types";
import {BellIcon, UserGroupIcon} from "@heroicons/vue/16/solid";
import type {NavigationItem, QuickActionNav} from "../types";
import HeaderWidget from "./HeaderWidget.vue";
import { getCurrentWindow } from "@tauri-apps/api/window";
import {getCurrentWindow} from "@tauri-apps/api/window";
const window = getCurrentWindow();
@ -79,11 +79,13 @@ const currentPageIndex = useCurrentNavigationIndex(navigation);
const quickActions: Array<QuickActionNav> = [
{
icon: UserGroupIcon,
action: async () => {},
action: async () => {
},
},
{
icon: BellIcon,
action: async () => {},
action: async () => {
},
},
];
</script>

9
src-tauri/src/lib.rs
View File

@ -25,12 +25,13 @@ pub enum AppStatus {
SignedInNeedsReauth,
}
#[derive(Clone, Serialize, Deserialize)]
#[serde(rename_all="camelCase")]
pub struct User {
id: String,
username: String,
admin: bool,
displayName: String,
profilePicture: String,
display_name: String,
profile_picture: String,
}
#[derive(Clone, Serialize)]
@ -41,14 +42,14 @@ pub struct AppState {
}
#[tauri::command]
fn fetch_state<'a>(state: tauri::State<'_, Mutex<AppState>>) -> Result<AppState, String> {
fn fetch_state(state: tauri::State<'_, Mutex<AppState>>) -> Result<AppState, String> {
let guard = state.lock().unwrap();
let cloned_state = guard.clone();
drop(guard);
Ok(cloned_state)
}
fn setup<'a>() -> AppState {
fn setup() -> AppState {
env_logger::Builder::from_env(Env::default().default_filter_or("info")).init();
let is_set_up = db::is_set_up();