From d395c9487a71ea03be1f7740f7c577ebd2541f03 Mon Sep 17 00:00:00 2001 From: Raphael Forment Date: Sun, 14 Apr 2024 15:45:25 +0200 Subject: [PATCH] Move DOM related files in their own folder --- src/{ => DOM}/DomElements.ts | 2 +- src/{ => DOM}/Keyboard.ts | 8 ++++---- src/{ => DOM}/UILogic.ts | 22 +++++++++++----------- src/{ => DOM}/WindowBehavior.ts | 10 +++++----- src/IO/OSCConnection.ts | 0 src/documentation/Documentation.ts | 2 +- src/main.ts | 8 ++++---- 7 files changed, 26 insertions(+), 26 deletions(-) rename src/{ => DOM}/DomElements.ts (98%) rename src/{ => DOM}/Keyboard.ts (95%) rename src/{ => DOM}/UILogic.ts (97%) rename src/{ => DOM}/WindowBehavior.ts (92%) delete mode 100644 src/IO/OSCConnection.ts diff --git a/src/DomElements.ts b/src/DOM/DomElements.ts similarity index 98% rename from src/DomElements.ts rename to src/DOM/DomElements.ts index 07c619e..18d07b2 100644 --- a/src/DomElements.ts +++ b/src/DOM/DomElements.ts @@ -1,4 +1,4 @@ -import { type Editor } from "./main"; +import { type Editor } from "../main"; export type ElementMap = { [key: string]: diff --git a/src/Keyboard.ts b/src/DOM/Keyboard.ts similarity index 95% rename from src/Keyboard.ts rename to src/DOM/Keyboard.ts index ba78337..0f1807e 100644 --- a/src/Keyboard.ts +++ b/src/DOM/Keyboard.ts @@ -1,8 +1,8 @@ -import { type Editor } from "./main"; +import { type Editor } from "../main"; import { vim } from "@replit/codemirror-vim"; -import { tryEvaluate } from "./Evaluator"; -import { hideDocumentation, showDocumentation } from "./documentation/Documentation"; -import { openSettingsModal, openUniverseModal } from "./FileManagement"; +import { tryEvaluate } from "../Evaluator"; +import { hideDocumentation, showDocumentation } from "../documentation/Documentation"; +import { openSettingsModal, openUniverseModal } from "../FileManagement"; export const registerFillKeys = (app: Editor) => { document.addEventListener("keydown", (event) => { diff --git a/src/UILogic.ts b/src/DOM/UILogic.ts similarity index 97% rename from src/UILogic.ts rename to src/DOM/UILogic.ts index d54d8a3..c3fdf2c 100644 --- a/src/UILogic.ts +++ b/src/DOM/UILogic.ts @@ -1,14 +1,14 @@ import { EditorView } from "codemirror"; import { vim } from "@replit/codemirror-vim"; -import { type Editor } from "./main"; -import colors from "./colors.json"; +import { type Editor } from "../main"; +import colors from "../colors.json"; import { documentation_factory, documentation_pages, hideDocumentation, showDocumentation, updateDocumentationContent, -} from "./documentation/Documentation"; +} from "../documentation/Documentation"; import { type Universe, template_universe, @@ -18,14 +18,14 @@ import { share, closeUniverseModal, openUniverseModal, -} from "./FileManagement"; -import { loadSamples } from "./API"; -import { tryEvaluate } from "./Evaluator"; -import { inlineHoveringTips } from "./documentation/inlineHelp"; +} from "../FileManagement"; +import { loadSamples } from "../API"; +import { tryEvaluate } from "../Evaluator"; +import { inlineHoveringTips } from "../documentation/inlineHelp"; import { lineNumbers } from "@codemirror/view"; -import { jsCompletions } from "./EditorSetup"; +import { jsCompletions } from "../EditorSetup"; import { saveState } from "./WindowBehavior"; -import { registerSamplesFromDB, samplesDBConfig, uploadSamplesToDB } from "./IO/SampleLoading"; +import { registerSamplesFromDB, samplesDBConfig, uploadSamplesToDB } from "../IO/SampleLoading"; export const installInterfaceLogic = (app: Editor) => { // Initialize style @@ -153,7 +153,7 @@ export const installInterfaceLogic = (app: Editor) => { ); }); - app.interface.upload_samples_button.addEventListener("input", async (event) => { + app.interface.upload_samples_button.addEventListener("input", async (event: Event) => { let fileInput = event.target as HTMLInputElement; if (!fileInput.files?.length) { return; @@ -509,7 +509,7 @@ export const installInterfaceLogic = (app: Editor) => { // app.settings.load_demo_songs = checked; // }); - app.interface.universe_creator.addEventListener("submit", (event) => { + app.interface.universe_creator.addEventListener("submit", (event: Event) => { event.preventDefault(); let data = new FormData(app.interface.universe_creator as HTMLFormElement); diff --git a/src/WindowBehavior.ts b/src/DOM/WindowBehavior.ts similarity index 92% rename from src/WindowBehavior.ts rename to src/DOM/WindowBehavior.ts index e42ef35..decc76b 100644 --- a/src/WindowBehavior.ts +++ b/src/DOM/WindowBehavior.ts @@ -1,5 +1,5 @@ -import { type Editor } from "./main"; -import { outputSocket, inputSocket } from "./IO/OSC"; +import { type Editor } from "../main"; +import { outputSocket, inputSocket } from "../IO/OSC"; const handleResize = (canvas: HTMLCanvasElement) => { if (!canvas) return; @@ -45,8 +45,8 @@ export const installWindowBehaviors = ( handleResize(app.interface.feedback as HTMLCanvasElement), ); window.addEventListener("resize", () => - handleResize(app.interface.drawings as HTMLCanvasElement), -); + handleResize(app.interface.drawings as HTMLCanvasElement), + ); window.addEventListener("beforeunload", (event) => { event.preventDefault(); saveBeforeExit(app); @@ -60,7 +60,7 @@ export const installWindowBehaviors = ( localStorage.openpages = Date.now(); window.addEventListener( "storage", - function (e) { + function(e) { if (e.key == "openpages") { // Listen if anybody else is opening the same page! localStorage.page_available = Date.now(); diff --git a/src/IO/OSCConnection.ts b/src/IO/OSCConnection.ts deleted file mode 100644 index e69de29..0000000 diff --git a/src/documentation/Documentation.ts b/src/documentation/Documentation.ts index a7ab313..3c5f0b9 100644 --- a/src/documentation/Documentation.ts +++ b/src/documentation/Documentation.ts @@ -23,7 +23,7 @@ import { patterns } from "./patterns/patterns"; import showdown from "showdown"; import showdownHighlight from "showdown-highlight"; import "highlight.js/styles/atom-one-dark-reasonable.min.css"; -import { createDocumentationStyle } from "../DomElements"; +import { createDocumentationStyle } from "../DOM/DomElements"; showdown.setFlavor("github"); type StyleBinding = { diff --git a/src/main.ts b/src/main.ts index 17a715f..b39d02a 100644 --- a/src/main.ts +++ b/src/main.ts @@ -12,8 +12,8 @@ import { Universe, loadUniverserFromUrl, } from "./FileManagement"; -import { singleElements, buttonGroups, ElementMap, createDocumentationStyle } from "./DomElements"; -import { registerFillKeys, registerOnKeyDown } from "./Keyboard"; +import { singleElements, buttonGroups, ElementMap, createDocumentationStyle } from "./DOM/DomElements"; +import { registerFillKeys, registerOnKeyDown } from "./DOM/Keyboard"; import { installEditor } from "./EditorSetup"; import { documentation_factory, documentation_pages, showDocumentation, updateDocumentationContent } from "./documentation/Documentation"; import { EditorView } from "codemirror"; @@ -28,8 +28,8 @@ import { tryEvaluate } from "./Evaluator"; // @ts-ignore import showdown from "showdown"; import { makeStringExtensions } from "./extensions/StringExtensions"; -import { installInterfaceLogic } from "./UILogic"; -import { installWindowBehaviors } from "./WindowBehavior"; +import { installInterfaceLogic } from "./DOM/UILogic"; +import { installWindowBehaviors } from "./DOM/WindowBehavior"; import { makeNumberExtensions } from "./extensions/NumberExtensions"; import colors from "./colors.json"; // @ts-ignore