Clean up assets and css locations

unisonweb · Apr 19, 2022 · bb0747a · bb0747a
1 parent e104138
commit bb0747a
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 34 deletions.
diff --git a/src/detectOs.js → src/Lib/detectOs.js b/src/detectOs.js → src/Lib/detectOs.js
diff --git a/src/preventDefaultGlobalKeyboardEvents.js → ...Lib/preventDefaultGlobalKeyboardEvents.js b/src/preventDefaultGlobalKeyboardEvents.js → ...Lib/preventDefaultGlobalKeyboardEvents.js
diff --git a/src/favicon.svg → src/assets/favicon.svg b/src/favicon.svg → src/assets/favicon.svg
diff --git a/src/css/unison-local.css b/src/css/unison-local.css
@@ -24,10 +24,6 @@
   color: var(--u-color_critical_icon);
 }
 
-@import "./ui.css";
-@import "./themes/unison-light.css";
-@import "./code.css";
-
 @import "./unison-local/help-modal.css";
 @import "./unison-local/publish-modal.css";
 @import "./unison-local/report-bug-modal.css";

diff --git a/src/css/unison-share.css b/src/css/unison-share.css
@@ -24,10 +24,6 @@
   color: var(--u-color_critical_icon);
 }
 
-@import "./ui.css";
-@import "./themes/unison-light.css";
-@import "./code.css";
-
 @import "./unison-share/banner.css";
 @import "./unison-share/help-modal.css";
 @import "./unison-share/publish-modal.css";

diff --git a/src/unisonLocal.ejs b/src/unisonLocal.ejs
@@ -2,23 +2,33 @@
 
 <html lang="en">
   <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="A friendly programming language from the future.">
+    <meta charset="utf-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
+    <meta
+      name="description"
+      content="A friendly programming language from the future."
+    />
     <title>Unison Local</title>
     <% if (webpackConfig.mode === "production") {%>
-      <script type="text/javascript">
-        const pathSegments = location.pathname.split("/").filter(p => p !== "");
+    <script type="text/javascript">
+      const pathSegments = location.pathname.split("/").filter((p) => p !== "");
 
-        if (pathSegments.length >= 2) {
-          const basePath = pathSegments.slice(0, 2).join("/")
-          const newBase = document.createElement("base");
-          newBase.setAttribute("href", "/" + basePath + "/")
-          document.getElementsByTagName("head")[0].appendChild(newBase);
-        }
-      </script>
+      if (pathSegments.length >= 2) {
+        const basePath = pathSegments.slice(0, 2).join("/");
+        const newBase = document.createElement("base");
+        newBase.setAttribute("href", "/" + basePath + "/");
+        document.getElementsByTagName("head")[0].appendChild(newBase);
+      }
+    </script>
     <% } %>
-    <link rel="icon" type="image/svg+xml" href="<%= require('./favicon.svg') %>">
+    <link
+      rel="icon"
+      type="image/svg+xml"
+      href="<%= require('./assets/favicon.svg') %>"
+    />
   </head>
   <body></body>
 </html>
diff --git a/src/unisonLocal.js b/src/unisonLocal.js
@@ -1,7 +1,10 @@
+import "./css/ui.css";
+import "./css/themes/unison-light.css";
+import "./css/code.css";
 import "./css/unison-local.css";
 import "./UI/CopyOnClick"; // Include web components
-import detectOs from "./detectOs";
-import preventDefaultGlobalKeyboardEvents from "./preventDefaultGlobalKeyboardEvents";
+import detectOs from "./Lib/detectOs";
+import preventDefaultGlobalKeyboardEvents from "./Lib/preventDefaultGlobalKeyboardEvents";
 import { Elm } from "./UnisonLocal.elm";
 
 console.log(`

diff --git a/src/unisonShare.ejs b/src/unisonShare.ejs
@@ -2,23 +2,39 @@
 
 <html lang="en">
   <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="Explore, read docs about, and share Unison libraries">
+    <meta charset="utf-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
+    <meta
+      name="description"
+      content="Explore, read docs about, and share Unison libraries"
+    />
 
-    <meta property="og:title" content="Unison Share">
-    <meta property="og:description" content="Explore, read docs about, and share Unison libraries">
-    <meta property="og:type" content="website">
-    <meta property="og:url" content="https://share.unison-lang.org">
-    <meta property="og:image" content="https://share.unison-lang.org/static/unison-share-social.png">
+    <meta property="og:title" content="Unison Share" />
+    <meta
+      property="og:description"
+      content="Explore, read docs about, and share Unison libraries"
+    />
+    <meta property="og:type" content="website" />
+    <meta property="og:url" content="https://share.unison-lang.org" />
+    <meta
+      property="og:image"
+      content="https://share.unison-lang.org/static/unison-share-social.png"
+    />
     <meta property="og:image:width" content="1200" />
     <meta property="og:image:height" content="627" />
 
     <meta name="twitter:card" content="summary_large_image" />
     <meta name="twitter:site" content="@unisonweb" />
 
     <title>Unison Share</title>
-    <link rel="icon" type="image/svg+xml" href="<%= require('./favicon.svg') %>">
+    <link
+      rel="icon"
+      type="image/svg+xml"
+      href="<%= require('./assets/favicon.svg') %>"
+    />
   </head>
   <body></body>
 </html>
diff --git a/src/unisonShare.js b/src/unisonShare.js
@@ -1,7 +1,10 @@
+import "./css/ui.css";
+import "./css/themes/unison-light.css";
+import "./css/code.css";
 import "./css/unison-share.css";
 import "./UI/CopyOnClick"; // Include web components
-import detectOs from "./detectOs";
-import preventDefaultGlobalKeyboardEvents from "./preventDefaultGlobalKeyboardEvents";
+import detectOs from "./Lib/detectOs";
+import preventDefaultGlobalKeyboardEvents from "./Lib/preventDefaultGlobalKeyboardEvents";
 import { Elm } from "./UnisonShare.elm";
 
 console.log(`