Skip to content

Fix offline page attempts to load from google fonts #418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joeframbach wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix offline page attempts to load from google fonts #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ui/build/asset-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"files": {
"main.js": "/static/js/main.2b22a9e9.chunk.js",
"main.js": "/static/js/main.78ef62ad.chunk.js",
"runtime-main.js": "/static/js/runtime-main.2a78626f.js",
"static/css/2.c38cd9da.chunk.css": "/static/css/2.c38cd9da.chunk.css",
"static/js/2.ef060f46.chunk.js": "/static/js/2.ef060f46.chunk.js",
"static/js/2.2adfc48c.chunk.js": "/static/js/2.2adfc48c.chunk.js",
"index.html": "/index.html",
"precache-manifest.96ed21ec05e3b25e96ee640119b0334b.js": "/precache-manifest.96ed21ec05e3b25e96ee640119b0334b.js",
"precache-manifest.a55b099dbe829e2d07ee816c92661155.js": "/precache-manifest.a55b099dbe829e2d07ee816c92661155.js",
"service-worker.js": "/service-worker.js",
"static/js/2.ef060f46.chunk.js.LICENSE.txt": "/static/js/2.ef060f46.chunk.js.LICENSE.txt",
"static/js/2.2adfc48c.chunk.js.LICENSE.txt": "/static/js/2.2adfc48c.chunk.js.LICENSE.txt",
"static/media/logo.svg": "/static/media/logo.34c0c94e.svg"
},
"entrypoints": [
"static/js/runtime-main.2a78626f.js",
"static/css/2.c38cd9da.chunk.css",
"static/js/2.ef060f46.chunk.js",
"static/js/main.2b22a9e9.chunk.js"
"static/js/2.2adfc48c.chunk.js",
"static/js/main.78ef62ad.chunk.js"
]
}
2 changes: 1 addition & 1 deletion ui/build/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/static/favicon.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/static/manifest.json"/><title>WiFi Connect</title><link href="/static/css/2.c38cd9da.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function t(t){for(var n,i,f=t[0],l=t[1],c=t[2],p=0,s=[];p<f.length;p++)i=f[p],Object.prototype.hasOwnProperty.call(o,i)&&o[i]&&s.push(o[i][0]),o[i]=0;for(n in l)Object.prototype.hasOwnProperty.call(l,n)&&(e[n]=l[n]);for(a&&a(t);s.length;)s.shift()();return u.push.apply(u,c||[]),r()}function r(){for(var e,t=0;t<u.length;t++){for(var r=u[t],n=!0,f=1;f<r.length;f++){var l=r[f];0!==o[l]&&(n=!1)}n&&(u.splice(t--,1),e=i(i.s=r[0]))}return e}var n={},o={1:0},u=[];function i(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,i),r.l=!0,r.exports}i.m=e,i.c=n,i.d=function(e,t,r){i.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,t){if(1&t&&(e=i(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(i.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)i.d(r,n,function(t){return e[t]}.bind(null,n));return r},i.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(t,"a",t),t},i.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},i.p="/";var f=this["webpackJsonpwifi-connect-ui"]=this["webpackJsonpwifi-connect-ui"]||[],l=f.push.bind(f);f.push=t,f=f.slice();for(var c=0;c<f.length;c++)t(f[c]);var a=l;r()}([])</script><script src="/static/js/2.ef060f46.chunk.js"></script><script src="/static/js/main.2b22a9e9.chunk.js"></script></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/static/favicon.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/static/manifest.json"/><title>WiFi Connect</title><link href="/static/css/2.c38cd9da.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function t(t){for(var n,i,f=t[0],l=t[1],c=t[2],p=0,s=[];p<f.length;p++)i=f[p],Object.prototype.hasOwnProperty.call(o,i)&&o[i]&&s.push(o[i][0]),o[i]=0;for(n in l)Object.prototype.hasOwnProperty.call(l,n)&&(e[n]=l[n]);for(a&&a(t);s.length;)s.shift()();return u.push.apply(u,c||[]),r()}function r(){for(var e,t=0;t<u.length;t++){for(var r=u[t],n=!0,f=1;f<r.length;f++){var l=r[f];0!==o[l]&&(n=!1)}n&&(u.splice(t--,1),e=i(i.s=r[0]))}return e}var n={},o={1:0},u=[];function i(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,i),r.l=!0,r.exports}i.m=e,i.c=n,i.d=function(e,t,r){i.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,t){if(1&t&&(e=i(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(i.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)i.d(r,n,function(t){return e[t]}.bind(null,n));return r},i.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(t,"a",t),t},i.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},i.p="/";var f=this["webpackJsonpwifi-connect-ui"]=this["webpackJsonpwifi-connect-ui"]||[],l=f.push.bind(f);f.push=t,f=f.slice();for(var c=0;c<f.length;c++)t(f[c]);var a=l;r()}([])</script><script src="/static/js/2.2adfc48c.chunk.js"></script><script src="/static/js/main.78ef62ad.chunk.js"></script></body></html>
14 changes: 7 additions & 7 deletions ...ifest.96ed21ec05e3b25e96ee640119b0334b.js → ...ifest.a55b099dbe829e2d07ee816c92661155.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
self.__precacheManifest = (self.__precacheManifest || []).concat([
{
"revision": "210cdfec75f8819cf88af6d7c1143fa7",
"revision": "64387746db13d5a1d8506bbb4e7e775e",
"url": "/index.html"
},
{
"revision": "bef5f9e0837401d4a7df",
"revision": "795fd1ab834d67ea5ad4",
"url": "/static/css/2.c38cd9da.chunk.css"
},
{
"revision": "bef5f9e0837401d4a7df",
"url": "/static/js/2.ef060f46.chunk.js"
"revision": "795fd1ab834d67ea5ad4",
"url": "/static/js/2.2adfc48c.chunk.js"
},
{
"revision": "28ce00ad444b69bea42850e06eec9da3",
"url": "/static/js/2.ef060f46.chunk.js.LICENSE.txt"
"url": "/static/js/2.2adfc48c.chunk.js.LICENSE.txt"
},
{
"revision": "c0cd579ca18a0480cc24",
"url": "/static/js/main.2b22a9e9.chunk.js"
"revision": "be003e31fc6495ab102b",
"url": "/static/js/main.78ef62ad.chunk.js"
},
{
"revision": "0e903404fe668039b1a7",
Expand Down
4 changes: 2 additions & 2 deletions ui/build/service-worker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");

importScripts(
"/precache-manifest.96ed21ec05e3b25e96ee640119b0334b.js"
"/precache-manifest.a55b099dbe829e2d07ee816c92661155.js"
);

self.addEventListener('message', (event) => {
Expand All @@ -35,5 +35,5 @@ workbox.precaching.precacheAndRoute(self.__precacheManifest, {});

workbox.routing.registerNavigationRoute(workbox.precaching.getCacheKeyForURL("/index.html"), {

blacklist: [/^\/_/,/\/[^\/?]+\.[^\/]+$/],
blacklist: [/^\/_/,/\/[^/?]+\.[^/]+$/],
});
2 changes: 1 addition & 1 deletion ui/build/static/js/2.ef060f46.chunk.js → ui/build/static/js/2.2adfc48c.chunk.js
View file
Open in desktop

Large diffs are not rendered by default.

0 ...static/js/2.ef060f46.chunk.js.LICENSE.txt → ...static/js/2.2adfc48c.chunk.js.LICENSE.txt
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion ui/build/static/js/main.2b22a9e9.chunk.js
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions ui/build/static/js/main.78ef62ad.chunk.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion ui/src/components/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ const GlobalStyle = createGlobalStyle`
}
`;

// rendition exports a Theme type, but Provider accepts a PartialDeep<Theme>.
// We shouldn't need to import PartialDeep from rendition's lodash just to conform.
// Instead, introspect the type from the Provider signature.
const renditionTheme: Parameters<typeof Provider>[0]['theme'] = {
font: 'Helvetica, sans-serif',
monospace: "'Courier New', monospace",
};

export interface NetworkInfo {
ssid?: string;
identity?: string;
Expand Down Expand Up @@ -79,7 +87,7 @@ const App = () => {
};

return (
<Provider>
<Provider theme={renditionTheme}>
<GlobalStyle />
<Navbar brand={<img src={logo} style={{ height: 30 }} alt="logo" />} />

Expand Down