From 70b02a33396567ed0b6395fbb5a6c2aedaf2d341 Mon Sep 17 00:00:00 2001
From: SymphonySimper <SymphonySimper@users.noreply.github.com>
Date: Sat, 8 Oct 2022 23:04:59 +0530
Subject: [PATCH] fix unsub not getting called onDestroy

for more info onDestroy not getting called refer 'https://github.com/sveltejs/svelte/issues/5268'
add alias fro stores -> $stores
format imports
---
 src/routes/+layout.svelte      |  7 ++++---
 src/routes/+page.svelte        |  2 +-
 src/routes/AddNote.svelte      |  7 ++++---
 src/routes/Card.svelte         |  2 +-
 src/routes/CardList.svelte     | 16 +++++++---------
 src/routes/InputFields.svelte  |  3 ++-
 src/routes/Profile.svelte      | 22 ++++++++++++----------
 src/routes/signin/+page.svelte |  5 +++--
 8 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index bfad91f..81f4170 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,13 +1,14 @@
 <script lang="ts">
 	import './styles.css';
-	import { isLoggedIn, user } from '../stores/auth';
-	import { auth } from '../lib/firebase';
 	import { onAuthStateChanged } from 'firebase/auth';
 	import { goto } from '$app/navigation';
 	import { Modals, closeModal } from 'svelte-modals';
 	import { browser } from '$app/environment';
-	import Profile from './Profile.svelte';
+
+	import { auth } from '$lib/firebase';
 	import type { User } from '$lib/types';
+	import { isLoggedIn, user } from '$stores/auth';
+	import Profile from './Profile.svelte';
 
 	onAuthStateChanged(auth, (authUser) => {
 		if (!!authUser) {
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 13aad2d..c40cf8e 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { isLoggedIn } from '../stores/auth';
+	import { isLoggedIn } from '$stores/auth';
 	import CardList from './CardList.svelte';
 	import AddNote from './AddNote.svelte';
 </script>
diff --git a/src/routes/AddNote.svelte b/src/routes/AddNote.svelte
index dad20a7..5b54475 100644
--- a/src/routes/AddNote.svelte
+++ b/src/routes/AddNote.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
 	import { addDoc, collection } from 'firebase/firestore';
-	import { db } from '../lib/firebase';
-	import { user, isLoggedIn } from '../stores/auth';
+
+	import { user, isLoggedIn } from '$stores/auth';
+	import { db } from '$lib/firebase';
 	import type { Note } from '$lib/types';
-	import InputFields from './InputFields.svelte';
 	import getTime from '$lib/time';
+	import InputFields from './InputFields.svelte';
 
 	let note: Note = { note: '' } as Note;
 
diff --git a/src/routes/Card.svelte b/src/routes/Card.svelte
index 5620f1c..af53f32 100644
--- a/src/routes/Card.svelte
+++ b/src/routes/Card.svelte
@@ -5,7 +5,7 @@
 
 	import type { Note, NoteWithId } from '$lib/types';
 	import InputFieldsModal from './InputFieldsModal.svelte';
-	import { user } from '../stores/auth';
+	import { user } from '$stores/auth';
 
 	export let note: NoteWithId;
 
diff --git a/src/routes/CardList.svelte b/src/routes/CardList.svelte
index 62acc46..7e2a5d4 100644
--- a/src/routes/CardList.svelte
+++ b/src/routes/CardList.svelte
@@ -1,17 +1,15 @@
 <script lang="ts">
-	import { flip } from 'svelte/animate';
-	import { fade } from 'svelte/transition';
-	import { notes } from '../stores/notes';
-	import Card from './Card.svelte';
 	import { collection, query, onSnapshot, orderBy } from 'firebase/firestore';
+	import { onDestroy } from 'svelte';
+
 	import type { NoteWithId, Note } from '$lib/types';
 	import { db } from '$lib/firebase';
-
-	import { user } from '../stores/auth';
-	import { onDestroy } from 'svelte';
+	import { user } from '$stores/auth';
+	import { notes } from '$stores/notes';
+	import Card from './Card.svelte';
 
 	const q = query(collection(db, 'users', $user.uid, 'notes'), orderBy('time'));
-	const unsub = onSnapshot(q, (querySnapshot) => {
+	export const unsub = onSnapshot(q, (querySnapshot) => {
 		notes.reset();
 		querySnapshot.forEach((doc) => {
 			let note: NoteWithId = {
@@ -28,7 +26,7 @@
 <div>
 	{#if $notes.length != 0}
 		{#each $notes as note, id (id)}
-			<div transition:fade={{ duration: 400 }} animate:flip={{ duration: 400 }}>
+			<div>
 				<Card {note} />
 			</div>
 		{/each}
diff --git a/src/routes/InputFields.svelte b/src/routes/InputFields.svelte
index 4cc5dbe..72b0c27 100644
--- a/src/routes/InputFields.svelte
+++ b/src/routes/InputFields.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
-	import type { Note } from '$lib/types';
 	import { afterUpdate } from 'svelte';
 
+	import type { Note } from '$lib/types';
+
 	export let note: Note;
 	export let onClose: () => void;
 	export let onSubmit: () => void;
diff --git a/src/routes/Profile.svelte b/src/routes/Profile.svelte
index 177e5ec..4be6d95 100644
--- a/src/routes/Profile.svelte
+++ b/src/routes/Profile.svelte
@@ -1,21 +1,23 @@
 <script lang="ts">
-	import { isLoggedIn, user } from '../stores/auth';
-	import { auth } from '../lib/firebase';
 	import { signOut } from 'firebase/auth';
 	import { goto } from '$app/navigation';
 	import { browser } from '$app/environment';
 
+	import { auth } from '$lib/firebase';
+	import { isLoggedIn, user } from '$stores/auth';
+	import { notes } from '$stores/notes';
+
 	let expand = false;
 
 	const logout = async () => {
-		try {
-			await signOut(auth);
-			isLoggedIn.set(false);
-			user.reset();
-			browser && goto('/signin');
-		} catch (err) {
-			console.error(err);
-		}
+		await signOut(auth)
+			.then(() => {
+				isLoggedIn.set(false);
+				user.reset();
+				notes.reset();
+				browser && goto('/signin');
+			})
+			.catch((err) => console.error(err));
 		expand = !expand;
 	};
 </script>
diff --git a/src/routes/signin/+page.svelte b/src/routes/signin/+page.svelte
index 6dc6d1d..5f3f896 100644
--- a/src/routes/signin/+page.svelte
+++ b/src/routes/signin/+page.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
-	import { isLoggedIn, user } from '../../stores/auth';
-	import { auth } from '$lib/firebase';
 	import { signInWithPopup, GoogleAuthProvider } from 'firebase/auth';
 	import { goto } from '$app/navigation';
+
+	import { auth } from '$lib/firebase';
 	import type { User } from '$lib/types';
+	import { isLoggedIn, user } from '$stores/auth';
 
 	const loginWithGoogle = async () => {
 		const provider = new GoogleAuthProvider();