refactor: first build

This commit is contained in:
Azgaar 2022-07-05 22:55:03 +03:00
parent 3018d94618
commit 41180c57bf
26 changed files with 37 additions and 35 deletions

1
.gitignore vendored
View file

@ -1,2 +1,3 @@
/node_modules /node_modules
/dist /dist
.DS_Store

View file

@ -108,9 +108,16 @@
} }
</style> </style>
<!-- public libs -->
<script src="/libs/jquery-3.1.1.min.js"></script>
<script defer src="/libs/jquery-ui.min.js"></script>
<script defer src="/libs/jquery.ui.touch-punch.min.js"></script>
<link href="/libs/jquery-ui.css" as="style" />
<script src="/libs/define-globals.js"></script>
<!-- styles -->
<link rel="preload" href="/src/index.css" as="style" onload="this.onload=null; this.rel='stylesheet'" /> <link rel="preload" href="/src/index.css" as="style" onload="this.onload=null; this.rel='stylesheet'" />
<link rel="preload" href="/src/icons.css" as="style" onload="this.onload=null; this.rel='stylesheet'" /> <link rel="preload" href="/src/icons.css" as="style" onload="this.onload=null; this.rel='stylesheet'" />
<link rel="preload" href="/src/libs/jquery-ui.css" as="style" onload="this.onload=null; this.rel='stylesheet'" />
</head> </head>
<body> <body>
<svg <svg
@ -7655,9 +7662,6 @@
</defs> </defs>
</svg> </svg>
<script src="/src/libs/jquery-3.1.1.min.js"></script>
<script src="/src/libs/jquery-ui.min.js"></script>
<script type="module" src="/src/modules/heightmap-generator.js"></script> <script type="module" src="/src/modules/heightmap-generator.js"></script>
<script type="module" src="/src/modules/ocean-layers.js"></script> <script type="module" src="/src/modules/ocean-layers.js"></script>
<script type="module" src="/src/modules/river-generator.js"></script> <script type="module" src="/src/modules/river-generator.js"></script>
@ -7673,10 +7677,8 @@
<script type="module" src="/src/modules/coa-generator.js"></script> <script type="module" src="/src/modules/coa-generator.js"></script>
<script type="module" src="/src/modules/submap.js"></script> <script type="module" src="/src/modules/submap.js"></script>
<script type="module" src="/src/modules/fonts.js"></script> <script type="module" src="/src/modules/fonts.js"></script>
<script type="modile" src="/src/modules/ui/stylePresets.js"></script> <script type="module" src="/src/modules/ui/stylePresets.js"></script>
<script type="module" src="/src/modules/ui/options.js"></script> <script type="module" src="/src/modules/ui/options.js"></script>
<script src="/src/modules/define-globals.js"></script>
<script type="module" src="/src/modules/zoom.js"></script> <script type="module" src="/src/modules/zoom.js"></script>
<script type="module" src="/src/main.ts"></script> <script type="module" src="/src/main.ts"></script>
@ -7684,8 +7686,8 @@
<script type="module" src="/src/modules/activeZooming.js"></script> <script type="module" src="/src/modules/activeZooming.js"></script>
<script type="module" src="/src/modules/relief-icons.js"></script> <script type="module" src="/src/modules/relief-icons.js"></script>
<script type="module" src="/src/modules/ui/style.js"></script> <script type="module" src="/src/modules/ui/style.js"></script>
<script type="module" src="/src/modules/ui/editors.js?v=1.87.01"></script> <script type="module" src="/src/modules/ui/editors.js"></script>
<script type="module" src="/src/modules/ui/tools.js?v=1.87.03"></script> <script type="module" src="/src/modules/ui/tools.js"></script>
<script type="module" src="/src/modules/ui/world-configurator.js"></script> <script type="module" src="/src/modules/ui/world-configurator.js"></script>
<script type="module" src="/src/modules/ui/heightmap-editor.js"></script> <script type="module" src="/src/modules/ui/heightmap-editor.js"></script>
<script type="module" src="/src/modules/ui/provinces-editor.js"></script> <script type="module" src="/src/modules/ui/provinces-editor.js"></script>
@ -7702,7 +7704,6 @@
<script type="module" src="/src/modules/ui/rivers-creator.js"></script> <script type="module" src="/src/modules/ui/rivers-creator.js"></script>
<script type="module" src="/src/modules/ui/relief-editor.js"></script> <script type="module" src="/src/modules/ui/relief-editor.js"></script>
<script type="module" src="/src/modules/ui/burg-editor.js"></script> <script type="module" src="/src/modules/ui/burg-editor.js"></script>
<script type="module" src="/src/modules/ui/units-editor.js"></script>
<script type="module" src="/src/modules/ui/notes-editor.js"></script> <script type="module" src="/src/modules/ui/notes-editor.js"></script>
<script type="module" src="/src/modules/ui/diplomacy-editor.js"></script> <script type="module" src="/src/modules/ui/diplomacy-editor.js"></script>
<script type="module" src="/src/modules/ui/zones-editor.js"></script> <script type="module" src="/src/modules/ui/zones-editor.js"></script>
@ -7719,7 +7720,6 @@
<script type="module" src="/src/modules/ui/submap.js"></script> <script type="module" src="/src/modules/ui/submap.js"></script>
<script type="module" src="/src/modules/ui/hotkeys.js"></script> <script type="module" src="/src/modules/ui/hotkeys.js"></script>
<script type="module" src="/src/modules/coa-renderer.js"></script> <script type="module" src="/src/modules/coa-renderer.js"></script>
<script defer src="/src/libs/jquery.ui.touch-punch.min.js"></script>
<script type="module" src="/src/modules/io/save.js"></script> <script type="module" src="/src/modules/io/save.js"></script>
<script type="module" src="/src/modules/io/load.js"></script> <script type="module" src="/src/modules/io/load.js"></script>
<script type="module" src="/src/modules/io/cloud.js"></script> <script type="module" src="/src/modules/io/cloud.js"></script>

