Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
4ab1589
reservation management, billing & invoice sections connected to database
ShaliniAvindya Sep 10, 2025
e3cd072
new updates
ShaliniAvindya Oct 7, 2025
1c116db
Merge pull request #1 from ShaliniAvindya/shalini
ShaliniAvindya Oct 7, 2025
aaff628
Update RoomInventory.jsx
ShaliniAvindya Oct 7, 2025
05e4616
Update RoomInventory.jsx
ShaliniAvindya Oct 7, 2025
abfd3a5
Update RoomStatus.jsx
ShaliniAvindya Oct 7, 2025
10fb7d8
Update RoomRate.jsx
ShaliniAvindya Oct 7, 2025
f4271b0
Update RoomRate.jsx
ShaliniAvindya Oct 7, 2025
6864dcf
api base url
ShaliniAvindya Oct 7, 2025
c7ffbab
Update and rename Server/server.js to Server/api/index.js
ShaliniAvindya Oct 7, 2025
b8cfaef
Create vercel.json
ShaliniAvindya Oct 7, 2025
6b6c616
Update package.json
ShaliniAvindya Oct 7, 2025
0f08b1e
Update apiconfig.js
ShaliniAvindya Oct 7, 2025
1241555
Update vite.config.js
ShaliniAvindya Oct 7, 2025
ba96d22
Update index.js
ShaliniAvindya Oct 7, 2025
bff737f
Update index.js
ShaliniAvindya Oct 7, 2025
bb4bc1a
Update apiconfig.js
ShaliniAvindya Oct 7, 2025
30ff1a5
Update vite.config.js
ShaliniAvindya Oct 7, 2025
81f00e5
updates
ShaliniAvindya Oct 16, 2025
efc4343
Create index.js
ShaliniAvindya Oct 16, 2025
e4f57ad
Delete Server/server.js
ShaliniAvindya Oct 16, 2025
7d6901e
Merge branch 'main' into shalini
ShaliniAvindya Oct 16, 2025
a24402b
Merge pull request #3 from ShaliniAvindya/shalini
ShaliniAvindya Oct 16, 2025
4f8e5db
Update index.js
ShaliniAvindya Oct 16, 2025
a164b0f
Update index.js
ShaliniAvindya Oct 16, 2025
95cd803
Update index.js
ShaliniAvindya Oct 16, 2025
c070a1b
Update Login.jsx
ShaliniAvindya Oct 16, 2025
5a4b7ca
Update Login.jsx
ShaliniAvindya Oct 16, 2025
81585ea
Update Login.jsx
ShaliniAvindya Oct 16, 2025
b8caf62
Update index.js
ShaliniAvindya Oct 16, 2025
69012d3
Update Login.jsx
ShaliniAvindya Oct 16, 2025
8b3e495
Update apiconfig.js
ShaliniAvindya Apr 28, 2026
2792b3d
Update index.js
ShaliniAvindya Apr 28, 2026
bbd5c77
Update index.js
ShaliniAvindya Apr 28, 2026
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
85 changes: 54 additions & 31 deletions Client/package-lock.json

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

