Merge branch 'develop' into issue-217

vaishali614 · Apr 20, 2021 · ddef5a2 · ddef5a2
2 parents f97f681 + 3f02bf1
commit ddef5a2
Show file tree

Hide file tree

Showing 20 changed files with 323 additions and 428 deletions.
diff --git a/.github/workflow/autoLabel.yaml b/.github/workflow/autoLabel.yaml
@@ -0,0 +1,14 @@
+
+name: Labeling new issue
+on:
+  issues:
+    types: ['opened']
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: Renato66/auto-label@v2
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          ignore-comments: true
+          labels-synonyms: '{"GSSOC21":["GSSOC","GSSOC21","gssoc21","Gssoc21"]}'
diff --git a/src/CSS/AboutUs.module.css b/src/CSS/AboutUs.module.css
@@ -51,8 +51,8 @@
 .AboutUs_knowMore {
   position: relative;
   float: left;
-  margin-top: 15px;
   margin-right: 10%;
+  margin-bottom: 10%;
   padding: 5px 30px 5px 30px;
   color: #fff;
   font-size: 20px;
@@ -94,8 +94,9 @@
   }
 
   .AboutUs_knowMore {
-    position: absolute;
-    right: 35%;
+    position: unset;
+
+
   }
 }
 
@@ -112,21 +113,24 @@
 @media screen and (max-width: 320px) {
   .AboutUs_AboutImage {
     margin-top: 0;
+    position: unset;
   }
 
   .AboutUs_knowMore {
-    position: absolute;
+    position: unset;
     left: 20%;
   }
 }
 
 @media screen and (max-width: 360px) {
   .AboutUs_AboutImage {
     margin-top: 0;
+
   }
 
   .AboutUs_knowMore {
     top: 100%;
+    position: unset;
   }
 }
 

diff --git a/src/CSS/KnowAbout.module.css b/src/CSS/KnowAbout.module.css
@@ -12,6 +12,11 @@
 .About {
   color: #008dc8;
 }
