refactor: consistent naming on modals and views, split modals into their

own folder
This commit is contained in:
Jacobtread 2026-04-09 23:45:44 +12:00
parent fd65fc96f7
commit 9707054c64
14 changed files with 11 additions and 12 deletions

View file

@ -1,8 +1,8 @@
import { App, Command } from "obsidian";
import { TimekeepMergerModal } from "@/modals/TimekeepMergerModal";
import { TimekeepSettings } from "@/settings";
import { Store } from "@/store";
import { TimekeepMergerModal } from "@/views/timekeep-merger-modal";
export default function (app: App, settings: Store<TimekeepSettings>): Command {
return {

View file

@ -1,8 +1,8 @@
import { App, Command } from "obsidian";
import { TimekeepMergerModal } from "@/modals/TimekeepMergerModal";
import { TimekeepSettings } from "@/settings";
import { Store } from "@/store";
import { TimekeepMergerModal } from "@/views/timekeep-merger-modal";
export default function (app: App, settings: Store<TimekeepSettings>): Command {
return {

View file

@ -1,6 +1,6 @@
import { App, Command } from "obsidian";
import { TimekeepLocatorModal } from "@/views/timekeep-locator-modal";
import { TimekeepLocatorModal } from "@/modals/TimekeepLocatorModal";
export default function (app: App): Command {
return {

View file

@ -8,9 +8,9 @@ import type { TimeEntry, Timekeep } from "@/timekeep/schema";
import { createObsidianIcon } from "@/components/obsidianIcon";
import { ReplaceableComponent } from "@/components/ReplaceableComponent";
import { ConfirmModal } from "@/modals/ConfirmModal";
import { removeEntry, updateEntry } from "@/timekeep/update";
import { formatEditableTimestamp, parseEditableTimestamp } from "@/utils/time";
import { ConfirmModal } from "@/views/confirm-modal";
/**
* Component for a timesheet row entry that is currently

View file

@ -13,6 +13,7 @@ import pdfMake from "pdfmake";
import type { TimekeepSettings } from "@/settings";
import type { TimeEntry, Timekeep } from "@/timekeep/schema";
import { FileNamePromptModal } from "@/modals/FileNamePromptModal";
import { PdfExportBehavior } from "@/settings";
import { getEntryDuration, getTotalDuration } from "@/timekeep/queries";
import {
@ -21,7 +22,6 @@ import {
formatPdfDate,
formatPdfRowDate,
} from "@/utils/time";
import { FileNamePromptModal } from "@/views/file-name-prompt-modal";
// Embedded fonts
import RobotoBold from "@/fonts/Roboto-Bold.ttf";

View file

@ -29,9 +29,8 @@ import {
} from "@/timekeep/queries";
import { stopAllTimekeeps } from "@/timekeep/stopAllTimekeeps";
import { stopFileTimekeeps } from "@/timekeep/stopFileTimekeeps";
import { TimekeepMarkdownView } from "@/views/timekeep-markdown-view";
import { TimekeepFileView } from "./views/timekeep-file-view";
import TimekeepFileView from "@/views/TimekeepFileView";
import TimekeepMarkdownView from "@/views/TimekeepMarkdownView";
export default class TimekeepPlugin extends Plugin {
/** Store containing the plugin settings */

View file

@ -4,7 +4,7 @@ import type { App } from "obsidian";
import { describe, it, expect, beforeEach, Mock, vi } from "vitest";
import { ConfirmModal } from "./confirm-modal";
import { ConfirmModal } from "./ConfirmModal";
describe("ConfirmModal", () => {
let app: App;

View file

@ -4,7 +4,7 @@ import type { App } from "obsidian";
import { describe, it, expect, beforeEach, Mock, vi } from "vitest";
import { FileNamePromptModal } from "./file-name-prompt-modal";
import { FileNamePromptModal } from "./FileNamePromptModal";
describe("ConfirmModal", () => {
let app: App;

View file

@ -10,7 +10,7 @@ import { createStore, Store } from "@/store";
import { load, LoadResult } from "@/timekeep/parser";
import { stripTimekeepRuntimeData, Timekeep } from "@/timekeep/schema";
export class TimekeepFileView extends EditableFileView {
export default class TimekeepFileView extends EditableFileView {
/** Access to the timekeep settings */
settings: Store<TimekeepSettings>;
/** Access to custom output formats */

View file

@ -14,7 +14,7 @@ import { type Store, createStore } from "@/store";
import { type LoadResult, load, replaceTimekeepCodeblock } from "@/timekeep/parser";
import { type Timekeep, stripTimekeepRuntimeData } from "@/timekeep/schema";
export class TimekeepMarkdownView extends MarkdownRenderChild {
export default class TimekeepMarkdownView extends MarkdownRenderChild {
// Obsidian app instance
app: App;
// Timekeep settings store