From 7cef78bc3bad22d69c8fec91372ebdddc9287e93 Mon Sep 17 00:00:00 2001 From: Raphael Forment Date: Sun, 14 Apr 2024 15:51:11 +0200 Subject: [PATCH] Moving more files around --- src/API.ts | 10 +++++----- src/DOM/Keyboard.ts | 2 +- src/DOM/UILogic.ts | 6 +++--- src/{ => DOM}/Visuals/Blinkers.ts | 0 src/{ => DOM}/Visuals/CanvasVisuals.ts | 0 src/{ => DOM}/Visuals/Oscilloscope.ts | 0 src/{ => Editor}/EditorSetup.ts | 5 ++--- src/{ => Editor}/FileManagement.ts | 4 ++-- src/{ => Editor}/colors.json | 0 src/main.ts | 14 +++++++------- 10 files changed, 20 insertions(+), 21 deletions(-) rename src/{ => DOM}/Visuals/Blinkers.ts (100%) rename src/{ => DOM}/Visuals/CanvasVisuals.ts (100%) rename src/{ => DOM}/Visuals/Oscilloscope.ts (100%) rename src/{ => Editor}/EditorSetup.ts (98%) rename src/{ => Editor}/FileManagement.ts (99%) rename src/{ => Editor}/colors.json (100%) diff --git a/src/API.ts b/src/API.ts index 4a282fc..3b406f6 100644 --- a/src/API.ts +++ b/src/API.ts @@ -1,6 +1,6 @@ import { sendToServer, type OSCMessage, oscMessages } from "./IO/OSC"; import { getAllScaleNotes, nearScales, seededRandom } from "zifferjs"; -import colorschemes from "./colors.json"; +import colorschemes from "./Editor/colors.json"; import { MidiCCEvent, MidiConnection, @@ -18,7 +18,7 @@ import { loadUniverse, openUniverseModal, template_universes, -} from "./FileManagement"; +} from "./Editor/FileManagement"; import { samples, initAudioOnFirstClick, @@ -29,12 +29,12 @@ import { } from "superdough"; import { Speaker } from "./extensions/StringExtensions"; import { getScaleNotes } from "zifferjs"; -import { OscilloscopeConfig } from "./Visuals/Oscilloscope"; -import { blinkScript } from "./Visuals/Blinkers"; +import { OscilloscopeConfig } from "./DOM/Visuals/Oscilloscope"; +import { blinkScript } from "./DOM/Visuals/Blinkers"; import { SkipEvent } from "./classes/SkipEvent"; import { AbstractEvent, EventOperation } from "./classes/AbstractEvents"; import drums from "./tidal-drum-machines.json"; -import { ShapeObject, createConicGradient, createLinearGradient, createRadialGradient, drawBackground, drawBall, drawBalloid, drawDonut, drawEquilateral, drawImage, drawPie, drawSmiley, drawStar, drawStroke, drawText, drawTriangular } from "./Visuals/CanvasVisuals"; +import { ShapeObject, createConicGradient, createLinearGradient, createRadialGradient, drawBackground, drawBall, drawBalloid, drawDonut, drawEquilateral, drawImage, drawPie, drawSmiley, drawStar, drawStroke, drawText, drawTriangular } from "./DOM/Visuals/CanvasVisuals"; interface ControlChange { channel: number; diff --git a/src/DOM/Keyboard.ts b/src/DOM/Keyboard.ts index 0f1807e..34c9c47 100644 --- a/src/DOM/Keyboard.ts +++ b/src/DOM/Keyboard.ts @@ -2,7 +2,7 @@ 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 { openSettingsModal, openUniverseModal } from "../Editor/FileManagement"; export const registerFillKeys = (app: Editor) => { document.addEventListener("keydown", (event) => { diff --git a/src/DOM/UILogic.ts b/src/DOM/UILogic.ts index c3fdf2c..78f9f76 100644 --- a/src/DOM/UILogic.ts +++ b/src/DOM/UILogic.ts @@ -1,7 +1,7 @@ import { EditorView } from "codemirror"; import { vim } from "@replit/codemirror-vim"; import { type Editor } from "../main"; -import colors from "../colors.json"; +import colors from "../Editor/colors.json"; import { documentation_factory, documentation_pages, @@ -18,12 +18,12 @@ import { share, closeUniverseModal, openUniverseModal, -} from "../FileManagement"; +} from "../Editor/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 "../Editor/EditorSetup"; import { saveState } from "./WindowBehavior"; import { registerSamplesFromDB, samplesDBConfig, uploadSamplesToDB } from "../IO/SampleLoading"; diff --git a/src/Visuals/Blinkers.ts b/src/DOM/Visuals/Blinkers.ts similarity index 100% rename from src/Visuals/Blinkers.ts rename to src/DOM/Visuals/Blinkers.ts diff --git a/src/Visuals/CanvasVisuals.ts b/src/DOM/Visuals/CanvasVisuals.ts similarity index 100% rename from src/Visuals/CanvasVisuals.ts rename to src/DOM/Visuals/CanvasVisuals.ts diff --git a/src/Visuals/Oscilloscope.ts b/src/DOM/Visuals/Oscilloscope.ts similarity index 100% rename from src/Visuals/Oscilloscope.ts rename to src/DOM/Visuals/Oscilloscope.ts diff --git a/src/EditorSetup.ts b/src/Editor/EditorSetup.ts similarity index 98% rename from src/EditorSetup.ts rename to src/Editor/EditorSetup.ts index 3b0e927..1794e2f 100644 --- a/src/EditorSetup.ts +++ b/src/Editor/EditorSetup.ts @@ -28,11 +28,10 @@ import { } from "@codemirror/autocomplete"; import { lintKeymap } from "@codemirror/lint"; import { Compartment } from "@codemirror/state"; -import { Editor } from "./main"; +import { Editor } from "../main"; import { EditorView } from "codemirror"; import { javascript } from "@codemirror/lang-javascript"; -import { inlineHoveringTips } from "./documentation/inlineHelp"; -import { toposCompletions, soundCompletions } from "./documentation/inlineHelp"; +import { inlineHoveringTips, toposCompletions, soundCompletions } from "../documentation/inlineHelp"; import { javascriptLanguage } from "@codemirror/lang-javascript"; export const getCodeMirrorTheme = (theme: { [key: string]: string }): Extension => { diff --git a/src/FileManagement.ts b/src/Editor/FileManagement.ts similarity index 99% rename from src/FileManagement.ts rename to src/Editor/FileManagement.ts index 799cd46..915504f 100644 --- a/src/FileManagement.ts +++ b/src/Editor/FileManagement.ts @@ -1,7 +1,7 @@ import { gzipSync, decompressSync, strFromU8 } from "fflate"; -import { type Editor } from "./main"; +import { type Editor } from "../main"; import { uniqueNamesGenerator, colors, animals } from "unique-names-generator"; -import { tryEvaluate } from "./Evaluator"; +import { tryEvaluate } from "../Evaluator"; export type Universes = { [key: string]: Universe }; export interface Universe { diff --git a/src/colors.json b/src/Editor/colors.json similarity index 100% rename from src/colors.json rename to src/Editor/colors.json diff --git a/src/main.ts b/src/main.ts index b39d02a..704b5a0 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,20 +1,20 @@ -import { OscilloscopeConfig, runOscilloscope } from "./Visuals/Oscilloscope"; +import { OscilloscopeConfig, runOscilloscope } from "./DOM/Visuals/Oscilloscope"; import { EditorState, Compartment } from "@codemirror/state"; -import { scriptBlinkers } from "./Visuals/Blinkers"; +import { scriptBlinkers } from "./DOM/Visuals/Blinkers"; import { javascript } from "@codemirror/lang-javascript"; import { markdown } from "@codemirror/lang-markdown"; import { Extension } from "@codemirror/state"; import { outputSocket } from "./IO/OSC"; -import { getCodeMirrorTheme, switchToDebugTheme } from "./EditorSetup"; +import { getCodeMirrorTheme, switchToDebugTheme } from "./Editor/EditorSetup"; import { initializeSelectedUniverse, AppSettings, Universe, loadUniverserFromUrl, -} from "./FileManagement"; +} from "./Editor/FileManagement"; import { singleElements, buttonGroups, ElementMap, createDocumentationStyle } from "./DOM/DomElements"; import { registerFillKeys, registerOnKeyDown } from "./DOM/Keyboard"; -import { installEditor } from "./EditorSetup"; +import { installEditor } from "./Editor/EditorSetup"; import { documentation_factory, documentation_pages, showDocumentation, updateDocumentationContent } from "./documentation/Documentation"; import { EditorView } from "codemirror"; import { Clock } from "./clock/Clock"; @@ -23,7 +23,7 @@ import * as oeis from "jisg"; import * as zpatterns from "zifferjs/src/patterns.ts"; import { makeArrayExtensions } from "./extensions/ArrayExtensions"; import "./style.css"; -import { Universes, File } from "./FileManagement"; +import { Universes, File } from "./Editor/FileManagement"; import { tryEvaluate } from "./Evaluator"; // @ts-ignore import showdown from "showdown"; @@ -31,7 +31,7 @@ import { makeStringExtensions } from "./extensions/StringExtensions"; import { installInterfaceLogic } from "./DOM/UILogic"; import { installWindowBehaviors } from "./DOM/WindowBehavior"; import { makeNumberExtensions } from "./extensions/NumberExtensions"; -import colors from "./colors.json"; +import colors from "./Editor/colors.json"; // @ts-ignore const images = import.meta.glob("./assets/*")