Skip to content

Commit 9bbee82

Browse files
arnavbarnavb
committed
Release: "Fix merge conflicts"
1 parent 800e8f8 commit 9bbee82

13 files changed

+146
-13
lines changed

‎404.html

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8" />
5+
<title>Single Page Apps for GitHub Pages</title>
6+
<script type="text/javascript">
7+
// Single Page Apps for GitHub Pages
8+
// https://github.com/rafgraph/spa-github-pages
9+
// Copyright (c) 2016 Rafael Pedicini, licensed under the MIT License
10+
// ----------------------------------------------------------------------
11+
// This script takes the current url and converts the path and query
12+
// string into just a query string, and then redirects the browser
13+
// to the new url with only a query string and hash fragment,
14+
// e.g. https://www.foo.tld/one/two?a=b&c=d#qwe, becomes
15+
// https://www.foo.tld/?p=/one/two&q=a=b~and~c=d#qwe
16+
// Note: this 404.html file must be at least 512 bytes for it to work
17+
// with Internet Explorer (it is currently > 512 bytes)
18+
19+
// If you're creating a Project Pages site and NOT using a custom domain,
20+
// then set segmentCount to 1 (enterprise users may need to set it to > 1).
21+
// This way the code will only replace the route part of the path, and not
22+
// the real directory in which the app resides, for example:
23+
// https://username.github.io/repo-name/one/two?a=b&c=d#qwe becomes
24+
// https://username.github.io/repo-name/?p=/one/two&q=a=b~and~c=d#qwe
25+
// Otherwise, leave segmentCount as 0.
26+
var segmentCount = 0;
27+
28+
var l = window.location;
29+
l.replace(
30+
l.protocol +
31+
"//" +
32+
l.hostname +
33+
(l.port ? ":" + l.port : "") +
34+
l.pathname
35+
.split("/")
36+
.slice(0, 1 + segmentCount)
37+
.join("/") +
38+
"/?p=/" +
39+
l.pathname
40+
.slice(1)
41+
.split("/")
42+
.slice(segmentCount)
43+
.join("/")
44+
.replace(/&/g, "~and~") +
45+
(l.search ? "&q=" + l.search.slice(1).replace(/&/g, "~and~") : "") +
46+
l.hash
47+
);
48+
</script>
49+
</head>
50+
<body></body>
51+
</html>

‎asset-manifest.json

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
{
22
"files": {
3-
"main.css": "/static/css/main.40095d4d.chunk.css",
4-
"main.js": "/static/js/main.d9d24a49.chunk.js",
5-
"main.js.map": "/static/js/main.d9d24a49.chunk.js.map",
3+
"main.css": "/static/css/main.40467d0d.chunk.css",
4+
"main.js": "/static/js/main.bac41094.chunk.js",
5+
"main.js.map": "/static/js/main.bac41094.chunk.js.map",
66
"runtime-main.js": "/static/js/runtime-main.9935317f.js",
77
"runtime-main.js.map": "/static/js/runtime-main.9935317f.js.map",
8-
"static/js/2.d99319c6.chunk.js": "/static/js/2.d99319c6.chunk.js",
9-
"static/js/2.d99319c6.chunk.js.map": "/static/js/2.d99319c6.chunk.js.map",
8+
"static/js/2.600fb0df.chunk.js": "/static/js/2.600fb0df.chunk.js",
9+
"static/js/2.600fb0df.chunk.js.map": "/static/js/2.600fb0df.chunk.js.map",
1010
"index.html": "/index.html",
11-
"precache-manifest.c42952cbf5d9c90bf24a576d0f29236b.js": "/precache-manifest.c42952cbf5d9c90bf24a576d0f29236b.js",
11+
"precache-manifest.27119d19bf85521fc5315f6db7c2ac6a.js": "/precache-manifest.27119d19bf85521fc5315f6db7c2ac6a.js",
1212
"service-worker.js": "/service-worker.js",
13-
"static/css/main.40095d4d.chunk.css.map": "/static/css/main.40095d4d.chunk.css.map",
14-
"static/js/2.d99319c6.chunk.js.LICENSE.txt": "/static/js/2.d99319c6.chunk.js.LICENSE.txt"
13+
"static/css/main.40467d0d.chunk.css.map": "/static/css/main.40467d0d.chunk.css.map",
14+
"static/js/2.600fb0df.chunk.js.LICENSE.txt": "/static/js/2.600fb0df.chunk.js.LICENSE.txt",
15+
"static/media/logo-img.png": "/static/media/logo-img.f2328b81.png"
1516
},
1617
"entrypoints": [
1718
"static/js/runtime-main.9935317f.js",
18-
"static/js/2.d99319c6.chunk.js",
19-
"static/css/main.40095d4d.chunk.css",
20-
"static/js/main.d9d24a49.chunk.js"
19+
"static/js/2.600fb0df.chunk.js",
20+
"static/css/main.40467d0d.chunk.css",
21+
"static/js/main.bac41094.chunk.js"
2122
]
2223
}

