Refactor static file asset hosting #578

atomicdata-dev · Feb 4, 2023 · 029e484 · 029e484
1 parent 1bc1d97
commit 029e484
Show file tree

Hide file tree

Showing 41 changed files with 66 additions and 677 deletions.
diff --git a/CONTRIBUTE.md b/CONTRIBUTE.md
@@ -26,7 +26,7 @@ Check out the [Roadmap](https://docs.atomicdata.dev/roadmap.html) if you want to
   - [Drill](#drill)
 - [Responsible disclosure / Coordinated Vulnerability Disclosure](#responsible-disclosure--coordinated-vulnerability-disclosure)
 - [Releases, Versioning and Tagging](#releases-versioning-and-tagging)
-  - [Including JS app_assets](#including-js-app_assets)
+  - [Including JS app\_assets](#including-js-app_assets)
   - [Publishing manually - doing the CI's work](#publishing-manually---doing-the-cis-work)
     - [Building and publishing binaries](#building-and-publishing-binaries)
     - [Publishing to Cargo](#publishing-to-cargo)
@@ -175,10 +175,11 @@ Note:
 
 Before tagging a new version, make sure to update the `app_assets` folder:
 
-1. clone [atomic-data-browser](https://github.com/atomicdata-dev/atomic-data-browser) in the folder above this one
-2. run `pmpm build-server` in `atomic-data-browser`, which should
-3. Make sure not to commit all the files, manually check them
-4. search and replace `.workbox` with `./app_assets/workbox` in `sw.js`, because we'll host `sw.js` from root.
+1. Go up one directory from `atomic-data-rust` => `cd ..`
+2. In here, clone [atomic-data-browser](https://github.com/atomicdata-dev/atomic-data-browser)
+3. Run `./build-server.sh` to compile assets and copy them to your `app_assets` directory
+4. Make sure not to commit all the files, manually check them
+5. search and replace `.workbox` with `./app_assets/workbox` in `sw.js`, because we'll host `sw.js` from root.
 
 ### Publishing manually - doing the CI's work
 

diff --git a/server/app_assets/android-chrome-192x192.png → ...pp_data/images/android-chrome-192x192.png b/server/app_assets/android-chrome-192x192.png → ...pp_data/images/android-chrome-192x192.png
diff --git a/server/app_assets/android-chrome-512x512.png → ...pp_data/images/android-chrome-512x512.png b/server/app_assets/android-chrome-512x512.png → ...pp_data/images/android-chrome-512x512.png
diff --git a/server/app_assets/apple-touch-icon.png → ...sets/app_data/images/apple-touch-icon.png b/server/app_assets/apple-touch-icon.png → ...sets/app_data/images/apple-touch-icon.png
diff --git a/server/app_assets/default_social_preview.jpg → ...pp_data/images/default_social_preview.jpg b/server/app_assets/default_social_preview.jpg → ...pp_data/images/default_social_preview.jpg
diff --git a/server/app_assets/favicon-16x16.png → ..._assets/app_data/images/favicon-16x16.png b/server/app_assets/favicon-16x16.png → ..._assets/app_data/images/favicon-16x16.png
diff --git a/server/app_assets/favicon-32x32.png → ..._assets/app_data/images/favicon-32x32.png b/server/app_assets/favicon-32x32.png → ..._assets/app_data/images/favicon-32x32.png
diff --git a/server/app_assets/favicon.ico → ...er/app_assets/app_data/images/favicon.ico b/server/app_assets/favicon.ico → ...er/app_assets/app_data/images/favicon.ico
diff --git a/server/app_assets/icon.png → server/app_assets/app_data/images/icon.png b/server/app_assets/icon.png → server/app_assets/app_data/images/icon.png
diff --git a/server/app_assets/safari-pinned-tab.svg → .../app_assets/app_data/images/mask-icon.svg b/server/app_assets/safari-pinned-tab.svg → .../app_assets/app_data/images/mask-icon.svg
diff --git a/server/app_assets/app_data/images/maskable_icon.png b/server/app_assets/app_data/images/maskable_icon.png
diff --git a/server/app_assets/app_data/images/maskable_icon_x128.png b/server/app_assets/app_data/images/maskable_icon_x128.png
diff --git a/server/app_assets/app_data/images/maskable_icon_x192.png b/server/app_assets/app_data/images/maskable_icon_x192.png
diff --git a/server/app_assets/app_data/images/maskable_icon_x384.png b/server/app_assets/app_data/images/maskable_icon_x384.png
diff --git a/server/app_assets/app_data/images/maskable_icon_x512.png b/server/app_assets/app_data/images/maskable_icon_x512.png
diff --git a/server/app_assets/mstile-144x144.png → ...assets/app_data/images/mstile-144x144.png b/server/app_assets/mstile-144x144.png → ...assets/app_data/images/mstile-144x144.png
diff --git a/server/app_assets/mstile-150x150.png → ...assets/app_data/images/mstile-150x150.png b/server/app_assets/mstile-150x150.png → ...assets/app_data/images/mstile-150x150.png
diff --git a/server/app_assets/mstile-310x150.png → ...assets/app_data/images/mstile-310x150.png b/server/app_assets/mstile-310x150.png → ...assets/app_data/images/mstile-310x150.png
diff --git a/server/app_assets/mstile-310x310.png → ...assets/app_data/images/mstile-310x310.png b/server/app_assets/mstile-310x310.png → ...assets/app_data/images/mstile-310x310.png
diff --git a/server/app_assets/mstile-70x70.png → ...p_assets/app_data/images/mstile-70x70.png b/server/app_assets/mstile-70x70.png → ...p_assets/app_data/images/mstile-70x70.png
diff --git a/server/app_assets/dist/assets/index.css → server/app_assets/assets/index.css b/server/app_assets/dist/assets/index.css → server/app_assets/assets/index.css
diff --git a/server/app_assets/dist/index.js → server/app_assets/assets/index.js b/server/app_assets/dist/index.js → server/app_assets/assets/index.js
diff --git a/server/app_assets/dist/index.js.map → server/app_assets/assets/index.js.map b/server/app_assets/dist/index.js.map → server/app_assets/assets/index.js.map
diff --git a/server/app_assets/browserconfig.xml b/server/app_assets/browserconfig.xml
@@ -2,7 +2,7 @@
 <browserconfig>
     <msapplication>
         <tile>
-            <square150x150logo src="/mstile-150x150.png"/>
+            <square150x150logo src="/app_data/images/mstile-150x150.png"/>
             <TileColor>#ffffff</TileColor>
         </tile>
     </msapplication>

diff --git a/server/app_assets/dist/assets/index.js b/server/app_assets/dist/assets/index.js
diff --git a/server/app_assets/dist/assets/index.js.map b/server/app_assets/dist/assets/index.js.map
diff --git a/server/app_assets/dist/index.css b/server/app_assets/dist/index.css
diff --git a/server/app_assets/index.html b/server/app_assets/index.html
@@ -2,27 +2,25 @@
 <html lang="en">
 
 <head>
-  <meta charset="utf-8">
-  <meta content="width=device-width,initial-scale=1" name="viewport">
-  <title>Atomic Data Browser</title>
-  <meta content="The easiest way to create, share and model Linked Atomic Data." name="description">
-  <link href="/icon.png" rel="icon" type="image/png">
-  <link href="/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180">
-  <link href="/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png">
-  <link href="/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png">
-  <link href="/site.webmanifest" rel="manifest">
-  <link color="#1e43a3" href="/safari-pinned-tab.svg" rel="mask-icon">
-  <meta content="#ffffff" name="msapplication-TileColor">
-  <meta content="#ffffff" name="theme-color">
-  <meta content="yes" name="apple-mobile-web-app-capable">
-  <meta content="yes" name="mobile-web-app-capable">
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <meta content="The easiest way to create, share and model Linked Atomic Data." name="description" />
+  <link href="/app_data/images/icon.png" rel="icon" type="image/png" />
+  <link href="/app_data/images/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180" />
+  <link href="/app_data/images/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png" />
+  <link href="/app_data/images/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png" />
+  <link color="#1e43a3" href="/app_data/images/mask-icon.svg" rel="mask-icon" />
+  <meta content="yes" name="apple-mobile-web-app-capable" />
+  <meta content="yes" name="mobile-web-app-capable" />
   <!-- Custom fonts -->
-  <link rel="preconnect" href="https://fonts.googleapis.com">
-  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-  <link
+  <link rel="dns-prefetch" href="https://fonts.googleapis.com">
+  <link rel="dns-prefetch" href="https://fonts.gstatic.com">
+  <link rel="preconnect" crossorigin="anonymous" href="https://fonts.googleapis.com">
+  <link rel="preconnect" crossorigin="anonymous" href="https://fonts.gstatic.com">
+  <link crossorigin="anonymous"
     href="https://fonts.googleapis.com/css2?family=Montserrat:wght@700&family=Open+Sans:ital,wght@0,400;0,700;1,400;1,700&display=swap"
     rel="stylesheet">
-  <!-- Styling for splash screen -->
+  <title>Atomic Data</title>
   <style>
     :root {
       --text-splash: black;
@@ -34,66 +32,58 @@
     }
 
   </style>
-  <!-- Meta tags and code added by from Atomic-Server -->
+  <!-- Meta tags and code added by Atomic-Server -->
   <!-- { inject_html_head } -->
-</head>
+  <script type="module" crossorigin src="/assets/index.js"></script>
+  <link rel="stylesheet" href="/assets/index.css">
+<link rel="manifest" href="/manifest.webmanifest"><script id="vite-plugin-pwa:register-sw" src="/registerSW.js"></script></head>
 
 <body>
   <div id="root">
-    <!-- Splash screen -->
     <svg width="647" height="75" viewBox="0 0 647 75" fill="none" xmlns="http://www.w3.org/2000/svg"
       style="max-width: 70vw; width: 30rem; margin: auto; display: block; margin-top: 45vh;">
       <path
         d="M57.512 58.4H23.712L17.264 74H0L32.448 1.19995H49.088L81.64 74H63.96L57.512 58.4ZM52.208 45.608L40.664 17.736L29.12 45.608H52.208Z"
-        fill="var(--text-splash)"></path>
+        fill="var(--text-splash)" />
       <path
         d="M119.469 71.296C117.875 72.4746 115.899 73.376 113.541 74C111.253 74.5546 108.827 74.832 106.261 74.832C99.6052 74.832 94.4398 73.1333 90.7652 69.736C87.1598 66.3386 85.3572 61.3466 85.3572 54.76V31.776H76.7252V19.296H85.3572V5.67196H101.581V19.296H115.517V31.776H101.581V54.552C101.581 56.9093 102.171 58.7466 103.349 60.064C104.597 61.312 106.331 61.936 108.549 61.936C111.115 61.936 113.299 61.2426 115.101 59.856L119.469 71.296Z"
-        fill="var(--text-splash)"></path>
+        fill="var(--text-splash)" />
       <path
         d="M258.334 17.216C265.337 17.216 270.884 19.296 274.974 23.456C279.134 27.5466 281.214 33.7173 281.214 41.9679V74H264.99V44.464C264.99 40.0266 264.054 36.7333 262.182 34.584C260.38 32.3653 257.78 31.256 254.382 31.256C250.569 31.256 247.553 32.504 245.334 35C243.116 37.4266 242.006 41.0666 242.006 45.92V74H225.782V44.464C225.782 35.6586 222.246 31.256 215.174 31.256C211.43 31.256 208.449 32.504 206.23 35C204.012 37.4266 202.902 41.0666 202.902 45.92V74H186.678V18.048H202.174V24.496C204.254 22.1386 206.785 20.336 209.766 19.088C212.817 17.84 216.145 17.216 219.75 17.216C223.702 17.216 227.273 18.0133 230.462 19.608C233.652 21.1333 236.217 23.3866 238.158 26.368C240.446 23.456 243.324 21.2026 246.79 19.608C250.326 18.0133 254.174 17.216 258.334 17.216Z"
-        fill="var(--text-splash)"></path>
-      <path d="M291.596 18.048H307.82V74H291.596V18.048Z" fill="var(--text-splash)"></path>
+        fill="var(--text-splash)" />
+      <path d="M291.596 18.048H307.82V74H291.596V18.048Z" fill="var(--text-splash)" />
       <path
         d="M345.758 74.832C339.795 74.832 334.422 73.6186 329.638 71.192C324.923 68.696 321.214 65.264 318.51 60.896C315.875 56.528 314.558 51.5706 314.558 46.0239C314.558 40.4773 315.875 35.52 318.51 31.152C321.214 26.784 324.923 23.3866 329.638 20.96C334.422 18.464 339.795 17.216 345.758 17.216C351.651 17.216 356.782 18.464 361.15 20.96C365.587 23.3866 368.811 26.888 370.822 31.464L358.238 38.224C355.326 33.0933 351.131 30.528 345.654 30.528C341.424 30.528 337.923 31.9146 335.15 34.688C332.376 37.4613 330.99 41.2399 330.99 46.0239C330.99 50.808 332.376 54.5866 335.15 57.36C337.923 60.1333 341.424 61.52 345.654 61.52C351.2 61.52 355.395 58.9546 358.238 53.824L370.822 60.688C368.811 65.1253 365.587 68.592 361.15 71.088C356.782 73.584 351.651 74.832 345.758 74.832Z"
-        fill="var(--text-splash)"></path>
+        fill="var(--text-splash)" />
       <path fill-rule="evenodd" clip-rule="evenodd"
         d="M137.633 17.5725C139.483 22.4964 144.235 26 149.806 26C155.376 26 160.128 22.4964 161.979 17.5725C172.482 22.241 179.806 32.7652 179.806 45C179.806 61.5685 166.374 75 149.806 75C133.237 75 119.806 61.5685 119.806 45C119.806 32.7652 127.13 22.241 137.633 17.5725ZM141.39 16.1965C142.679 19.589 145.961 22 149.806 22C153.65 22 156.932 19.589 158.221 16.1965C155.551 15.4176 152.727 15 149.806 15C146.884 15 144.06 15.4176 141.39 16.1965ZM163.806 45C163.806 52.732 157.538 59 149.806 59C142.074 59 135.806 52.732 135.806 45C135.806 37.268 142.074 31 149.806 31C157.538 31 163.806 37.268 163.806 45Z"
-        fill="var(--text-splash)"></path>
+        fill="var(--text-splash)" />
       <path
         d="M143.442 19.364C139.927 15.8492 139.927 10.1508 143.442 6.63604C146.956 3.12132 152.655 3.12132 156.17 6.63604C157.784 8.25001 158.656 10.3245 158.788 12.4365C158.943 14.9238 158.07 17.4632 156.17 19.364C152.655 22.8787 146.956 22.8787 143.442 19.364Z"
-        fill="url(#paint0_linear)"></path>
+        fill="url(#paint0_linear)" />
       <path
         d="M415.806 1.19995H448.878C456.782 1.19995 463.75 2.72528 469.782 5.77595C475.883 8.75729 480.598 12.9866 483.926 18.464C487.323 23.9413 489.022 30.32 489.022 37.6C489.022 44.88 487.323 51.2586 483.926 56.736C480.598 62.2133 475.883 66.4773 469.782 69.528C463.75 72.5093 456.782 74 448.878 74H415.806V1.19995ZM448.046 60.168C455.326 60.168 461.115 58.1573 465.414 54.136C469.782 50.0453 471.966 44.5333 471.966 37.6C471.966 30.6666 469.782 25.1893 465.414 21.168C461.115 17.0773 455.326 15.032 448.046 15.032H432.654V60.168H448.046Z"
-        fill="var(--text-splash)"></path>
+        fill="var(--text-splash)" />
       <path
         d="M518.992 17.216C527.658 17.216 534.314 19.296 538.96 23.456C543.605 27.5466 545.928 33.752 545.928 42.072V74H530.744V67.032C527.693 72.232 522.008 74.832 513.688 74.832C509.389 74.832 505.645 74.104 502.456 72.648C499.336 71.192 496.944 69.1813 495.28 66.616C493.616 64.0506 492.784 61.1386 492.784 57.88C492.784 52.68 494.725 48.5893 498.608 45.608C502.56 42.6266 508.626 41.136 516.808 41.136H529.704C529.704 37.6 528.629 34.896 526.48 33.024C524.33 31.0826 521.106 30.112 516.808 30.112C513.826 30.112 510.88 30.5973 507.968 31.568C505.125 32.4693 502.698 33.7173 500.688 35.312L494.864 23.976C497.914 21.8266 501.554 20.1626 505.784 18.9839C510.082 17.8053 514.485 17.216 518.992 17.216ZM517.744 63.912C520.517 63.912 522.978 63.288 525.128 62.04C527.277 60.7226 528.802 58.816 529.704 56.32V50.6H518.576C511.92 50.6 508.592 52.784 508.592 57.152C508.592 59.232 509.389 60.896 510.984 62.144C512.648 63.3226 514.901 63.912 517.744 63.912Z"
-        fill="var(--text-splash)"></path>
+        fill="var(--text-splash)" />
       <path
         d="M592.539 71.296C590.944 72.4746 588.968 73.376 586.611 74C584.323 74.5546 581.896 74.832 579.331 74.832C572.675 74.832 567.51 73.1333 563.835 69.736C560.23 66.3386 558.427 61.3466 558.427 54.76V31.776H549.795V19.296H558.427V5.67196H574.651V19.296H588.587V31.776H574.651V54.552C574.651 56.9093 575.24 58.7466 576.419 60.064C577.667 61.312 579.4 61.936 581.619 61.936C584.184 61.936 586.368 61.2426 588.171 59.856L592.539 71.296Z"
-        fill="var(--text-splash)"></path>
+        fill="var(--text-splash)" />
       <path
         d="M620.054 17.216C628.721 17.216 635.377 19.296 640.022 23.456C644.668 27.5466 646.99 33.752 646.99 42.072V74H631.806V67.032C628.756 72.232 623.07 74.832 614.75 74.832C610.452 74.832 606.708 74.104 603.518 72.648C600.398 71.192 598.006 69.1813 596.342 66.616C594.678 64.0506 593.846 61.1386 593.846 57.88C593.846 52.68 595.788 48.5893 599.67 45.608C603.622 42.6266 609.689 41.136 617.87 41.136H630.766C630.766 37.6 629.692 34.896 627.542 33.024C625.393 31.0826 622.169 30.112 617.87 30.112C614.889 30.112 611.942 30.5973 609.03 31.568C606.188 32.4693 603.761 33.7173 601.75 35.312L595.926 23.976C598.977 21.8266 602.617 20.1626 606.846 18.9839C611.145 17.8053 615.548 17.216 620.054 17.216ZM618.806 63.912C621.58 63.912 624.041 63.288 626.19 62.04C628.34 60.7226 629.865 58.816 630.766 56.32V50.6H619.638C612.982 50.6 609.654 52.784 609.654 57.152C609.654 59.232 610.452 60.896 612.046 62.144C613.71 63.3226 615.964 63.912 618.806 63.912Z"
-        fill="var(--text-splash)"></path>
+        fill="var(--text-splash)" />
       <defs>
         <linearGradient id="paint0_linear" x1="156.17" y1="19.364" x2="143.442" y2="6.63604"
           gradientUnits="userSpaceOnUse">
-          <stop stop-color="#033049"></stop>
-          <stop offset="1" stop-color="#00C2FF"></stop>
+          <stop stop-color="#033049" />
+          <stop offset="1" stop-color="#00C2FF" />
         </linearGradient>
       </defs>
     </svg>
   </div>
-  <script src="/dist/index.js" type="module"></script>
-  <!-- Server custom script, can be set with  -->
 
-  <!-- Service worker -->
-  <script>
-    if ('serviceWorker' in navigator) {
-      window.addEventListener('load', () => {
-        navigator.serviceWorker.register('/sw.js', { scope: '/' });
-      })
-    }
-  </script>
+
 
   <!-- Dark mode for first few seconds  -->
   <script>

diff --git a/server/app_assets/manifest.webmanifest b/server/app_assets/manifest.webmanifest
@@ -0,0 +1 @@
+{"name":"Atomic Data Browser","short_name":"Atomic","start_url":"/","display":"standalone","background_color":"#ffffff","lang":"en","scope":"/","description":"The easiest way to create, share and model Linked Atomic Data.","theme_color":"#ffffff","icons":[{"src":"app_data/images/android-chrome-192x192.png","sizes":"192x192","type":"image/png","purpose":"any"},{"src":"app_data/images/android-chrome-512x512.png","sizes":"512x512","type":"image/png","purpose":"any"},{"src":"app_data/images/maskable_icon.png","sizes":"1024x1024","type":"image/png","purpose":"maskable"},{"src":"app_data/images/maskable_icon_x512.png","sizes":"512x512","type":"image/png","purpose":"maskable"},{"src":"app_data/images/maskable_icon_x384.png","sizes":"384x384","type":"image/png","purpose":"maskable"},{"src":"app_data/images/maskable_icon_x192.png","sizes":"192x192","type":"image/png","purpose":"maskable"},{"src":"app_data/images/maskable_icon_x128.png","sizes":"128x128","type":"image/png","purpose":"maskable"}]}
diff --git a/server/app_assets/registerSW.js b/server/app_assets/registerSW.js
diff --git a/server/app_assets/robots.txt b/server/app_assets/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Allow: /
diff --git a/server/app_assets/site.webmanifest b/server/app_assets/site.webmanifest
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"name":"Atomic Data Browser","short_name":"Atomic","start_url":"/","display":"standalone","background_color":"#ffffff","lang":"en","scope":"/","description":"The easiest way to create, share and model Linked Atomic Data.","theme_color":"#ffffff","icons":[{"src":"app_data/images/android-chrome-192x192.png","sizes":"192x192","type":"image/png","purpose":"any"},{"src":"app_data/images/android-chrome-512x512.png","sizes":"512x512","type":"image/png","purpose":"any"},{"src":"app_data/images/maskable_icon.png","sizes":"1024x1024","type":"image/png","purpose":"maskable"},{"src":"app_data/images/maskable_icon_x512.png","sizes":"512x512","type":"image/png","purpose":"maskable"},{"src":"app_data/images/maskable_icon_x384.png","sizes":"384x384","type":"image/png","purpose":"maskable"},{"src":"app_data/images/maskable_icon_x192.png","sizes":"192x192","type":"image/png","purpose":"maskable"},{"src":"app_data/images/maskable_icon_x128.png","sizes":"128x128","type":"image/png","purpose":"maskable"}]}