zxz

SvitPrakarsh · Feb 9, 2023 · 67525b2 · 67525b2
1 parent c47c858
commit 67525b2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/src/App.jsx b/src/App.jsx
@@ -8,7 +8,7 @@ import Event from "./components/Events/Event";
 import Sponsor from "./components/Sponsor/Sponsor";
 import { NavBar } from "./components/Nav/NavBar";
 import Glimpse from "./components/Glimpse/Glimpse";
-import Signup from "./components/Signup/Signup";
+import Signup from "./components/signup/Signup";
 import { render } from "@testing-library/react";
 const App = () => {
 

diff --git a/src/components/Events/Event.jsx b/src/components/Events/Event.jsx
@@ -31,31 +31,31 @@ function Event() {
     },
     {
       imgurl: "assests/Events/innovative.png",
-      title: "inovative heist",
+      title: "arcadian evovle",
       description: "orem ipsum dolor sit amet, consectetur adipiscing elit. Cras magna leo, porta a justo at, suscipit scelerisque erat. Quisque risus dui, ultrices ac semper sed,",
       link: "",
     },
     {
-      imgurl: "assests/Events/cyber.png",
-      title: "wheels & wings",
+      imgurl: "assests/Events/sharks.png",
+      title: "s.h.a.r.k.s",
       description: "orem ipsum dolor sit amet, consectetur adipiscing elit. Cras magna leo, porta a justo at, suscipit scelerisque erat. Quisque risus dui, ultrices ac semper sed,",
       link: "",
     },
     {
-      imgurl: "assests/Events/cyber.png",
-      title: "wheels & wings",
+      imgurl: "assests/Events/handson.png",
+      title: "Hands-on",
       description: "orem ipsum dolor sit amet, consectetur adipiscing elit. Cras magna leo, porta a justo at, suscipit scelerisque erat. Quisque risus dui, ultrices ac semper sed,",
       link: "",
     },
     {
-      imgurl: "assests/Events/cyber.png",
-      title: "wheels & wings",
+      imgurl: "assests/Events/ws.png",
+      title: "workshop",
       description: "orem ipsum dolor sit amet, consectetur adipiscing elit. Cras magna leo, porta a justo at, suscipit scelerisque erat. Quisque risus dui, ultrices ac semper sed,",
       link: "",
     },
     {
-      imgurl: "assests/Events/cyber.png",
-      title: "wheels & wings",
+      imgurl: "assests/Events/fab.png",
+      title: "Fab-Lab",
       description: "orem ipsum dolor sit amet, consectetur adipiscing elit. Cras magna leo, porta a justo at, suscipit scelerisque erat. Quisque risus dui, ultrices ac semper sed,",
       link: "",
     },

diff --git a/src/components/signup/Signup.css b/src/components/signup/Signup.css
@@ -31,8 +31,6 @@
     text-align: center;
 }
 
-
-<<<<<<< HEAD
 .scontent{
     display: flex;
     justify-content: center;
@@ -80,5 +78,3 @@
 
 
 
-=======
->>>>>>> 8823b651373b5423cdf7c57224838b969736e12b
diff --git a/src/components/signup/Signup.jsx b/src/components/signup/Signup.jsx
@@ -22,14 +22,12 @@ const Signup = () => {
 
             </div>
 
-<<<<<<< HEAD
-=======
+
              <div className="s-content">
               <div className="email">
                 Email: <input type="email"/> 
               </div>
              </div>
->>>>>>> 8823b651373b5423cdf7c57224838b969736e12b