From 68e64a725e5f0f6d0d8ae16ed7544668d298b841 Mon Sep 17 00:00:00 2001 From: Murtadha Date: Wed, 17 Jul 2024 21:04:19 -0400 Subject: [PATCH] v0.9.4 Move assets to assets directory in the public directory --- public/{ => assets}/data/educationData.json | 6 +++--- public/{ => assets}/data/experienceData.json | 6 +++--- public/{ => assets}/data/projectsData.json | 10 +++++----- public/{ => assets}/logos/amazon.png | Bin public/{ => assets}/logos/logo.png | Bin public/{ => assets}/logos/srhc.png | Bin public/{ => assets}/logos/uog.png | Bin public/{ => assets}/papers/sem_com01.pdf | Bin public/{ => assets}/pp/abtme.JPG | Bin public/{ => assets}/pp/pp.jpg | Bin public/{ => assets}/projects/carmodelclass0.png | Bin public/{ => assets}/projects/keypad0.jpg | Bin public/{ => assets}/projects/memallc0.png | Bin public/{ => assets}/projects/portfolio0.png | Bin public/{ => assets}/projects/stonkbot0.jpg | Bin src/App.jsx | 6 +++--- src/assets/react.svg | 1 - src/components/About.jsx | 0 src/components/aboutMe/AboutMe.jsx | 4 +++- src/components/footer/Footer.jsx | 2 +- src/components/header/Header.jsx | 2 +- src/components/hero/Hero.jsx | 4 +++- src/components/publications/Publications.jsx | 2 +- version.txt | 2 +- 24 files changed, 24 insertions(+), 21 deletions(-) rename public/{ => assets}/data/educationData.json (96%) rename public/{ => assets}/data/experienceData.json (95%) rename public/{ => assets}/data/projectsData.json (91%) rename public/{ => assets}/logos/amazon.png (100%) rename public/{ => assets}/logos/logo.png (100%) rename public/{ => assets}/logos/srhc.png (100%) rename public/{ => assets}/logos/uog.png (100%) rename public/{ => assets}/papers/sem_com01.pdf (100%) rename public/{ => assets}/pp/abtme.JPG (100%) rename public/{ => assets}/pp/pp.jpg (100%) rename public/{ => assets}/projects/carmodelclass0.png (100%) rename public/{ => assets}/projects/keypad0.jpg (100%) rename public/{ => assets}/projects/memallc0.png (100%) rename public/{ => assets}/projects/portfolio0.png (100%) rename public/{ => assets}/projects/stonkbot0.jpg (100%) delete mode 100644 src/assets/react.svg delete mode 100644 src/components/About.jsx diff --git a/public/data/educationData.json b/public/assets/data/educationData.json similarity index 96% rename from public/data/educationData.json rename to public/assets/data/educationData.json index 2e834e7..0505b7e 100644 --- a/public/data/educationData.json +++ b/public/assets/data/educationData.json @@ -3,7 +3,7 @@ "id": 1, "title": "Bachelor of Engineering - Computer Engineering", "organization": "University of Guelph", - "logo": "/logos/uog.png", + "logo": "/assets/logos/uog.png", "location": "Guelph, ON", "duration": "2019 - 2023", "description": "As a graduate in Computer Engineering, my expertise encompasses a wide range of skills essential for modern computing systems. This includes circuit design and development, hardware integration, and system-level design integration. I am well-versed in the science and tools required for designing, constructing, implementing, and maintaining both software and hardware components in computing systems.", @@ -17,7 +17,7 @@ "id": 2, "title": "Bachelor of Computer Science", "organization": "University of Guelph", - "logo": "/logos/uog.png", + "logo": "/assets/logos/uog.png", "location": "Guelph, ON", "duration": "2020 - 2023", "description": "As a graduate in Computer Science, the journey emphasizes mathematical principles, systems development, programming, and in-depth algorithm design and analysis. With a curriculum that spans topics like databases, data structures, and full-stack development. Additionally, my educational background covers essential aspects such as cybersecurity, networking, and other crucial disciplines.", @@ -31,7 +31,7 @@ "id": 3, "title": "MASc Candidate - Computer Engineering", "organization": "University of Guelph", - "logo": "/logos/uog.png", + "logo": "/assets/logos/uog.png", "location": "Guelph, ON", "duration": "2023 - 2024", "description": "Pursuing advanced studies in Computer Engineering with a focus on AI systems and machine learning applications.", diff --git a/public/data/experienceData.json b/public/assets/data/experienceData.json similarity index 95% rename from public/data/experienceData.json rename to public/assets/data/experienceData.json index 9dd908a..f344361 100644 --- a/public/data/experienceData.json +++ b/public/assets/data/experienceData.json @@ -3,7 +3,7 @@ "id": 3, "title": "Graduate Researcher", "organization": "University of Guelph", - "logo": "/logos/uog.png", + "logo": "/assets/logos/uog.png", "location": "Guelph, Ontario", "duration": "Jan 2024 - Dec 2024", "description": "Conducted research on transformer-based models for semantic data transmission in end-to-end (E2E) communications, developing and training models using PyTorch to enhance data transmission efficiency and reliability.", @@ -15,7 +15,7 @@ "id": 2, "title": "Software Developer", "organization": "University of Guelph - Robotics Institute", - "logo": "/logos/uog.png", + "logo": "/assets/logos/uog.png", "location": "Guelph, Ontario", "duration": "Oct 2022 - Oct 2023", "description": "Developed ROS2 modules for an Assistive Robotic Feeding System, managed a React Native mobile app, and deployed analytics applications using AWS services.", @@ -31,7 +31,7 @@ "id": 1, "title": "Information Technology Analyst", "organization": "Kitchener Downtown Community Health Centre - SRHC", - "logo": "/logos/srhc.png", + "logo": "/assets/logos/srhc.png", "location": "Kitchener, Ontario", "duration": "Jul 2020 - Oct 2020", "description": "Managed IT infrastructure upgrades, streamlined communication systems, and maintained electronic medical record systems, resulting in significant cost savings and improved patient care efficiency.", diff --git a/public/data/projectsData.json b/public/assets/data/projectsData.json similarity index 91% rename from public/data/projectsData.json rename to public/assets/data/projectsData.json index 593adf9..4d0bbd4 100644 --- a/public/data/projectsData.json +++ b/public/assets/data/projectsData.json @@ -3,7 +3,7 @@ "id": 1, "title": "PaperKeypad", "category": "Misc", - "images": ["/projects/keypad0.jpg"], + "images": ["/assets/projects/keypad0.jpg"], "description": "Ever need to use a keyboard, but you got only your phone and a printer, PaperKeypad is a keypad that is made of paper.", "technologies": ["Java", "JavaFX", "Android Studio"], "features": ["Mobile sensor manipulation", "Responsive design"], @@ -13,7 +13,7 @@ "id": 2, "title": "StonkBot", "category": "Misc", - "images": ["/projects/stonkbot0.jpg"], + "images": ["/assets/projects/stonkbot0.jpg"], "description": "The fear of losing money is common among first-time and seasoned investors alike. This inspired the creation of Stonk Bot, a fantasy trading platform that can be implemented in Discord.", "technologies": ["Python", "VS Code", "Matplotlib", "Financial Modeling Prep API", "Discord API"], "features": ["Buy shares", "Sell shares", "View stock information", "View personal portfolio", "View leaderboard"], @@ -24,7 +24,7 @@ "id": 3, "title": "Car Model Classification", "category": "Machine Learning", - "images": ["/projects/carmodelclass0.png"], + "images": ["/assets/projects/carmodelclass0.png"], "description": "Developing a computer vision application to identify a vehicle model from a given image is an interesting and challenging problem to solve. Challenge of this problem is that different vehicle models can appear very similar and the same vehicle can look different and hard to identify depending on lighting conditions, angle and many other factors. In this project, I decided to train a Convolutional Neural Network(CNN) to generate a model that can identify a given vehicle model.", "technologies": ["Python", "Tensorflow", "CNN", "Deep learning", "ResNet", "EfficientNet", "Stanford Cars Dataset"], "features": ["Buy shares", "Sell shares", "View stock information", "View personal portfolio", "View leaderboard"], @@ -34,7 +34,7 @@ "id": 4, "title": "Memory Allocation Simulations", "category": "Misc", - "images": ["/projects/memallc0.png"], + "images": ["/assets/projects/memallc0.png"], "description": "This implementation uses doubly linked list to simulate memory allocation given 4 different memory management algorithms", "technologies": ["C", "CMake", "Data structures"], "features": ["First fit", "Best fit", "Next fit", "Worst fit"], @@ -44,7 +44,7 @@ "id": 5, "title": "Portfolio Website", "category": "Web Development", - "images": ["/projects/memallc0.png"], + "images": ["/assets/projects/memallc0.png"], "description": "This implementation uses doubly linked list to simulate memory allocation given 4 different memory management algorithms", "technologies": ["C", "CMake", "Data structures"], "features": ["First fit", "Best fit", "Next fit", "Worst fit"], diff --git a/public/logos/amazon.png b/public/assets/logos/amazon.png similarity index 100% rename from public/logos/amazon.png rename to public/assets/logos/amazon.png diff --git a/public/logos/logo.png b/public/assets/logos/logo.png similarity index 100% rename from public/logos/logo.png rename to public/assets/logos/logo.png diff --git a/public/logos/srhc.png b/public/assets/logos/srhc.png similarity index 100% rename from public/logos/srhc.png rename to public/assets/logos/srhc.png diff --git a/public/logos/uog.png b/public/assets/logos/uog.png similarity index 100% rename from public/logos/uog.png rename to public/assets/logos/uog.png diff --git a/public/papers/sem_com01.pdf b/public/assets/papers/sem_com01.pdf similarity index 100% rename from public/papers/sem_com01.pdf rename to public/assets/papers/sem_com01.pdf diff --git a/public/pp/abtme.JPG b/public/assets/pp/abtme.JPG similarity index 100% rename from public/pp/abtme.JPG rename to public/assets/pp/abtme.JPG diff --git a/public/pp/pp.jpg b/public/assets/pp/pp.jpg similarity index 100% rename from public/pp/pp.jpg rename to public/assets/pp/pp.jpg diff --git a/public/projects/carmodelclass0.png b/public/assets/projects/carmodelclass0.png similarity index 100% rename from public/projects/carmodelclass0.png rename to public/assets/projects/carmodelclass0.png diff --git a/public/projects/keypad0.jpg b/public/assets/projects/keypad0.jpg similarity index 100% rename from public/projects/keypad0.jpg rename to public/assets/projects/keypad0.jpg diff --git a/public/projects/memallc0.png b/public/assets/projects/memallc0.png similarity index 100% rename from public/projects/memallc0.png rename to public/assets/projects/memallc0.png diff --git a/public/projects/portfolio0.png b/public/assets/projects/portfolio0.png similarity index 100% rename from public/projects/portfolio0.png rename to public/assets/projects/portfolio0.png diff --git a/public/projects/stonkbot0.jpg b/public/assets/projects/stonkbot0.jpg similarity index 100% rename from public/projects/stonkbot0.jpg rename to public/assets/projects/stonkbot0.jpg diff --git a/src/App.jsx b/src/App.jsx index 71189d2..1258f11 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -18,19 +18,19 @@ function App() { useEffect(() => { const fetchEducationData = async () => { - const response = await fetch("/data/educationData.json"); + const response = await fetch("/assets/data/educationData.json"); const data = await response.json(); setEducationData(data); }; const fetchExperienceData = async () => { - const response = await fetch("/data/experienceData.json"); + const response = await fetch("/assets/data/experienceData.json"); const data = await response.json(); setExperienceData(data); }; const fetchProjectsData = async () => { - const response = await fetch("/data/projectsData.json"); + const response = await fetch("/assets/data/projectsData.json"); const data = await response.json(); setProjectsData(data); }; diff --git a/src/assets/react.svg b/src/assets/react.svg deleted file mode 100644 index 6c87de9..0000000 --- a/src/assets/react.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/components/About.jsx b/src/components/About.jsx deleted file mode 100644 index e69de29..0000000 diff --git a/src/components/aboutMe/AboutMe.jsx b/src/components/aboutMe/AboutMe.jsx index 658c20b..964709c 100644 --- a/src/components/aboutMe/AboutMe.jsx +++ b/src/components/aboutMe/AboutMe.jsx @@ -2,6 +2,8 @@ import React from "react"; import styles from "./AboutMe.module.css"; import { FaGithub, FaLinkedin, FaTwitter } from "react-icons/fa"; +import pp from "/assets/pp/abtme.JPG?url"; + const AboutMe = () => { const scrollToContact = () => { const contactSection = document.getElementById("contact"); @@ -16,7 +18,7 @@ const AboutMe = () => {

About Me

- Murtadha Nisyif + Murtadha Nisyif
diff --git a/src/components/footer/Footer.jsx b/src/components/footer/Footer.jsx index 2dbd151..634ffd0 100644 --- a/src/components/footer/Footer.jsx +++ b/src/components/footer/Footer.jsx @@ -1,6 +1,6 @@ import React, { useEffect, useRef, useState } from "react"; import styles from "./Footer.module.css"; -import logo from "/logos/logo.png"; +import logo from "/assets/logos/logo.png"; function Footer() { const [isVisible, setIsVisible] = useState(false); diff --git a/src/components/header/Header.jsx b/src/components/header/Header.jsx index d7b2b01..d475b5e 100644 --- a/src/components/header/Header.jsx +++ b/src/components/header/Header.jsx @@ -1,6 +1,6 @@ import React, { useState } from "react"; import styles from "./Header.module.css"; -import logo from "/logos/logo.png"; +import logo from "/assets/logos/logo.png"; function Header() { const [isNavVisible, setIsNavVisible] = useState(false); diff --git a/src/components/hero/Hero.jsx b/src/components/hero/Hero.jsx index fb520a5..c0c3b25 100644 --- a/src/components/hero/Hero.jsx +++ b/src/components/hero/Hero.jsx @@ -1,10 +1,12 @@ import React from "react"; import styles from "./Hero.module.css"; +import pp from "/assets/pp/pp.jpg"; + function Hero() { return (
- Murtadha Nisyif + Murtadha Nisyif

Murtadha Nisyif

diff --git a/src/components/publications/Publications.jsx b/src/components/publications/Publications.jsx index d7a2d96..5007a61 100644 --- a/src/components/publications/Publications.jsx +++ b/src/components/publications/Publications.jsx @@ -10,7 +10,7 @@ const publicationsData = [ year: 2024, // doi: "10.1234/example.doi.2023", // link: "https://doi.org/10.1234/example.doi.2023" - pdfLink: "/papers/sem_com01.pdf", + pdfLink: "/assets/papers/sem_com01.pdf", }, // Add more publications as needed ]; diff --git a/version.txt b/version.txt index b3ec163..2bd77c7 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.9.3 \ No newline at end of file +0.9.4 \ No newline at end of file