Skip to content

Commit

Permalink
Merge pull request #95 from OudomMunint/dev
Browse files Browse the repository at this point in the history 
PR: Dev => Main
  • Loading branch information
@OudomMunint
OudomMunint authored Aug 21, 2024
2 parents cfef027 + 3063dc1 commit ca1268e
Show file tree
Hide file tree
Showing 10 changed files with 54 additions and 137 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ jobs:
uses: ncipollo/[email protected]
with:
artifacts: "react-github-actions-build"
tag: v1.5.5
tag: v1.5.5.1
3 changes: 1 addition & 2 deletions public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="Web site created using ReactJs" />
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<title>Studio Zed</title>
<meta name="description" content="A student led design studio">
<meta name="description" content="A student led design studio, designing for good.">

<!-- Google / Search Engine Tags -->
<meta itemprop="name" content="Studio Zed">
Expand Down
21 changes: 21 additions & 0 deletions src/Assets/paintbrush.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 0 additions & 27 deletions src/components/About/About.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,40 +27,13 @@ function About() {
<Particle />
<Container>
<Home2/>
{/* <Row style={{ justifyContent: "center", padding: "10px" }}>
<Col
md={7}
style={{
justifyContent: "center",
paddingTop: "30px",
paddingBottom: "50px",
}}
>
<h1 style={{ fontSize: "2.1em", paddingBottom: "20px" }}>
Know Who <strong className="purple">I'M</strong>
</h1>
<Aboutcard />
</Col>
<Col
md={5}
style={{ paddingTop: "120px", paddingBottom: "50px" }}
className="about-img"
>
<img src={laptopImg} alt="about" className="img-fluid" />
</Col>
</Row> */}
<h1 className="project-heading">
Who we <strong className="purple">work with </strong>
</h1>
<p>(This we will change to the logos of those we worked with)</p>

<Clients />

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

{/* <Github /> */}
</Container>
</Container>
Expand Down
4 changes: 2 additions & 2 deletions src/components/About/Github.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function Github() {
return (
<Row style={{ justifyContent: "center", paddingBottom: "10px" }}>
<h1 className="project-heading" style={{ paddingBottom: "20px" }}>
Days I <strong className="purple">Code</strong>
My Github <strong className="purple">Contributions</strong>
</h1>
<GitHubCalendar
username="OudomMunint"
Expand All @@ -19,4 +19,4 @@ function Github() {
);
}

export default Github;
export default Github;
66 changes: 18 additions & 48 deletions src/components/Footer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,19 @@ function Footer() {
<Container fluid className="footer">
<Row>
<Col md="4" className="footer-copywright">
{/* <h3>Powered By ReactJs, NodeJs & ExpressJs</h3> */}
</Col>
<Col md="4" className="footer-copywright">
<h3>Copyright © {year} Studio Zed</h3>
<h3>Copyright © {year} Studio Zed | Powered by ReactJs, NodeJs & Netlify</h3>
<ul className="footer-icons">
<li className="social-icons">
<a
href="/#"
href="https://github.com/OudomMunint/StudioZed-ReactJS"
style={{ color: "white" }}
target="_blank"
rel="noopener noreferrer"
data-toggle="tooltip"
data-placement="top"
title="GitHub"
>
<AiFillGithub />
</a>
Expand All @@ -35,6 +37,10 @@ function Footer() {
style={{ color: "white" }}
target="_blank"
rel="noopener noreferrer"
data-toggle="tooltip"
data-placement="top"
title="Twitter - Coming Soon"
onClick={(e) => e.preventDefault()}
>
<AiOutlineTwitter />
</a>
Expand All @@ -45,6 +51,10 @@ function Footer() {
style={{ color: "white" }}
target="_blank"
rel="noopener noreferrer"
data-toggle="tooltip"
data-placement="top"
title="LinkedIn - Coming Soon"
onClick={(e) => e.preventDefault()}
>
<FaLinkedinIn />
</a>
Expand All @@ -55,59 +65,19 @@ function Footer() {
style={{ color: "white" }}
target="_blank"
rel="noopener noreferrer"
data-toggle="tooltip"
data-placement="top"
title="Instagram - Coming Soon"
onClick={(e) => e.preventDefault()}
>
<AiFillInstagram />
</a>
</li>
</ul>
</Col>
{/* <Col md="4" className="footer-body">
<ul className="footer-icons">
<li className="social-icons">
<a
href="https://github.com/soumyajit4419"
style={{ color: "white" }}
target="_blank"
rel="noopener noreferrer"
>
<AiFillGithub />
</a>
</li>
<li className="social-icons">
<a
href="https://twitter.com/Soumyajit4419"
style={{ color: "white" }}
target="_blank"
rel="noopener noreferrer"
>
<AiOutlineTwitter />
</a>
</li>
<li className="social-icons">
<a
href="https://www.linkedin.com/in/soumyajit4419/"
style={{ color: "white" }}
target="_blank"
rel="noopener noreferrer"
>
<FaLinkedinIn />
</a>
</li>
<li className="social-icons">
<a
href="https://www.instagram.com/soumyajit4419"
style={{ color: "white" }}
target="_blank"
rel="noopener noreferrer"
>
<AiFillInstagram />
</a>
</li>
</ul>
</Col> */}
</Row>
</Container>
);
}

export default Footer;
export default Footer;
9 changes: 6 additions & 3 deletions src/components/Home/Home.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import Particle from "../Particle";
//import Home2 from "./Home2";
import Type from "./Type";
import {ReactComponent as Design} from "../../Assets/design.svg";
import {ReactComponent as HomeLogo} from "../../Assets/paintbrush.svg";

// import {
// AiFillGithub,
Expand All @@ -24,9 +25,11 @@ function Home() {
<Col md={7} className="home-header">
<h1 style={{ paddingBottom: 15 }} className="heading">
Welcome!{" "}
<span className="wave" role="img" aria-labelledby="wave" style={{fontSize:"90px"}}>
🖋️
</span>
{/* <span className="wave" role="img" aria-labelledby="wave" style={{fontSize:"90px"}}>
🖌️
<HomeLogo></HomeLogo>
</span> */}
<HomeLogo className="wave" role="img" aria-label="wave" style={{width:"80px", height:"80px", marginLeft:"30px"}}/>
</h1>

<h1 className="heading-name">
Expand Down
49 changes: 0 additions & 49 deletions src/components/Home/Home2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,55 +63,6 @@ function Home2() {
</Tilt>
</Col>
</Row>
{/* <Row>
<Col md={12} className="home-about-social">
<h1>FIND US ON</h1>
<p>
Feel free to <span className="purple">connect </span>with me
</p>
<ul className="home-about-social-links">
<li className="social-icons">
<a
href=""
rel="noreferrer"
className="icon-colour home-social-icons"
>
<AiFillDribbbleCircle />
</a>
</li>
<li className="social-icons">
<a
href="https://twitter.com/Soumyajit4419"
target="_blank"
rel="noreferrer"
className="icon-colour home-social-icons"
>
<AiOutlineTwitter />
</a>
</li>
<li className="social-icons">
<a
href="https://www.linkedin.com/in/soumyajit4419/"
target="_blank"
rel="noreferrer"
className="icon-colour home-social-icons"
>
<FaLinkedinIn />
</a>
</li>
<li className="social-icons">
<a
href="https://www.instagram.com/soumyajit4419"
target="_blank"
rel="noreferrer"
className="icon-colour home-social-icons"
>
<AiFillInstagram />
</a>
</li>
</ul>
</Col>
</Row> */}
</Container>
{/* about end */}

Expand Down
4 changes: 2 additions & 2 deletions src/components/Navbar.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ function NavBar() {
const [navColour, updateNavbar] = useState(false);

function scrollHandler() {
if (window.scrollY >= -1) {
if (window.scrollY >= 1) {
updateNavbar(true);
} else {
updateNavbar(true);
updateNavbar(false);
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ html {
/* Must add this unique class in order for home to take BG */
.HomeHeroSection {
position: relative !important;
height: 100%;
margin-bottom: 27px;
height: 90vh;
/* margin-bottom: 27px; */
/* background: linear-gradient( to bottom left, rgba(0, 0, 0, 0.678), rgba(255,192,203, 0.200), rgba(22, 17, 37, 0.863) ); */
/* background: linear-gradient(to top, #30cfd0 -50%, #330867 100%); */
background-color: rgb(227, 227, 227);
Expand Down Expand Up @@ -467,7 +467,7 @@ a {
bottom: 0% !important;
padding-top: 10px !important;
padding-bottom: 8px !important ;
margin-top: 113px;
margin-top: 112px;
}
.footer-copywright {
text-align: center !important;
Expand Down

0 comments on commit ca1268e

Please sign in to comment.