Merge pull request #95 from OudomMunint/dev

PR: Dev => Main
OudomMunint · Aug 21, 2024 · ca1268e · ca1268e
2 parents cfef027 + 3063dc1
commit ca1268e
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 137 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -45,4 +45,4 @@ jobs:
         uses: ncipollo/release-action@v1.14.0
         with:
           artifacts: "react-github-actions-build"
-          tag: v1.5.5
+          tag: v1.5.5.1
diff --git a/public/index.html b/public/index.html
@@ -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">

diff --git a/src/Assets/paintbrush.svg b/src/Assets/paintbrush.svg
diff --git a/src/components/About/About.js b/src/components/About/About.js
@@ -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>

diff --git a/src/components/About/Github.js b/src/components/About/Github.js
@@ -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"
@@ -19,4 +19,4 @@ function Github() {
   );
 }
 
-export default Github;
+export default Github;
diff --git a/src/components/Footer.js b/src/components/Footer.js
@@ -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>
@@ -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>
@@ -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>
@@ -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;
diff --git a/src/components/Home/Home.js b/src/components/Home/Home.js
@@ -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,
@@ -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">

diff --git a/src/components/Home/Home2.js b/src/components/Home/Home2.js
@@ -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 */}
 

diff --git a/src/components/Navbar.js b/src/components/Navbar.js
@@ -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);
     }
   }
 

diff --git a/src/style.css b/src/style.css
@@ -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);
@@ -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;