Remove dashboard page and make bookings page default

frontend/src/components/booking-creation-finalize-view/booking-creation-finalize-view.tsx

@@ -16,7 +16,7 @@ import {
   selectSelectedVenue,
   successBookingFormSubmissionAction,
 } from "../../redux/slices/booking-creation-slice";
-import { BOOKINGS_PATH } from "../../routes/paths";
+import { DASHBOARD_PATH } from "../../routes/paths";
 import { FieldType } from "../../types/venues";
 import { resolveApiError } from "../../utils/error-utils";
 import { displayDateTimeRange } from "../../utils/transform-utils";
@@ -208,7 +208,7 @@ function BookingCreationFinalizeView() {
             <Button
               color="blue"
               content="Done"
-              onClick={() => history.push(BOOKINGS_PATH)}
+              onClick={() => history.push(DASHBOARD_PATH)}
             />
           </HorizontalLayoutContainer>
         ) : (

frontend/src/components/navigation-container/navigation-container.tsx

@@ -7,7 +7,6 @@ import FullPageContainer from "../full-page-container";
 import PageBody from "../page-body";
 // import EventsTab from "./events-tab";
 import RoleRestrictedWrapper from "../role-restricted-wrapper";
-import BookingsTab from "./bookings-tab";
 import DashboardTab from "./dashboard-tab";
 import DesktopAboutTab from "./desktop-about-tab";
 import DesktopAdminTab from "./desktop-admin-tab";
@@ -47,7 +46,6 @@ function NavigationContainer({ children }: Props) {
       >
         <LogoTab onTabClick={closeSidebar} />
         <DashboardTab onTabClick={closeSidebar} />
-        <BookingsTab onTabClick={closeSidebar} />
         {/* <EventsTab onTabClick={closeSidebar} /> */}
         <MobileAboutTab onTabClick={closeSidebar} />
         <RoleRestrictedWrapper allowedRoles={[Role.Admin]}>
@@ -62,7 +60,6 @@ function NavigationContainer({ children }: Props) {
               <>
                 <LogoTab />
                 <DashboardTab />
-                <BookingsTab />
                 {/* <EventsTab /> */}
                 <DesktopAboutTab />
                 <RoleRestrictedWrapper allowedRoles={[Role.Admin]}>

frontend/src/pages/bookings-creation-page/bookings-creation-page.tsx

@@ -3,7 +3,7 @@ import { Button, Icon } from "semantic-ui-react";
 
 import BookingCreationSection from "../../components/booking-creation-section";
 import useScrollToTop from "../../custom-hooks/use-scroll-to-top";
-import { BOOKINGS_PATH } from "../../routes/paths";
+import { DASHBOARD_PATH } from "../../routes/paths";
 
 function BookingsCreationPage() {
   useScrollToTop();
@@ -15,7 +15,7 @@ function BookingsCreationPage() {
         fluid
         color="red"
         as={Link}
-        to={BOOKINGS_PATH}
+        to={DASHBOARD_PATH}
       >
         <Button.Content hidden content="Cancel Booking Creation" />
         <Button.Content visible content={<Icon name="times" fitted />} />

frontend/src/pages/bookings-page/bookings-page.tsx

@@ -1,6 +1,7 @@
 import { useCallback, useEffect } from "react";
 import { Link } from "react-router-dom";
 import { Button, Icon, Popup } from "semantic-ui-react";
+import { useMediaQuery } from "react-responsive";
 
 import BookingUserCalendar from "../../components/booking-user-calendar";
 import BookingUserTable from "../../components/booking-user-table";
@@ -33,6 +34,10 @@ const OPTIONS: TabOption[] = [
 ];
 
 function BookingsPage() {
+  const { name } = useAppSelector(selectCurrentUserDisplayInfo) ?? {};
+
+  const isTabletOrLarger = useMediaQuery({ query: "(min-width: 768px)" });
+
   const { getBookings: _getBookings } = useGetBookings();
   const loading = useAppSelector(selectBookingsLoadingState);
   const { id: userId } =
@@ -59,17 +64,13 @@ function BookingsPage() {
 
   return (
     <>
-      <Button
-        animated="vertical"
-        fluid
-        color="teal"
-        as={Link}
-        to={BOOKINGS_CREATION_PATH}
-      >
-        <Button.Content hidden content="Create New Bookings" />
-        <Button.Content visible content={<Icon name="plus" fitted />} />
-      </Button>
-
+      <h2>Welcome, {name}!</h2>
+      <p>
+        <strong>Note:</strong> Treeckle is currently in development and we are
+        working hard towards making residential life better for you. For urgent
+        queries or if you have found any bugs, please contact us at
+        [email protected].
+      </p>
       <h1>
         <HorizontalLayoutContainer align="center">
           <span>My Bookings</span>
@@ -90,6 +91,18 @@ function BookingsPage() {
           />
         </HorizontalLayoutContainer>
       </h1>
+      <Button
+        animated="vertical"
+        fluid
+        color="teal"
+        as={Link}
+        to={BOOKINGS_CREATION_PATH}
+      >
+        <Button.Content hidden content="Create New Bookings" />
+        <Button.Content visible content={<Icon name="plus" fitted />} />
+      </Button>
+
+      {isTabletOrLarger ? <div /> : <br />}
 
       <Tab options={OPTIONS} showTitle={false} />
     </>

frontend/src/routes/paths.ts

@@ -2,8 +2,7 @@ import { EVENT_ID, USER_ID, VENUE_ID } from "../constants";
 
 export const HOME_PATH = "/";
 export const DASHBOARD_PATH = "/dashboard";
-export const BOOKINGS_PATH = "/bookings";
-export const BOOKINGS_CREATION_PATH = "/bookings/create";
+export const BOOKINGS_CREATION_PATH = "/dashboard/create";
 export const EVENTS_PATH = "/events";
 export const EVENTS_SIGNED_UP_PATH = "/events/signedup";
 export const EVENTS_SUBSCRIPTIONS_PATH = "/events/subscriptions";

frontend/src/routes/routes.tsx

@@ -29,7 +29,6 @@ import {
   ADMIN_VENUES_EDIT_PATH,
   ADMIN_VENUES_PATH,
   BOOKINGS_CREATION_PATH,
-  BOOKINGS_PATH,
   DASHBOARD_PATH,
   HOME_PATH,
   // AUTH_CALLBACK_PATH,
@@ -42,7 +41,6 @@ import RoleRestrictedRoute from "./role-restricted-route";
 import GaProvider from "../components/ga-provider";
 
 // Code splitting
-const DashboardPage = lazy(() => import("../pages/dashboard-page"));
 // const EventsPage = lazy(() => import("../pages/events-page"));
 const BookingsPage = lazy(() => import("../pages/bookings-page"));
 const AdminBookingsPage = lazy(() => import("../pages/admin-bookings-page"));
@@ -110,10 +108,6 @@ function Routes() {
               {/* Authenticated routes  */}
 
               <Route path={DASHBOARD_PATH} exact strict>
-                <DashboardPage />
-              </Route>
-
-              <Route path={BOOKINGS_PATH} exact strict>
                 <BookingsPage />
               </Route>