From a830be1c449745b0e9313a145e72ca155f78e74e Mon Sep 17 00:00:00 2001
From: Arijan <pmomo9099@gmail.com>
Date: Sun, 15 Jun 2025 19:45:30 +0800
Subject: [PATCH 1/4] fix redirect issue

---
 frontend/src/app/App.js                         | 10 ++++++++--
 frontend/src/components/PrivateRoute.js         |  4 ++++
 frontend/src/components/pages/PartnerGallery.js | 10 +++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/frontend/src/app/App.js b/frontend/src/app/App.js
index 9e11ea5e5..f0be49db5 100644
--- a/frontend/src/app/App.js
+++ b/frontend/src/app/App.js
@@ -116,6 +116,12 @@ function App() {
         localStorage.setItem("direct_path", direct_path);
       }
     }
+    if (path.indexOf("/group_messages") > 0) {
+      if (!role) {
+        let direct_path = "group_messages" + path.split("/group_messages")[1];
+        localStorage.setItem("direct_path", direct_path);
+      }
+    }
   }, [path]);
 
   useEffect(() => {
@@ -233,7 +239,7 @@ function App() {
                 </PublicRoute>
               </HomeLayout>
             </Content>
-            {role && (
+            
               <Content style={{ height: "100vh", overflow: "hidden" }}>
                 {role && <NavigationHeader />}
                 <div style={{ height: "calc(100vh - 48px)", overflow: "auto" }}>
@@ -762,7 +768,7 @@ function App() {
                   {n50Flag && <HubFooter />}
                 </div>
               </Content>
-            )}
+            
             <MeetingPanel />
           </Layout>
         </Router>
diff --git a/frontend/src/components/PrivateRoute.js b/frontend/src/components/PrivateRoute.js
index 71c914a0f..c101d8bd8 100644
--- a/frontend/src/components/PrivateRoute.js
+++ b/frontend/src/components/PrivateRoute.js
@@ -11,6 +11,10 @@ function PrivateRoute({ children, ...rest }) {
   if (path.indexOf("/event") > 0) {
     login_url = "/" + path.split("/")[1];
   }
+  if (path.indexOf("/group_messages") > 0) {
+    login_url = "/" + path.split("/")[1];
+  }
+  
 
   return (
     <Route
diff --git a/frontend/src/components/pages/PartnerGallery.js b/frontend/src/components/pages/PartnerGallery.js
index 2cb779cb8..a877a2afd 100644
--- a/frontend/src/components/pages/PartnerGallery.js
+++ b/frontend/src/components/pages/PartnerGallery.js
@@ -95,7 +95,7 @@ function PartnerGallery(props) {
       let matchestopics = false;
       if (
         (user && user.hub_user && user.hub_user.url === "GSRFoundation") ||
-        (user.role === ACCOUNT_TYPE.HUB && user.url === "GSRFoundation")
+        (user && user.role === ACCOUNT_TYPE.HUB && user.url === "GSRFoundation")
       ) {
         matchestopics =
           !query2 ||
@@ -116,7 +116,7 @@ function PartnerGallery(props) {
           user.hub_user &&
           user.hub_user.url &&
           user.hub_user.url.includes("AUAF")) ||
-        (user.role === ACCOUNT_TYPE.HUB &&
+        (user && user.role === ACCOUNT_TYPE.HUB &&
           user.url &&
           user.url.includes("AUAF"))
       ) {
@@ -144,7 +144,7 @@ function PartnerGallery(props) {
         user.hub_user &&
         user.hub_user.url &&
         user.hub_user.url.includes("AUAF")) ||
-      (user.role === ACCOUNT_TYPE.HUB &&
+      (user && user.role === ACCOUNT_TYPE.HUB &&
         user.url &&
         user.url.includes("AUAF")) ? (
         <>
@@ -193,7 +193,7 @@ function PartnerGallery(props) {
           />
           <Title level={4}>
             {(user && user.hub_user && user.hub_user.url === "GSRFoundation") ||
-            (user.role === ACCOUNT_TYPE.HUB && user.url === "GSRFoundation")
+            (user && user.role === ACCOUNT_TYPE.HUB && user.url === "GSRFoundation")
               ? t("gallery.projectTopicsPlaceholder_GSR")
               : t("gallery.projectTopics")}
           </Title>
@@ -205,7 +205,7 @@ function PartnerGallery(props) {
               (user &&
                 user.hub_user &&
                 user.hub_user.url === "GSRFoundation") ||
-              (user.role === ACCOUNT_TYPE.HUB && user.url === "GSRFoundation")
+              (user && user.role === ACCOUNT_TYPE.HUB && user.url === "GSRFoundation")
                 ? t("gallery.projectTopicsPlaceholder_GSR")
                 : t("gallery.projectTopicsPlaceholder")
             }

From 20ff5b867b5d9073b9634079b635e2bc3731f223 Mon Sep 17 00:00:00 2001
From: Arijan <pmomo9099@gmail.com>
Date: Sun, 15 Jun 2025 19:52:19 +0800
Subject: [PATCH 2/4] front format

---
 frontend/src/app/App.js                       | 1045 ++++++++---------
 frontend/src/components/PrivateRoute.js       |    1 -
 .../src/components/pages/PartnerGallery.js    |   14 +-
 3 files changed, 531 insertions(+), 529 deletions(-)

diff --git a/frontend/src/app/App.js b/frontend/src/app/App.js
index f0be49db5..166fac525 100644
--- a/frontend/src/app/App.js
+++ b/frontend/src/app/App.js
@@ -239,536 +239,533 @@ function App() {
                 </PublicRoute>
               </HomeLayout>
             </Content>
-            
-              <Content style={{ height: "100vh", overflow: "hidden" }}>
-                {role && <NavigationHeader />}
-                <div style={{ height: "calc(100vh - 48px)", overflow: "auto" }}>
-                  <PrivateRoute path="/support/all-mentors">
-                    {role == ACCOUNT_TYPE.SUPPORT ? (
-                      <Gallery isSupport={true} />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
-                  <PrivateRoute path="/dashboard">
-                    {role == ACCOUNT_TYPE.ADMIN ? (
-                      <div style={{ padding: "40px", fontSize: "20px" }}>
-                        <a
-                          href="https://lookerstudio.google.com/u/0/reporting/c11362c3-fec0-4e34-bff7-cb302caf762d/page/p1iHF?s=u2xKH-NSqII"
-                          target="_blank"
-                          rel="noopener noreferrer"
-                        >
-                          Looker insights
-                        </a>
-                      </div>
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
-                  <PrivateRoute path="/support/all-mentees">
-                    {role == ACCOUNT_TYPE.SUPPORT ? (
-                      <MenteeGallery isSupport={true} />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
-                  <PrivateRoute path="/support/all-partners">
-                    {role == ACCOUNT_TYPE.SUPPORT ? (
-                      <PartnerGallery isSupport={true} />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
-                  <PrivateRoute path="/support/all-hubs">
-                    {role == ACCOUNT_TYPE.SUPPORT ? (
-                      <HubGallery isSupport={true} />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
-                  <PrivateRoute path={"/moderator/admin_group_messages"}>
-                    {role == ACCOUNT_TYPE.MODERATOR ? (
-                      <GroupMessages />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
-                  <PrivateRoute path="/appointments">
-                    {role == ACCOUNT_TYPE.MENTOR ? (
-                      <Appointments />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
-                  <PrivateRoute path="/mentor/training">
-                    {role == ACCOUNT_TYPE.MENTOR ? (
-                      <TrainingData role={ACCOUNT_TYPE.MENTOR} />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
-                  <PrivateRoute path="/videos">
-                    {role == ACCOUNT_TYPE.MENTOR ? (
-                      <Videos />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
-
-                  <PrivateRoute path="/mentee-appointments">
-                    {role == ACCOUNT_TYPE.MENTEE ? (
-                      <MenteeAppointments />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
-                  <PrivateRoute path="/mentee/training">
-                    {role == ACCOUNT_TYPE.MENTEE ? (
-                      <TrainingData role={ACCOUNT_TYPE.MENTEE} />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
-                  <PrivateRoute path="/profile">
-                    {role == ACCOUNT_TYPE.MENTOR ||
-                    role == ACCOUNT_TYPE.MENTEE ||
-                    role == ACCOUNT_TYPE.PARTNER ? (
-                      <Profile />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
 
-                  <PrivateRoute path="/gallery" exact>
-                    {role == ACCOUNT_TYPE.MENTEE ||
-                    role == ACCOUNT_TYPE.GUEST ||
-                    role == ACCOUNT_TYPE.ADMIN ? (
-                      <Gallery />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
-                  {Object.keys(allHubData).map((hub_url) => {
-                    return (
-                      <>
-                        <PrivateRoute path={hub_url + "/partner-gallery"}>
-                          <PartnerGallery />
-                        </PrivateRoute>
-                        <PrivateRoute path={hub_url + "/events"}>
-                          <Events />
-                        </PrivateRoute>
-                        <PrivateRoute path={hub_url + "/partner/training"}>
-                          <TrainingData role={ACCOUNT_TYPE.HUB} />
-                        </PrivateRoute>
-                        <PrivateRoute path={hub_url + "/profile"}>
-                          <Profile />
-                        </PrivateRoute>
-                        <PrivateRoute path={hub_url + "/invite-link"}>
-                          <HubInviteLink />
-                        </PrivateRoute>
-                        <PrivateRoute path={hub_url + "/event/:id"}>
-                          <EventDetail />
-                        </PrivateRoute>
-                        <PrivateRoute
-                          path={hub_url + "/group_messages/:hub_user_id"}
-                        >
-                          <GroupMessages />
-                        </PrivateRoute>
-                        <PrivateRoute path={hub_url + "/community"}>
-                          <CommunityLibrary />
-                        </PrivateRoute>
-                        <PrivateRoute
-                          path={hub_url + "/new_training/:type/:id"}
-                        >
-                          <NewTrainingConfirm />
-                        </PrivateRoute>
-                      </>
-                    );
-                  })}
-                  <PrivateRoute path="/partner-gallery" exact>
-                    {role == ACCOUNT_TYPE.PARTNER ||
-                    role == ACCOUNT_TYPE.GUEST ||
-                    role == ACCOUNT_TYPE.HUB ||
-                    role == ACCOUNT_TYPE.ADMIN ? (
-                      <PartnerGallery />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
-                  <PrivateRoute path="/mentee-gallery" exact>
-                    {role == ACCOUNT_TYPE.MENTOR ||
-                    role == ACCOUNT_TYPE.MENTEE ||
-                    role == ACCOUNT_TYPE.GUEST ||
-                    role == ACCOUNT_TYPE.ADMIN ? (
-                      <MenteeGallery />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
+            <Content style={{ height: "100vh", overflow: "hidden" }}>
+              {role && <NavigationHeader />}
+              <div style={{ height: "calc(100vh - 48px)", overflow: "auto" }}>
+                <PrivateRoute path="/support/all-mentors">
+                  {role == ACCOUNT_TYPE.SUPPORT ? (
+                    <Gallery isSupport={true} />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+                <PrivateRoute path="/dashboard">
+                  {role == ACCOUNT_TYPE.ADMIN ? (
+                    <div style={{ padding: "40px", fontSize: "20px" }}>
+                      <a
+                        href="https://lookerstudio.google.com/u/0/reporting/c11362c3-fec0-4e34-bff7-cb302caf762d/page/p1iHF?s=u2xKH-NSqII"
+                        target="_blank"
+                        rel="noopener noreferrer"
+                      >
+                        Looker insights
+                      </a>
+                    </div>
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+                <PrivateRoute path="/support/all-mentees">
+                  {role == ACCOUNT_TYPE.SUPPORT ? (
+                    <MenteeGallery isSupport={true} />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+                <PrivateRoute path="/support/all-partners">
+                  {role == ACCOUNT_TYPE.SUPPORT ? (
+                    <PartnerGallery isSupport={true} />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+                <PrivateRoute path="/support/all-hubs">
+                  {role == ACCOUNT_TYPE.SUPPORT ? (
+                    <HubGallery isSupport={true} />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+                <PrivateRoute path={"/moderator/admin_group_messages"}>
+                  {role == ACCOUNT_TYPE.MODERATOR ? (
+                    <GroupMessages />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+                <PrivateRoute path="/appointments">
+                  {role == ACCOUNT_TYPE.MENTOR ? (
+                    <Appointments />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+                <PrivateRoute path="/mentor/training">
+                  {role == ACCOUNT_TYPE.MENTOR ? (
+                    <TrainingData role={ACCOUNT_TYPE.MENTOR} />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+                <PrivateRoute path="/videos">
+                  {role == ACCOUNT_TYPE.MENTOR ? (
+                    <Videos />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
 
-                  <PrivateRoute path="/gallery/:type/:id">
-                    <PublicProfile />
-                  </PrivateRoute>
-                  <PrivateRoute path="/new_training/:type/:id">
-                    <NewTrainingConfirm />
-                  </PrivateRoute>
+                <PrivateRoute path="/mentee-appointments">
+                  {role == ACCOUNT_TYPE.MENTEE ? (
+                    <MenteeAppointments />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+                <PrivateRoute path="/mentee/training">
+                  {role == ACCOUNT_TYPE.MENTEE ? (
+                    <TrainingData role={ACCOUNT_TYPE.MENTEE} />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+                <PrivateRoute path="/profile">
+                  {role == ACCOUNT_TYPE.MENTOR ||
+                  role == ACCOUNT_TYPE.MENTEE ||
+                  role == ACCOUNT_TYPE.PARTNER ? (
+                    <Profile />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
 
-                  <PrivateRoute path="/admin_group_messages">
-                    {role == ACCOUNT_TYPE.ADMIN ? (
-                      <GroupMessages />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
-                  <PrivateRoute path="/organizer">
-                    {role == ACCOUNT_TYPE.ADMIN ? (
-                      <ApplicationOrganizer isMentor={true} />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
-                  <PrivateRoute path="/menteeOrganizer">
-                    {role == ACCOUNT_TYPE.ADMIN ? (
-                      <ApplicationOrganizer isMentor={false} />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
-                  <PrivateRoute path="/account-data">
-                    {role == ACCOUNT_TYPE.ADMIN || role == ACCOUNT_TYPE.HUB ? (
-                      <AdminAccountData />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
-                  <PrivateRoute path="/hub-data">
-                    {role == ACCOUNT_TYPE.ADMIN ? (
-                      <Hubs />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
-                  <PrivateRoute path="/partner-data">
-                    {role == ACCOUNT_TYPE.ADMIN ? (
-                      <AdminPartnerData />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
-                  <PrivateRoute path="/all-appointments">
-                    {role == ACCOUNT_TYPE.ADMIN ? (
-                      <AdminAppointmentData />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
-                  <PrivateRoute path="/admin-announcement">
-                    {role == ACCOUNT_TYPE.ADMIN ? (
-                      <AdminAnnouncement />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
-                  <PrivateRoute path="/admin-training">
-                    {role == ACCOUNT_TYPE.ADMIN ? (
-                      <AdminTraining />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
-                  <PrivateRoute path="/admin-sign">
-                    {role == ACCOUNT_TYPE.ADMIN ? (
-                      <AdminSign />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
-                  <PrivateRoute path="/languages">
-                    {role == ACCOUNT_TYPE.ADMIN ? (
-                      <Languages />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
-                  <PrivateRoute path="/specializations">
-                    {role == ACCOUNT_TYPE.ADMIN ? (
-                      <Specializations />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
-                  <PrivateRoute path="/messages-details">
-                    {role == ACCOUNT_TYPE.ADMIN ? (
-                      <AdminMessages />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
+                <PrivateRoute path="/gallery" exact>
+                  {role == ACCOUNT_TYPE.MENTEE ||
+                  role == ACCOUNT_TYPE.GUEST ||
+                  role == ACCOUNT_TYPE.ADMIN ? (
+                    <Gallery />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+                {Object.keys(allHubData).map((hub_url) => {
+                  return (
+                    <>
+                      <PrivateRoute path={hub_url + "/partner-gallery"}>
+                        <PartnerGallery />
+                      </PrivateRoute>
+                      <PrivateRoute path={hub_url + "/events"}>
+                        <Events />
+                      </PrivateRoute>
+                      <PrivateRoute path={hub_url + "/partner/training"}>
+                        <TrainingData role={ACCOUNT_TYPE.HUB} />
+                      </PrivateRoute>
+                      <PrivateRoute path={hub_url + "/profile"}>
+                        <Profile />
+                      </PrivateRoute>
+                      <PrivateRoute path={hub_url + "/invite-link"}>
+                        <HubInviteLink />
+                      </PrivateRoute>
+                      <PrivateRoute path={hub_url + "/event/:id"}>
+                        <EventDetail />
+                      </PrivateRoute>
+                      <PrivateRoute
+                        path={hub_url + "/group_messages/:hub_user_id"}
+                      >
+                        <GroupMessages />
+                      </PrivateRoute>
+                      <PrivateRoute path={hub_url + "/community"}>
+                        <CommunityLibrary />
+                      </PrivateRoute>
+                      <PrivateRoute path={hub_url + "/new_training/:type/:id"}>
+                        <NewTrainingConfirm />
+                      </PrivateRoute>
+                    </>
+                  );
+                })}
+                <PrivateRoute path="/partner-gallery" exact>
+                  {role == ACCOUNT_TYPE.PARTNER ||
+                  role == ACCOUNT_TYPE.GUEST ||
+                  role == ACCOUNT_TYPE.HUB ||
+                  role == ACCOUNT_TYPE.ADMIN ? (
+                    <PartnerGallery />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+                <PrivateRoute path="/mentee-gallery" exact>
+                  {role == ACCOUNT_TYPE.MENTOR ||
+                  role == ACCOUNT_TYPE.MENTEE ||
+                  role == ACCOUNT_TYPE.GUEST ||
+                  role == ACCOUNT_TYPE.ADMIN ? (
+                    <MenteeGallery />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
 
-                  <PrivateRoute path="/partner/training">
-                    {role == ACCOUNT_TYPE.PARTNER ||
-                    role == ACCOUNT_TYPE.HUB ? (
-                      <TrainingData role={ACCOUNT_TYPE.PARTNER} />
-                    ) : (
-                      <>
-                        {cur_time - startPathTime > 100 && (
-                          <Result
-                            status="403"
-                            title="403"
-                            subTitle={t("gallery.unauthorizedAccess")}
-                          />
-                        )}
-                      </>
-                    )}
-                  </PrivateRoute>
+                <PrivateRoute path="/gallery/:type/:id">
+                  <PublicProfile />
+                </PrivateRoute>
+                <PrivateRoute path="/new_training/:type/:id">
+                  <NewTrainingConfirm />
+                </PrivateRoute>
 
-                  <PrivateRoute path="/messages/:receiverId">
-                    <Messages />
-                  </PrivateRoute>
-                  <PrivateRoute path={"/partner_group_messages/:receiverId"}>
+                <PrivateRoute path="/admin_group_messages">
+                  {role == ACCOUNT_TYPE.ADMIN ? (
                     <GroupMessages />
-                  </PrivateRoute>
-                  <PrivateRoute path="/events">
-                    <Events />
-                  </PrivateRoute>
-                  <PrivateRoute path="/event/:id">
-                    <EventDetail />
-                  </PrivateRoute>
-                  <PrivateRoute path="/announcements">
-                    <Announcements />
-                  </PrivateRoute>
-                  <PrivateRoute path="/createmeetinglink">
-                    <CreateMeetingLink />
-                  </PrivateRoute>
-                  {role == ACCOUNT_TYPE.HUB && <HubFooter />}
-                  {n50Flag && <HubFooter />}
-                </div>
-              </Content>
-            
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+                <PrivateRoute path="/organizer">
+                  {role == ACCOUNT_TYPE.ADMIN ? (
+                    <ApplicationOrganizer isMentor={true} />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+                <PrivateRoute path="/menteeOrganizer">
+                  {role == ACCOUNT_TYPE.ADMIN ? (
+                    <ApplicationOrganizer isMentor={false} />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+                <PrivateRoute path="/account-data">
+                  {role == ACCOUNT_TYPE.ADMIN || role == ACCOUNT_TYPE.HUB ? (
+                    <AdminAccountData />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+                <PrivateRoute path="/hub-data">
+                  {role == ACCOUNT_TYPE.ADMIN ? (
+                    <Hubs />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+                <PrivateRoute path="/partner-data">
+                  {role == ACCOUNT_TYPE.ADMIN ? (
+                    <AdminPartnerData />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+                <PrivateRoute path="/all-appointments">
+                  {role == ACCOUNT_TYPE.ADMIN ? (
+                    <AdminAppointmentData />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+                <PrivateRoute path="/admin-announcement">
+                  {role == ACCOUNT_TYPE.ADMIN ? (
+                    <AdminAnnouncement />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+                <PrivateRoute path="/admin-training">
+                  {role == ACCOUNT_TYPE.ADMIN ? (
+                    <AdminTraining />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+                <PrivateRoute path="/admin-sign">
+                  {role == ACCOUNT_TYPE.ADMIN ? (
+                    <AdminSign />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+                <PrivateRoute path="/languages">
+                  {role == ACCOUNT_TYPE.ADMIN ? (
+                    <Languages />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+                <PrivateRoute path="/specializations">
+                  {role == ACCOUNT_TYPE.ADMIN ? (
+                    <Specializations />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+                <PrivateRoute path="/messages-details">
+                  {role == ACCOUNT_TYPE.ADMIN ? (
+                    <AdminMessages />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+
+                <PrivateRoute path="/partner/training">
+                  {role == ACCOUNT_TYPE.PARTNER || role == ACCOUNT_TYPE.HUB ? (
+                    <TrainingData role={ACCOUNT_TYPE.PARTNER} />
+                  ) : (
+                    <>
+                      {cur_time - startPathTime > 100 && (
+                        <Result
+                          status="403"
+                          title="403"
+                          subTitle={t("gallery.unauthorizedAccess")}
+                        />
+                      )}
+                    </>
+                  )}
+                </PrivateRoute>
+
+                <PrivateRoute path="/messages/:receiverId">
+                  <Messages />
+                </PrivateRoute>
+                <PrivateRoute path={"/partner_group_messages/:receiverId"}>
+                  <GroupMessages />
+                </PrivateRoute>
+                <PrivateRoute path="/events">
+                  <Events />
+                </PrivateRoute>
+                <PrivateRoute path="/event/:id">
+                  <EventDetail />
+                </PrivateRoute>
+                <PrivateRoute path="/announcements">
+                  <Announcements />
+                </PrivateRoute>
+                <PrivateRoute path="/createmeetinglink">
+                  <CreateMeetingLink />
+                </PrivateRoute>
+                {role == ACCOUNT_TYPE.HUB && <HubFooter />}
+                {n50Flag && <HubFooter />}
+              </div>
+            </Content>
+
             <MeetingPanel />
           </Layout>
         </Router>
diff --git a/frontend/src/components/PrivateRoute.js b/frontend/src/components/PrivateRoute.js
index c101d8bd8..dc9990228 100644
--- a/frontend/src/components/PrivateRoute.js
+++ b/frontend/src/components/PrivateRoute.js
@@ -14,7 +14,6 @@ function PrivateRoute({ children, ...rest }) {
   if (path.indexOf("/group_messages") > 0) {
     login_url = "/" + path.split("/")[1];
   }
-  
 
   return (
     <Route
diff --git a/frontend/src/components/pages/PartnerGallery.js b/frontend/src/components/pages/PartnerGallery.js
index a877a2afd..1d9580fa2 100644
--- a/frontend/src/components/pages/PartnerGallery.js
+++ b/frontend/src/components/pages/PartnerGallery.js
@@ -116,7 +116,8 @@ function PartnerGallery(props) {
           user.hub_user &&
           user.hub_user.url &&
           user.hub_user.url.includes("AUAF")) ||
-        (user && user.role === ACCOUNT_TYPE.HUB &&
+        (user &&
+          user.role === ACCOUNT_TYPE.HUB &&
           user.url &&
           user.url.includes("AUAF"))
       ) {
@@ -144,7 +145,8 @@ function PartnerGallery(props) {
         user.hub_user &&
         user.hub_user.url &&
         user.hub_user.url.includes("AUAF")) ||
-      (user && user.role === ACCOUNT_TYPE.HUB &&
+      (user &&
+        user.role === ACCOUNT_TYPE.HUB &&
         user.url &&
         user.url.includes("AUAF")) ? (
         <>
@@ -193,7 +195,9 @@ function PartnerGallery(props) {
           />
           <Title level={4}>
             {(user && user.hub_user && user.hub_user.url === "GSRFoundation") ||
-            (user && user.role === ACCOUNT_TYPE.HUB && user.url === "GSRFoundation")
+            (user &&
+              user.role === ACCOUNT_TYPE.HUB &&
+              user.url === "GSRFoundation")
               ? t("gallery.projectTopicsPlaceholder_GSR")
               : t("gallery.projectTopics")}
           </Title>
@@ -205,7 +209,9 @@ function PartnerGallery(props) {
               (user &&
                 user.hub_user &&
                 user.hub_user.url === "GSRFoundation") ||
-              (user && user.role === ACCOUNT_TYPE.HUB && user.url === "GSRFoundation")
+              (user &&
+                user.role === ACCOUNT_TYPE.HUB &&
+                user.url === "GSRFoundation")
                 ? t("gallery.projectTopicsPlaceholder_GSR")
                 : t("gallery.projectTopicsPlaceholder")
             }

From 5d4d832aa32e7261e88b98eabba7568880f19a65 Mon Sep 17 00:00:00 2001
From: Arijan <pmomo9099@gmail.com>
Date: Wed, 18 Jun 2025 01:11:53 +0800
Subject: [PATCH 3/4] update node version for dev

---
 .circleci/config.yml             | 2 +-
 .github/workflows/dev-deploy.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0100f6c82..2d136fe4a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,7 +16,7 @@ jobs:
             /home/circleci/.local/bin/black . --check 
   frontend-format:
     docker:
-      - image: cimg/node:16.19.0
+      - image: cimg/node:18.18.2
     steps:
       - checkout
       - run:
diff --git a/.github/workflows/dev-deploy.yml b/.github/workflows/dev-deploy.yml
index 3fc566665..ad8d279d2 100644
--- a/.github/workflows/dev-deploy.yml
+++ b/.github/workflows/dev-deploy.yml
@@ -27,7 +27,7 @@ jobs:
       - name: run yarn build
         uses: actions/setup-node@v3.6.0
         with:
-          node-version: "16"
+          node-version: "18"
           check-latest: true
 
       - name: Install and Build

From d30a27c2b7481fbeaa057b02db20cd3d253a612f Mon Sep 17 00:00:00 2001
From: Arijan <pmomo9099@gmail.com>
Date: Wed, 18 Jun 2025 01:19:02 +0800
Subject: [PATCH 4/4] update node version for prod

---
 .github/workflows/prod-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/prod-deploy.yml b/.github/workflows/prod-deploy.yml
index 3f7412c2a..535e4a5a5 100644
--- a/.github/workflows/prod-deploy.yml
+++ b/.github/workflows/prod-deploy.yml
@@ -27,7 +27,7 @@ jobs:
       - name: run yarn build
         uses: actions/setup-node@v3.6.0
         with:
-          node-version: "16"
+          node-version: "18"
           check-latest: true
 
       - name: Install and Build