Merge branch 'release-1.0.95'

Author: entrotech

client/src/Routes.jsx

@@ -11,7 +11,6 @@ import { useWidget } from "./appReducer";
 import useFeatureFlag from "./hooks/useFeatureFlag";
 import SurveySnackbar from "./components/UI/SurveySnackbar";
 import AnnouncementSnackbar from "components/UI/AnnouncementSnackbar";
-import useLocationHook from "hooks/useLocationHook";
 
 const VerificationAdmin = lazy(() =>
   import("components/Admin/VerificationAdmin")
@@ -53,10 +52,18 @@ const MuiDemo = lazy(() => import("./components/MuiDemo/MuiDemo"));
 const Features = lazy(() => import("./components/Admin/Features"));
 const Profile = lazy(() => import("./components/Account/Profile"));
 const Suggestion = lazy(() => import("components/FoodSeeker/Suggestion"));
+const Announcements = lazy(() => import("./components/Admin/Announcements"));
 
 export default function AppRoutes() {
-  const hasUserFeedbackSuveyFeatureFlag = useFeatureFlag("userFeedbackSurvey");
   const location = useLocation();
+  const pathname = location.pathname;
+  const hasUserFeedbackSuveyFeatureFlag = useFeatureFlag("userFeedbackSurvey");
+  const isAdminRoute = pathname.startsWith("/admin");
+  const isWidgetRoute = pathname === "/widget";
+  const isUserFacingRoute = !isAdminRoute && !isWidgetRoute;
+
+  const showSurveySnackbar =
+    hasUserFeedbackSuveyFeatureFlag && isUserFacingRoute;
 
   return (
     <Suspense
@@ -66,9 +73,7 @@ export default function AppRoutes() {
         </Stack>
       }
     >
-      {hasUserFeedbackSuveyFeatureFlag && location.pathname !== "/widget" && (
-        <SurveySnackbar />
-      )}
+      {showSurveySnackbar && <SurveySnackbar />}
 
       <Routes>
         <Route path="/" element={<AppWrapper />}>
@@ -181,6 +186,14 @@ export default function AppRoutes() {
                 </PrivateRoute>
               }
             />
+            <Route
+              path="announcements"
+              element={
+                <PrivateRoute roles={["isAdmin"]}>
+                  <Announcements />
+                </PrivateRoute>
+              }
+            />
             <Route
               path="securityadmindashboard"
               element={