From ea79eb57df0eb2c8cc64f55e45559e3799d10f92 Mon Sep 17 00:00:00 2001 From: Andrew Simonson Date: Mon, 27 Sep 2021 14:36:19 -0400 Subject: [PATCH] Updated projects and added basic fade aos --- site/package-lock.json | 71 ++++++++++++++++++++++++++--------- site/package.json | 1 + site/src/App.css | 19 ++++++++-- site/src/App.js | 4 ++ site/src/Projects.js | 12 +++--- site/src/componets/About.js | 4 ++ site/src/componets/Project.js | 39 +++++++++---------- site/yarn.lock | 60 ++++++++++++----------------- 8 files changed, 127 insertions(+), 83 deletions(-) diff --git a/site/package-lock.json b/site/package-lock.json index c393d9d..7d7d49e 100644 --- a/site/package-lock.json +++ b/site/package-lock.json @@ -11,6 +11,7 @@ "@testing-library/jest-dom": "^5.11.4", "@testing-library/react": "^11.1.0", "@testing-library/user-event": "^12.1.10", + "aos": "^2.3.4", "react": "^17.0.2", "react-dom": "^17.0.2", "react-router-dom": "^5.3.0", @@ -1884,7 +1885,6 @@ "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", @@ -3384,6 +3384,16 @@ "node": ">= 8" } }, + "node_modules/aos": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/aos/-/aos-2.3.4.tgz", + "integrity": "sha512-zh/ahtR2yME4I51z8IttIt4lC1Nw0ktsFtmeDzID1m9naJnWXhCoARaCgNOGXb5CLy3zm+wqmRAEgMYB5E2HUw==", + "dependencies": { + "classlist-polyfill": "^1.0.3", + "lodash.debounce": "^4.0.6", + "lodash.throttle": "^4.0.1" + } + }, "node_modules/aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", @@ -4769,7 +4779,6 @@ "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", @@ -4916,6 +4925,11 @@ "node": ">=0.10.0" } }, + "node_modules/classlist-polyfill": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/classlist-polyfill/-/classlist-polyfill-1.2.0.tgz", + "integrity": "sha1-k1vC39lFiodrJ5YXUUY4vKqWSi4=" + }, "node_modules/clean-css": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz", @@ -6751,8 +6765,7 @@ "esprima": "^4.0.1", "estraverse": "^4.2.0", "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" + "optionator": "^0.8.1" }, "bin": { "escodegen": "bin/escodegen.js", @@ -10519,7 +10532,6 @@ "@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", @@ -11717,7 +11729,6 @@ "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": { @@ -11909,6 +11920,11 @@ "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=" }, + "node_modules/lodash.debounce": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", + "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" + }, "node_modules/lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", @@ -11936,6 +11952,11 @@ "lodash._reinterpolate": "^3.0.0" } }, + "node_modules/lodash.throttle": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz", + "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=" + }, "node_modules/lodash.uniq": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", @@ -15424,7 +15445,6 @@ "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", @@ -19019,10 +19039,8 @@ "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", - "watchpack-chokidar2": "^2.0.1" + "neo-async": "^2.5.0" }, "optionalDependencies": { "chokidar": "^3.4.1", @@ -19112,7 +19130,6 @@ "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", @@ -19560,7 +19577,6 @@ "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", @@ -20110,9 +20126,6 @@ "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" } @@ -20570,9 +20583,6 @@ "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" } @@ -23520,6 +23530,16 @@ "picomatch": "^2.0.4" } }, + "aos": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/aos/-/aos-2.3.4.tgz", + "integrity": "sha512-zh/ahtR2yME4I51z8IttIt4lC1Nw0ktsFtmeDzID1m9naJnWXhCoARaCgNOGXb5CLy3zm+wqmRAEgMYB5E2HUw==", + "requires": { + "classlist-polyfill": "^1.0.3", + "lodash.debounce": "^4.0.6", + "lodash.throttle": "^4.0.1" + } + }, "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", @@ -24767,6 +24787,11 @@ } } }, + "classlist-polyfill": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/classlist-polyfill/-/classlist-polyfill-1.2.0.tgz", + "integrity": "sha1-k1vC39lFiodrJ5YXUUY4vKqWSi4=" + }, "clean-css": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz", @@ -30313,6 +30338,11 @@ "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=" }, + "lodash.debounce": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", + "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" + }, "lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", @@ -30340,6 +30370,11 @@ "lodash._reinterpolate": "^3.0.0" } }, + "lodash.throttle": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz", + "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=" + }, "lodash.uniq": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", diff --git a/site/package.json b/site/package.json index 18f0e99..af6d0b6 100644 --- a/site/package.json +++ b/site/package.json @@ -7,6 +7,7 @@ "@testing-library/jest-dom": "^5.11.4", "@testing-library/react": "^11.1.0", "@testing-library/user-event": "^12.1.10", + "aos": "^2.3.4", "react": "^17.0.2", "react-dom": "^17.0.2", "react-router-dom": "^5.3.0", diff --git a/site/src/App.css b/site/src/App.css index 1950123..33011f2 100644 --- a/site/src/App.css +++ b/site/src/App.css @@ -97,21 +97,25 @@ a { width: 85rem; background-color: rgba(0, 0, 0, 0.5); border: solid rgba(156,49,45,.2) .3rem; - text-align: center; } .project{ - background-image: radial-gradient(ellipse at top, #ff000036,transparent), radial-gradient(ellipse at bottom,#25282c,transparent), radial-gradient(ellipse at right,#25282c,transparent), radial-gradient(ellipse at left,#25282c,transparent); display: inline-block; text-align: left; margin: 1rem; width: 25rem; height: 15rem; border: .3rem black solid; + background-color: rgba(22,22,22,.8); +} +.tab{ + display: inline; + float: right; } .project h3{ + display: inline-block; border-bottom: black solid .2rem; } -.project p{ +.body{ color:rgb(212, 212, 212); } .project img{ @@ -136,6 +140,15 @@ a { filter: invert(18%) sepia(6%) saturate(5428%) hue-rotate(314deg) brightness(95%) contrast(97%); } +.incomplete{ + color:red; +} +.WIP{ + color:yellow; +} +.complete{ + color:green; +} .footer{ display: block; background-color: rgb(156,49,45); diff --git a/site/src/App.js b/site/src/App.js index cf91a69..00bdc6b 100644 --- a/site/src/App.js +++ b/site/src/App.js @@ -5,6 +5,10 @@ import Nav from './componets/Nav.js' import Socials from './componets/Socials.js' import About from './componets/About.js' import Projects from './Projects'; +import AOS from 'aos'; +import 'aos/dist/aos.css'; // You can also use for styles + +AOS.init(); function App() { return ( diff --git a/site/src/Projects.js b/site/src/Projects.js index 29045be..a37931d 100644 --- a/site/src/Projects.js +++ b/site/src/Projects.js @@ -6,8 +6,10 @@ export default function Projects(){ return( <>

Projects

+

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

- }> + }> A personal portfolio site made with React.js }> @@ -16,16 +18,16 @@ export default function Projects(){ }> 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 C++ keylogger for windows based off a udemy course with my custom modifications and powershell script. diff --git a/site/src/componets/About.js b/site/src/componets/About.js index ec5e679..5c273df 100644 --- a/site/src/componets/About.js +++ b/site/src/componets/About.js @@ -1,9 +1,11 @@ import React from 'react'; import picture from '../assets/itsa_me.JPG' +import AOS from 'aos' export default function About(){ return( <> +

A biography

Ahoy, I'm Andrew Simonson

I'm primarily an extremely forgetful person @@ -17,6 +19,8 @@ export default function About(){

I'm a first year student at Rochester Institute of Technology in the Computing Exploration program. I'm from Hagerstown, Maryland.

+
+ me ) } \ No newline at end of file diff --git a/site/src/componets/Project.js b/site/src/componets/Project.js index 2434739..f5a36e6 100644 --- a/site/src/componets/Project.js +++ b/site/src/componets/Project.js @@ -1,25 +1,22 @@ import React from 'react' -export default function Project(props){ - let statusColor = 'rgb(0,0,0)' - if(props.status == "WIP"){ - statusColor = 'yellow'; +export default class Project extends React.Component { + constructor(props){ + super(props) } - else if(props.status == "Complete"){ - statusColor = 'green'; + + render(){ + return ( +
  • +
    +

    {this.props.title}

    +

    ⬤

    +

    {this.props.children}

    +
    +
    + {this.props.linkText} +
    +
    • + ) } - else if(props.status == "Incomplete"){ - statusColor = 'red'; - } - return ( -
  • -
    -

    {props.title}

    -

    {props.children}

    -
    -
    - {props.linkText} -
    -
    • - ) -} \ No newline at end of file +} diff --git a/site/yarn.lock b/site/yarn.lock index cdbd49a..81639d9 100644 --- a/site/yarn.lock +++ b/site/yarn.lock @@ -1298,7 +1298,6 @@ "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" @@ -2294,6 +2293,15 @@ "normalize-path" "^3.0.0" "picomatch" "^2.0.4" +"aos@^2.3.4": + "integrity" "sha512-zh/ahtR2yME4I51z8IttIt4lC1Nw0ktsFtmeDzID1m9naJnWXhCoARaCgNOGXb5CLy3zm+wqmRAEgMYB5E2HUw==" + "resolved" "https://registry.npmjs.org/aos/-/aos-2.3.4.tgz" + "version" "2.3.4" + dependencies: + "classlist-polyfill" "^1.0.3" + "lodash.debounce" "^4.0.6" + "lodash.throttle" "^4.0.1" + "aproba@^1.1.1": "integrity" "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" "resolved" "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz" @@ -2740,13 +2748,6 @@ "resolved" "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz" "version" "2.2.0" -"bindings@^1.5.0": - "integrity" "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==" - "resolved" "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz" - "version" "1.5.0" - dependencies: - "file-uri-to-path" "1.0.0" - "bluebird@^3.5.5": "integrity" "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" "resolved" "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz" @@ -3200,7 +3201,6 @@ "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" @@ -3219,7 +3219,6 @@ 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" @@ -3273,6 +3272,11 @@ "isobject" "^3.0.0" "static-extend" "^0.1.1" +"classlist-polyfill@^1.0.3": + "integrity" "sha1-k1vC39lFiodrJ5YXUUY4vKqWSi4=" + "resolved" "https://registry.npmjs.org/classlist-polyfill/-/classlist-polyfill-1.2.0.tgz" + "version" "1.2.0" + "clean-css@^4.2.3": "integrity" "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==" "resolved" "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz" @@ -4482,7 +4486,6 @@ "estraverse" "^4.2.0" "esutils" "^2.0.2" "optionator" "^0.8.1" - "source-map" "~0.6.1" optionalDependencies: "source-map" "~0.6.1" @@ -5212,19 +5215,6 @@ "resolved" "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" "version" "1.0.0" -"fsevents@^1.2.7": - "integrity" "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==" - "resolved" "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz" - "version" "1.2.13" - dependencies: - "bindings" "^1.5.0" - "nan" "^2.12.1" - -"fsevents@^2.1.2", "fsevents@^2.1.3", "fsevents@~2.3.1": - "integrity" "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==" - "resolved" "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz" - "version" "2.3.2" - "function-bind@^1.1.1": "integrity" "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" "resolved" "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" @@ -6428,7 +6418,6 @@ "@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" @@ -6835,8 +6824,6 @@ "integrity" "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=" "resolved" "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz" "version" "4.0.0" - dependencies: - "graceful-fs" "^4.1.6" optionalDependencies: "graceful-fs" "^4.1.6" @@ -6845,7 +6832,6 @@ "resolved" "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz" "version" "6.1.0" dependencies: - "graceful-fs" "^4.1.6" "universalify" "^2.0.0" optionalDependencies: "graceful-fs" "^4.1.6" @@ -7048,6 +7034,11 @@ "resolved" "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz" "version" "3.0.0" +"lodash.debounce@^4.0.6": + "integrity" "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" + "resolved" "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz" + "version" "4.0.8" + "lodash.memoize@^4.1.2": "integrity" "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=" "resolved" "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz" @@ -7073,6 +7064,11 @@ dependencies: "lodash._reinterpolate" "^3.0.0" +"lodash.throttle@^4.0.1": + "integrity" "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=" + "resolved" "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz" + "version" "4.1.1" + "lodash.uniq@^4.5.0": "integrity" "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=" "resolved" "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz" @@ -7458,11 +7454,6 @@ "dns-packet" "^1.3.1" "thunky" "^1.0.2" -"nan@^2.12.1": - "integrity" "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==" - "resolved" "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz" - "version" "2.14.2" - "nanoid@^3.1.20": "integrity" "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==" "resolved" "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz" @@ -9273,7 +9264,6 @@ "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" @@ -11375,10 +11365,8 @@ "resolved" "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz" "version" "1.7.5" dependencies: - "chokidar" "^3.4.1" "graceful-fs" "^4.1.2" "neo-async" "^2.5.0" - "watchpack-chokidar2" "^2.0.1" optionalDependencies: "chokidar" "^3.4.1" "watchpack-chokidar2" "^2.0.1"