temporary open for tester off

VK-Lab · Mar 25, 2024 · c51b82f · c51b82f
1 parent cedf1a6
commit c51b82f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/packages/admin/src/components/LayoutHeader/index.tsx b/packages/admin/src/components/LayoutHeader/index.tsx
@@ -70,7 +70,7 @@ const Header = () => {
                     className="text-base text-center text-white-A700 w-auto"
                     size="txtLexendSemiBold16WhiteA700"
                   >
-                    <Link href={AdminPaths.CAMPAIGNS}>Dashboard</Link>
+                    <Link href={AdminPaths.DASHBOARD}>Dashboard</Link>
                   </Text>
                 </div>
               </div>

diff --git a/packages/admin/src/hocs/RouterGuard.tsx b/packages/admin/src/hocs/RouterGuard.tsx
@@ -4,7 +4,7 @@ import { useEffect, useCallback } from 'react';
 import { useAccount } from '@casperdash/usewallet';
 import { AdminPaths, PublicPaths } from '@mlem-admin/enums/paths.enum';
 import { checkUser, setUserInfo } from '@mlem-admin/services/auth';
-// import { isAdmin } from '@mlem-admin/utils/permission';
+import { isAdmin } from '@mlem-admin/utils/permission';
 import { useRouter } from 'next/router';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -43,22 +43,22 @@ const RouterGuard = ({ children }: { children: any }) => {
 
         setUserInfo(JSON.stringify(user));
 
-        // if (isAdmin(user)) {
-        //   return;
-        // }
+        if (isAdmin(user)) {
+          return;
+        }
 
         const path = url.split('?')[0];
         if (!adminPaths.includes(path as string)) {
           return;
         }
 
-        // router.push({
-        //   pathname: PublicPaths.HOME,
-        // });
+        router.push({
+          pathname: PublicPaths.HOME,
+        });
       } catch (error) {
-        // router.push({
-        //   pathname: PublicPaths.HOME,
-        // });
+        router.push({
+          pathname: PublicPaths.HOME,
+        });
       }
 
       return;

diff --git a/packages/admin/src/utils/permission.ts b/packages/admin/src/utils/permission.ts
@@ -1,8 +1,5 @@
 import { RoleEnum, User } from '@mlem-admin/types/user';
 
 export const isAdmin = (user: User) => {
-  return (
-    (user.roles && user.roles.includes(RoleEnum.ADMIN)) ||
-    (user.roles && user.roles.includes(RoleEnum.USER))
-  );
+  return user.roles && user.roles.includes(RoleEnum.ADMIN);
 };