Merge pull request #5260 from urbit/lf/fe-fixes

dist: FE fixes

pkg/garden/app/hark-system-hook.hoon

@@ -128,11 +128,12 @@
   ::
   ++  title-prefix
     |=  =cord
+    %+  rap  3
     ?:  =(desk %base)
-      'System software'
+      ['System software' cord ~]
     ?:  has-docket  
-      (rap 3 'App: "' title:docket '"' cord ~)
-    (rap 3 'Desk: ' desk cord ~)
+      ['App: "' title:docket '"' cord ~]
+    ['Desk: ' desk cord ~]
   ::
   ++  get-version
     ?:  has-docket

pkg/grid/src/nav/preferences/AppPrefs.tsx

@@ -9,8 +9,9 @@ export const AppPrefs = ({ match }: RouteComponentProps<{ desk: string }>) => {
   const { desk } = match.params;
   const charge = useCharge(desk);
   const vat = useVat(desk);
-  const otasEnabled = !vat?.arak.rail?.paused;
-  const otaSource = vat?.arak.rail!.ship;
+  const tracking = !!vat?.arak.rail;
+  const otasEnabled = vat?.arak.rail?.paused;
+  const otaSource = vat?.arak.rail?.ship;
   const toggleOTAs = useKilnState((s) => s.toggleOTAs);
 
   const toggleUpdates = useCallback((on: boolean) => toggleOTAs(desk, on), [desk, toggleOTAs]);
@@ -19,14 +20,18 @@ export const AppPrefs = ({ match }: RouteComponentProps<{ desk: string }>) => {
     <>
       <h2 className="h3 mb-7">{charge?.title} Settings</h2>
       <div className="space-y-3">
-        <Setting on={!!otasEnabled} toggle={toggleUpdates} name="Automatic Updates">
-          <p>Automatically download and apply updates to keep {charge?.title} up to date.</p>
-          {otaSource && (
-            <p>
-              OTA Source: <ShipName name={otaSource} className="font-semibold font-mono" />
-            </p>
-          )}
-        </Setting>
+        {tracking ? (
+          <Setting on={!!otasEnabled} toggle={toggleUpdates} name="Automatic Updates">
+            <p>Automatically download and apply updates to keep {charge?.title} up to date.</p>
+            {otaSource && (
+              <p>
+                OTA Source: <ShipName name={otaSource} className="font-semibold font-mono" />
+              </p>
+            )}
+          </Setting>
+        ) : (
+          <h4 className="text-gray-500">No settings</h4>
+        )}
       </div>
     </>
   );

pkg/grid/src/state/hark.ts

@@ -88,12 +88,12 @@ export const useHarkStore = createState<HarkState>(
       await api.poke(archiveAll);
     },
     archiveNote: async (bin, lid) => {
+      get().set((draft) => {
+        const seen = 'seen' in lid ? 'seen' : 'unseen';
+        const binId = harkBinToId(bin);
+        delete draft[seen][binId];
+      });
       if (useMockData) {
-        get().set((draft) => {
-          const seen = 'seen' in lid ? 'seen' : 'unseen';
-          const binId = harkBinToId(bin);
-          delete draft[seen][binId];
-        });
         return;
       }
       await api.poke(archive(bin, lid));

pkg/grid/src/state/mock-data.ts

@@ -342,13 +342,16 @@ export const mockVat = (desk: string, blockers?: boolean): Vat => ({
       sub: [],
       add: []
     },
-    rail: {
-      aeon: 3,
-      desk,
-      next: blockers ? [{ aeon: 3, weft: { name: 'zuse', kelvin: 419 } }] : [],
-      ship: '~zod',
-      paused: desk === 'groups'
-    }
+    rail:
+      desk === 'uniswap'
+        ? null
+        : {
+            aeon: 3,
+            desk,
+            next: blockers ? [{ aeon: 3, weft: { name: 'zuse', kelvin: 419 } }] : [],
+            ship: '~zod',
+            paused: desk === 'groups'
+          }
   },
   hash: '0vh.lhfn6.julg1.fs52d.g2lqj.q5kp0.2o7j3.2bljl.jdm34.hd46v.9uv5v'
 });

pkg/interface/config/webpack.dev.js

@@ -85,7 +85,20 @@ module.exports = {
           // Compiles Sass to CSS
           'sass-loader'
         ]
+      },
+      {
+        test: /\.(woff(2)?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/,
+        use: [
+          {
+            loader: 'file-loader',
+            options: {
+              name: '[name].[ext]',
+              outputPath: 'fonts/'
+            }
+          }
+        ]
       }
+
     ]
   },
   resolve: {

pkg/interface/config/webpack.prod.js

@@ -42,6 +42,18 @@ module.exports = {
           // Compiles Sass to CSS
           'sass-loader'
         ]
+      },
+      {
+        test: /\.(woff(2)?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/,
+        use: [
+          {
+            loader: 'file-loader',
+            options: {
+              name: '[name].[ext]',
+              outputPath: 'fonts/'
+            }
+          }
+        ]
       }
     ]
   },
