Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

My2 #641

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

My2 #641

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14,768 changes: 906 additions & 13,862 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"colorthief": "^2.3.0",
"colorthief": "^2.2.0",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.6",
"gh-pages": "^2.1.1",
Expand Down
Binary file added src/assets/images/UNEC_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/alishanjpg.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/code-academy-logo-new.webp
Binary file not shown.
Binary file added src/assets/images/codeacademy.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/logodefendo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/neveratech.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/technest.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions src/components/footer/Footer.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import React, {useContext} from "react";
import React, { useContext } from "react";
import "./Footer.scss";
import {Fade} from "react-reveal";
import { Fade } from "react-reveal";
import emoji from "react-easy-emoji";
import StyleContext from "../../contexts/StyleContext";

export default function Footer() {
const {isDark} = useContext(StyleContext);
const { isDark } = useContext(StyleContext);
return (
<Fade bottom duration={1000} distance="5px">
<div className="footer-div">
<p className={isDark ? "dark-mode footer-text" : "footer-text"}>
{emoji("Made with ❤️ by DeveloperFolio Team")}
{emoji("")}
</p>
<p className={isDark ? "dark-mode footer-text" : "footer-text"}>
Theme by{" "}
{/* Theme by{" "} */}
<a href="https://github.com/saadpasta/developerFolio">
developerFolio
{/* developerFolio */}
</a>
</p>
</div>
Expand Down
13 changes: 1 addition & 12 deletions src/components/socialMedia/SocialMedia.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import "./SocialMedia.scss";
import {socialMediaLinks} from "../../portfolio";
import { socialMediaLinks } from "../../portfolio";

export default function socialMedia() {
if (!socialMediaLinks.display) {
Expand Down Expand Up @@ -44,17 +44,6 @@ export default function socialMedia() {
</a>
) : null}

{socialMediaLinks.gitlab ? (
<a
href={socialMediaLinks.gitlab}
className="icon-button gitlab"
target="_blank"
rel="noopener noreferrer"
>
<i className="fab fa-gitlab"></i>
<span></span>
</a>
) : null}

{socialMediaLinks.facebook ? (
<a
Expand Down
2 changes: 1 addition & 1 deletion src/components/softwareSkills/SoftwareSkill.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import "./SoftwareSkill.scss";
import {skillsSection} from "../../portfolio";
import { skillsSection } from "../../portfolio";

export default function SoftwareSkill() {
return (
Expand Down
15 changes: 8 additions & 7 deletions src/containers/Main.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, {useEffect, useState} from "react";
import React, { useEffect, useState } from "react";
import Header from "../components/header/Header";
import Greeting from "./greeting/Greeting";
import Skills from "./skills/Skills";
Expand All @@ -8,18 +8,18 @@ import Projects from "./projects/Projects";
import StartupProject from "./StartupProjects/StartupProject";
import Achievement from "./achievement/Achievement";
import Blogs from "./blogs/Blogs";
import Footer from "../components/footer/Footer";
import Talks from "./talks/Talks";
import Podcast from "./podcast/Podcast";
import Education from "./education/Education";
import ScrollToTopButton from "./topbutton/Top";
import Twitter from "./twitter-embed/twitter";
import Profile from "./profile/Profile";
import SplashScreen from "./splashScreen/SplashScreen";
import {splashScreen} from "../portfolio";
import {StyleProvider} from "../contexts/StyleContext";
import {useLocalStorage} from "../hooks/useLocalStorage";
import { splashScreen } from "../portfolio";
import { StyleProvider } from "../contexts/StyleContext";
import { useLocalStorage } from "../hooks/useLocalStorage";
import "./Main.scss";
import Contact from "./contact/Contact";

const Main = () => {
const darkPref = window.matchMedia("(prefers-color-scheme: dark)");
Expand All @@ -45,7 +45,7 @@ const Main = () => {

return (
<div className={isDark ? "dark-mode" : null}>
<StyleProvider value={{isDark: isDark, changeTheme: changeTheme}}>
<StyleProvider value={{ isDark: isDark, changeTheme: changeTheme }}>
{isShowingSplashAnimation && splashScreen.enabled ? (
<SplashScreen />
) : (
Expand All @@ -64,7 +64,8 @@ const Main = () => {
<Twitter />
<Podcast />
<Profile />
<Footer />
<Contact />
{/* <Footer /> */}
<ScrollToTopButton />
</>
)}
Expand Down
12 changes: 6 additions & 6 deletions src/containers/contact/Contact.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import React, {useContext} from "react";
import React, { useContext } from "react";
import "./Contact.scss";
import SocialMedia from "../../components/socialMedia/SocialMedia";
import {illustration, contactInfo} from "../../portfolio";
import {Fade} from "react-reveal";
import { illustration, contactInfo } from "../../portfolio";
import { Fade } from "react-reveal";
import email from "../../assets/lottie/email";
import DisplayLottie from "../../components/displayLottie/DisplayLottie";
import StyleContext from "../../contexts/StyleContext";

export default function Contact() {
const {isDark} = useContext(StyleContext);
const { isDark } = useContext(StyleContext);
console.log(contactInfo);
return (
<Fade bottom duration={1000} distance="20px">
<div className="main contact-margin-top" id="contact">
Expand Down Expand Up @@ -49,7 +49,7 @@ export default function Contact() {
</a>
<br />
<br />
<SocialMedia />
{/* <SocialMedia /> */}
</div>
</div>
<div className="contact-image-div">
Expand Down
Loading