Contact us button added

GDGCampusAEC · Oct 28, 2023 · 9d6bfbb · 9d6bfbb
1 parent 19fd403
commit 9d6bfbb
Show file tree

Hide file tree

Showing 24 changed files with 16 additions and 113 deletions.
diff --git a/src/App.jsx b/src/App.jsx
@@ -1,12 +1,5 @@
-<<<<<<< HEAD
 import { Navbar, Team, ContactUs, Footer } from "./components";
 
-=======
-import Navbar from "./components/NavBar/NavBar";
-import Footer from "./components/footer/Footer";
-import Team from "./components/team/Team";
-import ContactUs from "./components/contact/ContactUs";
->>>>>>> team/initial-design
 function App() {
   return (
     <div>

diff --git a/...assets/2023 Core Team Pic/Aditya Shaw.png → src/assets/coreTeamPictures/Aditya Shaw.png b/...assets/2023 Core Team Pic/Aditya Shaw.png → src/assets/coreTeamPictures/Aditya Shaw.png
diff --git a/...sets/2023 Core Team Pic/Anirban Sinha.png → ...assets/coreTeamPictures/Anirban Sinha.png b/...sets/2023 Core Team Pic/Anirban Sinha.png → ...assets/coreTeamPictures/Anirban Sinha.png
diff --git a/...s/2023 Core Team Pic/Arnab Chatterjee.png → ...ets/coreTeamPictures/Arnab Chatterjee.png b/...s/2023 Core Team Pic/Arnab Chatterjee.png → ...ets/coreTeamPictures/Arnab Chatterjee.png
diff --git a/...assets/2023 Core Team Pic/Bhumi Sinha.png → src/assets/coreTeamPictures/Bhumi Sinha.png b/...assets/2023 Core Team Pic/Bhumi Sinha.png → src/assets/coreTeamPictures/Bhumi Sinha.png
diff --git a/...ets/2023 Core Team Pic/Bikash Agawala.png → ...ssets/coreTeamPictures/Bikash Agawala.png b/...ets/2023 Core Team Pic/Bikash Agawala.png → ...ssets/coreTeamPictures/Bikash Agawala.png
diff --git a/...23 Core Team Pic/Bishal Bhattacharjee.png → ...coreTeamPictures/Bishal Bhattacharjee.png b/...23 Core Team Pic/Bishal Bhattacharjee.png → ...coreTeamPictures/Bishal Bhattacharjee.png
diff --git a/...ssets/2023 Core Team Pic/Gourav Rajak.png → src/assets/coreTeamPictures/Gourav Rajak.png b/...ssets/2023 Core Team Pic/Gourav Rajak.png → src/assets/coreTeamPictures/Gourav Rajak.png
diff --git a/...ets/2023 Core Team Pic/Jayanta Pandit.png → ...ssets/coreTeamPictures/Jayanta Pandit.png b/...ets/2023 Core Team Pic/Jayanta Pandit.png → ...ssets/coreTeamPictures/Jayanta Pandit.png
diff --git a/...ssets/2023 Core Team Pic/MD AMIR KHAN.png → src/assets/coreTeamPictures/MD AMIR KHAN.png b/...ssets/2023 Core Team Pic/MD AMIR KHAN.png → src/assets/coreTeamPictures/MD AMIR KHAN.png
diff --git a/...ets/2023 Core Team Pic/Moulina Pandey.png → ...ssets/coreTeamPictures/Moulina Pandey.png b/...ets/2023 Core Team Pic/Moulina Pandey.png → ...ssets/coreTeamPictures/Moulina Pandey.png
diff --git a/src/assets/2023 Core Team Pic/Niraj Modi.PNG → src/assets/coreTeamPictures/Niraj Modi.PNG b/src/assets/2023 Core Team Pic/Niraj Modi.PNG → src/assets/coreTeamPictures/Niraj Modi.PNG
diff --git a/...assets/2023 Core Team Pic/Riya Kumari.png → src/assets/coreTeamPictures/Riya Kumari.png b/...assets/2023 Core Team Pic/Riya Kumari.png → src/assets/coreTeamPictures/Riya Kumari.png
diff --git a/...ssets/2023 Core Team Pic/Rounak Kayal.png → src/assets/coreTeamPictures/Rounak Kayal.png b/...ssets/2023 Core Team Pic/Rounak Kayal.png → src/assets/coreTeamPictures/Rounak Kayal.png
diff --git a/.../2023 Core Team Pic/Shivam Kumar Shaw.png → ...ts/coreTeamPictures/Shivam Kumar Shaw.png b/.../2023 Core Team Pic/Shivam Kumar Shaw.png → ...ts/coreTeamPictures/Shivam Kumar Shaw.png
diff --git a/src/assets/2023 Core Team Pic/contactus.png → src/assets/coreTeamPictures/contactus.png b/src/assets/2023 Core Team Pic/contactus.png → src/assets/coreTeamPictures/contactus.png
diff --git a/...ssets/2023 Core Team Pic/Rajdip Sinha.png → src/assets/coreTeamPictures/rajdipSinha.png b/...ssets/2023 Core Team Pic/Rajdip Sinha.png → src/assets/coreTeamPictures/rajdipSinha.png
diff --git a/src/components/ContactUs.jsx b/src/components/ContactUs.jsx
diff --git a/src/components/Footer.jsx b/src/components/Footer.jsx
diff --git a/src/components/NavBar.jsx b/src/components/NavBar.jsx
@@ -1,10 +1,5 @@
-<<<<<<< HEAD:src/components/NavBar.jsx
-import React from 'react'
-import Logo from '../assets/gdsc-logo.png'
-=======
 import React from "react";
-import Logo from "../../assets/gdsc-logo.png";
->>>>>>> team/initial-design:src/components/NavBar/NavBar.jsx
+import Logo from "../assets/gdsc-logo.png";
 const Navbar = () => {
   return (
     <div className="w-[100%]  flex justify-center items-center py-6 relative">

diff --git a/src/components/contact/ContactUs.jsx b/src/components/contact/ContactUs.jsx
@@ -1,5 +1,6 @@
 import contactus from "../../assets/contactus.png";
 export default function ContactUs() {
+  const contactUsHandler = (e) => {};
   return (
     <div className="flex flex-col p-10 pt-[10rem] pb-[10rem] justify-evenly md:flex-row">
       <img src={contactus} className="max-w-full" alt="Contact Us" />
@@ -29,6 +30,12 @@ export default function ContactUs() {
             name="Message"
             placeholder="Message"
           ></textarea>
+          <input
+            className="bg-blue-700 w-[13.6875rem] h-[3.75rem] m-4 rounded-3xl text-white text-[1.375] "
+            type="submit"
+            value="Submit"
+            onClick={contactUsHandler}
+          />
         </form>
       </div>
     </div>

diff --git a/src/components/index.js b/src/components/index.js
@@ -1,6 +1,6 @@
-import Navbar from './NavBar'
-import Team from './team/Team'
-import ContactUs from './ContactUs'
-import Footer from './Footer'
+import Navbar from "./NavBar";
+import Team from "./team/Team";
+import ContactUs from "./contact/ContactUs";
+import Footer from "./footer/Footer";
 
-export { Navbar, Team, ContactUs, Footer }
+export { Navbar, Team, ContactUs, Footer };
diff --git a/src/components/team/Card.jsx b/src/components/team/Card.jsx
@@ -8,6 +8,7 @@ export default function Card({
   twitter,
   colour,
 }) {
+  console.log(image);
   console.log(colour);
   const className = `flex flex-col m-6 justify-center gap-2 items-center shadow-[0px_0px_15px_2px_rgba(0,0,0,0.17)] border-b-8 border-b-[${colour}] border-solid
   w-[18rem] h-[22rem] shrink-0`;

diff --git a/src/data/data2023.json b/src/data/data2023.json
@@ -106,7 +106,8 @@
             "githubUrl": "http://github.com/rajdips834",
             "twitterUrl": "https://x.com/rajdips834?t=K0E58jxs0sleVQUDzLAvjw&s=09",
             "websiteUrl": "",
-            "roleType": 3
+            "roleType": 3,
+            "image":"../../assets/coreTeamPictures/rajdipSinha.png"
         },
         {
             "name": "Shivam kumar shaw",