From a8a38f04678f39e3a63f0b7110b60cd1644a326d Mon Sep 17 00:00:00 2001
From: Ben Floyd <bfloydd@gmail.com>
Date: Tue, 4 Feb 2025 08:52:09 -0700
Subject: [PATCH] Refactor into named dirs

---
 main.ts                                            |  4 ++--
 settings.ts                                        |  2 +-
 CalendarWidget.ts => src/Widgets/CalendarWidget.ts | 10 +++++-----
 src/commands/OpenStreamDateCommand.ts              |  3 ++-
 src/commands/OpenTodayStreamCommand.ts             |  3 ++-
 streamUtils.ts => src/utils/streamUtils.ts         |  4 ++--
 6 files changed, 14 insertions(+), 12 deletions(-)
 rename CalendarWidget.ts => src/Widgets/CalendarWidget.ts (96%)
 rename streamUtils.ts => src/utils/streamUtils.ts (98%)

diff --git a/main.ts b/main.ts
index d9413d8..a06b718 100644
--- a/main.ts
+++ b/main.ts
@@ -1,8 +1,8 @@
 import { App, Editor, MarkdownView, Modal, Notice, Plugin, PluginSettingTab, Setting, WorkspaceLeaf } from 'obsidian';
 import { StreamsSettingTab } from './settings';
 import { Stream, StreamsSettings } from './types';
-import { createDailyNote, openStreamDate } from './streamUtils';
-import { CalendarWidget } from './CalendarWidget';
+import { createDailyNote, openStreamDate } from './src/utils/streamUtils';
+import { CalendarWidget } from './src/Widgets/CalendarWidget';
 import { normalize } from 'path';
 import { Logger } from './src/utils/Logger';
 import { OpenTodayStreamCommand } from './src/commands/OpenTodayStreamCommand';
diff --git a/settings.ts b/settings.ts
index fca67ff..3391949 100644
--- a/settings.ts
+++ b/settings.ts
@@ -1,7 +1,7 @@
 import { App, PluginSettingTab, Setting } from 'obsidian';
 import StreamsPlugin from './main';
 import { Stream, StreamsSettings, LucideIcon } from './types';
-import { getFolderSuggestions } from './streamUtils';
+import { getFolderSuggestions } from './src/utils/streamUtils';
 
 export class StreamsSettingTab extends PluginSettingTab {
     plugin: StreamsPlugin;
diff --git a/CalendarWidget.ts b/src/Widgets/CalendarWidget.ts
similarity index 96%
rename from CalendarWidget.ts
rename to src/Widgets/CalendarWidget.ts
index 4431da3..41368cc 100644
--- a/CalendarWidget.ts
+++ b/src/Widgets/CalendarWidget.ts
@@ -1,9 +1,9 @@
 import { App, WorkspaceLeaf, TFile, MarkdownView } from 'obsidian';
-import { Stream } from './types';
-import { openStreamDate } from './streamUtils';
-import { Logger } from './src/utils/Logger';
-import { OpenStreamDateCommand } from './src/commands/OpenStreamDateCommand';
-import { OpenTodayStreamCommand } from './src/commands/OpenTodayStreamCommand';
+import { Stream } from '../../types';
+import { openStreamDate } from '../utils/streamUtils';
+import { Logger } from '../utils/Logger';
+import { OpenStreamDateCommand } from '../commands/OpenStreamDateCommand';
+import { OpenTodayStreamCommand } from '../commands/OpenTodayStreamCommand';
 
 export class CalendarWidget {
     private widget: HTMLElement;
diff --git a/src/commands/OpenStreamDateCommand.ts b/src/commands/OpenStreamDateCommand.ts
index a250320..c8ffc9e 100644
--- a/src/commands/OpenStreamDateCommand.ts
+++ b/src/commands/OpenStreamDateCommand.ts
@@ -1,9 +1,10 @@
 import { App } from 'obsidian';
 import { Stream } from '../../types';
-import { openStreamDate } from '../../streamUtils';
+import { openStreamDate } from '../utils/streamUtils';
 import { Logger } from '../utils/Logger';
 import { Command } from './Command';
 
+
 const log = new Logger();
 
 export class OpenStreamDateCommand implements Command {
diff --git a/src/commands/OpenTodayStreamCommand.ts b/src/commands/OpenTodayStreamCommand.ts
index a1e2cfa..8f7acaf 100644
--- a/src/commands/OpenTodayStreamCommand.ts
+++ b/src/commands/OpenTodayStreamCommand.ts
@@ -1,9 +1,10 @@
 import { App } from 'obsidian';
 import { Stream } from '../../types';
-import { openStreamDate } from '../../streamUtils';
+import { openStreamDate } from '../utils/streamUtils';
 import { Logger } from '../utils/Logger';
 import { Command } from './Command';
 
+
 const log = new Logger();
 
 export class OpenTodayStreamCommand implements Command {
diff --git a/streamUtils.ts b/src/utils/streamUtils.ts
similarity index 98%
rename from streamUtils.ts
rename to src/utils/streamUtils.ts
index c527503..9a441cb 100644
--- a/streamUtils.ts
+++ b/src/utils/streamUtils.ts
@@ -1,7 +1,7 @@
 import { App, TFolder, TFile, MarkdownView } from 'obsidian';
 import { join, normalize } from 'path';
-import { Stream } from './types';
-import { Logger } from './src/utils/Logger';
+import { Stream } from '../../types';
+import { Logger } from './Logger';
 
 const log = new Logger();