Merge pull request #94 from adityasimant/main

Update Changes
DIEMS-HUB · Sep 5, 2023 · 617654f · 617654f
2 parents adcfcd5 + ee19026
commit 617654f
Show file tree

Hide file tree

Showing 9 changed files with 88 additions and 14 deletions.
diff --git a/src/App.js b/src/App.js
@@ -1,4 +1,5 @@
 import NavBar from './components/Navbar';
+import Error from './components/Error';
 import {
   HashRouter as Router,
   Route,
@@ -26,7 +27,8 @@ function App() {
           <Route path="/coreteam" element={<CoreTeam />} />
           <Route path="/about" element={<About />} />
           <Route path="/join" element={<Join />} />
-          <Route path="*" element={<Navigate to="/" />} />
+          <Route path="*" element={<Error />} />
+
         </Routes>
         <Footer/>
       </Router>

diff --git a/src/Style.css b/src/Style.css
@@ -11,6 +11,14 @@ button:focus {
   box-shadow: none !important;
 }
 
+.co-ord-img{
+  border-radius: 50%;
+  box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+  border-style: solid;
+  border-width: thin !important;
+  border-color: #FA1632 !important;
+}
+
 /* --------- */
 /*  Preloader */
 /* --------- */

diff --git a/src/assets/cordimg.jpeg b/src/assets/cordimg.jpeg
diff --git a/src/assets/page_not_found.svg b/src/assets/page_not_found.svg
diff --git a/src/components/Error.js b/src/components/Error.js
@@ -0,0 +1,61 @@
+import React, { Component } from 'react';
+import { Container, Row } from 'react-bootstrap';
+import {
+    AiOutlineHome
+} from "react-icons/ai";
+import errorimg from "../assets/page_not_found.svg"
+import Button from "react-bootstrap/Button";
+import Home from './Home';
+
+
+class Error extends Component {
+    render() {
+        return (
+            <Container fluid className="home-about-section" id="about">
+                <Container>
+                    <Row className="home-about-description" style={{ textAlign: "center", marginTop: "50px", padding:"40px", }}>
+                        <h1 className="project-heading" >
+                            Invaild Page requested!
+                        </h1>
+                        <p style={{textAlign:"center", paddingTop:"20px"}}>Make sure you are following the correct URL!</p>
+                    </Row>
+                    <Row>
+                        <img
+                            src={errorimg}
+                            alt="Join pic"
+                            style={{ maxHeight: "190px",
+                            background: "#ffffff",
+                            padding:"30px",
+                            margin:"50px",
+                            marginLeft: "auto",
+                            marginRight: "auto",
+                            maxWidth:"400px"
+                         }}
+                            className="iete-join-logo img-fluid main-iete-logo"
+                        />
+                    </Row>
+                    <Row>
+                        <Button
+                            className="button-join "
+                            href='/'
+                            style={{
+                                display: "flex",
+                                justifyContent: "center",
+                                alignItems: "center",
+                                width: "200px",
+                                marginLeft: "auto",
+                                marginRight: "auto",
+                                marginTop: "15px"
+                            }}
+                        >
+                            <AiOutlineHome /> &nbsp;
+                                Homepage
+                        </Button>
+                    </Row>
+                </Container>
+            </Container>
+        );
+    }
+}
+
+export default Error;
diff --git a/src/components/Faculty.js b/src/components/Faculty.js
@@ -40,21 +40,20 @@ class Faculty extends Component {
             <Row>
 
               <Col
-                md={7}
+                md={8}
                 style={{
-                  justifyContent: "center",
                   paddingTop: "30px",
                   paddingBottom: "50px",
                 }}>
 
 
 
-                <Card className="quote-card-view">
+                <Card className="quote-card-view ">
                   <Card.Body>
 
-                    <blockquote className="blockquote mb-0">
+                    <blockquote className="blockquote  ">
 
-                      <p style={{ textAlign: "justify" }}>
+                      <p style={{ textAlign: "justify" }} >
                         <br />
                         As the Faculty Coordinator for the IETE Student Forum in our college, I am truly enthusiastic about the opportunities and benefits that the IETE (Institution of Electronics and Telecommunication Engineers) brings to our students. The IETE plays a pivotal role in nurturing technical skills, fostering innovation, and building a strong foundation in electronics and telecommunication engineering. The forum provides an interactive platform for students to engage in knowledge-sharing, workshops, seminars, and technical competitions.
                       </p>
@@ -71,10 +70,10 @@ class Faculty extends Component {
                 </Card>
 
               </Col>
-              <Col md={4} className="myAvtar">
+              <Col md={3} className="myAvtar">
 
 
-                <img src={myImg} className="img-fluid main-iete-logo" style={{ maxHeight: "350px" }} alt="avatar" />
+                <img src={myImg} className="img-fluid  co-ord-img" style={{ maxHeight: "280px", marginRight:"auto", marginLeft:"auto"}} alt="avatar" />
 
               </Col>
             </Row>

diff --git a/src/components/Home.js b/src/components/Home.js
@@ -6,6 +6,7 @@ import Particle from "./Particles";
 import Home2 from "./Home2";
 import AboutInst from "./AboutInst";
 
+
 function Home() {
   return (
     <section>

diff --git a/src/components/Join.js b/src/components/Join.js
@@ -27,9 +27,11 @@ class Join extends Component {
                 <blockquote className="blockquote mb-0">
                   <p
                     style={{
-                      textAlign: "justify",
+                      textAlign: "center",
                       fontSize: "1em",
-                      marginBottom: "20px"
+                      marginBottom: "20px",
+                      marginLeft:"15%",
+                      marginRight:"15%"
                     }}
                   >
                     <br />
@@ -42,14 +44,14 @@ class Join extends Component {
             <Button
               className="button-join"
               target="_blank"
-              href={""}
+              href={"https://forms.gle/TbPLgebEvUBpTrjD7"}
               style={{
                 display: "flex",
                 justifyContent: "center",
                 alignItems: "center",
                 width: "200px",
-                marginLeft: "43%",
-                marginRight: "43%",
+                marginLeft: "auto",
+                marginRight: "auto",
                 marginTop: "15px"
               }}
             >

diff --git a/src/components/Navbar.js b/src/components/Navbar.js
@@ -34,7 +34,7 @@ function NavBar() {
     >
       <Container>
       <Navbar.Brand href="/" className="d-flex">
-          <h3>IETE DIEMS ISF</h3>
+          <h3>IETE DIEMS </h3>
         </Navbar.Brand>
         <Navbar.Toggle
           aria-controls="responsive-navbar-nav"