Skip to content

Commit 4676dcc

Browse files
mathcodesmathcodes
committed
Merge branch 'main' into alternate-adjustments
2 parents db9703c + df48b3e commit 4676dcc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1007
-26
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
![badge](https://img.shields.io/badge/•-web_vitals.1.0.1-blue)
7070

7171
## Description
72-
Welcome to my portfolio, updated as of February 2022! I've added some more projects, certifications to the downloadable resume, and implemented some more advanced features to the page! Enjoy and please contact me if you have an job opening for a full stack web developer!
72+
Welcome to my site, updated as of August 2022! I've added some more projects and implemented some more advanced features to the page! Enjoy and please contact me if you have a job opening for a full stack web developer!
7373

7474
## Contact
7575
<img src="https://avatars0.githubusercontent.com/u/17928947?v=4" alt="Github profile image" width="80px" height="80px" />

‎build/asset-manifest.json‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"files": {
3+
<<<<<<< HEAD
34
"main.css": "/static/css/main.dca2c018.chunk.css",
45
"main.js": "/static/js/main.52d9720e.chunk.js",
56
"main.js.map": "/static/js/main.52d9720e.chunk.js.map",
@@ -14,7 +15,25 @@
1415
"static/css/2.65f8c46c.chunk.css.map": "/static/css/2.65f8c46c.chunk.css.map",
1516
"static/css/main.dca2c018.chunk.css.map": "/static/css/main.dca2c018.chunk.css.map",
1617
"static/js/2.e6bc8f28.chunk.js.LICENSE.txt": "/static/js/2.e6bc8f28.chunk.js.LICENSE.txt",
18+
=======
19+
"main.css": "/static/css/main.84eaa128.chunk.css",
20+
"main.js": "/static/js/main.999e5ffa.chunk.js",
21+
"main.js.map": "/static/js/main.999e5ffa.chunk.js.map",
22+
"runtime-main.js": "/static/js/runtime-main.416d70ce.js",
23+
"runtime-main.js.map": "/static/js/runtime-main.416d70ce.js.map",
24+
"static/css/2.65f8c46c.chunk.css": "/static/css/2.65f8c46c.chunk.css",
25+
"static/js/2.c33d3377.chunk.js": "/static/js/2.c33d3377.chunk.js",
26+
"static/js/2.c33d3377.chunk.js.map": "/static/js/2.c33d3377.chunk.js.map",
27+
"static/js/3.842724a4.chunk.js": "/static/js/3.842724a4.chunk.js",
28+
"static/js/3.842724a4.chunk.js.map": "/static/js/3.842724a4.chunk.js.map",
29+
"index.html": "/index.html",
30+
"static/css/2.65f8c46c.chunk.css.map": "/static/css/2.65f8c46c.chunk.css.map",
31+
"static/css/main.84eaa128.chunk.css.map": "/static/css/main.84eaa128.chunk.css.map",
32+
"static/js/2.c33d3377.chunk.js.LICENSE.txt": "/static/js/2.c33d3377.chunk.js.LICENSE.txt",
33+
>>>>>>> main
1734
"static/media/index.css": "/static/media/BestermindRegular.e58a1922.ttf",
35+
"static/media/GH.f774be34.svg": "/static/media/GH.f774be34.svg",
36+
"static/media/JCircle.396647e0.png": "/static/media/JCircle.396647e0.png",
1837
"static/media/JCircle_dark_gray.77dc7436.png": "/static/media/JCircle_dark_gray.77dc7436.png",
1938
"static/media/Jon_Christie_Web_Developer_Resume.8b056d30.pdf": "/static/media/Jon_Christie_Web_Developer_Resume.8b056d30.pdf",
2039
"static/media/adobe-xd.a6dca99d.svg": "/static/media/adobe-xd.a6dca99d.svg",
@@ -67,6 +86,7 @@
6786
"static/media/girl2.c1222fab.svg": "/static/media/girl2.c1222fab.svg",
6887
"static/media/girl3.46f7c62b.svg": "/static/media/girl3.46f7c62b.svg",
6988
"static/media/git.a0b8447e.svg": "/static/media/git.a0b8447e.svg",
89+
"static/media/github.50ecaab5.svg": "/static/media/github.50ecaab5.svg",
7090
"static/media/gnco.43ebccb0.png": "/static/media/gnco.43ebccb0.png",
7191
"static/media/go.cda9e1cf.svg": "/static/media/go.cda9e1cf.svg",
7292
"static/media/graphql.be1dc316.svg": "/static/media/graphql.be1dc316.svg",
@@ -82,6 +102,7 @@
82102
"static/media/keys.b06b2149.png": "/static/media/keys.b06b2149.png",
83103
"static/media/kotlin.4f592da4.svg": "/static/media/kotlin.4f592da4.svg",
84104
"static/media/lightroom.0e67d833.svg": "/static/media/lightroom.0e67d833.svg",
105+
"static/media/linkedin.a55160cb.svg": "/static/media/linkedin.a55160cb.svg",
85106
"static/media/markdown.62e50cf0.svg": "/static/media/markdown.62e50cf0.svg",
86107
"static/media/mars.448b5864.svg": "/static/media/mars.448b5864.svg",
87108
"static/media/materialui.518da2c0.svg": "/static/media/materialui.518da2c0.svg",
@@ -128,10 +149,18 @@
128149
"static/media/wordpress.1c0bf6df.svg": "/static/media/wordpress.1c0bf6df.svg"
129150
},
130151
"entrypoints": [
152+
<<<<<<< HEAD
131153
"static/js/runtime-main.7bf4185d.js",
132154
"static/css/2.65f8c46c.chunk.css",
133155
"static/js/2.e6bc8f28.chunk.js",
134156
"static/css/main.dca2c018.chunk.css",
135157
"static/js/main.52d9720e.chunk.js"
158+
=======
159+
"static/js/runtime-main.416d70ce.js",
160+
"static/css/2.65f8c46c.chunk.css",
161+
"static/js/2.c33d3377.chunk.js",
162+
"static/css/main.84eaa128.chunk.css",
163+
"static/js/main.999e5ffa.chunk.js"
164+
>>>>>>> main
136165
]
137166
}

