Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added my gallery and speaker section with necessary changes in the file #58

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Added my gallery and speaker section with necessary changes in the file #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66d033f
Final Merge
Iamchandni Feb 17, 2023
4e4060b
merged files
Iamchandni Feb 17, 2023
da6016a
Merged files
Iamchandni Feb 17, 2023
d08e211
Meging my components
Iamchandni Feb 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 112 additions & 0 deletions client/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
"react-router": "^6.8.1",
"react-router-dom": "^6.8.1",
"react-scripts": "5.0.1",
"react-slick": "^0.29.0",
"sass": "^1.58.0",
"slick-carousel": "^1.8.1",
"web-vitals": "^2.1.4"
},
"scripts": {
Expand Down
10 changes: 9 additions & 1 deletion client/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ import Footer from "./components/Footer/Footer";
// Pages
import Register from "./components/AuthPage/AuthPage";
import Layout from "./components/AuthPage/Login";
<<<<<<< HEAD
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove unnecessary lines from merge conflict

import Speakers from "./components/Speakers/Speakers";
import Gallery from "./components/Gallery/Gallery";
import ButtonBacktoTop from "./components/ButtonBacktoTop/ButtonBacktoTop";
=======

import Nayak from "./pages/Events/Nayak";
import EPlan from "./pages/Events/EPlan";
Expand All @@ -28,6 +33,7 @@ import MockIPLAuction from "./pages/Events/MockIPLAuction";
import GameOfStocks from "./pages/Events/GameOfStocks";
import InternshipFair from "./pages/Events/InternshipFair";
import PanelDiscussion from "./pages/Events/PanelDiscussion";
>>>>>>> 7b32eb8f67887573e2a8ea6f69185ca84e1a941f

function App() {
const List = [
Expand Down Expand Up @@ -77,7 +83,9 @@ function App() {
<Navbar />
<About />
<Events />
<Sponsors ImageList={List} />
<Speakers />
<Gallery />
<Sponsors ImageList={List} />;
<Testimonials />
<Footer />
<ButtonBacktoTop />
Expand Down
16 changes: 8 additions & 8 deletions client/src/components/Gallery/Gallery.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,25 +54,25 @@ const Carousel = () => {
slidesToShow: 3,
slidesToScroll: 1,
infinite: true,
dots: true
}
dots: true,
},
},
{
breakpoint: 950,
settings: {
slidesToShow: 2,
slidesToScroll: 1,
initialSlide: 2
}
initialSlide: 2,
},
},
{
breakpoint: 660,
settings: {
slidesToShow: 1,
slidesToScroll: 1
}
}
]
slidesToScroll: 1,
},
},
],
};
return (
<div className="m-6 ">
Expand Down
16 changes: 8 additions & 8 deletions client/src/components/Speakers/Speakers.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,25 @@ export default class Responsive extends Component {
slidesToShow: 3,
slidesToScroll: 1,
infinite: true,
dots: true
}
dots: true,
},
},
{
breakpoint: 1013,
settings: {
slidesToShow: 2,
slidesToScroll: 1,
initialSlide: 2
}
initialSlide: 2,
},
},
{
breakpoint: 660,
settings: {
slidesToShow: 1,
slidesToScroll: 1
}
}
]
slidesToScroll: 1,
},
},
],
};
return (
<div className="bg-back text-white">
Expand Down
15 changes: 7 additions & 8 deletions client/src/components/Speakers/card.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import React from "react";
import { icons } from "react-icons";
import {
AiFillInstagram,
AiFillLinkedin,
AiFillFacebook,
AiFillTwitterCircle
} from "react-icons/ai";
// import {
// AiFillInstagram,
// AiFillLinkedin,
// AiFillFacebook,
// AiFillTwitterCircle
// } from "react-icons/ai";
const Card = () => {
return (
<>
Expand All @@ -23,7 +22,7 @@ const Card = () => {
Mark A. Parker
</h1>

<p className="text-neutral-700 flex justify-center p-2 text-gray-200">
<p className="text-neutral-700 flex justify-center p-2 text-gray-700">
Web Developer
</p>
</div>
Expand Down