Skip to content

Commit

Permalink
changed file structure
Browse files Browse the repository at this point in the history
  • Loading branch information
aarabii committed Sep 29, 2022
1 parent df6dbdb commit f275e26
Show file tree
Hide file tree
Showing 33 changed files with 51 additions and 53 deletions.
8 changes: 4 additions & 4 deletions src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import React from "react";

import {BrowserRouter as Router , Routes , Route} from 'react-router-dom'

import Home from "./components/Home/Home";
import Home from "./components/Home";

import PageNotFound from "./components/Pages/404Page/PageNotFound";
import ComingSoon from "./components/Pages/ComingSoon/ComingSoon";
import PageNotFound from "./components/Pages/PageNotFound";
import ComingSoon from "./components/Pages/ComingSoon";

import Project from "./components/Pages/Projects/Project";
import Project from "./components/Pages/Project";

const App = () => {
return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React from "react";
import "./dotRing.css";
import "../styles/dotRing.css";

import useMousePosition from "../../hooks/useMousePosition";
import useMousePosition from "../hooks/useMousePosition";

const DotRing = () => {
const { x, y } = useMousePosition();
return (
<>
<div style={{ left: `${x}px`, top: `${y}px` }} className="ring"></div>
<div style={{ left: `${x}px`, top: `${y}px` }} className="ring_cursor"></div>

<div style={{ left: `${x}px`, top: `${y}px` }} className="dot"></div>
</>
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import img1 from "../../../assets/githubRepo/Img1.jfif";
import img2 from "../../../assets/githubRepo/Img2.png";
import img3 from "../../../assets/githubRepo/Img3.jpg";
import img4 from "../../../assets/githubRepo/Img4.jfif";
import img5 from "../../../assets/githubRepo/Img5.jfif";
import img6 from "../../../assets/githubRepo/Img6.jfif";
import img1 from "../../assets/githubRepo/Img1.jfif";
import img2 from "../../assets/githubRepo/Img2.png";
import img3 from "../../assets/githubRepo/Img3.jpg";
import img4 from "../../assets/githubRepo/Img4.jfif";
import img5 from "../../assets/githubRepo/Img5.jfif";
import img6 from "../../assets/githubRepo/Img6.jfif";

/*
Image Source:
Expand Down
20 changes: 10 additions & 10 deletions src/components/Home/Home.jsx → src/components/Home.jsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import React, { useState, useEffect } from "react";

import About from "../Section/About/About";
import Contact from "../Section/Contact/Contact";
import Exp from "../Section/Experience/Exp";
import Footer from "../Section/Footer/Footer";
import Header from "../Section/Header/Header";
import Nav from "../Section/Nav/Nav";
import GithubRepo from "../Section/GithubProjects/GithubRepo";

import PreLoader from "../PreLoader/PreLoader";
import DotRing from "../DotRing/DotRing";
import About from "./Section/About";
import Contact from "./Section/Contact";
import Exp from "./Section/Exp";
import Footer from "./Section/Footer";
import Header from "./Section/Header";
import Nav from "./Section/Nav";
import GithubRepo from "./Section/GithubRepo";

import PreLoader from "./PreLoader";
import DotRing from "./DotRing";

const HomePage = (props) => {
const [inView, setInView] = useState("");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from "react";
import "./aboutMe.css";
import "../../styles/aboutMe.css";

import Nav from "../../Section/Nav/Nav";
import ComingSoon from "../ComingSoon/ComingSoon";
import DotRing from "../../DotRing/DotRing";
import Nav from "../Section/Nav";
import ComingSoon from "./ComingSoon";
import DotRing from "../DotRing";

const AboutMe = () => {
return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, { useState, useRef, useEffect } from "react";
import DotRing from "../../DotRing/DotRing";
import DotRing from "../DotRing";

// import Timer from './Timer';
import "./comingSoon.css";
import "../../styles/comingSoon.css";

const ComingSoon = () => {
const [timerDays, setTimerDays] = useState("00");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from "react";
import "./404.css";

import { useLocation } from "react-router-dom";
import DotRing from "../../DotRing/DotRing";

import "../../styles/404.css";
import DotRing from "../DotRing";

const PageNotFount = () => {
const location = useLocation();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from "react";
import DotRing from "../../DotRing/DotRing";
import Nav from "../../Section/Nav/Nav";
import "./project.css";
import DotRing from "../DotRing";
import Nav from "../Section/Nav";
import "../../styles/project.css";

import RepoStats from "./RepoStats";
import RepoStats from "../ExternalComponents/RepoStats";

const Project = () => {
return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import "./preloader.scss";
import "../styles/preloader.scss";

const PreLoader = () => {
return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import React from "react";
import "./About.css";

// import About_Image from "../../../assets/Pics/about_image.png";
import "../../styles/About.css";

import { FaAward } from "react-icons/fa";
import { BsFolder } from "react-icons/bs";
Expand Down Expand Up @@ -30,7 +28,7 @@ const About = () => {
<img src={About_Image} alt="profile_pic" />
</div> */}
<div className="me image-card">
<img src={require("../../../assets/Pics/me2.jpg")} alt="me" />
<img src={require("../../assets/Pics/me2.jpg")} alt="me" />
</div>
{/* </div> */}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useRef, useEffect, useState } from "react";
import emailjs from "emailjs-com";
import "./Contact.css";
import "../../styles/Contact.css";

import { HiOutlineMail } from "react-icons/hi";
import { FaTelegramPlane } from "react-icons/fa";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import "./Exp.css";
import "../../styles/Exp.css";
import { BsPatchCheck } from "react-icons/bs";

const Exp = () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import "./Footer.css";
import "../../styles/Footer.css";

import {
FaFacebookSquare,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import "./githubRepo.css";
import "../../styles/githubRepo.css";

import { data } from "./demoProjectArray";
import { data } from "../ExternalComponents/demoProjectArray";

const GithubRepo = () => {
return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from "react";
import "./Header.css";
import "../../styles/Header.css";

import HeaderSocials from "./HeaderSocials";
import TypingEffect from "./TypingEffect";
import CTA from "./CTA";
import HeaderSocials from "../ExternalComponents/HeaderSocials";
import TypingEffect from "../ExternalComponents/TypingEffect";
import CTA from "../ExternalComponents/CTA";

const Header = () => {
return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useState, useEffect } from "react";

import "./Nav.css";
import "../../styles/Nav.css";

const Nav = ({ inView }) => {
const [activeNav, setActiveNav] = useState("#");
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
footer {
background-color: var(--color-bg);
background: url("../../../assets/othersPics/banner-bg.png");
background: url("../assets/othersPics/banner-bg.png");
padding: 3rem 0;
text-align: center;
font-size: 0.9rem;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.ring {
.ring_cursor {
position: fixed;
width: 50px;
height: 50px;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.

1 comment on commit f275e26

@vercel
Copy link

@vercel vercel bot commented on f275e26 Sep 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

v4 – ./

v4-git-master-losier.vercel.app
v4-losier.vercel.app
aarab.vercel.app

Please sign in to comment.