Skip to content

Commit 16b36a7

Browse files
OudomMunintOudomMunint
authored
Merge pull request #83 from OudomMunint/dev
Dev => Main
2 parents 1f8ffff + bbe5b21 commit 16b36a7

File tree

8 files changed

+99
-127
lines changed

8 files changed

+99
-127
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.6
41+
tag: v1.5.4.7

‎src/App.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import ScrollToTop from "./components/ScrollToTop";
1717
import "./style.css";
1818
import "./App.css";
1919
import "bootstrap/dist/css/bootstrap.min.css";
20-
import Home2 from "./components/Home/Home2";
20+
//import Home2 from "./components/Home/Home2";
2121

2222
function App() {
2323
const [load, upadateLoad] = useState(true);

‎src/components/About/About.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22
import Particle from "../Particle";
3-
import Techstack from "./Techstack";
3+
import Clients from "./Clients";
44
import Home2 from "../Home/Home2"
55
import { Container } from "react-bootstrap";
66

@@ -54,7 +54,7 @@ function About() {
5454
</h1>
5555
<p>(This we will change to the logos of those we worked with)</p>
5656

57-
<Techstack />
57+
<Clients />
5858

5959
{/* <h1 className="project-heading">
6060
<strong className="purple">Tools</strong> I use

‎src/components/About/Techstack.js‎ renamed to ‎src/components/About/Clients.js‎

Lines changed: 21 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,58 @@
11
import React from "react";
22
import { Col, Row } from "react-bootstrap";
3-
import { CgCPlusPlus } from "react-icons/cg";
43
import pubArt from "../../Assets/publicartworkers.png";
54
import nsw from "../../Assets/nsw.svg";
65
import local from "../../Assets/local.png";
76
import nw from "../../Assets/nw.png";
87
import air from "../../Assets/air.png";
98
import tina from "../../Assets/tina.png";
109
import nag from "../../Assets/nag.png";
11-
import {
12-
DiJavascript1,
13-
DiReact,
14-
DiNodejs,
15-
DiMongodb,
16-
DiPython,
17-
DiGit,
18-
} from "react-icons/di";
19-
import {
20-
SiPytorch,
21-
SiFirebase,
22-
SiNextdotjs,
23-
} from "react-icons/si";
10+
// import {
11+
// DiJavascript1,
12+
// DiReact,
13+
// DiNodejs,
14+
// DiMongodb,
15+
// DiPython,
16+
// DiGit,
17+
// } from "react-icons/di";
18+
// import {
19+
// SiPytorch,
20+
// SiFirebase,
21+
// SiNextdotjs,
22+
// } from "react-icons/si";
2423

25-
function Techstack() {
24+
function Clients() {
2625
return (
2726
<Row style={{ justifyContent: "center", paddingBottom: "50px" }}>
2827
<Col xs={4} md={2} className="tech-icons">
29-
{/* <CgCPlusPlus /> */}
3028
<img src={pubArt} className="img-fluid" alt="avatar" style={{paddingTop:"25px"}}/>
3129
</Col>
30+
3231
<Col xs={4} md={2} className="tech-icons">
33-
{/* <DiJavascript1 /> */}
3432
<img src={nsw} className="img-fluid" alt="avatar"/>
3533
</Col>
34+
3635
<Col xs={4} md={2} className="tech-icons">
37-
{/* <DiNodejs /> */}
3836
<img src={local} className="img-fluid" alt="avatar" style={{paddingTop:"5px"}}/>
3937
</Col>
38+
4039
<Col xs={4} md={2} className="tech-icons">
41-
{/* <DiReact /> */}
4240
<img src={nw} className="img-fluid" alt="avatar" style={{paddingTop:"85px"}}/>
4341
</Col>
42+
4443
<Col xs={4} md={2} className="tech-icons">
45-
{/* <DiMongodb /> */}
4644
<img src={air} className="img-fluid" alt="avatar"/>
4745
</Col>
46+
4847
<Col xs={4} md={2} className="tech-icons">
49-
{/* <SiNextdotjs /> */}
5048
<img src={tina} className="img-fluid" alt="avatar"/>
5149
</Col>
50+
5251
<Col xs={4} md={2} className="tech-icons">
53-
{/* <SiNextdotjs /> */}
5452
<img src={nag} className="img-fluid" alt="avatar"/>
5553
</Col>
56-
{/* <Col xs={4} md={2} className="tech-icons">
57-
<DiGit />
58-
</Col>
59-
<Col xs={4} md={2} className="tech-icons">
60-
<SiFirebase />
61-
</Col>
62-
<Col xs={4} md={2} className="tech-icons">
63-
<DiPython />
64-
</Col>
65-
<Col xs={4} md={2} className="tech-icons">
66-
<SiPytorch />
67-
</Col> */}
6854
</Row>
6955
);
7056
}
7157

72-
export default Techstack;
58+
export default Clients;

‎src/components/About/Toolstack.js‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎src/components/Contact.js‎

Lines changed: 64 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,95 @@
11
import React, { useState } from "react";
22

