diff --git a/src/App.js b/src/App.js
index b51565a..f761961 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,8 +1,8 @@
import { Route, Link, Routes, BrowserRouter as Router } from 'react-router-dom'
-import './static/css/App.css';
-import './static/css/head.scss'
-import menu from './assets/menu.svg'
+import './assets/css/App.css';
+import './assets/css/head.scss'
+import menu from './assets/icons/menu.svg'
import Nav from './componets/Nav.js'
import Socials from './componets/Socials.js'
import Name from './componets/Name.js'
@@ -13,7 +13,7 @@ import AboutMe from './pages/AboutMe';
import ErrorNotFound from './pages/Error'
import AOS from 'aos';
import 'aos/dist/aos.css'; // You can also use for styles
-import { toggleMenu } from './responsive'
+import { toggleMenu } from './scripts/responsive'
diff --git a/src/static/css/App.css b/src/assets/css/App.css
similarity index 98%
rename from src/static/css/App.css
rename to src/assets/css/App.css
index a88140a..a326be1 100644
--- a/src/static/css/App.css
+++ b/src/assets/css/App.css
@@ -27,7 +27,7 @@ html, body {
body {
margin: 0;
- background-image: url('../../assets/plexus.jpg');
+ background-image: url('../photos/plexus.jpg');
/*url('https://i.pinimg.com/originals/d6/c3/ac/d6c3ac09021dbc0cda8ee27837d2c795.png')*/
background-attachment: fixed;
background-size: 100% auto;
@@ -286,8 +286,11 @@ a {
padding-right: 1rem;
}
-.bottomBox a {
+.bottomBox a, .placeholding {
vertical-align: middle;
+ display: inline;
+ text-align: left;
+ height:unset;
}
.project a img, .project a p {
diff --git a/src/static/css/head.scss b/src/assets/css/head.scss
similarity index 100%
rename from src/static/css/head.scss
rename to src/assets/css/head.scss
diff --git a/src/static/fonts/INDEPENDENT.ttf b/src/assets/fonts/INDEPENDENT.ttf
similarity index 100%
rename from src/static/fonts/INDEPENDENT.ttf
rename to src/assets/fonts/INDEPENDENT.ttf
diff --git a/src/static/fonts/Neon Future.ttf b/src/assets/fonts/Neon Future.ttf
similarity index 100%
rename from src/static/fonts/Neon Future.ttf
rename to src/assets/fonts/Neon Future.ttf
diff --git a/src/static/fonts/Starixo.otf b/src/assets/fonts/Starixo.otf
similarity index 100%
rename from src/static/fonts/Starixo.otf
rename to src/assets/fonts/Starixo.otf
diff --git a/src/static/fonts/SunsetClub.otf b/src/assets/fonts/SunsetClub.otf
similarity index 100%
rename from src/static/fonts/SunsetClub.otf
rename to src/assets/fonts/SunsetClub.otf
diff --git a/src/assets/email.svg b/src/assets/icons/email.svg
similarity index 100%
rename from src/assets/email.svg
rename to src/assets/icons/email.svg
diff --git a/src/assets/github.svg b/src/assets/icons/github.svg
similarity index 100%
rename from src/assets/github.svg
rename to src/assets/icons/github.svg
diff --git a/src/assets/globe.svg b/src/assets/icons/globe.svg
similarity index 100%
rename from src/assets/globe.svg
rename to src/assets/icons/globe.svg
diff --git a/src/assets/instagram.svg b/src/assets/icons/instagram.svg
similarity index 100%
rename from src/assets/instagram.svg
rename to src/assets/icons/instagram.svg
diff --git a/src/assets/linkedin.svg b/src/assets/icons/linkedin.svg
similarity index 100%
rename from src/assets/linkedin.svg
rename to src/assets/icons/linkedin.svg
diff --git a/src/assets/menu.svg b/src/assets/icons/menu.svg
similarity index 100%
rename from src/assets/menu.svg
rename to src/assets/icons/menu.svg
diff --git a/src/assets/placeholder.png b/src/assets/photos/placeholder.png
similarity index 100%
rename from src/assets/placeholder.png
rename to src/assets/photos/placeholder.png
diff --git a/src/assets/plexus.jpg b/src/assets/photos/plexus.jpg
similarity index 100%
rename from src/assets/plexus.jpg
rename to src/assets/photos/plexus.jpg
diff --git a/src/componets/Project.js b/src/componets/Project.js
index 789347e..8337218 100644
--- a/src/componets/Project.js
+++ b/src/componets/Project.js
@@ -1,5 +1,5 @@
import React from 'react'
-import placeholder from '../assets/placeholder.png'
+import placeholder from '../assets/photos/placeholder.png'
export default class Project extends React.Component {
render() {
diff --git a/src/componets/Socials.js b/src/componets/Socials.js
index cceb0c8..4a8b85c 100644
--- a/src/componets/Socials.js
+++ b/src/componets/Socials.js
@@ -1,9 +1,9 @@
import React from 'react';
-import github from '../assets/github.svg'
-import instagram from '../assets/instagram.svg'
-import linkedin from '../assets/linkedin.svg'
-import email from '../assets/email.svg'
+import github from '../assets/icons/github.svg'
+import instagram from '../assets/icons/instagram.svg'
+import linkedin from '../assets/icons/linkedin.svg'
+import email from '../assets/icons/email.svg'
export default function Socials(){
return(
diff --git a/src/index.js b/src/index.js
index 416af2c..5ad1315 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,7 +1,7 @@
import React from 'react';
import { createRoot } from 'react-dom/client';
import App from './App';
-import reportWebVitals from './reportWebVitals';
+import reportWebVitals from './scripts/reportWebVitals';
const container = document.getElementById('root');
const root = createRoot(container);
diff --git a/src/pages/AboutMe.js b/src/pages/AboutMe.js
index ca67188..405749a 100644
--- a/src/pages/AboutMe.js
+++ b/src/pages/AboutMe.js
@@ -64,10 +64,12 @@ export default function AboutMe() {
"Processing",
"P5.js",
"SQL",
+ "SQLite",
"PostgreSQL",
"SQLAlchemy",
"HTML",
"CSS",
+ "Docker",
"LaTeX",
"ArcGIS",
"Git",
@@ -82,6 +84,7 @@ export default function AboutMe() {
"Google API",
"React",
"Node.js",
+ "ArcGIS"
]}
diff --git a/src/pages/Projects.js b/src/pages/Projects.js
index 3b46da3..9f8f210 100644
--- a/src/pages/Projects.js
+++ b/src/pages/Projects.js
@@ -1,7 +1,7 @@
import ProjectList from '../componets/ProjectList'
import Project from '../componets/Project'
-import github from '../assets/github.svg'
-import globe from '../assets/globe.svg'
+import github from '../assets/icons/github.svg'
+import globe from '../assets/icons/globe.svg'
export default function Projects() {
return (
@@ -20,9 +20,6 @@ export default function Projects() {
]]}>
Collects RIT Gym Occupancy data for analysis, determining busiest times.
- ]]} >
- A personal portfolio site made with React.js. Might overhaul.
-
]]} >
A team derived from the RIT Financial Management Association dedicated to learning about financial management of equities using automated solutions developed by students.
diff --git a/src/reportWebVitals.js b/src/scripts/reportWebVitals.js
similarity index 100%
rename from src/reportWebVitals.js
rename to src/scripts/reportWebVitals.js
diff --git a/src/responsive.js b/src/scripts/responsive.js
similarity index 100%
rename from src/responsive.js
rename to src/scripts/responsive.js
diff --git a/src/setupTests.js b/src/setupTests.js
deleted file mode 100644
index 8f2609b..0000000
--- a/src/setupTests.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// jest-dom adds custom jest matchers for asserting on DOM nodes.
-// allows you to do things like:
-// expect(element).toHaveTextContent(/react/i)
-// learn more: https://github.com/testing-library/jest-dom
-import '@testing-library/jest-dom';