‎index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>React App</title><link href="/static/css/main.40095d4d.chunk.css" rel="stylesheet"></head><body class="has-navbar-fixed-top"><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,f,l=r[0],i=r[1],a=r[2],c=0,s=[];c<l.length;c++)f=l[c],Object.prototype.hasOwnProperty.call(o,f)&&o[f]&&s.push(o[f][0]),o[f]=0;for(n in i)Object.prototype.hasOwnProperty.call(i,n)&&(e[n]=i[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var i=t[l];0!==o[i]&&(n=!1)}n&&(u.splice(r--,1),e=f(f.s=t[0]))}return e}var n={},o={1:0},u=[];function f(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,f),t.l=!0,t.exports}f.m=e,f.c=n,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,r){if(1&r&&(e=f(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)f.d(t,n,function(r){return e[r]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var l=this["webpackJsonpweb-frontend"]=this["webpackJsonpweb-frontend"]||[],i=l.push.bind(l);l.push=r,l=l.slice();for(var a=0;a<l.length;a++)r(l[a]);var p=i;t()}([])</script><script src="/static/js/2.d99319c6.chunk.js"></script><script src="/static/js/main.d9d24a49.chunk.js"></script></body></html>
1+
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>React App</title><script type="text/javascript">!function(i){if(i.search){var a={};i.search.slice(1).split("&").forEach((function(i){var l=i.split("=");a[l[0]]=l.slice(1).join("=").replace(/~and~/g,"&")})),void 0!==a.p&&window.history.replaceState(null,null,i.pathname.slice(0,-1)+(a.p||"")+(a.q?"?"+a.q:"")+i.hash)}}(window.location)</script><link href="/static/css/main.40467d0d.chunk.css" rel="stylesheet"></head><body class="has-navbar-fixed-top"><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,f,l=r[0],i=r[1],a=r[2],c=0,s=[];c<l.length;c++)f=l[c],Object.prototype.hasOwnProperty.call(o,f)&&o[f]&&s.push(o[f][0]),o[f]=0;for(n in i)Object.prototype.hasOwnProperty.call(i,n)&&(e[n]=i[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var i=t[l];0!==o[i]&&(n=!1)}n&&(u.splice(r--,1),e=f(f.s=t[0]))}return e}var n={},o={1:0},u=[];function f(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,f),t.l=!0,t.exports}f.m=e,f.c=n,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,r){if(1&r&&(e=f(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)f.d(t,n,function(r){return e[r]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var l=this["webpackJsonpweb-frontend"]=this["webpackJsonpweb-frontend"]||[],i=l.push.bind(l);l.push=r,l=l.slice();for(var a=0;a<l.length;a++)r(l[a]);var p=i;t()}([])</script><script src="/static/js/2.600fb0df.chunk.js"></script><script src="/static/js/main.bac41094.chunk.js"></script></body></html>

‎precache-manifest.27119d19bf85521fc5315f6db7c2ac6a.js

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
self.__precacheManifest = (self.__precacheManifest || []).concat([
2+
{
3+
"revision": "95f2cf25f00ce42d895bf1de049046f1",
4+
"url": "/index.html"
5+
},
6+
{
7+
"revision": "9c90f6f56b6f7392a342",
8+
"url": "/static/css/main.40467d0d.chunk.css"
9+
},
10+
{
11+
"revision": "f1c4cd464081fa7a51fe",
12+
"url": "/static/js/2.600fb0df.chunk.js"
13+
},
14+
{
15+
"revision": "c64c486544348f10a6d6c716950bc223",
16+
"url": "/static/js/2.600fb0df.chunk.js.LICENSE.txt"
17+
},
18+
{
19+
"revision": "9c90f6f56b6f7392a342",
20+
"url": "/static/js/main.bac41094.chunk.js"
21+
},
22+
{
23+
"revision": "c5c5d11a5123bae317ed",
24+
"url": "/static/js/runtime-main.9935317f.js"
25+
},
26+
{
27+
"revision": "f2328b81b9fd274728289a9a17a8a021",
28+
"url": "/static/media/logo-img.f2328b81.png"
29+
}
30+
]);

‎service-worker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
1515

1616
importScripts(
17-
"/precache-manifest.c42952cbf5d9c90bf24a576d0f29236b.js"
17+
"/precache-manifest.27119d19bf85521fc5315f6db7c2ac6a.js"
1818
);
1919

2020
self.addEventListener('message', (event) => {

‎static/css/main.40467d0d.chunk.css

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎static/css/main.40467d0d.chunk.css.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎static/js/2.600fb0df.chunk.js

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎static/js/2.600fb0df.chunk.js.LICENSE.txt

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/*
2+
object-assign
3+
(c) Sindre Sorhus
4+
@license MIT
5+
*/
6+
7+
/** @license React v0.19.1
8+
* scheduler.production.min.js
9+
*
10+
* Copyright (c) Facebook, Inc. and its affiliates.
11+
*
12+
* This source code is licensed under the MIT license found in the
13+
* LICENSE file in the root directory of this source tree.
14+
*/
15+
16+
/** @license React v16.13.1
17+
* react-dom.production.min.js
18+
*
19+
* Copyright (c) Facebook, Inc. and its affiliates.
20+
*
21+
* This source code is licensed under the MIT license found in the
22+
* LICENSE file in the root directory of this source tree.
23+
*/
24+
25+
/** @license React v16.13.1
26+
* react-is.production.min.js
27+
*
28+
* Copyright (c) Facebook, Inc. and its affiliates.
29+
*
30+
* This source code is licensed under the MIT license found in the
31+
* LICENSE file in the root directory of this source tree.
32+
*/
33+
34+
/** @license React v16.13.1
35+
* react.production.min.js
36+
*
37+
* Copyright (c) Facebook, Inc. and its affiliates.
38+
*
39+
* This source code is licensed under the MIT license found in the
40+
* LICENSE file in the root directory of this source tree.
41+
*/

‎static/js/2.600fb0df.chunk.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎static/js/main.bac41094.chunk.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎static/js/main.bac41094.chunk.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎static/media/logo-img.f2328b81.png

25 KB
Loading

0 commit comments

Comments
 (0)