From 26b4f0bb19813b8dc304b90a6d9cb43da655b0fa Mon Sep 17 00:00:00 2001 From: Mickael Kerjean Date: Tue, 25 Jul 2023 23:55:32 +1000 Subject: [PATCH] chore (refactoring): import path for lib related stuff --- public/components/modal.js | 6 +- public/lib/{ajax/index.js => ajax.js} | 4 +- public/lib/{animate/index.js => animate.js} | 4 +- public/lib/animate/animation.js | 110 ------------------ public/lib/{dom/index.js => dom.js} | 0 public/lib/{error/index.js => error.js} | 0 public/lib/{locales/index.js => locales.js} | 0 public/lib/{rxjs/index.js => rx.js} | 2 +- public/lib/{rxjs => }/vendor/rxjs-ajax.min.js | 0 .../{rxjs => }/vendor/rxjs-operators.min.js | 0 .../lib/{rxjs => }/vendor/rxjs-shared.min.js | 0 public/lib/{rxjs => }/vendor/rxjs.min.js | 0 public/pages/adminpage/animate.js | 2 +- public/pages/adminpage/ctrl_about.js | 4 +- public/pages/adminpage/ctrl_backend.js | 2 +- public/pages/adminpage/ctrl_logger.js | 2 +- public/pages/adminpage/ctrl_login.js | 6 +- public/pages/adminpage/ctrl_setup.js | 8 +- .../pages/adminpage/decorator_admin_only.js | 2 +- public/pages/adminpage/decorator_sidemenu.js | 4 +- public/pages/adminpage/model_admin_session.js | 4 +- public/pages/adminpage/model_config.js | 2 +- public/pages/adminpage/model_release.js | 4 +- public/pages/ctrl_error.js | 8 +- public/pages/ctrl_logout.js | 4 +- public/pages/ctrl_notfound.js | 2 +- 26 files changed, 35 insertions(+), 145 deletions(-) rename public/lib/{ajax/index.js => ajax.js} (97%) rename public/lib/{animate/index.js => animate.js} (90%) delete mode 100644 public/lib/animate/animation.js rename public/lib/{dom/index.js => dom.js} (100%) rename public/lib/{error/index.js => error.js} (100%) rename public/lib/{locales/index.js => locales.js} (100%) rename public/lib/{rxjs/index.js => rx.js} (95%) rename public/lib/{rxjs => }/vendor/rxjs-ajax.min.js (100%) rename public/lib/{rxjs => }/vendor/rxjs-operators.min.js (100%) rename public/lib/{rxjs => }/vendor/rxjs-shared.min.js (100%) rename public/lib/{rxjs => }/vendor/rxjs.min.js (100%) diff --git a/public/components/modal.js b/public/components/modal.js index 408d1b14..20e398e4 100644 --- a/public/components/modal.js +++ b/public/components/modal.js @@ -1,7 +1,7 @@ import { createElement } from "../lib/skeleton/index.js"; -import rxjs, { applyMutation } from "../lib/rxjs/index.js"; -import { animate } from "../lib/animate/index.js"; -import { qs } from "../lib/dom/index.js"; +import rxjs, { applyMutation } from "../lib/rx.js"; +import { animate } from "../lib/animate.js"; +import { qs } from "../lib/dom.js"; import CSSLoader from "../../helpers/css.js"; // http://127.0.0.1:8000/admin/setup diff --git a/public/lib/ajax/index.js b/public/lib/ajax.js similarity index 97% rename from public/lib/ajax/index.js rename to public/lib/ajax.js index e14b7b69..2a160c7a 100644 --- a/public/lib/ajax/index.js +++ b/public/lib/ajax.js @@ -1,5 +1,5 @@ -import rxjs, { ajax } from "../rxjs/index.js"; -import { AjaxError } from "../error/index.js"; +import rxjs, { ajax } from "./rx.js"; +import { AjaxError } from "./error.js"; export default function(opts) { if (typeof opts === "string") opts = { url: opts }; diff --git a/public/lib/animate/index.js b/public/lib/animate.js similarity index 90% rename from public/lib/animate/index.js rename to public/lib/animate.js index e8b4266e..ebcc8411 100644 --- a/public/lib/animate/index.js +++ b/public/lib/animate.js @@ -1,5 +1,5 @@ -import { onDestroy, createElement } from "../skeleton/index.js"; -import rxjs from "../rxjs/index.js"; +import { onDestroy, createElement } from "./skeleton/index.js"; +import rxjs from "./rx.js"; export function transition($node, opts = {}) { const { diff --git a/public/lib/animate/animation.js b/public/lib/animate/animation.js deleted file mode 100644 index d1cf70fd..00000000 --- a/public/lib/animate/animation.js +++ /dev/null @@ -1,110 +0,0 @@ -const sleep = (t) => new Promise((done) => setTimeout(done, t)); - -export async function requestAnimation() { - return new Promise((done) => requestAnimationFrame(done)); -} - -export async function enterAnimation($node, timeout) { - $node.classList.remove("leave", "leave-active", "enter", "enter-active"); - await requestAnimation(); - $node.classList.add("enter"); - await requestAnimation(); - $node.classList.add("enter-active") - await sleep(timeout); - $node.classList.remove("enter", "enter-active"); -} - -export async function leaveAnimation($node, timeout) { - $node.classList.remove("leave", "leave-active", "enter", "enter-active"); - await requestAnimation(); - $node.classList.add("leave"); - await requestAnimation(); - $node.classList.add("leave-active") - await sleep(timeout); -} - -export function slideXIn(size) { - return function (querySelector, t){ - return ` -${querySelector}.enter { - opacity: 0; - transform: translateX(${size}px); -} -${querySelector}.enter.enter-active { - opacity: 1; - transform: translateX(0); - transition: all ${t}ms ease; -}`; - } -} - -export function slideYIn(size) { - return function (querySelector, t){ - return ` -${querySelector}.enter { - opacity: 0; - transform: translateY(${size}px); -} -${querySelector}.enter.enter-active { - opacity: 1; - transform: translateY(0); - transition: all ${t}ms ease; -}`; - } -} - -export function slideXOut(size) { - return function (querySelector, t){ - return ` -${querySelector}.leave { - opacity: 1; - transform: translateX(0); -} -${querySelector}.leave.leave-active { - opacity: 0; - transform: translateX(${size}px); - transition: all ${t}ms ease; -}`; - } -} - -export function slideYOut(size) { - return function (querySelector, t){ - return ` -${querySelector}.leave { - opacity: 1; - transform: translateY(0); -} -${querySelector}.leave.leave-active { - opacity: 0; - transform: translateY(${size}px); - transition: all ${t}ms ease; -}`; - } -} - -export function opacityIn() { - return function (querySelector, t){ - return ` -${querySelector}.enter { - opacity: 0; -} -${querySelector}.enter.enter-active { - opacity: 1; - transition: opacity ${t}ms ease; -}`; - } -} - -export function opacityOut() { - return function (querySelector, t){ - return ` -${querySelector}.leave { - opacity: 1; -} -${querySelector}.leave.leave-active { - opacity: 0; - transition: opacity ${t}ms ease; -}`; - } -} diff --git a/public/lib/dom/index.js b/public/lib/dom.js similarity index 100% rename from public/lib/dom/index.js rename to public/lib/dom.js diff --git a/public/lib/error/index.js b/public/lib/error.js similarity index 100% rename from public/lib/error/index.js rename to public/lib/error.js diff --git a/public/lib/locales/index.js b/public/lib/locales.js similarity index 100% rename from public/lib/locales/index.js rename to public/lib/locales.js diff --git a/public/lib/rxjs/index.js b/public/lib/rx.js similarity index 95% rename from public/lib/rxjs/index.js rename to public/lib/rx.js index d107638f..26753d51 100644 --- a/public/lib/rxjs/index.js +++ b/public/lib/rx.js @@ -1,4 +1,4 @@ -import { onDestroy } from "../skeleton/index.js"; +import { onDestroy } from "./skeleton/index.js"; // https://github.com/ReactiveX/rxjs/issues/4416#issuecomment-620847759 const rxjsModule = await import("./vendor/rxjs.min.js"); diff --git a/public/lib/rxjs/vendor/rxjs-ajax.min.js b/public/lib/vendor/rxjs-ajax.min.js similarity index 100% rename from public/lib/rxjs/vendor/rxjs-ajax.min.js rename to public/lib/vendor/rxjs-ajax.min.js diff --git a/public/lib/rxjs/vendor/rxjs-operators.min.js b/public/lib/vendor/rxjs-operators.min.js similarity index 100% rename from public/lib/rxjs/vendor/rxjs-operators.min.js rename to public/lib/vendor/rxjs-operators.min.js diff --git a/public/lib/rxjs/vendor/rxjs-shared.min.js b/public/lib/vendor/rxjs-shared.min.js similarity index 100% rename from public/lib/rxjs/vendor/rxjs-shared.min.js rename to public/lib/vendor/rxjs-shared.min.js diff --git a/public/lib/rxjs/vendor/rxjs.min.js b/public/lib/vendor/rxjs.min.js similarity index 100% rename from public/lib/rxjs/vendor/rxjs.min.js rename to public/lib/vendor/rxjs.min.js diff --git a/public/pages/adminpage/animate.js b/public/pages/adminpage/animate.js index bd2d323d..a4943ce1 100644 --- a/public/pages/adminpage/animate.js +++ b/public/pages/adminpage/animate.js @@ -1,4 +1,4 @@ -import { transition } from "../../lib/animate/index.js"; +import { transition } from "../../lib/animate.js"; export default function($node) { return transition($node, { diff --git a/public/pages/adminpage/ctrl_about.js b/public/pages/adminpage/ctrl_about.js index eae58de1..1c742bb9 100644 --- a/public/pages/adminpage/ctrl_about.js +++ b/public/pages/adminpage/ctrl_about.js @@ -1,6 +1,6 @@ import { createElement } from "../../lib/skeleton/index.js"; -import rxjs, { effect, stateMutation } from "../../lib/rxjs/index.js" -import { qs } from "../../lib/dom/index.js"; +import rxjs, { effect, stateMutation } from "../../lib/rx.js" +import { qs } from "../../lib/dom.js"; import CSSLoader from "../../helpers/css.js"; import transition from "./animate.js"; diff --git a/public/pages/adminpage/ctrl_backend.js b/public/pages/adminpage/ctrl_backend.js index 734d0ec9..faa47440 100644 --- a/public/pages/adminpage/ctrl_backend.js +++ b/public/pages/adminpage/ctrl_backend.js @@ -1,5 +1,5 @@ import { createElement } from "../../lib/skeleton/index.js"; -import { effect } from "../../lib/rxjs/index.js"; +import { effect } from "../../lib/rx.js"; import transition from "./animate.js"; import AdminOnly from "./decorator_admin_only.js"; diff --git a/public/pages/adminpage/ctrl_logger.js b/public/pages/adminpage/ctrl_logger.js index e00ab94e..5cf5bf22 100644 --- a/public/pages/adminpage/ctrl_logger.js +++ b/public/pages/adminpage/ctrl_logger.js @@ -1,5 +1,5 @@ import { createElement, createRender } from "../../lib/skeleton/index.js"; -import { effect } from "../../lib/rxjs/index.js"; +import { effect } from "../../lib/rx.js"; import transition from "./animate.js"; import AdminOnly from "./decorator_admin_only.js"; diff --git a/public/pages/adminpage/ctrl_login.js b/public/pages/adminpage/ctrl_login.js index 26f43a87..aa0cbdaf 100644 --- a/public/pages/adminpage/ctrl_login.js +++ b/public/pages/adminpage/ctrl_login.js @@ -1,7 +1,7 @@ import { createElement } from "../../lib/skeleton/index.js"; -import rxjs, { effect, stateMutation, applyMutation, preventDefault } from "../../lib/rxjs/index.js"; -import { qs } from "../../lib/dom/index.js"; -import { transition } from "../../lib/animate/index.js"; +import rxjs, { effect, stateMutation, applyMutation, preventDefault } from "../../lib/rx.js"; +import { qs } from "../../lib/dom.js"; +import { transition } from "../../lib/animate.js"; import CSSLoader from "../../helpers/css.js"; import { zoomIn } from "./animate.js"; diff --git a/public/pages/adminpage/ctrl_setup.js b/public/pages/adminpage/ctrl_setup.js index 739f8233..17fedba3 100644 --- a/public/pages/adminpage/ctrl_setup.js +++ b/public/pages/adminpage/ctrl_setup.js @@ -1,8 +1,8 @@ import { createElement, createRender, onDestroy } from "../../lib/skeleton/index.js"; -import rxjs, { effect, stateMutation, applyMutation, preventDefault } from "../../lib/rxjs/index.js"; -import { qs } from "../../lib/dom/index.js"; -import { ApplicationError } from "../../lib/error/index.js"; -import { transition, animate } from "../../lib/animate/index.js"; +import rxjs, { effect, stateMutation, applyMutation, preventDefault } from "../../lib/rx.js"; +import { qs } from "../../lib/dom.js"; +import { ApplicationError } from "../../lib/error.js"; +import { transition, animate } from "../../lib/animate.js"; import CSSLoader from "../../helpers/css.js"; import modal from "../../helpers/modal.js"; diff --git a/public/pages/adminpage/decorator_admin_only.js b/public/pages/adminpage/decorator_admin_only.js index 71ce1e53..a33953d6 100644 --- a/public/pages/adminpage/decorator_admin_only.js +++ b/public/pages/adminpage/decorator_admin_only.js @@ -1,5 +1,5 @@ import { createElement, onDestroy } from "../../lib/skeleton/index.js"; -import rxjs, { effect } from "../../lib/rxjs/index.js"; +import rxjs, { effect } from "../../lib/rx.js"; import ctrlLogin from "./ctrl_login.js"; import ctrlError from "../ctrl_error.js"; diff --git a/public/pages/adminpage/decorator_sidemenu.js b/public/pages/adminpage/decorator_sidemenu.js index 66616866..0e485a57 100644 --- a/public/pages/adminpage/decorator_sidemenu.js +++ b/public/pages/adminpage/decorator_sidemenu.js @@ -1,6 +1,6 @@ import { createElement } from "../../../lib/skeleton/index.js"; -import rxjs, { effect, stateMutation } from "../../../lib/rxjs/index.js"; -import { qs } from "../../lib/dom/index.js"; +import rxjs, { effect, stateMutation } from "../../../lib/rx.js"; +import { qs } from "../../lib/dom.js"; import CSSLoader from "../../helpers/css.js"; diff --git a/public/pages/adminpage/model_admin_session.js b/public/pages/adminpage/model_admin_session.js index b4040581..5f308c4e 100644 --- a/public/pages/adminpage/model_admin_session.js +++ b/public/pages/adminpage/model_admin_session.js @@ -1,5 +1,5 @@ -import rxjs from "../../lib/rxjs/index.js"; -import ajax from "../../lib/ajax/index.js"; +import rxjs from "../../lib/rx.js"; +import ajax from "../../lib/ajax.js"; window.ajax = ajax; diff --git a/public/pages/adminpage/model_config.js b/public/pages/adminpage/model_config.js index 5a408517..66c9c1a1 100644 --- a/public/pages/adminpage/model_config.js +++ b/public/pages/adminpage/model_config.js @@ -1,4 +1,4 @@ -import rxjs from "../../lib/rxjs/index.js"; +import rxjs from "../../lib/rx.js"; class ConfigManager { diff --git a/public/pages/adminpage/model_release.js b/public/pages/adminpage/model_release.js index 0bd1bd46..18d9f1b6 100644 --- a/public/pages/adminpage/model_release.js +++ b/public/pages/adminpage/model_release.js @@ -1,5 +1,5 @@ -import rxjs from "../../lib/rxjs/index.js"; -import ajax from "../../lib/ajax/index.js"; +import rxjs from "../../lib/rx.js"; +import ajax from "../../lib/ajax.js"; const release$ = ajax({ url: "/about", diff --git a/public/pages/ctrl_error.js b/public/pages/ctrl_error.js index b0af0687..1b1e405c 100644 --- a/public/pages/ctrl_error.js +++ b/public/pages/ctrl_error.js @@ -1,9 +1,9 @@ import { createElement } from "../lib/skeleton/index.js"; -import rxjs, { effect, applyMutation } from "../lib/rxjs/index.js"; -import { qs } from "../lib/dom/index.js"; -import t from "../lib/locales/index.js"; +import rxjs, { effect, applyMutation } from "../lib/rx.js"; +import { qs } from "../lib/dom.js"; +import t from "../lib/locales.js"; -import { AjaxError, ApplicationError } from "../lib/error/index.js"; +import { AjaxError, ApplicationError } from "../lib/error.js"; import CSSLoader from "../helpers/css.js"; import "../../components/icon.js"; diff --git a/public/pages/ctrl_logout.js b/public/pages/ctrl_logout.js index cbd55b71..780642bc 100644 --- a/public/pages/ctrl_logout.js +++ b/public/pages/ctrl_logout.js @@ -1,6 +1,6 @@ import { createElement, navigate } from "../lib/skeleton/index.js"; -import rxjs, { effect } from "../lib/rxjs/index.js"; -import ajax from "../lib/ajax/index.js"; +import rxjs, { effect } from "../lib/rx.js"; +import ajax from "../lib/ajax.js"; import ctrlError from "./ctrl_error.js"; import "../components/icon.js"; diff --git a/public/pages/ctrl_notfound.js b/public/pages/ctrl_notfound.js index 3b181994..488b4698 100644 --- a/public/pages/ctrl_notfound.js +++ b/public/pages/ctrl_notfound.js @@ -1,4 +1,4 @@ import ctrlError from "./ctrl_error.js"; -import { ApplicationError } from "../lib/error/index.js"; +import { ApplicationError } from "../lib/error.js"; export default ctrlError(new ApplicationError("Not Found"));