Merge branch 'master' of github.com:eisbuk/EisBuk into feature/error_…

…boundary
eisbuk · Sep 20, 2023 · 1178470 · 1178470
2 parents 0721e61 + 5e9667b
commit 1178470
Show file tree

Hide file tree

Showing 35 changed files with 598 additions and 66 deletions.
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/common/config/rush/repo-state.json b/common/config/rush/repo-state.json
@@ -1,5 +1,5 @@
 // DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush.
 {
-  "pnpmShrinkwrapHash": "cc17ab6655bc3d4f47bc885c0d816820c0d2a09a",
+  "pnpmShrinkwrapHash": "9be2627e80b4a097f61c386c05b488c48c47c0ff",
   "preferredVersionsHash": "bf21a9e8fbc5a3846fb05b4fa0859e0917b2202f"
 }
diff --git a/packages/client/src/controllers/Layout.tsx b/packages/client/src/controllers/Layout.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { useSelector } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 
 import { LinkItem, Layout, UserAvatarProps } from "@eisbuk/ui";
 import { PrivateRoutes } from "@eisbuk/shared/ui";
@@ -10,6 +10,8 @@ import BirthdayMenu from "@/controllers/BirthdayMenu";
 import AthletesApproval from "@/controllers/AthletesApproval";
 import { NotificationsContainer } from "@/features/notifications/components/index";
 
+import { signOut } from "@/store/actions/authOperations";
+
 import { getIsAdmin } from "@/store/selectors/auth";
 import { getOrgDisplayName } from "@/store/selectors/orgInfo";
 
@@ -20,6 +22,8 @@ interface Props {
 }
 
 const LayoutController: React.FC<Props> = (params) => {
+  const dispatch = useDispatch();
+
   const isAdmin = useSelector(getIsAdmin);
 
   const displayName = useSelector(getOrgDisplayName);
@@ -44,6 +48,7 @@ const LayoutController: React.FC<Props> = (params) => {
       adminLinks={adminLinks}
       Notifications={NotificationsContainer}
       additionalAdminContent={additionalAdminContent}
+      onLogout={() => dispatch(signOut())}
     />
   );
 };