3 changes: 2 additions & 1 deletion Client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,14 @@
"@stripe/stripe-js": "^7.2.0",
"antd": "^5.24.9",
"axios": "^1.10.0",
"chart.js": "^4.5.0",
"date-fns": "^2.30.0",
"form-data": "^4.0.3",
"i18next": "^25.0.1",
"i18next-browser-languagedetector": "^8.0.5",
"js-cookie": "^3.0.5",
"json2csv": "^6.0.0-alpha.2",
"jspdf": "^3.0.1",
"jspdf": "^3.0.2",
"leaflet": "^1.9.4",
"lodash": "^4.17.21",
"lucide-react": "^0.487.0",
Expand Down
48 changes: 23 additions & 25 deletions Client/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,19 @@ import { Routes, Route, Outlet } from 'react-router-dom';
import ScrollRestoration from './components/ScrollRestoration';
import { AuthProvider } from './components/context/AuthContext';
import HomeScreen from './screens/HomeScreen';
import Login from './screens/Login';
import Register from './screens/Register';
import BillingInvoice from './screens/BillingInvoice';
// import CustomerFeedback from './screens/CustomerFeedback';
// import InventoryStockManage from './screens/InventoryStockManage';
// import KitchenDisplay from './screens/KitchenDisplay';
// import LoyaltyPrograms from './screens/LoyaltyPrograms';
// import MenuManagement from './screens/MenuManagement';
// import POSsystem from './screens/POSsystem';
import RestaurantAnalytics from './screens/RestaurantAnalytics';
import Settings from './screens/Settings';
// import StaffManagement from './screens/StaffManagement';
import ProtectedRoute from './components/ProtectedRoute';
import ReservationManagement from './screens/ReservationManagement/ReservationManagement';
// import WalkinManagement from './screens/WalkinManagement';
import RoomManagement from './screens/RoomManaagemnt/RoomManagement';
import RestaurantBarManagement from './screens/Restaurant&BarManagement/RestaurantBarManagement';
import RestaurantAnalytics from './screens/RestaurantAnalytics';
import { useContext } from 'react';
import { AuthContext } from './components/context/AuthContext';
import { Navigate } from 'react-router-dom';
import { Toaster } from 'react-hot-toast';

const Layout = () => {
return (
Expand All @@ -27,29 +26,28 @@ const Layout = () => {
};

const App = () => {
const Redirector = () => {
const { user, loading } = useContext(AuthContext);
if (loading) return null;
return user ? <Navigate to="/" replace /> : <Navigate to="/login" replace />;
};
return (
<AuthProvider>
<div className="App">
<Toaster position="top-right" />
<ScrollRestoration />
<Routes>
<Route element={<Layout />}>
{/* Public Routes */}
<Route path="/" element={<HomeScreen />} />
<Route path="/billing-invoice" element={<BillingInvoice />} />
{/* <Route path="/customer-feedback" element={<CustomerFeedback />} />
<Route path="/inventory-stock-manage" element={<InventoryStockManage />} />
<Route path="/kitchen-display" element={<KitchenDisplay />} />
<Route path="/loyalty-programs" element={<LoyaltyPrograms />} />
<Route path="/menu-management" element={<MenuManagement />} />
<Route path="/pos-system" element={<POSsystem />} /> */}
<Route path="/analytics-reports" element={<RestaurantAnalytics />} />
<Route path="/settings" element={<Settings />} />
{/* <Route path="/staff-management" element={<StaffManagement />} /> */}
<Route path="/reservation-management" element={<ReservationManagement />} />
{/* <Route path="/walkin-management" element={<WalkinManagement />} /> */}
{/* Room Management Route */}
<Route path="/room-management" element={<RoomManagement />} />
<Route path="/restaurant-bar-management" element={<RestaurantBarManagement />} />
<Route path="/login" element={<Login />} />
<Route path="/register" element={<Register />} />
<Route path="/" element={<ProtectedRoute><HomeScreen /></ProtectedRoute>} />
<Route path="/billing-invoice" element={<ProtectedRoute><BillingInvoice /></ProtectedRoute>} />
<Route path="/settings" element={<ProtectedRoute><Settings /></ProtectedRoute>} />
<Route path="/reservation-management" element={<ProtectedRoute><ReservationManagement /></ProtectedRoute>} />
<Route path="/room-management" element={<ProtectedRoute><RoomManagement /></ProtectedRoute>} />
<Route path="/restaurant-bar-management" element={<ProtectedRoute><RestaurantBarManagement /></ProtectedRoute>} />
<Route path="/analytics" element={<ProtectedRoute><RestaurantAnalytics /></ProtectedRoute>} />
</Route>
</Routes>
</div>
Expand Down
1 change: 1 addition & 0 deletions Client/src/apiconfig.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const API_BASE_URL = "https://api.lushhotelcloud.com/api";
Loading