33
function ContactForm() {
4+
const isDevelopment = process.env.NODE_ENV === "development";
45
const [name, setName] = useState("");
56
const [email, setEmail] = useState("");
67
const [message, setMessage] = useState("");
78

89
const handleSubmit = async (event) => {
910
event.preventDefault();
10-
const data = { name, email, message };
11+
let data = { name, email, message };
1112
try {
12-
console.log('Form submission successful:');
1313
// clear form
1414
setName('');
1515
setEmail('');
1616
setMessage('');
17+
data = { name: "testUser1", email: "test@test.com", message: "Hello, this is a test message." };
18+
console.log('Form submission successful:');
19+
console.log(data);
1720
} catch (error) {
1821
console.error('Form submission error:', error);
1922
console.log('Error caught');
2023
}
2124
};
2225

26+
if (isDevelopment) {
27+
try {
28+
document.getElementsByClassName("submit").addEventListener("click", handleSubmit);
29+
}
30+
catch (error) {
31+
console.error('Error:', error);
32+
}
33+
}
34+
else {
35+
try {
36+
document.getElementsByClassName("submit").removeEventListener("click", handleSubmit);
37+
}
38+
catch (error) {
39+
console.error('Error:', error);
40+
}
41+
}
42+
2343
return (
24-
<>
44+
<>
2545
<form name="contact" netlify="true" netlify-honeypot="bot-field" data-netlify-recaptcha="true" hidden>
26-
<input type="text" name="name" />
27-
<input type="email" name="email" />
28-
<textarea name="message"></textarea>
46+
<input type="text" name="name" />
47+
<input type="email" name="email" />
48+
<textarea name="message"></textarea>
2949
</form>
3050

31-
<div className="formFlex">
32-
<div className="form">
33-
<div className="top-bar">
34-
<span></span>
35-
<span></span>
36-
<span></span>
37-
</div>
38-
<div className="title">Get in touch!</div>
39-
<form name="contact" method="POST" data-netlify-recaptcha="true">
40-
<input type="hidden" name="form-name" value="contact" />
41-
42-
{/* Name */}
43-
<div className="input-container ic1">
44-
<label className="form-label" htmlFor="name"></label>
45-
<input className="form-control input" type="text" id="name" name="name" value={name} onChange={(e) => setName(e.target.value)}
46-
placeholder="Name"
47-
required />
51+
<div className="formFlex">
52+
<div className="form">
53+
<div className="top-bar">
54+
<span></span>
55+
<span></span>
56+
<span></span>
4857
</div>
58+
<div className="title">Get in touch!</div>
59+
<form name="contact" method="POST" data-netlify-recaptcha="true">
60+
<input type="hidden" name="form-name" value="contact" />
4961

50-
{/* Email */}
51-
<div className="input-container ic2">
52-
<label className="form-label" htmlFor="email"></label>
53-
<input className="form-control input" type="email" id="email" name="email" value={email} onChange={(e) => setEmail(e.target.value)}
54-
placeholder="Email"
55-
required/>
56-
</div>
62+
{/* Name */}
63+
<div className="input-container ic1">
64+
<label className="form-label" htmlFor="name"></label>
65+
<input className="form-control input" type="text" id="name" name="name" value={name} onChange={(e) => setName(e.target.value)}
66+
placeholder="Name"
67+
required />
68+
</div>
5769

58-
{/* Message */}
59-
<div className="input-container ic2">
60-
<label className="form-label" htmlFor="message"></label>
61-
<textarea className="form-control input from-textarea" id="message" name="message" value={message} onChange={(e) => setMessage(e.target.value)}
62-
placeholder="Message"
63-
required />
64-
</div>
65-
<div data-netlify-recaptcha="true" className="reCaptcha"></div>
66-
{/* Submit */}
67-
<button className="btn btn-danger submit" type="submit" style={{ position: "relative", marginTop: "68px" }}>
68-
Submit
69-
</button>
70-
</form>
70+
{/* Email */}
71+
<div className="input-container ic2">
72+
<label className="form-label" htmlFor="email"></label>
73+
<input className="form-control input" type="email" id="email" name="email" value={email} onChange={(e) => setEmail(e.target.value)}
74+
placeholder="Email"
75+
required />
76+
</div>
77+
78+
{/* Message */}
79+
<div className="input-container ic2">
80+
<label className="form-label" htmlFor="message"></label>
81+
<textarea className="form-control input from-textarea" id="message" name="message" value={message} onChange={(e) => setMessage(e.target.value)}
82+
placeholder="Message"
83+
required />
84+
</div>
85+
<div data-netlify-recaptcha="true" className="reCaptcha"></div>
86+
{/* Submit */}
87+
<button className="btn btn-danger submit" type="submit" style={{ position: "relative", marginTop: "68px" }}>
88+
Submit
89+
</button>
90+
</form>
91+
</div>
7192
</div>
72-
</div>
7393
</>
7494
);
7595
}

‎src/components/Home/Home.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import React from "react";
22
import { Container, Row, Col } from "react-bootstrap";
3-
import homeLogo from "../../Assets/about.png";
3+
//import homeLogo from "../../Assets/about.png";
44
import Particle from "../Particle";
5-
import Home2 from "./Home2";
5+
//import Home2 from "./Home2";
66
import Type from "./Type";
77
import {ReactComponent as Design} from "../../Assets/design.svg";
88

9-
import {
10-
AiFillGithub,
11-
AiOutlineTwitter,
12-
AiFillInstagram,
13-
AiFillDribbbleCircle,
14-
} from "react-icons/ai";
15-
import { FaLinkedinIn } from "react-icons/fa";
9+
// import {
10+
// AiFillGithub,
11+
// AiOutlineTwitter,
12+
// AiFillInstagram,
13+
// AiFillDribbbleCircle,
14+
// } from "react-icons/ai";
15+
// import { FaLinkedinIn } from "react-icons/fa";
1616

1717
function Home() {
1818
return (

‎src/index.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ ReactDOM.render(
1111
document.getElementById("root")
1212
);
1313

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

1716
ReactDOM.render(
@@ -26,5 +25,5 @@ if (isDevelopment) {
2625
}
2726

2827
else {
29-
console.log("Web vitals report generation is disabled in production mode");
28+
console.log("Web vitals report generation is disabled in production");
3029
}

0 commit comments

Comments
 (0)