= {
+ AI: AILogo,
+ Cyber: CyberLogo,
+ Design: DesignLogo,
+ Hack: HackLogo,
+ General: ACMLogo,
+};
diff --git a/src/lib/services/CookieService.ts b/src/lib/services/CookieService.ts
index 9a58e7e5..2c48e8c9 100644
--- a/src/lib/services/CookieService.ts
+++ b/src/lib/services/CookieService.ts
@@ -1,3 +1,4 @@
+import { CookieType } from '@/lib/types/enums';
import { deleteCookie, getCookie, setCookie } from 'cookies-next';
import type { OptionsType } from 'cookies-next/lib/types';
@@ -33,3 +34,11 @@ export const deleteClientCookie = (key: string): void => {
export const deleteServerCookie = (key: string, options: OptionsType): void => {
deleteCookie(key, options);
};
+
+export const clearClientCookies = (): void => {
+ Object.keys(CookieType).forEach(key => deleteClientCookie(key));
+};
+
+export const clearServerCookies = (options: OptionsType): void => {
+ Object.keys(CookieType).forEach(key => deleteServerCookie(key, options));
+};
diff --git a/src/lib/services/PermissionService.ts b/src/lib/services/PermissionService.ts
index 29b40d55..42d74d70 100644
--- a/src/lib/services/PermissionService.ts
+++ b/src/lib/services/PermissionService.ts
@@ -22,7 +22,7 @@ export const canViewAdminPage = [
/**
* @returns Array of all possible user access types
*/
-export const allUserTypes = () => Object.values(UserAccessType) as UserAccessType[];
+export const allUserTypes = Object.values(UserAccessType);
/**
* @param types to exclude from array
@@ -32,3 +32,8 @@ export const allUserTypesExcept = (types: UserAccessType[]): UserAccessType[] =>
const values = Object.keys(UserAccessType) as UserAccessType[];
return values.filter(value => !types.includes(value));
};
+
+/**
+ * @returns Valid logged in user types
+ */
+export const loggedInUser = allUserTypesExcept([UserAccessType.RESTRICTED]);
diff --git a/src/lib/types/enums.ts b/src/lib/types/enums.ts
index c0794cac..0f21d6b6 100644
--- a/src/lib/types/enums.ts
+++ b/src/lib/types/enums.ts
@@ -3,6 +3,14 @@ export enum CookieType {
ACCESS_TOKEN = 'ACCESS_TOKEN',
}
+export enum Community {
+ HACK = 'Hack',
+ AI = 'AI',
+ CYBER = 'Cyber',
+ DESIGN = 'Design',
+ GENERAL = 'General',
+}
+
export enum UserAccessType {
RESTRICTED = 'RESTRICTED',
STANDARD = 'STANDARD',
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index 4d0dd14d..2ebf498e 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -236,14 +236,17 @@ export const getDateRange = (sort: string | number) => {
}
case 'past-week': {
from = now - DAY_SECONDS * 7;
+ to = now;
break;
}
case 'past-month': {
from = now - DAY_SECONDS * 28;
+ to = now;
break;
}
case 'past-year': {
from = now - DAY_SECONDS * 365;
+ to = now;
break;
}
case 'all-time': {
diff --git a/src/pages/404.tsx b/src/pages/404.tsx
index 820dd6b8..3951b70e 100644
--- a/src/pages/404.tsx
+++ b/src/pages/404.tsx
@@ -1,24 +1,12 @@
import { SignInButton } from '@/components/auth';
import { VerticalForm } from '@/components/common';
-import { Navbar } from '@/components/store';
-import { config } from '@/lib';
-import { PrivateProfile } from '@/lib/types/apiResponses';
import Cat404 from '@/public/assets/graphics/cat404.png';
import styles from '@/styles/pages/404.module.scss';
import Image from 'next/image';
-import { useRouter } from 'next/router';
-interface PageNotFoundProps {
- user?: PrivateProfile;
-}
-
-const PageNotFound = ({ user }: PageNotFoundProps) => {
- const router = useRouter();
+const PageNotFound = () => {
return (
- {user && router.asPath.startsWith(config.storeRoute) && (
-
- )}
Whoops, we ended up on the wrong page!
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index a32900d9..a816cc0d 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -6,37 +6,14 @@ import 'react-toastify/dist/ReactToastify.css';
import { SEO } from '@/components/common';
import { PageLayout } from '@/components/layout';
-import { CookieService } from '@/lib/services';
-import type { PrivateProfile } from '@/lib/types/apiResponses';
-import { CookieType } from '@/lib/types/enums';
-import { NextPageContext } from 'next';
import { ThemeProvider } from 'next-themes';
import type { AppProps } from 'next/app';
import { DM_Sans as DMSans } from 'next/font/google';
-import { useEffect, useState } from 'react';
import { ToastContainer } from 'react-toastify';
-interface InitialPropInterface {
- user?: PrivateProfile;
-}
const dmSans = DMSans({ subsets: ['latin'], weight: ['400', '500', '700'] });
-export default function MyApp({ Component, pageProps }: AppProps) {
- const [user, setUser] = useState(pageProps?.user);
-
- // For 404 page: Try getting user from cookie on client side (because 404
- // pages in Next.js must be a static page)
- useEffect(() => {
- if (pageProps?.user) {
- setUser(pageProps?.user);
- return;
- }
- const userCookie = CookieService.getClientCookie(CookieType.USER);
- if (userCookie) {
- setUser(JSON.parse(userCookie));
- }
- }, [pageProps?.user]);
-
+export default function MyApp({ Component, pageProps }: AppProps) {
return (
<>