Merge branch 'feature/bus-routes'
This commit is contained in:
@@ -1,11 +1,16 @@
|
||||
C:\Users\deves\OneDrive\project_main\Freshers-Hub\backend\src\main\java\com\rit\portal\config\DataInitializer.java
|
||||
C:\Users\deves\OneDrive\project_main\Freshers-Hub\backend\src\main\java\com\rit\portal\config\WebConfig.java
|
||||
C:\Users\deves\OneDrive\project_main\Freshers-Hub\backend\src\main\java\com\rit\portal\controller\CommunityQuestionController.java
|
||||
C:\Users\deves\OneDrive\project_main\Freshers-Hub\backend\src\main\java\com\rit\portal\controller\NotePyqController.java
|
||||
C:\Users\deves\OneDrive\project_main\Freshers-Hub\backend\src\main\java\com\rit\portal\entity\CommunityAnswer.java
|
||||
C:\Users\deves\OneDrive\project_main\Freshers-Hub\backend\src\main\java\com\rit\portal\entity\CommunityQuestion.java
|
||||
C:\Users\deves\OneDrive\project_main\Freshers-Hub\backend\src\main\java\com\rit\portal\entity\NotePyq.java
|
||||
C:\Users\deves\OneDrive\project_main\Freshers-Hub\backend\src\main\java\com\rit\portal\PortalApplication.java
|
||||
C:\Users\deves\OneDrive\project_main\Freshers-Hub\backend\src\main\java\com\rit\portal\repository\CommunityAnswerRepository.java
|
||||
C:\Users\deves\OneDrive\project_main\Freshers-Hub\backend\src\main\java\com\rit\portal\repository\CommunityQuestionRepository.java
|
||||
C:\Users\deves\OneDrive\project_main\Freshers-Hub\backend\src\main\java\com\rit\portal\repository\NotePyqRepository.java
|
||||
D:\projects\Freshers-Hub\backend\src\main\java\com\rit\portal\config\DataInitializer.java
|
||||
D:\projects\Freshers-Hub\backend\src\main\java\com\rit\portal\config\WebConfig.java
|
||||
D:\projects\Freshers-Hub\backend\src\main\java\com\rit\portal\controller\BusRouteController.java
|
||||
D:\projects\Freshers-Hub\backend\src\main\java\com\rit\portal\controller\CommunityQuestionController.java
|
||||
D:\projects\Freshers-Hub\backend\src\main\java\com\rit\portal\controller\NotePyqController.java
|
||||
D:\projects\Freshers-Hub\backend\src\main\java\com\rit\portal\entity\BusRoute.java
|
||||
D:\projects\Freshers-Hub\backend\src\main\java\com\rit\portal\entity\BusStop.java
|
||||
D:\projects\Freshers-Hub\backend\src\main\java\com\rit\portal\entity\CommunityAnswer.java
|
||||
D:\projects\Freshers-Hub\backend\src\main\java\com\rit\portal\entity\CommunityQuestion.java
|
||||
D:\projects\Freshers-Hub\backend\src\main\java\com\rit\portal\entity\NotePyq.java
|
||||
D:\projects\Freshers-Hub\backend\src\main\java\com\rit\portal\PortalApplication.java
|
||||
D:\projects\Freshers-Hub\backend\src\main\java\com\rit\portal\repository\BusRouteRepository.java
|
||||
D:\projects\Freshers-Hub\backend\src\main\java\com\rit\portal\repository\BusStopRepository.java
|
||||
D:\projects\Freshers-Hub\backend\src\main\java\com\rit\portal\repository\CommunityAnswerRepository.java
|
||||
D:\projects\Freshers-Hub\backend\src\main\java\com\rit\portal\repository\CommunityQuestionRepository.java
|
||||
D:\projects\Freshers-Hub\backend\src\main\java\com\rit\portal\repository\NotePyqRepository.java
|
||||
|
||||
@@ -44,7 +44,7 @@ export const FEATURES: Feature[] = [
|
||||
icon: 'Map',
|
||||
title: 'Campus Map',
|
||||
description: 'Explore RIT campus interactively – find departments, labs, library, canteen, and facilities.',
|
||||
path: '/campus',
|
||||
path: '/campus?tab=map',
|
||||
color: '#10B981',
|
||||
bgColor: '#ECFDF5',
|
||||
},
|
||||
@@ -53,7 +53,7 @@ export const FEATURES: Feature[] = [
|
||||
icon: 'Bus',
|
||||
title: 'Bus Routes',
|
||||
description: 'View all campus bus routes, timings, and pickup locations at a glance.',
|
||||
path: '/campus',
|
||||
path: '/campus?tab=bus',
|
||||
color: '#3B82F6',
|
||||
bgColor: '#EFF6FF',
|
||||
},
|
||||
@@ -62,7 +62,7 @@ export const FEATURES: Feature[] = [
|
||||
icon: 'UserCheck',
|
||||
title: 'Faculty Directory',
|
||||
description: 'Find faculty contact details, department, designation, and office hours.',
|
||||
path: '/campus',
|
||||
path: '/campus?tab=faculty',
|
||||
color: '#EC4899',
|
||||
bgColor: '#FDF2F8',
|
||||
},
|
||||
|
||||
@@ -7,12 +7,17 @@ import FacultyCard from '@/components/FacultyCard/FacultyCard';
|
||||
import { StaggerContainer, StaggerItem } from '@/components/AnimatedContainer/AnimatedContainer';
|
||||
import { FACULTY_DATA, CAMPUS_LOCATIONS, DEPARTMENTS } from '@/constants';
|
||||
import * as LucideIcons from 'lucide-react';
|
||||
import { useLocation } from 'react-router-dom';
|
||||
import type { BusRoute } from '@/types';
|
||||
|
||||
type Tab = 'map' | 'bus' | 'faculty';
|
||||
|
||||
export default function Campus() {
|
||||
const [activeTab, setActiveTab] = useState<Tab>('map');
|
||||
const location = useLocation();
|
||||
const queryTab = new URLSearchParams(location.search).get('tab') as Tab;
|
||||
const [activeTab, setActiveTab] = useState<Tab>(
|
||||
queryTab === 'map' || queryTab === 'bus' || queryTab === 'faculty' ? queryTab : 'map'
|
||||
);
|
||||
const [searchFaculty, setSearchFaculty] = useState('');
|
||||
const [selectedDept, setSelectedDept] = useState('All Departments');
|
||||
const [sortBy, setSortBy] = useState('Name A-Z');
|
||||
@@ -20,6 +25,14 @@ export default function Campus() {
|
||||
const [busRoutes, setBusRoutes] = useState<BusRoute[]>([]);
|
||||
const [loadingBus, setLoadingBus] = useState(true);
|
||||
|
||||
// Sync tab state when URL query parameter changes
|
||||
useEffect(() => {
|
||||
const qTab = new URLSearchParams(location.search).get('tab') as Tab;
|
||||
if (qTab === 'map' || qTab === 'bus' || qTab === 'faculty') {
|
||||
setActiveTab(qTab);
|
||||
}
|
||||
}, [location.search]);
|
||||
|
||||
useEffect(() => {
|
||||
if (activeTab === 'bus' && busRoutes.length === 0) {
|
||||
setLoadingBus(true);
|
||||
|
||||
Reference in New Issue
Block a user