From 3596a78b0666d923c9a886e5e4f370039fd8eeef Mon Sep 17 00:00:00 2001
From: RunasSudo <runassudo@yingtongli.me>
Date: Fri, 22 Nov 2024 23:19:40 +1100
Subject: [PATCH] Add button to close open file

---
 src/components/HeaderBar.vue | 19 ++++++++++++++++---
 src/db.ts                    | 27 +++++++++++++++++----------
 src/pages/NoFileView.vue     |  2 +-
 3 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/src/components/HeaderBar.vue b/src/components/HeaderBar.vue
index 125a482..506d539 100644
--- a/src/components/HeaderBar.vue
+++ b/src/components/HeaderBar.vue
@@ -19,8 +19,8 @@
 <template>
 	<nav class="border-b border-gray-200 bg-white print:hidden" v-if="isMainWindow">
 		<div class="mx-auto max-w-7xl px-6 lg:px-8">
-			<div class="flex h-12 justify-between ml-[-0.25rem]"><!-- Adjust margin by -0.25rem to align navbar text with body text -->
-				<div class="flex">
+			<div class="flex h-12 justify-between ml-[-0.25rem] w-full"><!-- Adjust margin by -0.25rem to align navbar text with body text -->
+				<div class="flex w-full">
 					<div class="flex flex-shrink-0">
 						<RouterLink to="/" class="border-transparent text-gray-900 hover:border-emerald-500 hover:text-emerald-700 inline-flex items-center border-b-2 px-1 pt-1 text-sm font-medium">
 							DrCr
@@ -28,7 +28,7 @@
 					</div>
 					
 					<!-- Menu items -->
-					<div v-if="db.filename !== null" class="hidden sm:-my-px sm:ml-6 sm:flex sm:space-x-4">
+					<div v-if="db.filename !== null" class="hidden sm:-my-px sm:ml-6 sm:flex sm:gap-4 w-full">
 						<RouterLink :to="{ name: 'journal' }" class="border-transparent text-gray-700 hover:border-emerald-500 hover:text-emerald-700 inline-flex items-center border-b-2 px-1 pt-1 text-sm">
 							Journal
 						</RouterLink>
@@ -44,6 +44,10 @@
 						<RouterLink :to="{ name: 'income-statement'}" class="border-transparent text-gray-700 hover:border-emerald-500 hover:text-emerald-700 inline-flex items-center border-b-2 px-1 pt-1 text-sm">
 							Income statement
 						</RouterLink>
+						
+						<a href="#" @click="closeFile" class="ml-auto border-transparent text-gray-700 hover:border-emerald-500 hover:text-emerald-700 inline-flex items-center border-b-2 px-1 pt-1 text-sm">
+							Close file
+						</a>
 					</div>
 				</div>
 			</div>
@@ -54,8 +58,17 @@
 <script setup lang="ts">
 	import { getCurrentWindow } from '@tauri-apps/api/window';
 	
+	import { useRouter } from 'vue-router';
+	
 	import { db } from '../db.js';
 	
 	// Only display header bar in main window
 	const isMainWindow = getCurrentWindow().label === 'main';
+	
+	const router = useRouter();
+	
+	async function closeFile() {
+		await db.init(null);
+		router.push({ name: 'index' });
+	}
 </script>
diff --git a/src/db.ts b/src/db.ts
index e1dcc03..1d9c746 100644
--- a/src/db.ts
+++ b/src/db.ts
@@ -38,21 +38,28 @@ export const db = reactive({
 		dps: null! as number,
 	},
 	
-	init: async function(filename: string): Promise<void> {
+	init: async function(filename: string | null): Promise<void> {
 		// Set the DB filename and initialise cached data
 		this.filename = filename;
 		
 		await invoke('set_open_filename', { 'filename': filename });
-		await getCurrentWindow().setTitle('DrCr – ' + filename.replaceAll('\\', '/').split('/').at(-1));
 		
-		// Initialise cached data
-		const session = await this.load();
-		const metadataRaw: {key: string, value: string}[] = await session.select("SELECT * FROM metadata");
-		const metadataObject = Object.fromEntries(metadataRaw.map((x) => [x.key, x.value]));
-		this.metadata.version = parseInt(metadataObject.version);
-		this.metadata.eofy_date = metadataObject.eofy_date;
-		this.metadata.reporting_commodity = metadataObject.reporting_commodity;
-		this.metadata.dps = parseInt(metadataObject.amount_dps);
+		if (filename !== null) {
+			await getCurrentWindow().setTitle('DrCr – ' + filename?.replaceAll('\\', '/').split('/').at(-1));
+		} else {
+			await getCurrentWindow().setTitle('DrCr');
+		}
+		
+		if (filename !== null) {
+			// Initialise cached data
+			const session = await this.load();
+			const metadataRaw: {key: string, value: string}[] = await session.select("SELECT * FROM metadata");
+			const metadataObject = Object.fromEntries(metadataRaw.map((x) => [x.key, x.value]));
+			this.metadata.version = parseInt(metadataObject.version);
+			this.metadata.eofy_date = metadataObject.eofy_date;
+			this.metadata.reporting_commodity = metadataObject.reporting_commodity;
+			this.metadata.dps = parseInt(metadataObject.amount_dps);
+		}
 	},
 	
 	load: async function(): Promise<ExtendedDatabase> {
diff --git a/src/pages/NoFileView.vue b/src/pages/NoFileView.vue
index 60ebfcd..6589b5c 100644
--- a/src/pages/NoFileView.vue
+++ b/src/pages/NoFileView.vue
@@ -36,7 +36,7 @@
 		});
 		
 		if (file !== null) {
-			db.init(file);
+			await db.init(file);
 		}
 	}
 </script>