From 41180c57bf12ce6b7852fdee3fc4fbc15ae4f240 Mon Sep 17 00:00:00 2001 From: Azgaar Date: Tue, 5 Jul 2022 22:55:03 +0300 Subject: [PATCH] refactor: first build --- .gitignore | 1 + index.html | 22 +++++++++---------- package.json | 2 ++ .../modules => public/libs}/define-globals.js | 0 {src => public}/libs/jquery-3.1.1.min.js | 0 {src => public}/libs/jquery-ui.css | 0 {src => public}/libs/jquery-ui.min.js | 0 .../libs/jquery.ui.touch-punch.min.js | 0 {styles => src/assets/styles}/ancient.json | 0 {styles => src/assets/styles}/atlas.json | 0 {styles => src/assets/styles}/clean.json | 0 {styles => src/assets/styles}/cyberpunk.json | 0 {styles => src/assets/styles}/default.json | 0 {styles => src/assets/styles}/gloom.json | 0 {styles => src/assets/styles}/light.json | 0 {styles => src/assets/styles}/monochrome.json | 0 {styles => src/assets/styles}/watercolor.json | 0 .../dynamic/editors/cultures-editor.js | 2 +- .../dynamic/editors/religions-editor.js | 2 +- src/modules/io/load.js | 2 +- src/modules/names-generator.js | 8 +++---- src/modules/ui/editors.js | 6 ++--- src/modules/ui/options.js | 4 ++-- src/modules/ui/stylePresets.js | 19 ++++++++-------- src/modules/ui/tools.js | 2 +- src/utils/unitUtils.ts | 2 +- 26 files changed, 37 insertions(+), 35 deletions(-) rename {src/modules => public/libs}/define-globals.js (100%) rename {src => public}/libs/jquery-3.1.1.min.js (100%) rename {src => public}/libs/jquery-ui.css (100%) rename {src => public}/libs/jquery-ui.min.js (100%) rename {src => public}/libs/jquery.ui.touch-punch.min.js (100%) rename {styles => src/assets/styles}/ancient.json (100%) rename {styles => src/assets/styles}/atlas.json (100%) rename {styles => src/assets/styles}/clean.json (100%) rename {styles => src/assets/styles}/cyberpunk.json (100%) rename {styles => src/assets/styles}/default.json (100%) rename {styles => src/assets/styles}/gloom.json (100%) rename {styles => src/assets/styles}/light.json (100%) rename {styles => src/assets/styles}/monochrome.json (100%) rename {styles => src/assets/styles}/watercolor.json (100%) diff --git a/.gitignore b/.gitignore index 8225baa4..891437fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /node_modules /dist +.DS_Store diff --git a/index.html b/index.html index 3a738675..1ea43399 100644 --- a/index.html +++ b/index.html @@ -108,9 +108,16 @@ } + + + + + + + + - - - - @@ -7673,10 +7677,8 @@ - + - - @@ -7684,8 +7686,8 @@ - - + + @@ -7702,7 +7704,6 @@ - @@ -7719,7 +7720,6 @@ - diff --git a/package.json b/package.json index c4965077..52c62b3e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,8 @@ { "name": "fantasy-map-generator", "version": "1.88.00", + "description": "Web application generating interactive and highly customizable maps", + "author": "Azgaar", "type": "module", "scripts": { "dev": "vite", diff --git a/src/modules/define-globals.js b/public/libs/define-globals.js similarity index 100% rename from src/modules/define-globals.js rename to public/libs/define-globals.js diff --git a/src/libs/jquery-3.1.1.min.js b/public/libs/jquery-3.1.1.min.js similarity index 100% rename from src/libs/jquery-3.1.1.min.js rename to public/libs/jquery-3.1.1.min.js diff --git a/src/libs/jquery-ui.css b/public/libs/jquery-ui.css similarity index 100% rename from src/libs/jquery-ui.css rename to public/libs/jquery-ui.css diff --git a/src/libs/jquery-ui.min.js b/public/libs/jquery-ui.min.js similarity index 100% rename from src/libs/jquery-ui.min.js rename to public/libs/jquery-ui.min.js diff --git a/src/libs/jquery.ui.touch-punch.min.js b/public/libs/jquery.ui.touch-punch.min.js similarity index 100% rename from src/libs/jquery.ui.touch-punch.min.js rename to public/libs/jquery.ui.touch-punch.min.js diff --git a/styles/ancient.json b/src/assets/styles/ancient.json similarity index 100% rename from styles/ancient.json rename to src/assets/styles/ancient.json diff --git a/styles/atlas.json b/src/assets/styles/atlas.json similarity index 100% rename from styles/atlas.json rename to src/assets/styles/atlas.json diff --git a/styles/clean.json b/src/assets/styles/clean.json similarity index 100% rename from styles/clean.json rename to src/assets/styles/clean.json diff --git a/styles/cyberpunk.json b/src/assets/styles/cyberpunk.json similarity index 100% rename from styles/cyberpunk.json rename to src/assets/styles/cyberpunk.json diff --git a/styles/default.json b/src/assets/styles/default.json similarity index 100% rename from styles/default.json rename to src/assets/styles/default.json diff --git a/styles/gloom.json b/src/assets/styles/gloom.json similarity index 100% rename from styles/gloom.json rename to src/assets/styles/gloom.json diff --git a/styles/light.json b/src/assets/styles/light.json similarity index 100% rename from styles/light.json rename to src/assets/styles/light.json diff --git a/styles/monochrome.json b/src/assets/styles/monochrome.json similarity index 100% rename from styles/monochrome.json rename to src/assets/styles/monochrome.json diff --git a/styles/watercolor.json b/src/assets/styles/watercolor.json similarity index 100% rename from styles/watercolor.json rename to src/assets/styles/watercolor.json diff --git a/src/modules/dynamic/editors/cultures-editor.js b/src/modules/dynamic/editors/cultures-editor.js index 31b292dc..5bd613cb 100644 --- a/src/modules/dynamic/editors/cultures-editor.js +++ b/src/modules/dynamic/editors/cultures-editor.js @@ -640,7 +640,7 @@ function togglePercentageMode() { async function showHierarchy() { if (customization) return; - const HeirarchyTree = await import("../hierarchy-tree.js?v=1.87.01"); + const HeirarchyTree = await import("../hierarchy-tree.js"); const getDescription = culture => { const {name, type, rural, urban} = culture; diff --git a/src/modules/dynamic/editors/religions-editor.js b/src/modules/dynamic/editors/religions-editor.js index 47f20f7c..70def4c4 100644 --- a/src/modules/dynamic/editors/religions-editor.js +++ b/src/modules/dynamic/editors/religions-editor.js @@ -544,7 +544,7 @@ function togglePercentageMode() { async function showHierarchy() { if (customization) return; - const HeirarchyTree = await import("../hierarchy-tree.js?v=1.87.01"); + const HeirarchyTree = await import("../hierarchy-tree.js"); const getDescription = religion => { const {name, type, form, rural, urban} = religion; diff --git a/src/modules/io/load.js b/src/modules/io/load.js index f63a76c0..b7a43994 100644 --- a/src/modules/io/load.js +++ b/src/modules/io/load.js @@ -490,7 +490,7 @@ async function parseLoadedData(data) { { // dynamically import and run auto-udpdate script const versionNumber = parseFloat(params[0]); - const {resolveVersionConflicts} = await import("../dynamic/auto-update.js?v=06062022"); + const {resolveVersionConflicts} = await import("../dynamic/auto-update.js"); resolveVersionConflicts(versionNumber); } diff --git a/src/modules/names-generator.js b/src/modules/names-generator.js index 65cc2b19..8b991ceb 100644 --- a/src/modules/names-generator.js +++ b/src/modules/names-generator.js @@ -1,10 +1,10 @@ -import {last} from "utils/arrayUtils"; +import {ERROR} from "config/logging"; import {locked} from "scripts/options/lock"; import {tip} from "scripts/tooltips"; -import {rand, P, ra} from "utils/probabilityUtils"; -import {capitalize} from "utils/stringUtils"; +import {last} from "utils/arrayUtils"; import {vowel} from "utils/languageUtils"; -import {ERROR} from "config/logging"; +import {P, ra, rand} from "utils/probabilityUtils"; +import {capitalize} from "utils/stringUtils"; window.Names = (function () { let chains = []; diff --git a/src/modules/ui/editors.js b/src/modules/ui/editors.js index c24525a3..87e05b9e 100644 --- a/src/modules/ui/editors.js +++ b/src/modules/ui/editors.js @@ -1029,19 +1029,19 @@ function refreshAllEditors() { // dynamically loaded editors export async function editStates() { if (customization) return; - const Editor = await import("../dynamic/editors/states-editor.js?v=12062022"); + const Editor = await import("../dynamic/editors/states-editor.js"); Editor.open(); } export async function editCultures() { if (customization) return; - const Editor = await import("../dynamic/editors/cultures-editor.js?v=1.87.01"); + const Editor = await import("../dynamic/editors/cultures-editor.js"); Editor.open(); } export async function editReligions() { if (customization) return; - const Editor = await import("../dynamic/editors/religions-editor.js?v=1.87.01"); + const Editor = await import("../dynamic/editors/religions-editor.js"); Editor.open(); } diff --git a/src/modules/ui/options.js b/src/modules/ui/options.js index 55471d78..2520f9aa 100644 --- a/src/modules/ui/options.js +++ b/src/modules/ui/options.js @@ -87,7 +87,7 @@ document // show popup with a list of Patreon supportes (updated manually) async function showSupporters() { - const {supporters} = await import("../dynamic/supporters.js?v=19062022"); + const {supporters} = await import("../dynamic/supporters.js"); alertMessage.innerHTML = ""; $("#alert").dialog({ @@ -651,7 +651,7 @@ function changeEra() { } async function openTemplateSelectionDialog() { - const HeightmapSelectionDialog = await import("../dynamic/heightmap-selection.js?v=1.87.00"); + const HeightmapSelectionDialog = await import("../dynamic/heightmap-selection.js"); HeightmapSelectionDialog.open(); } diff --git a/src/modules/ui/stylePresets.js b/src/modules/ui/stylePresets.js index 8f5fccd8..8fc2338d 100644 --- a/src/modules/ui/stylePresets.js +++ b/src/modules/ui/stylePresets.js @@ -1,3 +1,4 @@ +import {ERROR} from "config/logging"; import {tip} from "scripts/tooltips"; import {isJsonValid} from "utils/stringUtils"; import {byId} from "utils/shorthands"; @@ -56,20 +57,18 @@ async function getStylePreset(desiredPreset) { } } - const style = await fetchSystemPreset(presetToLoad); + const style = await importSystemPreset(presetToLoad); return [presetToLoad, style]; } -async function fetchSystemPreset(preset) { - const style = await fetch(`./styles/${preset}.json`) - .then(res => res.json()) - .catch(err => { - ERROR && console.error("Error on loading style preset", preset, err); - return null; - }); +async function importSystemPreset(preset) { + const style = await import(`../../assets/styles/${preset}.json`).catch(err => { + ERROR && console.error("Error on loading style preset", preset, err); + return null; + }); - if (!style) throw new Error("Cannot fetch style preset", preset); - return style; + if (!style.default) throw new Error("Cannot fetch style preset", preset); + return style.default; } function applyStyle(style) { diff --git a/src/modules/ui/tools.js b/src/modules/ui/tools.js index d0eb2a3b..c44b9bdc 100644 --- a/src/modules/ui/tools.js +++ b/src/modules/ui/tools.js @@ -869,6 +869,6 @@ function viewCellDetails() { } async function overviewCharts() { - const Overview = await import("../dynamic/overview/charts-overview.js?v=1.87.03"); + const Overview = await import("../dynamic/overview/charts-overview.js"); Overview.open(); } diff --git a/src/utils/unitUtils.ts b/src/utils/unitUtils.ts index d0fd8986..828c0dfb 100644 --- a/src/utils/unitUtils.ts +++ b/src/utils/unitUtils.ts @@ -84,7 +84,7 @@ export function getHeight(h: number, abs: boolean = false) { // Precipitation // *** -function getFriendlyPrecipitation(prec: number) { +export function getFriendlyPrecipitation(prec: number) { return prec * 100 + " mm"; }