Skip to content

Sync #14

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

Merged
mathcodes merged 3 commits into from
Nov 28, 2022
Merged

Sync #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55d0887
fb int
mathcodes Nov 28, 2022
027de0c
Merge branch 'main' into nov
mathcodes Nov 28, 2022
854fe6e
nov updated
mathcodes Nov 28, 2022
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
15 changes: 15 additions & 0 deletions build/asset-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
{
"files": {
<<<<<<< HEAD
"main.css": "/static/css/main.8bba0d8c.chunk.css",
"main.js": "/static/js/main.295a0fda.chunk.js",
"main.js.map": "/static/js/main.295a0fda.chunk.js.map",
=======
"main.css": "/static/css/main.ba96582f.chunk.css",
"main.js": "/static/js/main.ac6118f4.chunk.js",
"main.js.map": "/static/js/main.ac6118f4.chunk.js.map",
>>>>>>> 5dbcac5 (nov updated)
"runtime-main.js": "/static/js/runtime-main.cb89c5a1.js",
"runtime-main.js.map": "/static/js/runtime-main.cb89c5a1.js.map",
"static/css/2.65f8c46c.chunk.css": "/static/css/2.65f8c46c.chunk.css",
Expand All @@ -12,7 +18,11 @@
"static/js/3.ea174584.chunk.js.map": "/static/js/3.ea174584.chunk.js.map",
"index.html": "/index.html",
"static/css/2.65f8c46c.chunk.css.map": "/static/css/2.65f8c46c.chunk.css.map",
<<<<<<< HEAD
"static/css/main.8bba0d8c.chunk.css.map": "/static/css/main.8bba0d8c.chunk.css.map",
=======
"static/css/main.ba96582f.chunk.css.map": "/static/css/main.ba96582f.chunk.css.map",
>>>>>>> 5dbcac5 (nov updated)
"static/js/2.09d8be7a.chunk.js.LICENSE.txt": "/static/js/2.09d8be7a.chunk.js.LICENSE.txt",
"static/media/index.css": "/static/media/BestermindRegular.e58a1922.ttf",
"static/media/JCircle.396647e0.png": "/static/media/JCircle.396647e0.png",
Expand Down Expand Up @@ -117,7 +127,12 @@
"static/js/runtime-main.cb89c5a1.js",
"static/css/2.65f8c46c.chunk.css",
"static/js/2.09d8be7a.chunk.js",
<<<<<<< HEAD
"static/css/main.8bba0d8c.chunk.css",
"static/js/main.295a0fda.chunk.js"
=======
"static/css/main.ba96582f.chunk.css",
"static/js/main.ac6118f4.chunk.js"
>>>>>>> 5dbcac5 (nov updated)
]
}
6 changes: 5 additions & 1 deletion build/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Jon Christie's Fullstack Frontend with Backend Developer Website - Looking for Jobs in Javascript React MongoDB"/><meta property="og:image" content="https://www.jonchristie.net/favicon.png"/><meta property="og:locale" content="en_US"/><meta property="og:type" content="website"/><meta property="og:description" content="Jon Christie's Fullstack Frontend with Backend Developer Website - Looking for Jobs in Javascript React MongoDB"/><meta property="og:title" content="Jon Christie's Portfolio - Looking for a web developer that doesn't empty your bank account? Look no further."/><meta property="og:url" content="https://www.jonchristie.net/"/><meta property="og:site_name" content="Jon Christie's Portfolio"/><meta name="twitter:card" content="summary_large_image"/><meta name="twitter:title" content="Jon Christie's Portfolio - Looking for a web developer that doesn't empty your bank account? Look no further."/><meta name="twitter:description" content="Jon Christie's Fullstack Frontend with Backend Developer Website - Looking for Jobs in Javascript React MongoDB"/><meta name="twitter:image" content="https://www.jonchristie.net/favicon.png"/><link rel="apple-touch-icon" href="https://www.jonchristie.net/favicon.png"/><link rel="manifest" href="/manifest.json"/><meta name="ahrefs-site-verification" content="13f4b9c19edea083cae8bd694571116720c8c924fd99b5d9fc57a03682d2a4d6"><title>Portfolio</title><link href="/static/css/2.65f8c46c.chunk.css" rel="stylesheet"><link href="/static/css/main.8bba0d8c.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 r(r){for(var n,i,a=r[0],c=r[1],l=r[2],s=0,p=[];s<a.length;s++)i=a[s],Object.prototype.hasOwnProperty.call(o,i)&&o[i]&&p.push(o[i][0]),o[i]=0;for(n in c)Object.prototype.hasOwnProperty.call(c,n)&&(e[n]=c[n]);for(f&&f(r);p.length;)p.shift()();return u.push.apply(u,l||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,a=1;a<t.length;a++){var c=t[a];0!==o[c]&&(n=!1)}n&&(u.splice(r--,1),e=i(i.s=t[0]))}return e}var n={},o={1:0},u=[];function i(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,i),t.l=!0,t.exports}i.e=function(e){var r=[],t=o[e];if(0!==t)if(t)r.push(t[2]);else{var n=new Promise((function(r,n){t=o[e]=[r,n]}));r.push(t[2]=n);var u,a=document.createElement("script");a.charset="utf-8",a.timeout=120,i.nc&&a.setAttribute("nonce",i.nc),a.src=function(e){return i.p+"static/js/"+({}[e]||e)+"."+{3:"ea174584"}[e]+".chunk.js"}(e);var c=new Error;u=function(r){a.onerror=a.onload=null,clearTimeout(l);var t=o[e];if(0!==t){if(t){var n=r&&("load"===r.type?"missing":r.type),u=r&&r.target&&r.target.src;c.message="Loading chunk "+e+" failed.\n("+n+": "+u+")",c.name="ChunkLoadError",c.type=n,c.request=u,t[1](c)}o[e]=void 0}};var l=setTimeout((function(){u({type:"timeout",target:a})}),12e4);a.onerror=a.onload=u,document.head.appendChild(a)}return Promise.all(r)},i.m=e,i.c=n,i.d=function(e,r,t){i.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},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,r){if(1&r&&(e=i(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(i.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)i.d(t,n,function(r){return e[r]}.bind(null,n));return t},i.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(r,"a",r),r},i.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},i.p="/",i.oe=function(e){throw console.error(e),e};var a=this.webpackJsonpjonsportfolio=this.webpackJsonpjonsportfolio||[],c=a.push.bind(a);a.push=r,a=a.slice();for(var l=0;l<a.length;l++)r(a[l]);var f=c;t()}([])</script><script src="/static/js/2.09d8be7a.chunk.js"></script><script src="/static/js/main.295a0fda.chunk.js"></script></body></html>
<<<<<<< HEAD
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Jon Christie's Fullstack Frontend with Backend Developer Website - Looking for Jobs in Javascript React MongoDB"/><meta property="og:image" content="https://www.jonchristie.net/favicon.png"/><meta property="og:locale" content="en_US"/><meta property="og:type" content="website"/><meta property="og:description" content="Jon Christie's Fullstack Frontend with Backend Developer Website - Looking for Jobs in Javascript React MongoDB"/><meta property="og:title" content="Jon Christie's Portfolio - Looking for a web developer that doesn't empty your bank account? Look no further."/><meta property="og:url" content="https://www.jonchristie.net/"/><meta property="og:site_name" content="Jon Christie's Portfolio"/><meta name="twitter:card" content="summary_large_image"/><meta name="twitter:title" content="Jon Christie's Portfolio - Looking for a web developer that doesn't empty your bank account? Look no further."/><meta name="twitter:description" content="Jon Christie's Fullstack Frontend with Backend Developer Website - Looking for Jobs in Javascript React MongoDB"/><meta name="twitter:image" content="https://www.jonchristie.net/favicon.png"/><link rel="apple-touch-icon" href="https://www.jonchristie.net/favicon.png"/><link rel="manifest" href="/manifest.json"/><meta name="ahrefs-site-verification" content="13f4b9c19edea083cae8bd694571116720c8c924fd99b5d9fc57a03682d2a4d6"><title>Portfolio</title><link href="/static/css/2.65f8c46c.chunk.css" rel="stylesheet"><link href="/static/css/main.8bba0d8c.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 r(r){for(var n,i,a=r[0],c=r[1],l=r[2],s=0,p=[];s<a.length;s++)i=a[s],Object.prototype.hasOwnProperty.call(o,i)&&o[i]&&p.push(o[i][0]),o[i]=0;for(n in c)Object.prototype.hasOwnProperty.call(c,n)&&(e[n]=c[n]);for(f&&f(r);p.length;)p.shift()();return u.push.apply(u,l||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,a=1;a<t.length;a++){var c=t[a];0!==o[c]&&(n=!1)}n&&(u.splice(r--,1),e=i(i.s=t[0]))}return e}var n={},o={1:0},u=[];function i(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,i),t.l=!0,t.exports}i.e=function(e){var r=[],t=o[e];if(0!==t)if(t)r.push(t[2]);else{var n=new Promise((function(r,n){t=o[e]=[r,n]}));r.push(t[2]=n);var u,a=document.createElement("script");a.charset="utf-8",a.timeout=120,i.nc&&a.setAttribute("nonce",i.nc),a.src=function(e){return i.p+"static/js/"+({}[e]||e)+"."+{3:"ea174584"}[e]+".chunk.js"}(e);var c=new Error;u=function(r){a.onerror=a.onload=null,clearTimeout(l);var t=o[e];if(0!==t){if(t){var n=r&&("load"===r.type?"missing":r.type),u=r&&r.target&&r.target.src;c.message="Loading chunk "+e+" failed.\n("+n+": "+u+")",c.name="ChunkLoadError",c.type=n,c.request=u,t[1](c)}o[e]=void 0}};var l=setTimeout((function(){u({type:"timeout",target:a})}),12e4);a.onerror=a.onload=u,document.head.appendChild(a)}return Promise.all(r)},i.m=e,i.c=n,i.d=function(e,r,t){i.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},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,r){if(1&r&&(e=i(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(i.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)i.d(t,n,function(r){return e[r]}.bind(null,n));return t},i.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(r,"a",r),r},i.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},i.p="/",i.oe=function(e){throw console.error(e),e};var a=this.webpackJsonpjonsportfolio=this.webpackJsonpjonsportfolio||[],c=a.push.bind(a);a.push=r,a=a.slice();for(var l=0;l<a.length;l++)r(a[l]);var f=c;t()}([])</script><script src="/static/js/2.09d8be7a.chunk.js"></script><script src="/static/js/main.295a0fda.chunk.js"></script></body></html>
=======
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Jon Christie's Fullstack Frontend with Backend Developer Website - Looking for Jobs in Javascript React MongoDB"/><meta property="og:image" content="https://www.jonchristie.net/favicon.png"/><meta property="og:locale" content="en_US"/><meta property="og:type" content="website"/><meta property="og:description" content="Jon Christie's Fullstack Frontend with Backend Developer Website - Looking for Jobs in Javascript React MongoDB"/><meta property="og:title" content="Jon Christie's Portfolio - Looking for a web developer that doesn't empty your bank account? Look no further."/><meta property="og:url" content="https://www.jonchristie.net/"/><meta property="og:site_name" content="Jon Christie's Portfolio"/><meta name="twitter:card" content="summary_large_image"/><meta name="twitter:title" content="Jon Christie's Portfolio - Looking for a web developer that doesn't empty your bank account? Look no further."/><meta name="twitter:description" content="Jon Christie's Fullstack Frontend with Backend Developer Website - Looking for Jobs in Javascript React MongoDB"/><meta name="twitter:image" content="https://www.jonchristie.net/favicon.png"/><link rel="apple-touch-icon" href="https://www.jonchristie.net/favicon.png"/><link rel="manifest" href="/manifest.json"/><meta name="ahrefs-site-verification" content="13f4b9c19edea083cae8bd694571116720c8c924fd99b5d9fc57a03682d2a4d6"><title>Portfolio</title><link href="/static/css/2.65f8c46c.chunk.css" rel="stylesheet"><link href="/static/css/main.ba96582f.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 r(r){for(var n,i,a=r[0],c=r[1],l=r[2],s=0,p=[];s<a.length;s++)i=a[s],Object.prototype.hasOwnProperty.call(o,i)&&o[i]&&p.push(o[i][0]),o[i]=0;for(n in c)Object.prototype.hasOwnProperty.call(c,n)&&(e[n]=c[n]);for(f&&f(r);p.length;)p.shift()();return u.push.apply(u,l||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,a=1;a<t.length;a++){var c=t[a];0!==o[c]&&(n=!1)}n&&(u.splice(r--,1),e=i(i.s=t[0]))}return e}var n={},o={1:0},u=[];function i(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,i),t.l=!0,t.exports}i.e=function(e){var r=[],t=o[e];if(0!==t)if(t)r.push(t[2]);else{var n=new Promise((function(r,n){t=o[e]=[r,n]}));r.push(t[2]=n);var u,a=document.createElement("script");a.charset="utf-8",a.timeout=120,i.nc&&a.setAttribute("nonce",i.nc),a.src=function(e){return i.p+"static/js/"+({}[e]||e)+"."+{3:"ea174584"}[e]+".chunk.js"}(e);var c=new Error;u=function(r){a.onerror=a.onload=null,clearTimeout(l);var t=o[e];if(0!==t){if(t){var n=r&&("load"===r.type?"missing":r.type),u=r&&r.target&&r.target.src;c.message="Loading chunk "+e+" failed.\n("+n+": "+u+")",c.name="ChunkLoadError",c.type=n,c.request=u,t[1](c)}o[e]=void 0}};var l=setTimeout((function(){u({type:"timeout",target:a})}),12e4);a.onerror=a.onload=u,document.head.appendChild(a)}return Promise.all(r)},i.m=e,i.c=n,i.d=function(e,r,t){i.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},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,r){if(1&r&&(e=i(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(i.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)i.d(t,n,function(r){return e[r]}.bind(null,n));return t},i.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(r,"a",r),r},i.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},i.p="/",i.oe=function(e){throw console.error(e),e};var a=this.webpackJsonpjonsportfolio=this.webpackJsonpjonsportfolio||[],c=a.push.bind(a);a.push=r,a=a.slice();for(var l=0;l<a.length;l++)r(a[l]);var f=c;t()}([])</script><script src="/static/js/2.09d8be7a.chunk.js"></script><script src="/static/js/main.ac6118f4.chunk.js"></script></body></html>
>>>>>>> 5dbcac5 (nov updated)
2 changes: 2 additions & 0 deletions build/static/css/main.ba96582f.chunk.css
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions build/static/css/main.ba96582f.chunk.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions build/static/js/main.ac6118f4.chunk.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions build/static/js/main.ac6118f4.chunk.js.map
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@
"vercel": "^28.5.6",
"web-vitals": "^1.0.1"
},
"devDependencies":{
"react-app-rewired": "@2.2.1"
"devDependencies": {
"react-app-rewired": "^2.2.1"
},
"scripts": {
"start": "react-app-rewired start",
"build": "react-app-rewired build",
"test": "react-app-rewired test",
"eject": "react-scripts eject"
},
},
"eslintConfig": {
"extends": [
"react-app",
Expand Down
1 change: 0 additions & 1 deletion public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.png" />
Expand Down