+
+.jus_content{
+  justify-content: center;
+}
+
 @media only screen and (max-width: 531px) {
   .Heading {
     font-size: 40px;

diff --git a/src/CSS/SignupLogin.module.css b/src/CSS/SignupLogin.module.css
@@ -1,3 +1,5 @@
+
+
 .card {
   display: flex;
   flex-direction: column;

diff --git a/src/Components/Footer/Footer.js b/src/Components/Footer/Footer.js
@@ -8,7 +8,7 @@ import {
   FaTwitter,
   FaPhoneAlt,
 } from 'react-icons/fa';
-import { BiCopyright } from 'react-icons/bi';
+// import { BiCopyright } from 'react-icons/bi';
 import { GrMail } from 'react-icons/gr';
 import { Link } from 'react-router-dom';
 
@@ -21,10 +21,10 @@ function Footer() {
             <h5 style={{ fontSize: '22px' }}> Products </h5>
             <div className={styles.Rectangle} style={{ width: '120px' }}></div>
             <a href="https://girlcodeit.com/codemaps">
-              <p style={{ fontSize: '18px', color: 'black', cursor:"pointer"}}>CodeMaps</p>
+              <p style={{ fontSize: '18px', color: 'black', cursor: "pointer" }}>CodeMaps</p>
             </a>
             <Link to="/">
-              <p style={{ fontSize: '18px', color: "black", cursor:"pointer" }}> Opportuntiy Calendar </p>
+              <p style={{ fontSize: '18px', color: "black", cursor: "pointer" }}> Opportuntiy Calendar </p>
             </Link>
           </Col>
 

diff --git a/src/Components/HomePage/HomePage.js b/src/Components/HomePage/HomePage.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React from 'react';
 import Navbar from './Sections/Navbar';
 import Banner from './Sections/Banner';
 import KnowAbout from './Sections/KnowAbout';

diff --git a/src/Components/HomePage/Sections/KnowAbout.js b/src/Components/HomePage/Sections/KnowAbout.js
@@ -31,7 +31,7 @@ class KnowAbout extends Component {
             <span className={styles.About}> About </span>
           </h2>
           <Row
-            className="justify-content-md-center"
+            className={styles.jus_content}
             style={{ marginTop: '50px' }}
           >
             {KnowAboutData}

diff --git a/src/Components/PostOpportunity/PostOpportunity.js b/src/Components/PostOpportunity/PostOpportunity.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React from 'react';
 import Navbar from './sections/Navbar';
 
 function PostOpportunity() {

diff --git a/src/Components/PostOpportunity/sections/CodingComp/CodingComp.js b/src/Components/PostOpportunity/sections/CodingComp/CodingComp.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React from 'react';
 import Navbar from '../Navbar';
 import CodingCompForm from './CodingCompForm';
 import styles from '../../../../CSS/CodingCompForm.module.css';

diff --git a/src/Components/PostOpportunity/sections/FullTime/FullTime.js b/src/Components/PostOpportunity/sections/FullTime/FullTime.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React from 'react';
 import Navbar from '../Navbar';
 import FullTimeForm from './FullTimeForm';
 

diff --git a/src/Components/PostOpportunity/sections/Internships/Internships.js b/src/Components/PostOpportunity/sections/Internships/Internships.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React from 'react';
 import Navbar from '../Navbar';
 import InternshipForm from './InternshipForm';
 import styles from '../../../../CSS/FullTimeForm.module.css';

diff --git a/src/Components/PostOpportunity/sections/Navbar.js b/src/Components/PostOpportunity/sections/Navbar.js
@@ -4,12 +4,9 @@ import { Link } from 'react-router-dom'
 import {
   Navbar,
   Nav,
-  Form,
-  FormControl,
   Button,
-  NavDropdown,
 } from 'react-bootstrap';
-import { AiOutlineSearch } from 'react-icons/ai';
+// import { AiOutlineSearch } from 'react-icons/ai';
 
 function navbar() {
   return (

diff --git a/src/Components/PostOpportunity/sections/Scholarships/Scholarships.js b/src/Components/PostOpportunity/sections/Scholarships/Scholarships.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React from 'react';
 import Navbar from '../Navbar';
 import ScholarshipForm from './ScholarshipForm';
 

diff --git a/src/Components/PostOpportunity/sections/TechConf/TechConf.js b/src/Components/PostOpportunity/sections/TechConf/TechConf.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React from 'react';
 import Navbar from '../Navbar';
 import TechConfForm from './TechConfForm';
 import styles from '../../../../CSS/FullTimeForm.module.css';

diff --git a/src/Components/SignupLogin/Login.js b/src/Components/SignupLogin/Login.js
@@ -1,14 +1,17 @@
 import React, { useState } from 'react';
 import styles from '../../CSS/SignupLogin.module.css';
-import { Form, Card, Button, Row, InputGroup } from 'react-bootstrap';
+import { Navbar, Form, Card, Button, Row,Col, InputGroup } from 'react-bootstrap';
+
 import { GoogleLogin } from 'react-google-login';
-import { BsEye, BsEyeSlash } from "react-icons/bs";
+import { BsEye, BsEyeSlash } from 'react-icons/bs';
 
 const Login = () => {
   const [showPassword, setShowPassword] = useState(false);
-  const handleShowPassword = () => setShowPassword(prevShowPassword => !prevShowPassword);
+  const handleShowPassword = () =>
+    setShowPassword((prevShowPassword) => !prevShowPassword);
 
   return (
+
     <Row className="justify-content-md-center">
       <Card className={styles.card}>
         <h5>Login</h5>
@@ -45,6 +48,7 @@ const Login = () => {
         </p>
       </Card>
     </Row>
+
   );
 };
 

diff --git a/src/Components/SignupLogin/SignUp.js b/src/Components/SignupLogin/SignUp.js
@@ -1,71 +1,90 @@
 import React, { useState } from 'react';
 import styles from '../../CSS/SignupLogin.module.css';
-import { Form, Card, Button, Row, InputGroup } from 'react-bootstrap';
+import { Form, Card, Button, Row, InputGroup,Navbar } from 'react-bootstrap';
 import { GoogleLogin } from 'react-google-login';
-import { BsEye, BsEyeSlash } from "react-icons/bs";
+import { BsEye, BsEyeSlash } from 'react-icons/bs';
 
 const SignUp = () => {
   const [showPassword, setShowPassword] = useState(false);
-  const handleShowPassword = () => setShowPassword(prevShowPassword => !prevShowPassword);
+  const handleShowPassword = () =>
+    setShowPassword((prevShowPassword) => !prevShowPassword);
 
   return (
-    <Row className="justify-content-md-center">
-      <Card className={styles.card}>
-        <h5>Sign Up</h5>
-        <small className="text-muted">
-          Please fill this form to create your account.
-        </small>
-        <Form>
-          <Form.Group controlId="fname">
-            <Form.Label>First Name</Form.Label>
-            <Form.Control type="text" placeholder="First Name" />
-          </Form.Group>
+    <div>
+      <Navbar bg="light" expand="lg" className={styles.NavBar}>
+        <Navbar.Brand className={styles.Logo}>
+          <a href="/" className={styles.Brand} style={{ fontSize: '35px',color: '#000000' }}>
+            Girl
+            <span style={{ color: '#008DC8' }}> Code </span>
+            It
+          </a>
+        </Navbar.Brand>
+      </Navbar>
 
-          <Form.Group controlId="lname">
-            <Form.Label>Last Name</Form.Label>
-            <Form.Control type="text" placeholder="Last Name" />
-          </Form.Group>
+      <Row className="d-flex justify-content-center">
+        <Card className={styles.card}>
+          <h5>Sign Up</h5>
+          <small className="text-muted">
+            Please fill this form to create your account.
+          </small>
+          <Form>
+            <Form.Group controlId="fname">
+              <Form.Label>First Name</Form.Label>
+              <Form.Control type="text" placeholder="First Name" />
+            </Form.Group>
 
-          <Form.Group controlId="email">
-            <Form.Label>Email</Form.Label>
-            <Form.Control type="email" placeholder="[email protected]" />
-          </Form.Group>
+            <Form.Group controlId="lname">
+              <Form.Label>Last Name</Form.Label>
+              <Form.Control type="text" placeholder="Last Name" />
+            </Form.Group>
 
-          <Form.Group controlId="passWord">
-            <Form.Label>Password</Form.Label>
-            <InputGroup>
-              <Form.Control type={showPassword ? 'text' : 'password'}  placeholder="Password" />
-              <InputGroup.Append className={styles.reactIcons} onClick={handleShowPassword}>
-                <InputGroup.Text>
-                  {showPassword ? <BsEyeSlash /> : <BsEye />}
-                </InputGroup.Text>
-              </InputGroup.Append>
-            </InputGroup>
-          </Form.Group>
+            <Form.Group controlId="email">
+              <Form.Label>Email</Form.Label>
+              <Form.Control type="email" placeholder="[email protected]" />
+            </Form.Group>
 
-          <Form.Group controlId="c_passWord">
-            <Form.Label>Confirm Password</Form.Label>
-            <Form.Control type="password" placeholder="Confirm Password" />
-          </Form.Group>
+            <Form.Group controlId="passWord">
+              <Form.Label>Password</Form.Label>
+              <InputGroup>
+                <Form.Control
+                  type={showPassword ? 'text' : 'password'}
+                  placeholder="Password"
+                />
+                <InputGroup.Append
+                  className={styles.reactIcons}
+                  onClick={handleShowPassword}
+                >
+                  <InputGroup.Text>
+                    {showPassword ? <BsEyeSlash /> : <BsEye />}
+                  </InputGroup.Text>
+                </InputGroup.Append>
+              </InputGroup>
+            </Form.Group>
 
-          <input type="checkbox" />
+            <Form.Group controlId="c_passWord">
+              <Form.Label>Confirm Password</Form.Label>
+              <Form.Control type="password" placeholder="Confirm Password" />
+            </Form.Group>
 
-          <small style={{ paddingLeft: 10 }}>
-            I accept the
-            <a href="#"> Terms and Conditions </a>&{' '}
-            <a href="#">Privacy Policy</a>
-          </small>
-        </Form>
-        <Button size="md" className={styles.button}>
-          Sign Up
-        </Button>
-        <p>OR</p>
-        <GoogleLogin buttonText="Sign in with Google" />
-        <p>
-          Already have an Account? <a href="/login">Login</a>
-        </p>
-      </Card>
-    </Row>
+            <input type="checkbox" />
+
+            <small style={{ paddingLeft: 10 }}>
+              I accept the
+              <a href="#"> Terms and Conditions </a>&{' '}
+              <a href="#">Privacy Policy</a>
+            </small>
+          </Form>
+          <Button size="md" className={styles.button}>
+            Sign Up
+          </Button>
+          <p>OR</p>
+          <GoogleLogin buttonText="Sign in with Google" />
+          <p>
+            Already have an Account? <a href="/login">Login</a>
+          </p>
+        </Card>
+      </Row>
+    </div>
   );
 };
 

diff --git a/src/Components/ViewOpportunity/Navbar.js b/src/Components/ViewOpportunity/Navbar.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import styles from '../../CSS/Navbar.module.css';
-import { Navbar, Nav, Form, FormControl, Button } from 'react-bootstrap';
+import { Navbar, Nav, Button } from 'react-bootstrap';
 import { Link } from 'react-router-dom'
-import { AiOutlineSearch } from 'react-icons/ai';
+// import { AiOutlineSearch } from 'react-icons/ai';
 
 function Navbar1() {
   const [postOpportunityPath, setPostOpportunityPath] = React.useState();