From 42ba4c306f0fd43599dff601bbcdebf36b43ee23 Mon Sep 17 00:00:00 2001
From: Evan Fiordeliso <evan.fiordeliso@gmail.com>
Date: Sun, 29 Jun 2025 19:45:27 -0400
Subject: [PATCH] Move settings into ui directory

---
 src/main.ts                                   |  4 +--
 .../ReadingLogEntryEditModalView.svelte       |  2 +-
 .../settings/BookTrackerSettingTab.ts}        | 36 +------------------
 src/ui/settings/index.ts                      |  2 ++
 src/ui/settings/types.ts                      | 31 ++++++++++++++++
 .../book.ts => ui/suggesters/BookSuggest.ts}  |  2 --
 .../suggesters/FieldSuggest.ts}               |  0
 .../file.ts => ui/suggesters/FileSuggest.ts}  |  0
 .../suggesters/FolderSuggest.ts}              |  0
 src/{settings => ui}/suggesters/core.ts       |  0
 src/ui/suggesters/index.ts                    |  4 +++
 tsconfig.json                                 |  2 --
 12 files changed, 41 insertions(+), 42 deletions(-)
 rename src/{settings/settings.ts => ui/settings/BookTrackerSettingTab.ts} (89%)
 create mode 100644 src/ui/settings/index.ts
 create mode 100644 src/ui/settings/types.ts
 rename src/{settings/suggesters/book.ts => ui/suggesters/BookSuggest.ts} (88%)
 rename src/{settings/suggesters/field.ts => ui/suggesters/FieldSuggest.ts} (100%)
 rename src/{settings/suggesters/file.ts => ui/suggesters/FileSuggest.ts} (100%)
 rename src/{settings/suggesters/folder.ts => ui/suggesters/FolderSuggest.ts} (100%)
 rename src/{settings => ui}/suggesters/core.ts (100%)
 create mode 100644 src/ui/suggesters/index.ts