View file

@ -1,6 +1,8 @@
{ {
"name": "fantasy-map-generator", "name": "fantasy-map-generator",
"version": "1.88.00", "version": "1.88.00",
"description": "Web application generating interactive and highly customizable maps",
"author": "Azgaar",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",

View file

@ -640,7 +640,7 @@ function togglePercentageMode() {
async function showHierarchy() { async function showHierarchy() {
if (customization) return; 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 getDescription = culture => {
const {name, type, rural, urban} = culture; const {name, type, rural, urban} = culture;

View file

@ -544,7 +544,7 @@ function togglePercentageMode() {
async function showHierarchy() { async function showHierarchy() {
if (customization) return; 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 getDescription = religion => {
const {name, type, form, rural, urban} = religion; const {name, type, form, rural, urban} = religion;

View file

@ -490,7 +490,7 @@ async function parseLoadedData(data) {
{ {
// dynamically import and run auto-udpdate script // dynamically import and run auto-udpdate script
const versionNumber = parseFloat(params[0]); 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); resolveVersionConflicts(versionNumber);
} }

View file

@ -1,10 +1,10 @@
import {last} from "utils/arrayUtils"; import {ERROR} from "config/logging";
import {locked} from "scripts/options/lock"; import {locked} from "scripts/options/lock";
import {tip} from "scripts/tooltips"; import {tip} from "scripts/tooltips";
import {rand, P, ra} from "utils/probabilityUtils"; import {last} from "utils/arrayUtils";
import {capitalize} from "utils/stringUtils";
import {vowel} from "utils/languageUtils"; 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 () { window.Names = (function () {
let chains = []; let chains = [];

View file

@ -1029,19 +1029,19 @@ function refreshAllEditors() {
// dynamically loaded editors // dynamically loaded editors
export async function editStates() { export async function editStates() {
if (customization) return; 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(); Editor.open();
} }
export async function editCultures() { export async function editCultures() {
if (customization) return; 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(); Editor.open();
} }
export async function editReligions() { export async function editReligions() {
if (customization) return; 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(); Editor.open();
} }

View file

@ -87,7 +87,7 @@ document
// show popup with a list of Patreon supportes (updated manually) // show popup with a list of Patreon supportes (updated manually)
async function showSupporters() { async function showSupporters() {
const {supporters} = await import("../dynamic/supporters.js?v=19062022"); const {supporters} = await import("../dynamic/supporters.js");
alertMessage.innerHTML = alertMessage.innerHTML =
"<ul style='column-count: 5; column-gap: 2em'>" + supporters.map(n => `<li>${n}</li>`).join("") + "</ul>"; "<ul style='column-count: 5; column-gap: 2em'>" + supporters.map(n => `<li>${n}</li>`).join("") + "</ul>";
$("#alert").dialog({ $("#alert").dialog({
@ -651,7 +651,7 @@ function changeEra() {
} }
async function openTemplateSelectionDialog() { 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(); HeightmapSelectionDialog.open();
} }

View file

@ -1,3 +1,4 @@
import {ERROR} from "config/logging";
import {tip} from "scripts/tooltips"; import {tip} from "scripts/tooltips";
import {isJsonValid} from "utils/stringUtils"; import {isJsonValid} from "utils/stringUtils";
import {byId} from "utils/shorthands"; 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]; return [presetToLoad, style];
} }
async function fetchSystemPreset(preset) { async function importSystemPreset(preset) {
const style = await fetch(`./styles/${preset}.json`) const style = await import(`../../assets/styles/${preset}.json`).catch(err => {
.then(res => res.json())
.catch(err => {
ERROR && console.error("Error on loading style preset", preset, err); ERROR && console.error("Error on loading style preset", preset, err);
return null; return null;
}); });
if (!style) throw new Error("Cannot fetch style preset", preset); if (!style.default) throw new Error("Cannot fetch style preset", preset);
return style; return style.default;
} }
function applyStyle(style) { function applyStyle(style) {

View file

@ -869,6 +869,6 @@ function viewCellDetails() {
} }
async function overviewCharts() { 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(); Overview.open();
} }

View file

@ -84,7 +84,7 @@ export function getHeight(h: number, abs: boolean = false) {
// Precipitation // Precipitation
// *** // ***
function getFriendlyPrecipitation(prec: number) { export function getFriendlyPrecipitation(prec: number) {
return prec * 100 + " mm"; return prec * 100 + " mm";
} }