From 87313a5ab5ae6f58ce771bda090fb4d9eb46d87a Mon Sep 17 00:00:00 2001 From: Miodec Date: Thu, 10 Feb 2022 20:37:57 +0100 Subject: [PATCH] moved files to new folder --- frontend/src/js/controllers/challenge-controller.js | 2 +- frontend/src/js/controllers/input-controller.js | 2 +- frontend/src/js/controllers/route-controller.js | 2 +- frontend/src/js/elements/keymap.js | 2 +- frontend/src/js/elements/monkey-power.js | 2 +- frontend/src/js/elements/scroll-to-top.js | 2 +- frontend/src/js/pages/account.js | 2 +- frontend/src/js/{elements => states}/active-page.js | 0 frontend/src/js/{elements => states}/slow-timer.js | 0 frontend/src/js/test/caret.js | 2 +- frontend/src/js/test/focus.js | 2 +- frontend/src/js/test/pace-caret.js | 2 +- frontend/src/js/test/test-logic.js | 2 +- frontend/src/js/test/test-timer.js | 2 +- frontend/src/js/test/test-ui.js | 2 +- frontend/src/js/test/timer-progress.js | 2 +- frontend/src/js/ui.js | 2 +- 17 files changed, 15 insertions(+), 15 deletions(-) rename frontend/src/js/{elements => states}/active-page.js (100%) rename frontend/src/js/{elements => states}/slow-timer.js (100%) diff --git a/frontend/src/js/controllers/challenge-controller.js b/frontend/src/js/controllers/challenge-controller.js index df33d19ef..7a4733f6f 100644 --- a/frontend/src/js/controllers/challenge-controller.js +++ b/frontend/src/js/controllers/challenge-controller.js @@ -7,7 +7,7 @@ import * as Funbox from "../test/funbox"; import Config, * as UpdateConfig from "../config"; import * as UI from "../ui"; import * as TestUI from "../test/test-ui"; -import * as ActivePage from "./../elements/active-page"; +import * as ActivePage from "../states/active-page"; export let active = null; let challengeLoading = false; diff --git a/frontend/src/js/controllers/input-controller.js b/frontend/src/js/controllers/input-controller.js index ecbfb17b2..42de6860e 100644 --- a/frontend/src/js/controllers/input-controller.js +++ b/frontend/src/js/controllers/input-controller.js @@ -25,7 +25,7 @@ import * as Replay from "../test/replay.js"; import * as MonkeyPower from "../elements/monkey-power"; import * as WeakSpot from "../test/weak-spot"; import * as Leaderboards from "../elements/leaderboards"; -import * as ActivePage from "./../elements/active-page"; +import * as ActivePage from "./../states/active-page"; let dontInsertSpace = false; let correctShiftUsed = true; diff --git a/frontend/src/js/controllers/route-controller.js b/frontend/src/js/controllers/route-controller.js index f777208f8..7d42a47b7 100644 --- a/frontend/src/js/controllers/route-controller.js +++ b/frontend/src/js/controllers/route-controller.js @@ -1,7 +1,7 @@ import * as Funbox from "../test/funbox"; import * as UI from "../ui"; import Config from "../config"; -import * as ActivePage from "./../elements/active-page"; +import * as ActivePage from "./../states/active-page"; let mappedRoutes = { "/": "pageLoading", diff --git a/frontend/src/js/elements/keymap.js b/frontend/src/js/elements/keymap.js index c391e3721..03d37fb6d 100644 --- a/frontend/src/js/elements/keymap.js +++ b/frontend/src/js/elements/keymap.js @@ -3,7 +3,7 @@ import * as ThemeColors from "./theme-colors"; import layouts from "../test/layouts"; import * as CommandlineLists from "./commandline-lists"; import * as Commandline from "./commandline"; -import * as SlowTimer from "./../elements/slow-timer"; +import * as SlowTimer from "../states/slow-timer"; export function highlightKey(currentKey) { if (Config.mode === "zen") return; diff --git a/frontend/src/js/elements/monkey-power.js b/frontend/src/js/elements/monkey-power.js index 5f1104fb2..0ea9b25b8 100644 --- a/frontend/src/js/elements/monkey-power.js +++ b/frontend/src/js/elements/monkey-power.js @@ -1,5 +1,5 @@ import * as ThemeColors from "./theme-colors"; -import * as SlowTimer from "./../elements/slow-timer"; +import * as SlowTimer from "../states/slow-timer"; import * as UI from "../ui"; import Config from "../config"; diff --git a/frontend/src/js/elements/scroll-to-top.js b/frontend/src/js/elements/scroll-to-top.js index 18ac4a859..f07eba2f3 100644 --- a/frontend/src/js/elements/scroll-to-top.js +++ b/frontend/src/js/elements/scroll-to-top.js @@ -1,4 +1,4 @@ -import * as ActivePage from "./../elements/active-page"; +import * as ActivePage from "./../states/active-page"; let visible = false; diff --git a/frontend/src/js/pages/account.js b/frontend/src/js/pages/account.js index 827719776..dc206a14a 100644 --- a/frontend/src/js/pages/account.js +++ b/frontend/src/js/pages/account.js @@ -22,7 +22,7 @@ import * as Focus from "../test/focus"; import * as SignOutButton from "../account/sign-out-button"; import axiosInstance from "../axios-instance"; import * as TodayTracker from "./../test/today-tracker"; -import * as ActivePage from "./../elements/active-page"; +import * as ActivePage from "../states/active-page"; let filterDebug = false; //toggle filterdebug diff --git a/frontend/src/js/elements/active-page.js b/frontend/src/js/states/active-page.js similarity index 100% rename from frontend/src/js/elements/active-page.js rename to frontend/src/js/states/active-page.js diff --git a/frontend/src/js/elements/slow-timer.js b/frontend/src/js/states/slow-timer.js similarity index 100% rename from frontend/src/js/elements/slow-timer.js rename to frontend/src/js/states/slow-timer.js diff --git a/frontend/src/js/test/caret.js b/frontend/src/js/test/caret.js index b70309950..671ac711e 100644 --- a/frontend/src/js/test/caret.js +++ b/frontend/src/js/test/caret.js @@ -1,7 +1,7 @@ import * as Misc from "../misc"; import Config from "../config"; import * as TestLogic from "./test-logic"; -import * as SlowTimer from "./../elements/slow-timer"; +import * as SlowTimer from "../states/slow-timer"; export let caretAnimating = true; diff --git a/frontend/src/js/test/focus.js b/frontend/src/js/test/focus.js index 48615a263..9042a4307 100644 --- a/frontend/src/js/test/focus.js +++ b/frontend/src/js/test/focus.js @@ -1,5 +1,5 @@ import * as Caret from "./caret"; -import * as ActivePage from "./../elements/active-page"; +import * as ActivePage from "../states/active-page"; let state = false; diff --git a/frontend/src/js/test/pace-caret.js b/frontend/src/js/test/pace-caret.js index e15df21de..ea31bf70b 100644 --- a/frontend/src/js/test/pace-caret.js +++ b/frontend/src/js/test/pace-caret.js @@ -2,7 +2,7 @@ import * as TestLogic from "./test-logic"; import * as TestUI from "./test-ui"; import Config, * as UpdateConfig from "../config"; import * as DB from "../db"; -import * as SlowTimer from "./../elements/slow-timer"; +import * as SlowTimer from "../states/slow-timer"; export let settings = null; diff --git a/frontend/src/js/test/test-logic.js b/frontend/src/js/test/test-logic.js index 1c17cafc8..d497db9f2 100644 --- a/frontend/src/js/test/test-logic.js +++ b/frontend/src/js/test/test-logic.js @@ -38,7 +38,7 @@ import * as BritishEnglish from "./british-english"; import * as LazyMode from "./lazy-mode"; import * as Result from "./result"; import * as MonkeyPower from "./../elements/monkey-power"; -import * as ActivePage from "./../elements/active-page"; +import * as ActivePage from "../states/active-page"; const objecthash = require("node-object-hash")().hash; diff --git a/frontend/src/js/test/test-timer.js b/frontend/src/js/test/test-timer.js index b8c28d1de..f50a4e9d6 100644 --- a/frontend/src/js/test/test-timer.js +++ b/frontend/src/js/test/test-timer.js @@ -11,7 +11,7 @@ import * as Misc from "../misc"; import * as Notifications from "../elements/notifications"; import * as TestLogic from "./test-logic"; import * as Caret from "./caret"; -import * as SlowTimer from "./../elements/slow-timer"; +import * as SlowTimer from "../states/slow-timer"; let slowTimerCount = 0; export let time = 0; diff --git a/frontend/src/js/test/test-ui.js b/frontend/src/js/test/test-ui.js index b462b4bd0..e773bbbc1 100644 --- a/frontend/src/js/test/test-ui.js +++ b/frontend/src/js/test/test-ui.js @@ -20,7 +20,7 @@ import * as TestUI from "./test-ui"; import * as ChallengeController from "../controllers/challenge-controller"; import * as QuoteRatePopup from "../popups/quote-rate-popup"; import * as UI from "../ui"; -import * as SlowTimer from "./../elements/slow-timer"; +import * as SlowTimer from "../states/slow-timer"; import * as ReportQuotePopup from "../popups/quote-report-popup"; export let currentWordElementIndex = 0; diff --git a/frontend/src/js/test/timer-progress.js b/frontend/src/js/test/timer-progress.js index 84fbfd5cd..c98439ff4 100644 --- a/frontend/src/js/test/timer-progress.js +++ b/frontend/src/js/test/timer-progress.js @@ -3,7 +3,7 @@ import * as CustomText from "./custom-text"; import * as Misc from "../misc"; import * as TestLogic from "./test-logic"; import * as TestTimer from "./test-timer"; -import * as SlowTimer from "./../elements/slow-timer"; +import * as SlowTimer from "../states/slow-timer"; export function show() { let op = Config.showTimerProgress ? Config.timerOpacity : 0; diff --git a/frontend/src/js/ui.js b/frontend/src/js/ui.js index 08952d853..ecca0f868 100644 --- a/frontend/src/js/ui.js +++ b/frontend/src/js/ui.js @@ -16,7 +16,7 @@ import * as Leaderboards from "./elements/leaderboards"; import * as Funbox from "./test/funbox"; import * as About from "./pages/about"; import * as Misc from "./misc"; -import * as ActivePage from "./elements/active-page"; +import * as ActivePage from "./states/active-page"; export let pageTransition = true;