Merge pull request #73 from mrodz/master

v0.1.5

cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cli"
-version = "0.1.4"
+version = "0.1.5"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

db/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "db"
-version = "0.1.4"
+version = "0.1.5"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

db/entity/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "entity"
-version = "0.1.4"
+version = "0.1.5"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

db/migration/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "migration"
-version = "0.1.4"
+version = "0.1.5"
 edition = "2021"
 publish = false
 

desktop/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "app"
-version = "0.1.4"
+version = "0.1.5"
 description = "An advanced field scheduling and logistics app"
 authors = ["Mateo Rodriguez"]
 license = ""
@@ -17,7 +17,7 @@ tauri-build = { version = "1.5.1", features = [] }
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.5.4", features = ["updater", "dialog-all"] }
+tauri = { version = "1.5.4", features = [ "os-all", "updater", "dialog-all"] }
 grpc_server = { path = "../gcloud/grpc_server" }
 backend = { path = "../backend" }
 db = { path = "../db" }

desktop/tauri.conf.json

@@ -13,6 +13,9 @@
       "all": false,
       "dialog": {
         "all": true
+      },
+      "os": {
+        "all": true
       }
     },
     "bundle": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fieldz-desktop",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "scripts": {
     "preinstall": "cd webview && npm install"
   },

webview/src/routes/login/+page.svelte

@@ -5,7 +5,8 @@
 		signInWithPopup,
 		getAuth,
 		GithubAuthProvider,
-		OAuthProvider
+		OAuthProvider,
+		signInWithRedirect
 	} from 'firebase/auth';
 	import { goto } from '$app/navigation';
 	import { slide } from 'svelte/transition';
@@ -14,12 +15,27 @@
 	import TwitterIcon from './TwitterIcon.svelte';
 	import GitHubIcon from './GitHubIcon.svelte';
 	import MicrosoftIcon from './MicrosoftIcon.svelte';
+	import { type } from '@tauri-apps/api/os';
 
 	const queryParams = new URLSearchParams(window.location.search);
 	const next = queryParams.get('next') ?? '/';
 
 	const toastStore = getToastStore();
 
+	const signInFunction = type().then((type) => {
+		switch (type) {
+			/*
+			 * The webview on OSX does not support browser popups.
+			 * Why, you might ask?
+			 * No one knows :(
+			 */
+			case 'Darwin':
+				return signInWithRedirect;
+			default:
+				return signInWithPopup;
+		}
+	});
+
 	function duplicatedMessage(error: any) {
 		if ('code' in error && error.code === 'auth/account-exists-with-different-credential') {
 			toastStore.trigger({
@@ -40,7 +56,7 @@
 				prompt: 'select_account'
 			});
 
-			const userCredential = await signInWithPopup(getAuth(), provider);
+			const userCredential = await (await signInFunction)(getAuth(), provider);
 
 			console.log(userCredential);
 
@@ -58,7 +74,7 @@
 				prompt: 'select_account'
 			});
 
-			const userCredential = await signInWithPopup(getAuth(), provider);
+			const userCredential = await (await signInFunction)(getAuth(), provider);
 
 			console.log(userCredential);
 
@@ -73,7 +89,7 @@
 		try {
 			const provider = new GithubAuthProvider();
 
-			const userCredential = await signInWithPopup(getAuth(), provider);
+			const userCredential = await (await signInFunction)(getAuth(), provider);
 
 			console.log(userCredential);
 
@@ -91,7 +107,7 @@
 				prompt: 'select_account'
 			});
 
-			const userCredential = await signInWithPopup(getAuth(), provider);
+			const userCredential = await (await signInFunction)(getAuth(), provider);
 
 			console.log(userCredential);
 
@@ -110,19 +126,19 @@
 	>
 
 	<div class="logo-cloud grid-cols-1 gap-0.5 md:grid-cols-2 2xl:grid-cols-4">
-		<button class="logo-item" on:click={google}>
+		<button class="logo-item card-hover" on:click={google}>
 			<GoogleIcon class="mr-4 w-12" />
 			Sign In
 		</button>
-		<button class="logo-item" on:click={twitter}>
+		<button class="logo-item card-hover" on:click={twitter}>
 			<TwitterIcon class="mr-4 w-12" />
 			Sign In
 		</button>
-		<button class="logo-item" on:click={github}>
+		<button class="logo-item card-hover" on:click={github}>
 			<GitHubIcon class="mr-4 w-12" />
 			Sign In
 		</button>
-		<button class="logo-item" on:click={microsoft}>
+		<button class="logo-item card-hover" on:click={microsoft}>
 			<MicrosoftIcon class="mr-4 w-12" />
 			Sign In
 		</button>