Merge pull request #103 from MRT-Map/split-airportcalc

Split airportcalc 2 into its own page
MRT-Map · Jan 3, 2024 · 9ebc36d · 9ebc36d
2 parents 7845a4f + adebe46
commit 9ebc36d
Show file tree

Hide file tree

Showing 22 changed files with 494 additions and 425 deletions.
diff --git a/README.md b/README.md
@@ -2,6 +2,8 @@
 
 A detailed map of the Minecart Rapid Transit server, inspired by OpenStreetMap and Google Maps
 
+Also includes Airportcalc 2
+
 All data is sourced from staff documents and the server dynamic map. You may need to hard refresh your page (shift+f5) to get the latest updates.
 
 ## Collaborators
@@ -14,5 +16,3 @@ All data is sourced from staff documents and the server dynamic map. You may nee
 - megascatterbomb
 - Airplaneguy9
 - Scarycrumb45
-
-MRT Map and Airportcalc logo by Cortesi
diff --git a/airportcalc.html b/airportcalc.html
@@ -0,0 +1,31 @@
+<!doctype html>
+<html>
+  <head>
+    <title>Airportcalc 2</title>
+    <meta
+      name="description"
+      content="A city and airport size calculator for the Minecart Rapid Transit server"
+    />
+    <meta name="author" content="MRT Mapping Services" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+
+    <link rel="icon" type="image/png" href="./media/ac192.png" />
+    <link rel="manifest" href="manifest.json" />
+
+    <link rel="stylesheet" href="out-ac.css" />
+    <script defer src="out-ac.js"></script>
+  </head>
+
+  <body>
+    <div id="map"></div>
+    <div id="bar"></div>
+    <a id="downloader" style="display: none"></a>
+    <input
+      type="file"
+      name="importer"
+      id="importer"
+      accept=".apc,.json"
+      style="display: none"
+    />
+  </body>
+</html>
diff --git a/build.mjs b/build.mjs
@@ -10,12 +10,16 @@ import postcssPresetEnv from "postcss-preset-env";
 const postcssPlugins = [autoprefixer(), postcssPresetEnv({ stage: 0 })];
 
 let ctx = await esbuild.context({
-  entryPoints: ["src/index.ts"],
+  entryPoints: [
+    { in: "src/map/index.ts", out: "out-map" },
+    { in: "src/airportcalc/index.ts", out: "out-ac" },
+  ],
   bundle: true,
   minify: true,
   sourcemap: true,
-  outfile: "out/out.js",
-  publicPath: process.argv[2] == "prod" ? "https://mrt-map.github.io/map" : undefined,
+  outdir: "out",
+  publicPath:
+    process.argv[2] == "prod" ? "https://mrt-map.github.io/map" : undefined,
   plugins: [
     sassPlugin({
       async transform(source) {
@@ -34,6 +38,7 @@ let ctx = await esbuild.context({
 });
 if (!fs.existsSync("out")) fs.mkdirSync("out");
 fs.copyFileSync("./index.html", "./out/index.html");
+fs.copyFileSync("./airportcalc.html", "./out/airportcalc.html");
 fs.copyFileSync("./manifest.json", "./out/manifest.json");
 fse.copySync("./media", "./out/media");
 

diff --git a/index.html b/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <title>MRT City Map</title>
@@ -10,10 +10,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
     <link rel="icon" type="image/png" href="./media/map192.png" />
-    <link rel="manifest" href="manifest.json">
+    <link rel="manifest" href="manifest.json" />
 
-    <link rel="stylesheet" href="out.css" />
-    <script defer src="out.js"></script>
+    <link rel="stylesheet" href="out-map.css" />
+    <script defer src="out-map.js"></script>
   </head>
 
   <body>
@@ -29,14 +29,5 @@
     </div>
 
     <div id="map"></div>
-    <div id="bar"></div>
-    <a id="downloader" style="display: none"></a>
-    <input
-      type="file"
-      name="importer"
-      id="importer"
-      accept=".apc,.json"
-      style="display: none"
-    />
   </body>
 </html>
diff --git a/media/ac192.png b/media/ac192.png
diff --git a/media/ac512.png b/media/ac512.png
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml