Skip to content

Commit 433ad34

Browse files
authored
Merge pull request #65 from OudomMunint/dev
Dev => Main
2 parents ca65c8a + 575499e commit 433ad34

File tree

4 files changed

+44
-44
lines changed

4 files changed

+44
-44
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ jobs:
3838
uses: ncipollo/release-action@v1.14.0
3939
with:
4040
artifacts: "react-github-actions-build"
41-
tag: v1.5.4.3
41+
tag: v1.5.4.4

src/components/About/About.js

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
import React from "react";
2-
import { Container, Row, Col } from "react-bootstrap";
32
import Particle from "../Particle";
4-
import Github from "./Github";
53
import Techstack from "./Techstack";
6-
import Aboutcard from "./AboutCard";
7-
import laptopImg from "../../Assets/about.png";
8-
import Toolstack from "./Toolstack";
9-
104
import Home2 from "../Home/Home2"
11-
import myImg from "../../Assets/avatar.svg";
12-
import Student from "../../Assets/home-main.svg"
13-
import Tilt from "react-parallax-tilt";
14-
import {
15-
AiFillGithub,
16-
AiOutlineTwitter,
17-
AiFillInstagram,
18-
AiFillDribbbleCircle,
19-
} from "react-icons/ai";
20-
import { FaLinkedinIn } from "react-icons/fa";
5+
import { Container } from "react-bootstrap";
6+
7+
// import { Row, Col } from "react-bootstrap";
8+
// import Github from "./Github";
9+
// import Aboutcard from "./AboutCard";
10+
// import laptopImg from "../../Assets/about.png";
11+
// import Toolstack from "./Toolstack";
12+
// import myImg from "../../Assets/avatar.svg";
13+
// import Student from "../../Assets/home-main.svg"
14+
// import Tilt from "react-parallax-tilt";
15+
// import {
16+
// AiFillGithub,
17+
// AiOutlineTwitter,
18+
// AiFillInstagram,
19+
// AiFillDribbbleCircle,
20+
// } from "react-icons/ai";
21+
// import { FaLinkedinIn } from "react-icons/fa";
2122

2223
function About() {
2324
return (

src/components/Home/Home2.js

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
import React from "react";
22
import { Container, Row, Col } from "react-bootstrap";
3-
import myImg from "../../Assets/avatar.svg";
43
import Student from "../../Assets/home-main.svg"
54
import Tilt from "react-parallax-tilt";
65
import carl from "../../Assets/carl.svg"
76
import simone from "../../Assets/simone.svg"
7+
88
import {
9-
AiFillGithub,
10-
AiOutlineTwitter,
11-
AiFillInstagram,
12-
AiFillDribbbleCircle,
13-
AiFillLinkedin,
9+
// AiFillGithub,
10+
// AiOutlineTwitter,
11+
// AiFillInstagram,
12+
// AiFillDribbbleCircle,
13+
// AiFillLinkedin,
1414
AiOutlineLinkedin,
1515
AiOutlineInstagram,
1616
} from "react-icons/ai";
17-
import { FaLinkedinIn } from "react-icons/fa";
17+
// import { FaLinkedinIn } from "react-icons/fa";
18+
// import myImg from "../../Assets/avatar.svg";
1819

1920
function Home2() {
2021
return (
@@ -125,7 +126,7 @@ function Home2() {
125126
</h1>
126127
<p className="home-about-body" style={{width: "500px", textAlign: "left", fontSize: "2.2em"}}>
127128
<br />
128-
<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>
129+
<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>
129130
<i>
130131
Associate Lecturer at University of Newcastle & Co-Founder of Zookraft and Studio Zed.
131132
</i>
@@ -154,7 +155,7 @@ function Home2() {
154155
<Col md={4} className="myAvtar">
155156
<Tilt>
156157
<img src={carl} className="img-fluid" alt="avatar" style={{ minHeight: "450px"}}/>
157-
<a target="_blank" href="https://www.linkedin.com/in/carl-morgan-7066863b/"><figcaption style={{paddingRight:"40px", color:"black", textDecoration:"none"}}>@Carl Morgan</figcaption></a>
158+
<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>
158159
</Tilt>
159160
</Col>
160161
</Row>
@@ -168,7 +169,7 @@ function Home2() {
168169
<Col md={8} className="home-about-description2">
169170
<p className="home-about-body" style={{width: "500px", textAlign: "left", fontSize: "2.2em"}}>
170171
<br />
171-
<br />Meet <b><a target="_blank" href="https://www.linkedin.com/in/simoneo/" style={{textDecoration:"none", color:"white"}} className="purple">Simone, </a></b>
172+
<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>
172173
Deputy Head of Research Training, School of Humanities, Creative Industries, Social Sciences at University of Newcastle and founder at Studio Zed.
173174
{/* <br />
174175
{/* <br /> */}
@@ -195,7 +196,7 @@ function Home2() {
195196
<Col md={4} className="myAvtar2">
196197
<Tilt>
197198
<img src={simone} className="img-fluid" alt="avatar" style={{ minHeight: "450px"}}/>
198-
<a target="_blank" href="https://www.linkedin.com/in/simoneo/"><figcaption style={{color:"black", textDecoration:"none"}}>@Simone O'Callaghan</figcaption></a>
199+
<a target="_blank" rel="noreferrer" href="https://www.linkedin.com/in/simoneo/"><figcaption style={{color:"black", textDecoration:"none"}}>@Simone O'Callaghan</figcaption></a>
199200
</Tilt>
200201
</Col>
201202
</Row>

src/index.js

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,20 @@ ReactDOM.render(
1111
document.getElementById("root")
1212
);
1313

14-
// If you want to start measuring performance in your app, pass a function
15-
// to log results (for example: reportWebVitals(console.log))
16-
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
17-
// Web vitals report generation here
18-
reportWebVitals(console.log);
19-
2014
// WIP: Enable web vitals report generation only in development mode
21-
// const isDevelopment = process.env.NODE_ENV === "development";
15+
const isDevelopment = process.env.NODE_ENV === "development";
16+
17+
ReactDOM.render(
18+
<React.StrictMode>
19+
<App />
20+
</React.StrictMode>,
21+
document.getElementById("root")
22+
);
2223

23-
// ReactDOM.render(
24-
// <React.StrictMode>
25-
// <App />
26-
// </React.StrictMode>,
27-
// document.getElementById("root")
28-
// );
24+
if (isDevelopment) {
25+
reportWebVitals(console.log);
26+
}
2927

30-
// if (isDevelopment) {
31-
// reportWebVitals(console.log);
32-
// }
28+
else {
29+
console.log("Web vitals report generation is disabled in production mode");
30+
}

0 commit comments

Comments
 (0)