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

Dev => Main #65

Merged
merged 4 commits into from
Apr 10, 2024
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ jobs:
uses: ncipollo/release-action@v1.14.0
with:
artifacts: "react-github-actions-build"
tag: v1.5.4.3
tag: v1.5.4.4
33 changes: 17 additions & 16 deletions src/components/About/About.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
import React from "react";
import { Container, Row, Col } from "react-bootstrap";
import Particle from "../Particle";
import Github from "./Github";
import Techstack from "./Techstack";
import Aboutcard from "./AboutCard";
import laptopImg from "../../Assets/about.png";
import Toolstack from "./Toolstack";

import Home2 from "../Home/Home2"
import myImg from "../../Assets/avatar.svg";
import Student from "../../Assets/home-main.svg"
import Tilt from "react-parallax-tilt";
import {
AiFillGithub,
AiOutlineTwitter,
AiFillInstagram,
AiFillDribbbleCircle,
} from "react-icons/ai";
import { FaLinkedinIn } from "react-icons/fa";
import { Container } from "react-bootstrap";

// import { Row, Col } from "react-bootstrap";
// import Github from "./Github";
// import Aboutcard from "./AboutCard";
// import laptopImg from "../../Assets/about.png";
// import Toolstack from "./Toolstack";
// import myImg from "../../Assets/avatar.svg";
// import Student from "../../Assets/home-main.svg"
// import Tilt from "react-parallax-tilt";
// import {
// AiFillGithub,
// AiOutlineTwitter,
// AiFillInstagram,
// AiFillDribbbleCircle,
// } from "react-icons/ai";
// import { FaLinkedinIn } from "react-icons/fa";

function About() {
return (
Expand Down
23 changes: 12 additions & 11 deletions src/components/Home/Home2.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
import React from "react";
import { Container, Row, Col } from "react-bootstrap";
import myImg from "../../Assets/avatar.svg";
import Student from "../../Assets/home-main.svg"
import Tilt from "react-parallax-tilt";
import carl from "../../Assets/carl.svg"
import simone from "../../Assets/simone.svg"

import {
AiFillGithub,
AiOutlineTwitter,
AiFillInstagram,
AiFillDribbbleCircle,
AiFillLinkedin,
// AiFillGithub,
// AiOutlineTwitter,
// AiFillInstagram,
// AiFillDribbbleCircle,
// AiFillLinkedin,
AiOutlineLinkedin,
AiOutlineInstagram,
} from "react-icons/ai";
import { FaLinkedinIn } from "react-icons/fa";
// import { FaLinkedinIn } from "react-icons/fa";
// import myImg from "../../Assets/avatar.svg";

function Home2() {
return (
Expand Down Expand Up @@ -125,7 +126,7 @@ function Home2() {
</h1>
<p className="home-about-body" style={{width: "500px", textAlign: "left", fontSize: "2.2em"}}>
<br />
<br />Meet <b><a target="_blank" href="https://www.linkedin.com/in/carl-morgan-7066863b/" style={{textDecoration:"none", color:"white"}} className="purple">Carl, </a></b>
<br />Meet <b><a target="_blank" rel="noreferrer" href="https://www.linkedin.com/in/carl-morgan-7066863b/" style={{textDecoration:"none", color:"white"}} className="purple">Carl, </a></b>
<i>
Associate Lecturer at University of Newcastle & Co-Founder of Zookraft and Studio Zed.
</i>
Expand Down Expand Up @@ -154,7 +155,7 @@ function Home2() {
<Col md={4} className="myAvtar">
<Tilt>
<img src={carl} className="img-fluid" alt="avatar" style={{ minHeight: "450px"}}/>
<a target="_blank" href="https://www.linkedin.com/in/carl-morgan-7066863b/"><figcaption style={{paddingRight:"40px", color:"black", textDecoration:"none"}}>@Carl Morgan</figcaption></a>
<a target="_blank" rel="noreferrer" href="https://www.linkedin.com/in/carl-morgan-7066863b/"><figcaption style={{paddingRight:"40px", color:"black", textDecoration:"none"}}>@Carl Morgan</figcaption></a>
</Tilt>
</Col>
</Row>
Expand All @@ -168,7 +169,7 @@ function Home2() {
<Col md={8} className="home-about-description2">
<p className="home-about-body" style={{width: "500px", textAlign: "left", fontSize: "2.2em"}}>
<br />
<br />Meet <b><a target="_blank" href="https://www.linkedin.com/in/simoneo/" style={{textDecoration:"none", color:"white"}} className="purple">Simone, </a></b>
<br />Meet <b><a target="_blank" rel="noreferrer" href="https://www.linkedin.com/in/simoneo/" style={{textDecoration:"none", color:"white"}} className="purple">Simone, </a></b>
Deputy Head of Research Training, School of Humanities, Creative Industries, Social Sciences at University of Newcastle and founder at Studio Zed.
{/* <br />
{/* <br /> */}
Expand All @@ -195,7 +196,7 @@ function Home2() {
<Col md={4} className="myAvtar2">
<Tilt>
<img src={simone} className="img-fluid" alt="avatar" style={{ minHeight: "450px"}}/>
<a target="_blank" href="https://www.linkedin.com/in/simoneo/"><figcaption style={{color:"black", textDecoration:"none"}}>@Simone O'Callaghan</figcaption></a>
<a target="_blank" rel="noreferrer" href="https://www.linkedin.com/in/simoneo/"><figcaption style={{color:"black", textDecoration:"none"}}>@Simone O'Callaghan</figcaption></a>
</Tilt>
</Col>
</Row>
Expand Down
30 changes: 14 additions & 16 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,20 @@ ReactDOM.render(
document.getElementById("root")
);

// If you want to start measuring performance in your app, pass a function
// to log results (for example: reportWebVitals(console.log))
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
// Web vitals report generation here
reportWebVitals(console.log);

// WIP: Enable web vitals report generation only in development mode
// const isDevelopment = process.env.NODE_ENV === "development";
const isDevelopment = process.env.NODE_ENV === "development";

ReactDOM.render(
<React.StrictMode>
<App />
</React.StrictMode>,
document.getElementById("root")
);

// ReactDOM.render(
// <React.StrictMode>
// <App />
// </React.StrictMode>,
// document.getElementById("root")
// );
if (isDevelopment) {
reportWebVitals(console.log);
}

// if (isDevelopment) {
// reportWebVitals(console.log);
// }
else {
console.log("Web vitals report generation is disabled in production mode");
}
Loading