refactor: improve code formatting and organization across multiple files

lorens-osman-dev · lorens-osman-dev · commit d94b658b86b1 · 2025-01-10T21:29:59.000+03:00
diff --git a/main.ts b/main.ts
@@ -1,34 +1,26 @@
-import { Plugin, TFile} from "obsidian";
+import { Plugin, TFile } from "obsidian";
 import P from "src/util/P";
-import { settingTab ,DEFAULT_SETTINGS ,clusterPluginSettings } from "./src/settings/settings";
+import { settingTab, DEFAULT_SETTINGS, clusterPluginSettings } from "./src/settings/settings";
 
 
 export default class clusterPlugin extends Plugin {
 	settings: clusterPluginSettings;
 
 	async onload() {
 		console.log("loading Cluster plugin");
+		const file = this.app.workspace.getActiveFile() as TFile;
 
 		await this.loadSettings();
 		this.addSettingTab(new settingTab(this.app, this));
 
-		// UN-SORTED Folder Styling
-		setTimeout(async () => {
-			await P.addUnsortedFilesCounter(this.app);
-			await P.unSortedObserver(this.app);
-		}, 1000);
 
-		
-		const file = this.app.workspace.getActiveFile() as TFile;
-		if (file) {
-			await P.buttonsLine(this.app, file, this.settings);
-		}
+		file ? await P.buttonsLine(this.app, file, this.settings) : null;
 		P.addEvents(this)
-		P.addRibbonIcon( this);
-		P.fileMenu(this,P.SimpleFocus);
+		P.addRibbonIcon(this);
+		P.fileMenu(this, P.SimpleFocus);
 		P.addCommands(this);
-		
-		await P.cardStyleFunction( this.settings);//card style for lorens theme
+		P.unsorted.unsortedFiles(this.app);
+		await P.cardStyleFunction(this.settings);//card style for lorens theme
 	}
 
 	async loadSettings() {
@@ -44,7 +36,7 @@ export default class clusterPlugin extends Plugin {
 		// Remove Buttons line
 		const file = this.app.workspace.getActiveFile() as TFile;
 		await P.buttonsLine(this.app, file, this.settings, true);
-		P.unSortedObserver(this.app, false);
+		P.unsorted.unSortedObserver(this.app, false);
 		console.log("unloading Cluster plugin");
 	}
 }
diff --git a/src/focus/simpleFocus.ts b/src/focus/simpleFocus.ts
@@ -2,7 +2,7 @@
 
 const hideenClass = "plugin-simple-focus-hidden";
 
-class SimpleFocusClass  {
+class SimpleFocusClass {
   isFocus: boolean;
   constructor() {
     this.isFocus = false;
diff --git a/src/mainParts/addCommands.ts b/src/mainParts/addCommands.ts
@@ -84,7 +84,7 @@ export function addCommands(plugin: Plugin) {
     name: "Enter focus",
     callback: () => {
       const file = plugin.app.workspace.getActiveFile();
-      if(file?.path) {
+      if (file?.path) {
         SimpleFocus.enterFocus(file.path)
       }
     },
diff --git a/src/mainParts/fileMenu.ts b/src/mainParts/fileMenu.ts
@@ -1,16 +1,16 @@
-import { TFile, TFolder, Menu } from "obsidian";
+import { TFile, TFolder, Menu, Plugin } from "obsidian";
 import familyModal from "../createFamily/familyModal";
 import { createClustersAndOrphansFolder } from "../createFamily/createClustersAndOrphansFolder";
 import { NewFileLocation } from "src/util/enums";
+import SimpleFocusClass from "src/focus/simpleFocus";
 
 
 const clusters = "CLUSTERS"
 const orphans = "ORPHANS"
-//@ts-ignore
-export function fileMenu(x ,SimpleFocus) {
-  //- file-menu
-  x.registerEvent(
-    x.app.workspace.on("file-menu", (menu: Menu, file: TFile) => {
+
+export function fileMenu(plugin: Plugin, SimpleFocus: SimpleFocusClass) {
+  plugin.registerEvent(
+    plugin.app.workspace.on("file-menu", (menu: Menu, file: TFile) => {
       //- Focus menu
       if (file) {
         menu.addItem((item) => {
@@ -34,9 +34,9 @@ export function fileMenu(x ,SimpleFocus) {
             .setTitle("New cluster")
             .setIcon("folder-git-2")
             .onClick(async () => {
-              createClustersAndOrphansFolder(x.app);
+              createClustersAndOrphansFolder(plugin.app);
               const graphActiveFile = file
-              new familyModal(x.app, NewFileLocation.NewTab, "newCluster", graphActiveFile).open();
+              new familyModal(plugin.app, NewFileLocation.NewTab, "newCluster", graphActiveFile).open();
             });
         });
       }
@@ -48,9 +48,9 @@ export function fileMenu(x ,SimpleFocus) {
             .setTitle("New son")
             .setIcon("baby")
             .onClick(async () => {
-              createClustersAndOrphansFolder(x.app);
+              createClustersAndOrphansFolder(plugin.app);
               const graphActiveFile = file
-              new familyModal(x.app, NewFileLocation.NewTab, "newSon", graphActiveFile).open();
+              new familyModal(plugin.app, NewFileLocation.NewTab, "newSon", graphActiveFile).open();
             });
         });
       }
@@ -65,9 +65,9 @@ export function fileMenu(x ,SimpleFocus) {
             .setTitle("New brother")
             .setIcon("git-compare")
             .onClick(async () => {
-              createClustersAndOrphansFolder(x.app);
+              createClustersAndOrphansFolder(plugin.app);
               const graphActiveFile = file
-              new familyModal(x.app, NewFileLocation.NewTab, "newBrother", graphActiveFile).open();
+              new familyModal(plugin.app, NewFileLocation.NewTab, "newBrother", graphActiveFile).open();
             });
         });
       }
@@ -83,9 +83,9 @@ export function fileMenu(x ,SimpleFocus) {
             .setTitle("New orphan")
             .setIcon("disc")
             .onClick(async () => {
-              createClustersAndOrphansFolder(x.app);
+              createClustersAndOrphansFolder(plugin.app);
               const graphActiveFile = file
-              new familyModal(x.app, NewFileLocation.NewTab, "newOrphan", graphActiveFile).open();
+              new familyModal(plugin.app, NewFileLocation.NewTab, "newOrphan", graphActiveFile).open();
             });
         });
       }
diff --git a/src/settings/settings.ts b/src/settings/settings.ts
@@ -92,22 +92,22 @@ export class settingTab extends PluginSettingTab {
 				toggle.setValue(this.plugin.settings.cardStyle);
 				toggle.onChange(async (value) => {
 					this.plugin.settings.cardStyle = value;
-										const appContainer = document.body  
-										const classList = Array.from(appContainer.classList)
-										const isDark = classList.find((className : string) => className ==="theme-dark" )
-                    if(value){
-                        await this.plugin.saveSettings();
-												if(isDark){
+					const appContainer = document.body
+					const classList = Array.from(appContainer.classList)
+					const isDark = classList.find((className: string) => className === "theme-dark")
+					if (value) {
+						await this.plugin.saveSettings();
+						if (isDark) {
 
-													appContainer.classList.add("card-layout-open-dark")
-											}
-											appContainer.classList.add("card-layout-open-light")
-                    }else{
-                        appContainer.classList.remove("card-layout-open-dark")
-												appContainer.classList.remove("card-layout-open-light")
-                        await this.plugin.saveSettings();
+							appContainer.classList.add("card-layout-open-dark")
+						}
+						appContainer.classList.add("card-layout-open-light")
+					} else {
+						appContainer.classList.remove("card-layout-open-dark")
+						appContainer.classList.remove("card-layout-open-light")
+						await this.plugin.saveSettings();
 
-                    }
+					}
 				});
 			});
 		}
@@ -128,8 +128,8 @@ export class settingTab extends PluginSettingTab {
 				button.setIcon("github");
 				button.onClick(
 					() =>
-						(window.location.href =
-							"https://github.com/lorens-osman-dev/cluster"),
+					(window.location.href =
+						"https://github.com/lorens-osman-dev/cluster"),
 				);
 			});
 
diff --git a/src/util/P.ts b/src/util/P.ts
@@ -1,3 +1,4 @@
+import { App } from "obsidian";
 import { fileMenu } from "src/mainParts/fileMenu";
 import { addCommands } from "src/mainParts/addCommands";
 import { addEvents } from "src/mainParts/events";
@@ -13,6 +14,14 @@ import {
   unSortedObserver,
   foldPropertiesElement,
 } from "../createFamily/coloringTreePanel";
+
+// unsorted
+function unsortedFiles(appInstance: App) {
+  setTimeout(async () => {
+    await addUnsortedFilesCounter(appInstance);
+    await unSortedObserver(appInstance);
+  }, 1000);
+}
 const P = {
   fileMenu,
   addEvents,
@@ -22,10 +31,12 @@ const P = {
   buttonsLine,
   cardStyleFunction,
   coloringTreePanel,
-  addUnsortedFilesCounter,
-  unSortedObserver,
+  unsorted: {
+    unsortedFiles,
+    addUnsortedFilesCounter,
+    unSortedObserver,
+  },
   foldPropertiesElement,
+};
 
-}
-
-export default P
+export default P;

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ export function addCommands(plugin: Plugin) {`
`84`	`84`	`name: "Enter focus",`
`85`	`85`	`callback: () => {`
`86`	`86`	`const file = plugin.app.workspace.getActiveFile();`
`87`		`- if(file?.path) {`
	`87`	`+ if (file?.path) {`
`88`	`88`	`SimpleFocus.enterFocus(file.path)`
`89`	`89`	`}`
`90`	`90`	`},`