From 0609e116b0dd0ce14e9a91aa3b1a82aecaf3b4a6 Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Wed, 9 Oct 2024 17:55:19 +1100
Subject: [PATCH] fixed windows issues

---
 desktop/assets/main.scss                | 11 +++++++++++
 desktop/components/Header.vue           | 10 +++++-----
 desktop/components/HeaderUserWidget.vue | 11 ++++-------
 desktop/components/MiniHeader.vue       |  3 +--
 desktop/components/WindowControl.vue    |  8 +++++++-
 desktop/layouts/default.vue             |  2 +-
 desktop/layouts/mini.vue                |  2 +-
 desktop/pages/setup/index.vue           |  3 +--
 desktop/pages/setup/server.vue          |  9 ++++++++-
 desktop/src-tauri/src/lib.rs            |  3 +--
 desktop/src-tauri/src/remote.rs         |  6 ------
 11 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/desktop/assets/main.scss b/desktop/assets/main.scss
index 0258268b..c65152bd 100644
--- a/desktop/assets/main.scss
+++ b/desktop/assets/main.scss
@@ -2,6 +2,17 @@
 @tailwind components;
 @tailwind utilities;
 
+html,
+body {
+  -ms-overflow-style: none; /* IE and Edge /
+scrollbar-width: none; / Firefox */
+}
+
+/* Hide scrollbar for Chrome, Safari and Opera */
+html::-webkit-scrollbar {
+  display: none;
+}
+
 $motiva: (
   ("MotivaSansThin.ttf", "ttf", 100, normal),
   ("MotivaSansLight.woff.ttf", "woff", 300, normal),
diff --git a/desktop/components/Header.vue b/desktop/components/Header.vue
index dfe8d0b5..14314eb6 100644
--- a/desktop/components/Header.vue
+++ b/desktop/components/Header.vue
@@ -1,9 +1,9 @@
 <template>
-  <div
-    @mousedown="() => window.startDragging()"
-    class="h-16 cursor-pointer bg-gray-950 flex flex-row justify-between"
-  >
-    <div class="flex flex-row grow items-center justify-between pl-5 pr-2 py-3">
+  <div class="h-16 cursor-pointer bg-gray-950 flex flex-row justify-between">
+    <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">
         <Wordmark class="h-8 mb-0.5" />
         <nav class="inline-flex items-center mt-0.5">
diff --git a/desktop/components/HeaderUserWidget.vue b/desktop/components/HeaderUserWidget.vue
index cefe4bbe..4b4f1f16 100644
--- a/desktop/components/HeaderUserWidget.vue
+++ b/desktop/components/HeaderUserWidget.vue
@@ -38,15 +38,16 @@
           <div class="h-0.5 rounded-full w-full bg-zinc-800" />
           <div class="flex flex-col mb-1">
             <MenuItem v-slot="{ active }">
-              <NuxtLink
-                @click="() => openAdminUrl()"
+              <a
+                :href="adminUrl"
+                target="_blank"
                 :class="[
                   active ? 'bg-zinc-800 text-zinc-100' : 'text-zinc-400',
                   'transition block px-4 py-2 text-sm',
                 ]"
               >
                 Admin Dashboard
-              </NuxtLink>
+              </a>
             </MenuItem>
             <MenuItem v-for="(nav, navIdx) in navigation" v-slot="{ active }">
               <NuxtLink
@@ -82,10 +83,6 @@ const adminUrl: string = await invoke("gen_drop_url", {
   path: "/admin",
 });
 
