Skip to content

Commit

Permalink
Merge dev->master (#2)
Browse files Browse the repository at this point in the history
* formatted code

* updated date
  • Loading branch information
atulyadav745 authored Aug 23, 2024
1 parent 51bf180 commit dfbb483
Show file tree
Hide file tree
Showing 16 changed files with 274 additions and 384 deletions.
66 changes: 32 additions & 34 deletions frontend/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ const About = React.lazy(() => import('./components/LandingPages/About/About'));
const Events = React.lazy(() =>
import('./components/LandingPages/Events/Events')
);
const Admin = React.lazy(() =>
import('./components/DashBoard/Admin/Admin')
);
const Admin = React.lazy(() => import('./components/DashBoard/Admin/Admin'));
const Team = React.lazy(() => import('./components/LandingPages/Team/Team'));
const Sponsors = React.lazy(() =>
import('./components/LandingPages/Sponsors/Sponsors')
Expand Down Expand Up @@ -63,7 +61,9 @@ const Home = React.lazy(() => import('./components/DashBoard/Home/Home'));
const Registration = React.lazy(() =>
import('./components/DashBoard/Registration/Registration')
);
const Document = React.lazy(() => import('./components/DashBoard/Document/Document'));
const Document = React.lazy(() =>
import('./components/DashBoard/Document/Document')
);

const Profile = React.lazy(() =>
import('./components/DashBoard/Profile/Profile')
Expand All @@ -80,10 +80,10 @@ const HomePage = React.lazy(() =>
const Footer1 = React.lazy(() =>
import('./components/LandingPages/Contact/Contact.js')
);
const Matches =React.lazy(()=>
const Matches = React.lazy(() =>
import('./components/LandingPages/matches/matches')
);
const Espardha =React.lazy(()=>
const Espardha = React.lazy(() =>
import('./components/LandingPages/Espardha/Espardha')
);

Expand Down Expand Up @@ -111,7 +111,7 @@ function App() {
</Suspense>
}
>
<Route
<Route
path="/"
element={
<Suspense fallback={<Spinner />}>
Expand Down Expand Up @@ -141,7 +141,6 @@ function App() {
element={
<Suspense fallback={<Preloader />}>
<Signup />

</Suspense>
}
/>
Expand Down Expand Up @@ -172,7 +171,7 @@ function App() {
</Suspense>
}
/>

<Route
exact
path="verify"
Expand All @@ -195,7 +194,7 @@ function App() {
path="espardha"
element={
<Suspense fallback={<Preloader />}>
<Espardha/>
<Espardha />
</Suspense>
}
/>
Expand Down Expand Up @@ -272,25 +271,25 @@ function App() {
}
/>
</Route>

<Route
path="admin"
path="admin"
element={
<Suspense fallback={<Preloader />}>
<Admin/>
<Admin />
</Suspense>
}
/>
<Route
path="admin/showtable"
element={
<Suspense fallback={<Spinner />}>
<ShowTable />
</Suspense>
}
/>
/>
<Route
path="admin/showtable"
element={
<Suspense fallback={<Spinner />}>
<ShowTable />
</Suspense>
}
/>

{/* <Route
{/* <Route
path="admin/allgames"
element={
<Suspense fallback={<Spinner />}>
Expand All @@ -299,14 +298,14 @@ function App() {
}
/> */}

<Route
path="admin/allusers"
element={
<Suspense fallback={<Spinner />}>
<ShowallTable />
</Suspense>
}
/>
<Route
path="admin/allusers"
element={
<Suspense fallback={<Spinner />}>
<ShowallTable />
</Suspense>
}
/>
<Route
path="/dashboard"
element={
Expand Down Expand Up @@ -347,7 +346,7 @@ function App() {
</Suspense>
}
/>

<Route
path="events"
element={
Expand All @@ -364,12 +363,11 @@ function App() {
</Suspense>
}
/>

</Route>
</Routes>
{/* </Router> */}
</>
);
}

export default App;
export default App;
15 changes: 0 additions & 15 deletions frontend/src/components/LandingPages/Gallery/Gallery.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,13 @@ import 'react-responsive-carousel/lib/styles/carousel.min.css';
import { Modal, ModalHeader, ModalBody } from 'reactstrap';
import 'bootstrap/dist/css/bootstrap.min.css';

// import GalleryModal from '../GalleryModal/GalleryModal';
// import Background_gallery from '/images/bg/bg_football.png';

const Gallery = () => {
// const gallery_bg={
// backgroundImage: "url(" + { Background_gallery } + ")",
// backgroundAttachment: "fixed",
// backgroundPosition: "center",
// backgroundSize: "cover"
// }
const [modal, setModal] = useState(false);
const toggle = () => setModal(!modal);
const [item, setItem] = useState(0);
// const changeIndex=(index)=>{
// console.log("changeIndex",index);
// setItem(index)
// };
const [check, setCheck] = useState(false);

useEffect(() => {
// console.log('useEffect', check);
if (check) {
if (!modal) {
toggle();
Expand Down Expand Up @@ -63,7 +49,6 @@ const Gallery = () => {

</div>
</div>
{/* <hr style="margin-left: 30px; margin-right: 30px;"> */}
<div className="tz-gallery">
<div className="row_gallery mb-3 gallery-heading boldClass" style={{ color: '#760e53'}}>
Opening Ceremony
Expand Down
20 changes: 0 additions & 20 deletions frontend/src/components/LandingPages/Guests/SliderGuests.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ import 'owl.carousel/dist/assets/owl.theme.default.css';

const SliderGuests = () => {
return (
// <section id="testimonials">
// SliderGuests
// </section>

<section id="testimonials" className="testimony-section">
<div className="overlay"></div>
<div className="container_slider">
Expand Down Expand Up @@ -40,8 +36,6 @@ const SliderGuests = () => {
autoplay
center={true}
className="mine_slider_guests"
// stagePadding={500}
// margin="1px"
>
<div className="item">
<div className="testimony-wrap text-center py-4">
Expand All @@ -58,20 +52,6 @@ const SliderGuests = () => {
</div>
</div>

{/* <div className="item">
<div className="testimony-wrap text-center py-4">
<div className="user-img mt-3 mb-4 bg_class_guest8"></div>
<div className="text p-3">
<p className="mb-4">
Salute to all organisers for such dedication and
determination.
</p>
<p className="name">Sushil Kumar (Wrestler)</p>
<span className="position">2010 World Title winner</span>
</div>
</div>
</div> */}

<div className="item">
<div className="testimony-wrap text-center py-4">
<div className="user-img mt-3 mb-4 bg_class_guest9"></div>
Expand Down
Loading

0 comments on commit dfbb483

Please sign in to comment.