‎build/index.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
<!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="Portfolio Website"/><link rel="apple-touch-icon" href="/favicon.png"/><link rel="manifest" href="/manifest.json"/><title>Portfolio</title><link href="/static/css/2.65f8c46c.chunk.css" rel="stylesheet"><link href="/static/css/main.dca2c018.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:"a431897a"}[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.e6bc8f28.chunk.js"></script><script src="/static/js/main.52d9720e.chunk.js"></script></body></html>
1+
<<<<<<< HEAD
2+
<!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="Portfolio Website"/><link rel="apple-touch-icon" href="/favicon.png"/><link rel="manifest" href="/manifest.json"/><title>Portfolio</title><link href="/static/css/2.65f8c46c.chunk.css" rel="stylesheet"><link href="/static/css/main.dca2c018.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:"a431897a"}[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.e6bc8f28.chunk.js"></script><script src="/static/js/main.52d9720e.chunk.js"></script></body></html>
3+
=======
4+
<!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="Portfolio Website"/><link rel="apple-touch-icon" href="/favicon.png"/><link rel="manifest" href="/manifest.json"/><title>Portfolio</title><link href="/static/css/2.65f8c46c.chunk.css" rel="stylesheet"><link href="/static/css/main.84eaa128.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:"842724a4"}[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.c33d3377.chunk.js"></script><script src="/static/js/main.999e5ffa.chunk.js"></script></body></html>
5+
>>>>>>> main

‎build/static/css/main.84eaa128.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.

‎build/static/css/main.84eaa128.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.

‎build/static/js/2.c33d3377.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.

‎build/static/js/2.c33d3377.chunk.js.LICENSE.txt‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
/*
2+
object-assign
3+
(c) Sindre Sorhus
4+
@license MIT
5+
*/
6+
7+
/*!
8+
Copyright (c) 2018 Jed Watson.
9+
Licensed under the MIT License (MIT), see
10+
http://jedwatson.github.io/classnames
11+
*/
12+
13+
/*! *****************************************************************************
14+
Copyright (c) Microsoft Corporation.
15+
16+
Permission to use, copy, modify, and/or distribute this software for any
17+
purpose with or without fee is hereby granted.
18+
19+
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
20+
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
21+
AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
22+
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
23+
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
24+
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
25+
PERFORMANCE OF THIS SOFTWARE.
26+
***************************************************************************** */
27+
28+
/**
29+
* A better abstraction over CSS.
30+
*
31+
* @copyright Oleg Isonen (Slobodskoi) / Isonen 2014-present
32+
* @website https://github.com/cssinjs/jss
33+
* @license MIT
34+
*/
35+
36+
/** @license MUI v5.8.7
37+
*
38+
* This source code is licensed under the MIT license found in the
39+
* LICENSE file in the root directory of this source tree.
40+
*/
41+
42+
/** @license React v0.20.2
43+
* scheduler.production.min.js
44+
*
45+
* Copyright (c) Facebook, Inc. and its affiliates.
46+
*
47+
* This source code is licensed under the MIT license found in the
48+
* LICENSE file in the root directory of this source tree.
49+
*/
50+
51+
/** @license React v16.13.1
52+
* react-is.production.min.js
53+
*
54+
* Copyright (c) Facebook, Inc. and its affiliates.
55+
*
56+
* This source code is licensed under the MIT license found in the
57+
* LICENSE file in the root directory of this source tree.
58+
*/
59+
60+
/** @license React v17.0.2
61+
* react-dom.production.min.js
62+
*
63+
* Copyright (c) Facebook, Inc. and its affiliates.
64+
*
65+
* This source code is licensed under the MIT license found in the
66+
* LICENSE file in the root directory of this source tree.
67+
*/
68+
69+
/** @license React v17.0.2
70+
* react-jsx-runtime.production.min.js
71+
*
72+
* Copyright (c) Facebook, Inc. and its affiliates.
73+
*
74+
* This source code is licensed under the MIT license found in the
75+
* LICENSE file in the root directory of this source tree.
76+
*/
77+
78+
/** @license React v17.0.2
79+
* react.production.min.js
80+
*
81+
* Copyright (c) Facebook, Inc. and its affiliates.
82+
*
83+
* This source code is licensed under the MIT license found in the
84+
* LICENSE file in the root directory of this source tree.
85+
*/

‎build/static/js/2.c33d3377.chunk.js.map‎

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

‎build/static/js/2.e6bc8f28.chunk.js.map‎

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)