Skip to content

Commit

Permalink
Merge pull request #160 from Kajalmehta29/main
Browse files Browse the repository at this point in the history
closes : #98 

Routes Updated
  • Loading branch information
dhairyagothi authored Oct 9, 2024
2 parents aa913c2 + df2d244 commit 669d405
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 14 deletions.
7 changes: 4 additions & 3 deletions frontend/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import RailwayStations from './Pages/stations';
import NavigationPage from './Pages/navigation';
import './App.css'
import BookingPage from './Pages/booking';
import DMapPage from './Pages/3Dmaps';
import MapPage from './Pages/3Dmaps';
import SchedulePage from './Pages/schedule';
import NotificationPage from './Pages/notification';
import Contributor from './Pages/contributor';

import Chatbot from './components/chatbot';

function App() {

Expand All @@ -27,10 +27,11 @@ function App() {
<Route path='/Stations' element={<RailwayStations/>} />
<Route path='/Navigation' element={<NavigationPage/>} />
<Route path='/Booking' element={<BookingPage/>} />
<Route path='/3DMap' element={<DMapPage/>} />
<Route path='/3DMap' element={<MapPage/>} />
<Route path='/Schedule' element={<SchedulePage/>} />
<Route path='/Notification' element={<NotificationPage/>} />
<Route path='/contributors' element={<Contributor/>} />
<Route path='/chatbot' element={<Chatbot/>} />



Expand Down
33 changes: 27 additions & 6 deletions frontend/src/Pages/Herosection.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { useNavigate } from 'react-router-dom';
import HamburgerMenu from './hamburger';
import contributor from './contributor';
import contributorsvg from '../assets/svg/contributor.svg';
import chatbotsvg from '../assets/svg/chatbot.svg';

const Herosection = () => {
const navigate = useNavigate();
Expand All @@ -32,6 +33,21 @@ const Herosection = () => {
const BookingCLick = () => {
navigate('/Booking'); // Navigates to the login page
};
const MapCLick = () => {
navigate('/3DMap'); // Navigates to the login page
}
const ScheduleCLick = () => {
navigate('/Schedule'); // Navigates to the login page
}
const NotificationCLick = () => {
navigate('/Notification'); // Navigates to the login page
}
const ContributorCLick = () => {
navigate('/contributors'); // Navigates to the login page
}
const ChatbotCLick = () => {
navigate('/chatbot'); // Navigates to the login page
}

return (
<>
Expand Down Expand Up @@ -64,7 +80,7 @@ const Herosection = () => {
</div>
<div type="submit" onClick={BookingCLick} className='flex flex-col items-center justify-center py-8 my-auto rounded-full cursor-pointer'>
<img src={bookingsvg} alt="" srcset="" className="bg-blue-200 border-2 border-blue-200 rounded-full w-[64px] h-[64px] p-2" />
<button type="submit" onClick={StationCLick} className="w-20 py-1 mt-2 font-semibold text-white transition-all duration-300 ease-in-out bg-blue-500 rounded-lg shadow-md cursor-pointer hover:bg-blue-600 hover:shadow-lg focus:outline-none focus:ring-2 focus:ring-blue-300 focus:ring-opacity-50" >
<button type="submit" onClick={BookingCLick} className="w-20 py-1 mt-2 font-semibold text-white transition-all duration-300 ease-in-out bg-blue-500 rounded-lg shadow-md cursor-pointer hover:bg-blue-600 hover:shadow-lg focus:outline-none focus:ring-2 focus:ring-blue-300 focus:ring-opacity-50" >
<h1 className='font-bold text-white'>Booking</h1>
</button>
</div>
Expand All @@ -74,13 +90,18 @@ const Herosection = () => {
<h1 className='font-bold text-white'>Station</h1>
</button>
</div>
<div type="submit" onClick={StationCLick} className='flex flex-col items-center justify-center py-8 my-auto rounded-full cursor-pointer'><img src={mapsvg} alt="" srcset="" className="bg-blue-200 border-2 border-blue-200 rounded-full w-[64px] h-[64px] p-2" /> <button type="submit" onClick={StationCLick} className="w-20 py-1 mt-2 font-semibold text-white transition-all duration-300 ease-in-out bg-blue-500 rounded-lg shadow-md cursor-pointer hover:bg-blue-600 hover:shadow-lg focus:outline-none focus:ring-2 focus:ring-blue-300 focus:ring-opacity-50" > <h1 className='font-bold text-white'>3D Map</h1></button></div>
<div type="submit" onClick={StationCLick} className='flex flex-col items-center justify-center py-8 my-auto rounded-full cursor-pointer'><img src={schedulesvg} alt="" srcset="" className="bg-blue-200 border-2 border-blue-200 rounded-full w-[64px] h-[64px] p-2" /><button className="w-20 py-1 mt-2 font-semibold text-white transition-all duration-300 ease-in-out bg-blue-500 rounded-lg shadow-md cursor-pointer hover:bg-blue-600 hover:shadow-lg focus:outline-none focus:ring-2 focus:ring-blue-300 focus:ring-opacity-50" > <h1 className='font-bold text-white'>Schedule</h1></button></div>
<div type="submit" onClick={StationCLick} className='flex flex-col items-center justify-center py-8 my-auto rounded-full cursor-pointer'><img src={noticationsvg} alt="" srcset="" className="bg-blue-200 border-2 border-blue-200 rounded-full w-[64px] h-[64px] p-2" /> <button className="w-24 py-1 mt-2 font-semibold text-white transition-all duration-300 ease-in-out bg-blue-500 rounded-lg shadow-md cursor-pointer hover:bg-blue-600 hover:shadow-lg focus:outline-none focus:ring-2 focus:ring-blue-300 focus:ring-opacity-50" > <h1 className='font-bold text-white'>Notification</h1></button></div>
<div type="submit" onClick={MapCLick} className='flex flex-col items-center justify-center py-8 my-auto rounded-full cursor-pointer'><img src={mapsvg} alt="" srcset="" className="bg-blue-200 border-2 border-blue-200 rounded-full w-[64px] h-[64px] p-2" /> <button type="submit" onClick={MapCLick} className="w-20 py-1 mt-2 font-semibold text-white transition-all duration-300 ease-in-out bg-blue-500 rounded-lg shadow-md cursor-pointer hover:bg-blue-600 hover:shadow-lg focus:outline-none focus:ring-2 focus:ring-blue-300 focus:ring-opacity-50" > <h1 className='font-bold text-white'>3D Map</h1></button></div>

<div type="submit" onClick={ScheduleCLick} className='flex flex-col items-center justify-center py-8 my-auto rounded-full cursor-pointer'><img src={schedulesvg} alt="" srcset="" className="bg-blue-200 border-2 border-blue-200 rounded-full w-[64px] h-[64px] p-2" /><button type='submit' onClick={ScheduleCLick} className="w-20 py-1 mt-2 font-semibold text-white transition-all duration-300 ease-in-out bg-blue-500 rounded-lg shadow-md cursor-pointer hover:bg-blue-600 hover:shadow-lg focus:outline-none focus:ring-2 focus:ring-blue-300 focus:ring-opacity-50" > <h1 className='font-bold text-white'>Schedule</h1></button></div>

<div type="submit" onClick={NotificationCLick} className='flex flex-col items-center justify-center py-8 my-auto rounded-full cursor-pointer'><img src={noticationsvg} alt="" srcset="" className="bg-blue-200 border-2 border-blue-200 rounded-full w-[64px] h-[64px] p-2" /> <button type='submit' onClick={NotificationCLick} className="w-24 py-1 mt-2 font-semibold text-white transition-all duration-300 ease-in-out bg-blue-500 rounded-lg shadow-md cursor-pointer hover:bg-blue-600 hover:shadow-lg focus:outline-none focus:ring-2 focus:ring-blue-300 focus:ring-opacity-50" > <h1 className='font-bold text-white'>Notification</h1></button></div>

</div>
<div className='fixed right-0 z-50 flex flex-col items-center justify-center py-8 m-4 my-auto rounded-full cursor-pointer bottom-16'><img src={contributorsvg} alt="" srcset="" className="bg-blue-200 border-2 border-blue-200 rounded-full w-[64px] h-[64px] p-2" /> <h1 className='font-bold text-black'>Contributors</h1></div>

<div type="submit" onClick={ContributorCLick} className='fixed right-0 z-50 flex flex-col items-center justify-center py-8 m-4 my-auto rounded-full cursor-pointer bottom-16'><img src={contributorsvg} alt="" srcset="" className="bg-blue-200 border-2 border-blue-200 rounded-full w-[64px] h-[64px] p-2" /> <h1 className='font-bold text-black'>Contributors</h1></div>

<div className='fixed bottom-0 right-0 z-50 m-4 cursor-pointer'>
<img src={chatbotsvg} alt="chatbot" onClick={ChatbotCLick} className='w-16 h-16' />
</div>

</>
);
Expand Down
11 changes: 10 additions & 1 deletion frontend/src/Pages/booking.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,16 @@ import React from 'react'

const BookingPage = () => {
return (
<div className='h-full w-full text-6xl text-center font-bold justify-between p-44 text-white'>Website is in Progress</div>
<>
<div className='justify-between w-full h-full text-6xl font-bold text-center text-white p-44'>
Website is in Progress
</div>
<div className='mt-8 text-center text-black'>
<p>Welcome to the Booking Page!</p>
<p>Here you will be able to book your tickets for coolie booking , wheelchair booking and cloack room booking and manage your reservations.</p>
<p>Stay tuned for more updates.</p>
</div>
</>
)
}

Expand Down
14 changes: 11 additions & 3 deletions frontend/src/Pages/contributor.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@

import React from 'react'

const Contributor = () => {
return (
<div>contributor</div>
)
<>
<div className='justify-between w-full h-full text-6xl font-bold text-center text-white p-44'>
Website is in Progress
</div>
<div className='mt-8 text-center text-black'>
<p>Welcome to the Contributor Page!</p>


</div>
</>
)
}

export default Contributor;
12 changes: 11 additions & 1 deletion frontend/src/Pages/notification.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,17 @@ import React from 'react'

const NotificationPage = () => {
return (
<div className='h-full w-full text-6xl text-center font-bold justify-between p-44 text-white'>Making in Progress</div>
<>
<div className='justify-between w-full h-full text-6xl font-bold text-center text-white p-44'>
Website is in Progress
</div>
<div className='mt-8 text-center text-black'>
<p>Welcome to the Notification Page!</p>


</div>
</>

)
}

Expand Down

0 comments on commit 669d405

Please sign in to comment.