diff --git a/src/main.ts b/src/main.ts
index 1b280f6..a364142 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,9 +1,9 @@
 import { Notice, Plugin, requestUrl } from "obsidian";
 import {
 	type BookTrackerPluginSettings,
-	BookTrackerSettingTab,
 	DEFAULT_SETTINGS,
-} from "./settings/settings";
+	BookTrackerSettingTab,
+} from "@ui/settings";
 import { getBookByLegacyId, type SearchResult } from "@data-sources/goodreads";
 import { Templater } from "@utils/templater";
 import {
diff --git a/src/ui/modals/ReadingLogEntryEditModalView.svelte b/src/ui/modals/ReadingLogEntryEditModalView.svelte
index e960b70..a6887a9 100644
--- a/src/ui/modals/ReadingLogEntryEditModalView.svelte
+++ b/src/ui/modals/ReadingLogEntryEditModalView.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { ReadingLogEntry } from "@src/types";
 	import type { App } from "obsidian";
-	import { BookSuggest } from "@settings/suggesters/book";
+	import { BookSuggest } from "@ui/suggesters";
 	interface Props {
 		app: App;
 		entry?: ReadingLogEntry;
diff --git a/src/settings/settings.ts b/src/ui/settings/BookTrackerSettingTab.ts
similarity index 89%
rename from src/settings/settings.ts
rename to src/ui/settings/BookTrackerSettingTab.ts
index 75016b3..b45c7c3 100644
--- a/src/settings/settings.ts
+++ b/src/ui/settings/BookTrackerSettingTab.ts
@@ -1,40 +1,6 @@
 import BookTrackerPlugin from "@src/main";
 import { App, PluginSettingTab, Setting } from "obsidian";
-import { FileSuggest } from "./suggesters/file";
-import { FolderSuggest } from "./suggesters/folder";
-import { FieldSuggest } from "./suggesters/field";
-
-export interface BookTrackerPluginSettings {
-	templateFile: string;
-	tbrDirectory: string;
-	fileNameFormat: string;
-	downloadCovers: boolean;
-	coverDirectory: string;
-	groupCoversByFirstLetter: boolean;
-	overwriteExistingCovers: boolean;
-	statusProperty: string;
-	startDateProperty: string;
-	endDateProperty: string;
-	ratingProperty: string;
-	pageLengthProperty: string;
-	readingLogDirectory: string;
-}
-
-export const DEFAULT_SETTINGS: BookTrackerPluginSettings = {
-	templateFile: "",
-	tbrDirectory: "books/tbr",
-	fileNameFormat: "{{title}} - {{authors}}",
-	downloadCovers: false,
-	coverDirectory: "images/covers",
-	groupCoversByFirstLetter: true,
-	overwriteExistingCovers: false,
-	statusProperty: "status",
-	startDateProperty: "startDate",
-	endDateProperty: "endDate",
-	ratingProperty: "rating",
-	pageLengthProperty: "pageLength",
-	readingLogDirectory: "reading-logs",
-};
+import { FileSuggest, FolderSuggest, FieldSuggest } from "@ui/suggesters";
 
 export class BookTrackerSettingTab extends PluginSettingTab {
 	constructor(app: App, private plugin: BookTrackerPlugin) {
diff --git a/src/ui/settings/index.ts b/src/ui/settings/index.ts
new file mode 100644
index 0000000..2528393
--- /dev/null
+++ b/src/ui/settings/index.ts
@@ -0,0 +1,2 @@
+export { BookTrackerSettingTab } from "./BookTrackerSettingTab";
+export { type BookTrackerPluginSettings, DEFAULT_SETTINGS } from "./types";
diff --git a/src/ui/settings/types.ts b/src/ui/settings/types.ts
new file mode 100644
index 0000000..ef0b343
--- /dev/null
+++ b/src/ui/settings/types.ts
@@ -0,0 +1,31 @@
+export interface BookTrackerPluginSettings {
+	templateFile: string;
+	tbrDirectory: string;
+	fileNameFormat: string;
+	downloadCovers: boolean;
+	coverDirectory: string;
+	groupCoversByFirstLetter: boolean;
+	overwriteExistingCovers: boolean;
+	statusProperty: string;
+	startDateProperty: string;
+	endDateProperty: string;
+	ratingProperty: string;
+	pageLengthProperty: string;
+	readingLogDirectory: string;
+}
+
+export const DEFAULT_SETTINGS: BookTrackerPluginSettings = {
+	templateFile: "",
+	tbrDirectory: "books/tbr",
+	fileNameFormat: "{{title}} - {{authors}}",
+	downloadCovers: false,
+	coverDirectory: "images/covers",
+	groupCoversByFirstLetter: true,
+	overwriteExistingCovers: false,
+	statusProperty: "status",
+	startDateProperty: "startDate",
+	endDateProperty: "endDate",
+	ratingProperty: "rating",
+	pageLengthProperty: "pageLength",
+	readingLogDirectory: "reading-logs",
+};
diff --git a/src/settings/suggesters/book.ts b/src/ui/suggesters/BookSuggest.ts
similarity index 88%
rename from src/settings/suggesters/book.ts
rename to src/ui/suggesters/BookSuggest.ts
index 6e2d8c3..7b7aa4d 100644
--- a/src/settings/suggesters/book.ts
+++ b/src/ui/suggesters/BookSuggest.ts
@@ -1,5 +1,3 @@
-// Credits go to Liam's Periodic Notes Plugin: https://github.com/liamcain/obsidian-periodic-notes
-
 import { TAbstractFile, TFile } from "obsidian";
 import { TextInputSuggest } from "./core";
 
diff --git a/src/settings/suggesters/field.ts b/src/ui/suggesters/FieldSuggest.ts
similarity index 100%
rename from src/settings/suggesters/field.ts
rename to src/ui/suggesters/FieldSuggest.ts
diff --git a/src/settings/suggesters/file.ts b/src/ui/suggesters/FileSuggest.ts
similarity index 100%
rename from src/settings/suggesters/file.ts
rename to src/ui/suggesters/FileSuggest.ts
diff --git a/src/settings/suggesters/folder.ts b/src/ui/suggesters/FolderSuggest.ts
similarity index 100%
rename from src/settings/suggesters/folder.ts
rename to src/ui/suggesters/FolderSuggest.ts
diff --git a/src/settings/suggesters/core.ts b/src/ui/suggesters/core.ts
similarity index 100%
rename from src/settings/suggesters/core.ts
rename to src/ui/suggesters/core.ts
diff --git a/src/ui/suggesters/index.ts b/src/ui/suggesters/index.ts
new file mode 100644
index 0000000..886f363
--- /dev/null
+++ b/src/ui/suggesters/index.ts
@@ -0,0 +1,4 @@
+export { BookSuggest } from "./BookSuggest";
+export { FieldSuggest } from "./FieldSuggest";
+export { FileSuggest } from "./FileSuggest";
+export { FolderSuggest } from "./FolderSuggest";
diff --git a/tsconfig.json b/tsconfig.json
index 89784a7..decc67a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,10 +21,8 @@
     ],
     "paths": {
       "@data-sources/*": ["src/data-sources/*"],
-      "@settings/*": ["src/settings/*"],
       "@ui/*": ["src/ui/*"],
       "@utils/*": ["src/utils/*"],
-      "@views/*": ["src/views/*"],
       "@src/*": ["src/*"]
     }
   },