diff --git a/src/AdfView.ts b/src/AdfView.ts index a7e07cb0..c652c10f 100644 --- a/src/AdfView.ts +++ b/src/AdfView.ts @@ -5,7 +5,7 @@ import { Workspace, WorkspaceLeaf, } from "obsidian"; -import { MyPluginSettings } from "./Settings"; +import { ConfluenceSettings } from "./Settings"; import React from "react"; import ReactDOM from "react-dom"; import { ReactRenderer } from "@atlaskit/renderer"; @@ -19,7 +19,7 @@ export const ADF_VIEW_TYPE = "AtlassianDocumentFormatView"; export default class AdfView extends ItemView { displayText: string; - settings: MyPluginSettings; + settings: ConfluenceSettings; filePath: string | undefined; fileName: string; vault: Vault; @@ -39,7 +39,7 @@ export default class AdfView extends ItemView { } constructor( - settings: MyPluginSettings, + settings: ConfluenceSettings, leaf: WorkspaceLeaf, initialFileInfo: { path: string | undefined; basename: string }, adaptor: LoaderAdaptor diff --git a/src/Publisher.ts b/src/Publisher.ts index 02073cdc..c8203eb0 100644 --- a/src/Publisher.ts +++ b/src/Publisher.ts @@ -1,4 +1,4 @@ -import { MyPluginSettings } from "./Settings"; +import { ConfluenceSettings } from "./Settings"; import FolderFile from "./FolderFile.json"; import { traverse, filter } from "@atlaskit/adf-utils/traverse"; @@ -81,12 +81,12 @@ export class Publisher { confluenceClient: ConfluenceClient; blankPageAdf: string = JSON.stringify(doc(p("Page not published yet"))); adaptor: LoaderAdaptor; - settings: MyPluginSettings; + settings: ConfluenceSettings; mermaidRenderer: MermaidRenderer; constructor( adaptor: LoaderAdaptor, - settings: MyPluginSettings, + settings: ConfluenceSettings, confluenceClient: ConfluenceClient, mermaidRenderer: MermaidRenderer ) { diff --git a/src/Settings.ts b/src/Settings.ts index 2cf6ae58..e7c41e50 100644 --- a/src/Settings.ts +++ b/src/Settings.ts @@ -1,4 +1,4 @@ -export interface MyPluginSettings { +export interface ConfluenceSettings { confluenceBaseUrl: string; confluenceParentId: string; atlassianUserName: string; @@ -6,7 +6,7 @@ export interface MyPluginSettings { folderToPublish: string; } -export const DEFAULT_SETTINGS: MyPluginSettings = { +export const DEFAULT_SETTINGS: ConfluenceSettings = { confluenceBaseUrl: "", confluenceParentId: "", atlassianUserName: "", diff --git a/src/adaptors/obsidian.ts b/src/adaptors/obsidian.ts index 8507040f..3c512759 100644 --- a/src/adaptors/obsidian.ts +++ b/src/adaptors/obsidian.ts @@ -1,5 +1,5 @@ import { Vault, MetadataCache, App, TFile } from "obsidian"; -import { MyPluginSettings } from "src/Settings"; +import { ConfluenceSettings } from "src/Settings"; import { BinaryFile, FilesToUpload, @@ -11,13 +11,13 @@ import { lookup } from "mime-types"; export default class ObsidianAdaptor implements LoaderAdaptor { vault: Vault; metadataCache: MetadataCache; - settings: MyPluginSettings; + settings: ConfluenceSettings; app: App; constructor( vault: Vault, metadataCache: MetadataCache, - settings: MyPluginSettings, + settings: ConfluenceSettings, app: App ) { this.vault = vault; diff --git a/src/main.ts b/src/main.ts index b2a7efb7..f098b063 100644 --- a/src/main.ts +++ b/src/main.ts @@ -7,7 +7,7 @@ import { Workspace, } from "obsidian"; import { MainSettingTab } from "./MainSettingTab"; -import { DEFAULT_SETTINGS, MyPluginSettings } from "./Settings"; +import { DEFAULT_SETTINGS, ConfluenceSettings } from "./Settings"; import { Publisher } from "./Publisher"; import ObsidianAdaptor from "./adaptors/obsidian"; import { CompletedModal } from "./CompletedModal"; @@ -16,7 +16,7 @@ import { ElectronMermaidRenderer } from "./mermaid_renderers/electron"; import AdfView, { ADF_VIEW_TYPE } from "./AdfView"; export default class MyPlugin extends Plugin { - settings: MyPluginSettings; + settings: ConfluenceSettings; private isSyncing = false; adfView: AdfView; workspace: Workspace;