-async function openAdminUrl() {
-  await invoke("open_url", { path: adminUrl });
-}
-
 const navigation: NavigationItem[] = [
   {
     label: "Account settings",
diff --git a/desktop/components/MiniHeader.vue b/desktop/components/MiniHeader.vue
index 8e7a6d7c..58d9d19c 100644
--- a/desktop/components/MiniHeader.vue
+++ b/desktop/components/MiniHeader.vue
@@ -1,9 +1,8 @@
 <template>
   <div
-    @mousedown="() => window.startDragging()"
     class="h-10 cursor-pointer flex flex-row items-center justify-between bg-zinc-950"
   >
-    <div class="px-5 py-3">
+    <div class="px-5 py-3" @mousedown="() => window.startDragging()">
       <Wordmark class="mt-1" />
     </div>
     <WindowControl />
diff --git a/desktop/components/WindowControl.vue b/desktop/components/WindowControl.vue
index f777504b..75ea06ba 100644
--- a/desktop/components/WindowControl.vue
+++ b/desktop/components/WindowControl.vue
@@ -1,5 +1,5 @@
 <template>
-  <HeaderButton @click="() => window.close()">
+  <HeaderButton @click="() => close()">
     <XMarkIcon />
   </HeaderButton>
 </template>
@@ -8,5 +8,11 @@
 import { MinusIcon, XMarkIcon } from "@heroicons/vue/16/solid";
 import { getCurrentWindow } from "@tauri-apps/api/window";
 
+async function close(){
+  console.log(window);
+  const result = await window.close();
+  console.log(`closed window: ${result}`);
+}
+
 const window = getCurrentWindow();
 </script>
diff --git a/desktop/layouts/default.vue b/desktop/layouts/default.vue
index f79bc3b7..ac12650e 100644
--- a/desktop/layouts/default.vue
+++ b/desktop/layouts/default.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex flex-col bg-zinc-900 overflow-hidden">
     <Header class="select-none" />
-    <div class="grow overflow-y-scroll">
+    <div class="grow overflow-y-auto">
       <slot />
     </div>
   </div>
diff --git a/desktop/layouts/mini.vue b/desktop/layouts/mini.vue
index b2ffbfae..f34253b9 100644
--- a/desktop/layouts/mini.vue
+++ b/desktop/layouts/mini.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex flex-col bg-zinc-950 overflow-hidden">
     <MiniHeader />
-    <div class="grow overflow-y-scroll">
+    <div class="grow overflow-y-auto">
       <slot />
     </div>
   </div>
diff --git a/desktop/pages/setup/index.vue b/desktop/pages/setup/index.vue
index 83ae5de4..1b7eacb8 100644
--- a/desktop/pages/setup/index.vue
+++ b/desktop/pages/setup/index.vue
@@ -12,8 +12,7 @@
         Let's get you set up
       </h1>
       <p class="mt-6 text-lg leading-8 text-zinc-400">
-        Anim aute id magna aliqua ad ad non deserunt sunt. Qui irure qui lorem
-        cupidatat commodo. Elit sunt amet fugiat veniam occaecat fugiat aliqua.
+        You'll need to have set up a Drop instance and created an account on it. If you're connecting to another person's instance, you'll need the url and an account.
       </p>
       <div class="mt-10 flex items-center justify-center gap-x-6">
         <NuxtLink
diff --git a/desktop/pages/setup/server.vue b/desktop/pages/setup/server.vue
index d2fc4856..19b0794a 100644
--- a/desktop/pages/setup/server.vue
+++ b/desktop/pages/setup/server.vue
@@ -24,7 +24,7 @@
               class="flex rounded-md shadow-sm ring-1 ring-inset ring-zinc-700 focus-within:ring-2 focus-within:ring-inset focus-within:ring-blue-600 sm:max-w-md"
             >
               <span
-                v-if="!url.startsWith('http')"
+                v-if="showHttps"
                 class="flex select-none items-center pl-3 text-zinc-500 -mr-2.5 sm:text-sm"
                 >https://</span
               >
@@ -87,6 +87,13 @@ const error = ref(undefined);
 const loading = ref(false);
 
 const router = useRouter();
+const showHttps = computed(() => {
+  const prefixes = ["http://", "https://"];
+
+  const doesntHavePrefix = prefixes.findIndex((e) => url.value.startsWith(e.slice(0, url.value.length))) == -1;
+
+  return doesntHavePrefix;
+})
 
 async function connect() {
   const newUrl = url.value.startsWith("http")
diff --git a/desktop/src-tauri/src/lib.rs b/desktop/src-tauri/src/lib.rs
index c2402914..28e319f2 100644
--- a/desktop/src-tauri/src/lib.rs
+++ b/desktop/src-tauri/src/lib.rs
@@ -12,7 +12,7 @@ use std::{
 use auth::{auth_initiate, recieve_handshake};
 use data::DatabaseInterface;
 use log::info;
-use remote::{gen_drop_url, open_url, use_remote};
+use remote::{gen_drop_url, use_remote};
 use serde::{Deserialize, Serialize};
 use structured_logger::{json::new_writer, Builder};
 use tauri_plugin_deep_link::DeepLinkExt;
@@ -91,7 +91,6 @@ pub fn run() {
             auth_initiate,
             use_remote,
             gen_drop_url,
-            open_url,
         ])
         .plugin(tauri_plugin_shell::init())
         .setup(|app| {
diff --git a/desktop/src-tauri/src/remote.rs b/desktop/src-tauri/src/remote.rs
index c95f2e44..431b7717 100644
--- a/desktop/src-tauri/src/remote.rs
+++ b/desktop/src-tauri/src/remote.rs
@@ -62,12 +62,6 @@ pub async fn use_remote<'a>(
     return Ok(());
 }
 
-#[tauri::command]
-pub fn open_url(path: String) -> Result<(), String> {
-    webbrowser::open(&path).unwrap();
-    Ok(())
-}
-
 #[tauri::command]
 pub fn gen_drop_url(app: tauri::AppHandle, path: String) -> Result<String, String> {
     let base_url = {