diff --git a/package-lock.json b/package-lock.json index 9d74135..777e913 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1891,6 +1891,7 @@ "jest-resolve": "^26.6.2", "jest-util": "^26.6.2", "jest-worker": "^26.6.2", + "node-notifier": "^8.0.0", "slash": "^3.0.0", "source-map": "^0.6.0", "string-length": "^4.0.1", @@ -4785,6 +4786,7 @@ "dependencies": { "anymatch": "~3.1.1", "braces": "~3.0.2", + "fsevents": "~2.3.1", "glob-parent": "~5.1.0", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", @@ -6782,7 +6784,8 @@ "esprima": "^4.0.1", "estraverse": "^4.2.0", "esutils": "^2.0.2", - "optionator": "^0.8.1" + "optionator": "^0.8.1", + "source-map": "~0.6.1" }, "bin": { "escodegen": "bin/escodegen.js", @@ -8717,6 +8720,9 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "dev": true, + "dependencies": { + "graceful-fs": "^4.1.6" + }, "optionalDependencies": { "graceful-fs": "^4.1.6" } @@ -10725,6 +10731,7 @@ "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", + "fsevents": "^2.1.2", "graceful-fs": "^4.2.4", "jest-regex-util": "^26.0.0", "jest-serializer": "^26.6.2", @@ -11922,6 +11929,7 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dependencies": { + "graceful-fs": "^4.1.6", "universalify": "^2.0.0" }, "optionalDependencies": { @@ -15687,6 +15695,7 @@ "eslint-webpack-plugin": "^2.5.2", "file-loader": "6.1.1", "fs-extra": "^9.0.1", + "fsevents": "^2.1.3", "html-webpack-plugin": "4.5.0", "identity-obj-proxy": "3.0.0", "jest": "26.6.0", @@ -19323,8 +19332,10 @@ "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz", "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==", "dependencies": { + "chokidar": "^3.4.1", "graceful-fs": "^4.1.2", - "neo-async": "^2.5.0" + "neo-async": "^2.5.0", + "watchpack-chokidar2": "^2.0.1" }, "optionalDependencies": { "chokidar": "^3.4.1", @@ -19414,6 +19425,7 @@ "anymatch": "^2.0.0", "async-each": "^1.0.1", "braces": "^2.3.2", + "fsevents": "^1.2.7", "glob-parent": "^3.1.0", "inherits": "^2.0.3", "is-binary-path": "^1.0.0", @@ -19861,6 +19873,7 @@ "anymatch": "^2.0.0", "async-each": "^1.0.1", "braces": "^2.3.2", + "fsevents": "^1.2.7", "glob-parent": "^3.1.0", "inherits": "^2.0.3", "is-binary-path": "^1.0.0", @@ -20410,6 +20423,9 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dependencies": { + "graceful-fs": "^4.1.6" + }, "optionalDependencies": { "graceful-fs": "^4.1.6" } @@ -20867,6 +20883,9 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dependencies": { + "graceful-fs": "^4.1.6" + }, "optionalDependencies": { "graceful-fs": "^4.1.6" } diff --git a/src/App.css b/src/App.css index 9fc8d5c..ebd246c 100644 --- a/src/App.css +++ b/src/App.css @@ -35,14 +35,13 @@ a { transition: .4s; margin-bottom: 0px; margin-top: .5rem; - font-size: 2.5rem; + margin-left: 1rem; + font-size: 2rem; } .header{ margin-bottom: 0px; margin-left: 0rem; - padding-bottom: .2rem; background-color: #1a1a1a; - border-bottom: solid black 1px; width: 100%; z-index: 99; position: fixed; @@ -51,37 +50,29 @@ a { transition: .4s; overflow: hidden; } -.navControl{ - float:right; +.navBar{ + display: block; + padding-left: 0px; + margin: 0px; + width: 100%; } -.navBar li{ - display: inline; - text-align: right; - background-color: rgb(156,49,45,.5); - border-top: .2rem black solid; - border-bottom: .2rem black solid; - border-right: .2rem black solid; - padding-top: .3rem; - padding-bottom: .3rem; +.navElement{ + border: solid black .2rem; + width: 25vw; + text-align: center; font-size: 1.2rem; transition: .4s; + padding-top: .5rem; + padding-bottom: .5rem; + background-color: rgb(156,49,45,.4); } -.navBar li:hover{ +.navElement:hover{ background-color: rgb(156,49,45,.8); } -.navBar li:first-child{ - border-left: .2rem black solid; -} -.navBar li a{ +.navElement *{ color: white; - padding-left: 2rem;; - padding-right: 2rem; -} -.navBar{ - display: flex; - margin-top: 1rem; - margin-bottom: 0px; - padding-left: 0px; + margin:0px; + display: block; } .foreground{ padding-top:5.5rem; @@ -96,7 +87,7 @@ a { } .foreground p{ line-height: 1.5em; - max-width: 40rem; + max-width: min(95%, 40rem); } .sideimg{ float:right; @@ -229,13 +220,6 @@ a { body{ background-size: auto 100%; } - .navBar li a{ - padding-left: 3vw; - padding-right: 3vw; - } - .navControl{ - float: none; - } #aboutMe{ float: none; display:block; diff --git a/src/App.test.js b/src/App.test.js deleted file mode 100644 index 1f03afe..0000000 --- a/src/App.test.js +++ /dev/null @@ -1,8 +0,0 @@ -import { render, screen } from '@testing-library/react'; -import App from './App'; - -test('renders learn react link', () => { - render(); - const linkElement = screen.getByText(/learn react/i); - expect(linkElement).toBeInTheDocument(); -}); diff --git a/src/componets/Nav.js b/src/componets/Nav.js index 44201d0..1c00b55 100644 --- a/src/componets/Nav.js +++ b/src/componets/Nav.js @@ -6,15 +6,15 @@ export default function Nav(props){ items = ( <> {items} -
  • {props.children[i]}
    • + {props.children[i]} ) } return(
    -
    ) } \ No newline at end of file diff --git a/src/logo.svg b/src/logo.svg deleted file mode 100644 index 9dfc1c0..0000000 --- a/src/logo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/pages/Projects.js b/src/pages/Projects.js index 14b7c3a..3710abb 100644 --- a/src/pages/Projects.js +++ b/src/pages/Projects.js @@ -8,27 +8,27 @@ export default function Projects(){

    Projects

    Project status is indicated by the color of the project card:
    ⬤ - Complete
    - ⬤ - Work In Progress
    ⬤ - incomplete + ⬤ - Work In Progress
    ⬤ - Incomplete

    }> - A personal portfolio site made with React.js + A personal portfolio site made with React.js. }> - Slate is a web app designed to help event coordinators schedule events by congregating participant calendar data + Slate is a web app designed to help event coordinators schedule events by congregating participant calendar data. }> A modular discord bot to manage class discord servers. - }> + }> A simulator for the browser game, NationsGame, to analyze unit composition and predict in-game victors and unit statistics. }> A Discord bot to handle role management and statistics for RIT's Humans vs. Zombies games. }> - A GNOME extension that cycles through a folder of wallpapers + A GNOME extension that cycles through a folder of wallpapers. }> A C++ keylogger for windows based off a udemy course with my custom modifications and powershell script. diff --git a/src/pages/Resume.js b/src/pages/Resume.js new file mode 100644 index 0000000..4cb9b86 --- /dev/null +++ b/src/pages/Resume.js @@ -0,0 +1,5 @@ +import React from 'react' + +export default function Resume(){ + return(); +} diff --git a/src/responsive.js b/src/responsive.js index 1af8f8a..b90276e 100644 --- a/src/responsive.js +++ b/src/responsive.js @@ -3,13 +3,13 @@ window.onscroll = function() {scrollFunction()}; function scrollFunction() { if (document.body.scrollTop > 80 || document.documentElement.scrollTop > 80) { document.querySelector('.header').style.backgroundColor = '#1a1a1a'; - document.querySelector('.header > a > h1').style.fontSize = "2rem"; + document.querySelector('.header > a > h1').style.fontSize = "1.5rem"; // document.querySelector('.header > h1').style.color = "#a8a8a8"; - document.querySelectorAll('.navBar > li').forEach(x => {x.style.paddingTop = '0rem'; x.style.paddingBottom = '0rem'}); + document.querySelectorAll('.navElement').forEach(x => {x.style.paddingTop = '.3rem'; x.style.paddingBottom = '.3rem'; x.style.fontSize='1rem'}); } else { document.querySelector('.header').style.backgroundColor = 'rgba(0,0,0,0)'; - document.querySelector('.header > a > h1').style.fontSize = "2.5rem"; + document.querySelector('.header > a > h1').style.fontSize = "2rem"; // document.querySelector('.header > h1').style.color = "#ecebeb"; - document.querySelectorAll('.navBar > li').forEach(x => {x.style.paddingTop = '.3rem'; x.style.paddingBottom = '.3rem'}); + document.querySelectorAll('.navElement').forEach(x => {x.style.paddingTop = '.5rem'; x.style.paddingBottom = '.5rem'; x.style.fontSize='1.2rem'}); } } \ No newline at end of file