@@ -69,7 +81,8 @@ module.exports = {
     }),
     new HtmlWebpackPlugin({
       title: 'Groups',
-      template: './public/index.html'
+      template: './public/index.html',
+      favicon: './src/assets/img/Favicon.png'
     })
   ],
   output: {

pkg/interface/public/index.html

@@ -8,8 +8,6 @@
     <meta name="apple-mobile-web-app-capable" content="yes" />
     <meta name="apple-touch-fullscreen" content="yes" />
     <meta name="apple-mobile-web-app-status-bar-style" content="default" />
-    <link rel="apple-touch-icon" href="/~landscape/img/touch_icon.png">
-    <link rel="icon" type="image/png" href="/~landscape/img/Favicon.png">
     <link rel="manifest"
       href='data:application/manifest+json,{
         "name": "Groups",

pkg/interface/src/views/css/fonts.css

@@ -3,7 +3,7 @@
   font-style:  normal;
   font-weight: 400;
   font-display: swap;
-  src: url("/~landscape/fonts/inter-regular.woff2") format("woff2"),
+  src: url("../../assets/fonts/inter-regular.woff2") format("woff2"),
        url("https://media.urbit.org/fonts/Inter-Regular.woff2") format("woff2");
 }
 
@@ -28,7 +28,7 @@
   font-style:  italic;
   font-weight: 400;
   font-display: swap;
-  src: url("/~landscape/fonts/inter-italic.woff2") format("woff2"),
+  src: url("../../assets/fonts/inter-italic.woff2") format("woff2"),
        url("https://media.urbit.org/fonts/Inter-Italic.woff2") format("woff2");
 }
 
@@ -37,7 +37,7 @@
   font-style:  normal;
   font-weight: 700;
   font-display: swap;
-  src: url("/~landscape/fonts/inter-bold.woff2") format("woff2"),
+  src: url("../../assets/fonts/inter-bold.woff2") format("woff2"),
        url("https://media.urbit.org/fonts/Inter-Bold.woff2") format("woff2");
 }
 @font-face {
@@ -45,13 +45,13 @@
   font-style:  italic;
   font-weight: 700;
   font-display: swap;
-  src: url("/~landscape/fonts/inter-bolditalic.woff2") format("woff2"),
+  src: url("../../assets/fonts/inter-bolditalic.woff2") format("woff2"),
        url("https://media.urbit.org/fonts/Inter-BoldItalic.woff2") format("woff2");
 }
 
 @font-face {
   font-family: "Source Code Pro";
-  src: url("/~landscape/fonts/sourcecodepro-extralight.woff2"),
+  src: url("../../assets/fonts/sourcecodepro-extralight.woff2"),
        url("https://storage.googleapis.com/media.urbit.org/fonts/scp-extralight.woff");
   font-weight: 200;
   font-display: swap;
@@ -59,7 +59,7 @@
 
 @font-face {
   font-family: "Source Code Pro";
-  src: url("/~landscape/fonts/sourcecodepro-light.woff2"),
+  src: url("../../assets/fonts/sourcecodepro-light.woff2"),
        url("https://storage.googleapis.com/media.urbit.org/fonts/scp-light.woff");
   font-weight: 300;
   font-display: swap;
@@ -67,7 +67,7 @@
 
 @font-face {
   font-family: "Source Code Pro";
-  src: url("/~landscape/fonts/sourcecodepro-regular.woff2"),
+  src: url("../../assets/fonts/sourcecodepro-regular.woff2"),
        url("https://storage.googleapis.com/media.urbit.org/fonts/scp-regular.woff");
   font-weight: 400;
   font-display: swap;
@@ -75,7 +75,7 @@
 
 @font-face {
   font-family: "Source Code Pro";
-  src: url("(/~landscape/fonts/sourcecodepro-medium.woff2"),
+  src: url("(../../assets/fonts/sourcecodepro-medium.woff2"),
        url("https://storage.googleapis.com/media.urbit.org/fonts/scp-medium.woff");
   font-weight: 500;
   font-display: swap;
@@ -83,7 +83,7 @@
 
 @font-face {
   font-family: "Source Code Pro";
-  src: url("/~landscape/fonts/sourcecodepro-semibold.woff2"),
+  src: url("../../assets/fonts/sourcecodepro-semibold.woff2"),
        url("https://storage.googleapis.com/media.urbit.org/fonts/scp-semibold.woff");
   font-weight: 600;
   font-display: swap;
@@ -91,7 +91,7 @@
 
 @font-face {
   font-family: "Source Code Pro";
-  src: url("/~landscape/fonts/sourcecodepro-bold.woff2"),
+  src: url("../../assets/fonts/sourcecodepro-bold.woff2"),
        url("https://storage.googleapis.com/media.urbit.org/fonts/scp-bold.woff");
   font-weight: 700;
   font-display: swap;