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

Main #53

Merged
merged 1 commit into from Apr 13, 2023
Merged

Main #53

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

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
183 changes: 72 additions & 111 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
Expand Up @@ -22,6 +22,7 @@
"workbox-strategies": "^6.5.4"
},
"devDependencies": {
"@iconify/react": "^4.1.0",
"react-scripts": "^5.0.1"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions src/components/Hero.jsx
Expand Up @@ -3,7 +3,7 @@ import { selectData } from "../pages/homeSlice";
import { Link } from "react-scroll";
import styled from "styled-components";
// Icons
import { FaChevronCircleDown } from "react-icons/fa";
import { Icon } from '@iconify/react';
// Media
import Logo from "../images/logo.svg";
import { Light, Dark } from "../data";
Expand Down Expand Up @@ -104,7 +104,7 @@ export default function Hero() {
<Row className="align-items-end down-container">
<Col className="m-4 text-center">
<Link to={"About"} className="link-icons">
<FaChevronCircleDown />
<Icon icon="fa6-solid:circle-chevron-down" />
</Link>
</Col>
</Row>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Projects.jsx
Expand Up @@ -12,7 +12,7 @@ import styled from "styled-components";
// Data
import { filteredProjects } from "../data";
// Icons
import { FaGithub } from "react-icons/fa";
import { Icon } from '@iconify/react';
// Components
import { Button, Col, Container, Row } from "react-bootstrap";
import { Title, Loading } from "./globalStyledComponents";
Expand Down Expand Up @@ -98,7 +98,7 @@ export default function Projects() {
theme === "light" ? "outline-dark" : "outline-light"
}
>
All <FaGithub /> Projects
All <Icon icon="icomoon-free:github" /> Projects
</Button>
</Link>
</Container>
Expand Down
4 changes: 2 additions & 2 deletions src/components/SocialLinks.jsx
Expand Up @@ -5,7 +5,7 @@ import styled from "styled-components";
// Data
import { Blog } from "../data";
// Icons
import { FaGithub } from "react-icons/fa";
import { Icon } from '@iconify/react';

const StyledSocialLinks = styled.div`
a {
Expand All @@ -23,7 +23,7 @@ export default function SocialLinks() {
aria-label="Check out my GitHub profile."
className="link-icons"
>
<FaGithub />
<Icon icon="icomoon-free:github" />
</a>
{blog && (
<a href={blog} aria-label="External link" className="link-icons">
Expand Down
4 changes: 2 additions & 2 deletions src/components/StyledCard.jsx
@@ -1,7 +1,7 @@
import React from "react";
import styled from "styled-components";
// Icons
import { FaGithub } from "react-icons/fa";
import { Icon } from '@iconify/react';
// Media
import GH from "../images/GH.svg";
// Components
Expand Down Expand Up @@ -40,7 +40,7 @@ export default function StyledCard({ theme, image, name, description, url }) {
<Card.Footer className="text-center">
<Card.Link href={url}>
{"View on GitHub "}
<FaGithub />
<Icon icon="icomoon-free:github" />
</Card.Link>
</Card.Footer>
</Card>
Expand Down
7 changes: 3 additions & 4 deletions src/components/globalStyledComponents.jsx
Expand Up @@ -3,8 +3,7 @@ import { useAppContext } from "../appContext";
import styled, { keyframes } from "styled-components";
import { Link } from "react-scroll/modules";
// Icons
import { GiSunflower, GiMoon } from "react-icons/gi";
import { FaChevronCircleUp } from "react-icons/fa";
import { Icon } from '@iconify/react';

// Animations
export const Spin = keyframes`
Expand Down Expand Up @@ -83,7 +82,7 @@ export function ToggleSwitch() {
closeExpanded();
}}
/>
<div>{theme === "light" ? <GiSunflower /> : <GiMoon />}</div>
<div>{theme === "light" ? <Icon icon="game-icons:sunflower" /> : <Icon icon="game-icons:moon" />}</div>
</StyledSwitch>
);
}
Expand Down Expand Up @@ -151,7 +150,7 @@ export function BackToTop({ home }) {
return (
<StyledDiv ref={up}>
<Link to={home} className="link-icons">
<FaChevronCircleUp />
<Icon icon="fa6-solid:circle-chevron-up" />
</Link>
</StyledDiv>
);
Expand Down
31 changes: 11 additions & 20 deletions src/data.js
@@ -1,14 +1,5 @@
// Skills icons - https://react-icons.github.io/react-icons/
import {
FaHtml5,
FaCss3Alt,
FaBootstrap,
FaReact,
FaGitAlt,
FaGithubSquare,
FaLink,
} from "react-icons/fa";
import { SiJavascript, SiStyledcomponents, SiRedux } from "react-icons/si";
import { Icon } from "@iconify/react";

// Projects Images (add your images to the images directory and import below)
import Logo from "./images/logo.svg";
Expand All @@ -27,7 +18,7 @@ export { HeroDark as Dark };
export const githubUsername = "Your GitHub username here";

// Blog link icon (imported above)
export const Blog = <FaLink />;
export const Blog = <Icon icon="ph:link-bold" />;

/* About Me
**************************************************************
Expand All @@ -43,47 +34,47 @@ export const moreInfo =
export const skillData = [
{
id: 1,
skill: <FaHtml5 className="display-4" />,
skill: <Icon icon="mdi:language-html5" className="display-4" />,
name: "HTML5",
},
{
id: 2,
skill: <FaCss3Alt className="display-4" />,
skill: <Icon icon="ion:logo-css3" className="display-4" />,
name: "CSS3",
},
{
id: 3,
skill: <SiJavascript className="display-4" />,
skill: <Icon icon="fa6-brands:js" className="display-4" />,
name: "JavaScript",
},
{
id: 4,
skill: <FaBootstrap className="display-4" />,
skill: <Icon icon="ri:bootstrap-fill" className="display-4" />,
name: "BootStrap",
},
{
id: 5,
skill: <FaReact className="display-4" />,
skill: <Icon icon="mdi:react" className="display-4" />,
name: "React",
},
{
id: 6,
skill: <SiStyledcomponents className="display-4" />,
skill: <Icon icon="file-icons:styledcomponents" className="display-4" />,
name: "Styled Components",
},
{
id: 7,
skill: <SiRedux className="display-4" />,
skill: <Icon icon="akar-icons:redux-fill" className="display-4" />,
name: "Redux",
},
{
id: 8,
skill: <FaGitAlt className="display-4" />,
skill: <Icon icon="bi:git" className="display-4" />,
name: "Git",
},
{
id: 9,
skill: <FaGithubSquare className="display-4" />,
skill: <Icon icon="fa6-brands:square-github" className="display-4" />,
name: "GitHub",
},
];
Expand Down
10 changes: 5 additions & 5 deletions src/pages/AllProjects.jsx
Expand Up @@ -6,7 +6,7 @@ import { selectData, selectError, selectIsLoading } from "./allProjectsSlice";
import { Element } from "react-scroll";
import styled from "styled-components";
// Icons
import { FaGithub, FaSearch } from "react-icons/fa";
import { Icon } from "@iconify/react";
// Components
import {
Col,
Expand Down Expand Up @@ -134,7 +134,7 @@ export default function AllProjects() {
<Container className="d-flex">
<Title>
<h2>
All <FaGithub /> Projects
All <Icon icon="mdi:github" /> Projects
</h2>
<div className="underline"></div>
</Title>
Expand All @@ -154,7 +154,7 @@ export default function AllProjects() {
<Container className="d-flex">
<Title>
<h2>
All <FaGithub /> Projects
All <Icon icon="mdi:github" /> Projects
</h2>
<div className="underline"></div>
</Title>
Expand All @@ -176,15 +176,15 @@ export default function AllProjects() {
<Container className="d-flex">
<Title>
<h2>
All <FaGithub /> Projects
All <Icon icon="mdi:github" /> Projects
</h2>
<div className="underline"></div>
</Title>
</Container>
<Container>
<InputGroup className="mx-auto mb-3">
<InputGroup.Text id="search">
<FaSearch />
<Icon icon="ic:round-search" />
</InputGroup.Text>
<FormControl
placeholder="Project name"
Expand Down