fixed merge conflicts and help page

- need to fix buttons soon
soundscape-community · Jul 1, 2024 · 73478b7 · 73478b7
1 parent f5f91e1
commit 73478b7
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 31 deletions.
diff --git a/src/css/main.css b/src/css/main.css
@@ -238,6 +238,7 @@ img {
 
 .row {
     margin-bottom: 20px;
+}
 /* Current beacon marker on map */
 /* .beacon-icon {
     position: relative;
@@ -259,4 +260,4 @@ img {
     50% {
         opacity: 1.0;
     }
-} */
+} 
diff --git a/help.html → src/help.html b/help.html → src/help.html
@@ -5,17 +5,17 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css" />
     <link rel="stylesheet" href="https://unpkg.com/leaflet/dist/leaflet.css" />
-    <link rel="stylesheet" href="app/css/main.css" />
+    <link rel="stylesheet" href="./css/main.css" />
     <script src="https://unpkg.com/leaflet/dist/leaflet.js"></script>
     <script src="https://unpkg.com/@turf/turf@6/turf.min.js"></script>
-    <script src="app/js/vendor/unmute.js"></script>
-    <script src="app/js/main.js" type="module"></script>
+    <script src="./js/vendor/unmute.js" type="module"></script>
+    <script src="./js/main.js" type="module"></script>
 
     <body>
         <nav>
             <div class="home-container">
                 <button class="home" title="Home">
-                    <a href="index.html" class="help-link">&#x2302;</a>
+                    <a href="./index.html" class="help-link">&#x2302;</a>
                 </button>
             </div>
             <div class="title-container">

diff --git a/src/index.html b/src/index.html
@@ -1,48 +1,53 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <link rel="apple-touch-icon" sizes="180x180" href="./icons/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="./icons/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="./icons/favicon-16x16.png">
-    <link crossorigin="use-credentials" rel="manifest" href="./manifest.json">
-
     <meta charset="UTF-8" />
     <!-- Render to a usable size on mobile -->
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-
-    <script
-      type="module"
-      src="https://unpkg.com/@ionic/pwa-elements@latest/dist/ionicpwaelements/ionicpwaelements.esm.js"
-    ></script>
-    <script
-      nomodule
-      src="https://unpkg.com/@ionic/pwa-elements@latest/dist/ionicpwaelements/ionicpwaelements.js"
-    ></script>
-
     <link rel="stylesheet" href="https://unpkg.com/leaflet/dist/leaflet.css" />
-    <link rel="stylesheet" href="./css/main.css" />
-
+    <!-- <link rel="stylesheet" href="app/css/main.css" /> -->
+    <link rel="stylesheet" href="/css/main.css" />
+
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" />
     <script src="https://unpkg.com/leaflet/dist/leaflet.js"></script>
     <script src="https://unpkg.com/@turf/turf@6/turf.min.js"></script>
-    <script src="./js/main.js" type="module"></script>
+    <script src="/js/vendor/unmute.js" type="module"></script>
+    <script src="/js/main.js" type="module"></script>
   </head>
   <body>
     <nav>
-      <button class="nav-button" id="btn_callouts" title="Start tracking callouts">
-        ⌖
-      </button>
-      <button class="nav-button" id="btn_near_me" title="Announce places near me">
+      <button class="nav-button"
+      id="btn_callouts" title="btn_callouts">
+        <i class='fas'>&#xf124;</i>
+    </button>
+      <button
+        class="nav-button"
+        id="btn_near_me"
+        title="Announce places near me"
+      >
         ⓘ
       </button>
-      <select class="nav-button" id="voice" name="voice" title="Voice" required></select>
-
+      <select
+        class="nav-button"
+        id="voice"
+        name="voice"
+        title="Voice"
+        required
+      ></select>
+
       <div id="rate" title="Speaking rate">
         <button id="decreaseRate" title="Decrease speaking rate">−</button>
         <div id="rateValue">2</div>
         <button id="increaseRate" title="Increase speaking rate">+</button>
       </div>
-
+
+      <button class="nav-button">
+        <a href="./help.html" title="FAQ page">
+            <i class="fas fa-question" style="color: white;"></i>
+        </a>
+    </button>
+
     </nav>
 
     <main>
@@ -52,4 +57,4 @@
       </section>
     </main>
   </body>
-</html>
+</html>
diff --git a/vite.config.ts b/vite.config.ts
@@ -13,6 +13,7 @@ export default defineConfig({
       input: {
         index: './src/index.html',
         replay_gpx: './src/replay_gpx.html',
+        help: './src/help.html'
       }
     }
   },