From 44ce3a3c98e7660930b219d26255d1e6fbffc635 Mon Sep 17 00:00:00 2001
From: Kamran Ahmed <kamranahmed.se@gmail.com>
Date: Mon, 10 Apr 2023 19:35:38 +0100
Subject: [PATCH] Change placement of constant

---
 .../AuthenticationFlow/EmailLoginForm.tsx     |  2 +-
 .../AuthenticationFlow/GitHubButton.tsx       |  2 +-
 .../AuthenticationFlow/GoogleButton.tsx       |  2 +-
 .../AuthenticationFlow/ResetPasswordForm.tsx  |  2 +-
 .../TriggerVerifyAccount.tsx                  |  2 +-
 src/components/Authenticator/authenticator.ts |  2 +-
 src/components/Navigation/Navigation.astro    |  5 -----
 src/components/Navigation/navigation.ts       |  2 +-
 src/components/Setting/ChangePasswordForm.tsx |  2 +-
 src/components/Setting/UpdateProfileForm.tsx  |  2 +-
 src/hooks/use-auth.ts                         |  3 +--
 src/lib/constants.ts                          |  8 --------
 src/lib/http.ts                               |  2 +-
 src/lib/jwt.ts                                |  2 ++
 src/pages/profile/index.astro                 | 19 -------------------
 src/pages/settings/change-password.astro      | 10 ----------
 src/pages/settings/profile.astro              | 10 ----------
 17 files changed, 13 insertions(+), 64 deletions(-)
 delete mode 100644 src/lib/constants.ts
 delete mode 100644 src/pages/profile/index.astro

diff --git a/src/components/AuthenticationFlow/EmailLoginForm.tsx b/src/components/AuthenticationFlow/EmailLoginForm.tsx
index e1ae7f15b..8a3b90827 100644
--- a/src/components/AuthenticationFlow/EmailLoginForm.tsx
+++ b/src/components/AuthenticationFlow/EmailLoginForm.tsx
@@ -1,9 +1,9 @@
 import Cookies from 'js-cookie';
 import type { FunctionComponent } from 'preact';
 import { useState } from 'preact/hooks';
-import { TOKEN_COOKIE_NAME } from '../../lib/constants';
 import Spinner from '../Spinner';
 import { httpPost } from '../../lib/http';
+import {TOKEN_COOKIE_NAME} from "../../lib/jwt";
 
 const EmailLoginForm: FunctionComponent<{}> = () => {
   const [email, setEmail] = useState<string>('');
diff --git a/src/components/AuthenticationFlow/GitHubButton.tsx b/src/components/AuthenticationFlow/GitHubButton.tsx
index b95a958ec..7cf29065f 100644
--- a/src/components/AuthenticationFlow/GitHubButton.tsx
+++ b/src/components/AuthenticationFlow/GitHubButton.tsx
@@ -2,8 +2,8 @@ import { useEffect, useState } from 'preact/hooks';
 
 import GitHubIcon from '../../icons/github.svg';
 import SpinnerIcon from '../../icons/spinner.svg';
-import { TOKEN_COOKIE_NAME } from '../../lib/constants';
 import Cookies from 'js-cookie';
+import {TOKEN_COOKIE_NAME} from "../../lib/jwt";
 
 type GitHubButtonProps = {};
 
diff --git a/src/components/AuthenticationFlow/GoogleButton.tsx b/src/components/AuthenticationFlow/GoogleButton.tsx
index 002b26a29..993def800 100644
--- a/src/components/AuthenticationFlow/GoogleButton.tsx
+++ b/src/components/AuthenticationFlow/GoogleButton.tsx
@@ -2,7 +2,7 @@ import { useEffect, useState } from 'preact/hooks';
 import Cookies from 'js-cookie';
 import GoogleIcon from '../../icons/google.svg';
 import SpinnerIcon from '../../icons/spinner.svg';
-import { TOKEN_COOKIE_NAME } from '../../lib/constants';
+import {TOKEN_COOKIE_NAME} from "../../lib/jwt";
 
 type GoogleButtonProps = {};
 
diff --git a/src/components/AuthenticationFlow/ResetPasswordForm.tsx b/src/components/AuthenticationFlow/ResetPasswordForm.tsx
index d512131a3..8ebbcf769 100644
--- a/src/components/AuthenticationFlow/ResetPasswordForm.tsx
+++ b/src/components/AuthenticationFlow/ResetPasswordForm.tsx
@@ -2,7 +2,7 @@ import { useEffect, useState } from 'preact/hooks';
 import Spinner from '../Spinner';
 import { httpPost } from '../../lib/http';
 import Cookies from 'js-cookie';
-import { TOKEN_COOKIE_NAME } from '../../lib/constants';
+import {TOKEN_COOKIE_NAME} from "../../lib/jwt";
 
 export default function ResetPasswordForm() {
   const [code, setCode] = useState('');
diff --git a/src/components/AuthenticationFlow/TriggerVerifyAccount.tsx b/src/components/AuthenticationFlow/TriggerVerifyAccount.tsx
index 251a3827a..0979152ea 100644
--- a/src/components/AuthenticationFlow/TriggerVerifyAccount.tsx
+++ b/src/components/AuthenticationFlow/TriggerVerifyAccount.tsx
@@ -3,7 +3,7 @@ import ErrorIcon from '../../icons/error.svg';
 
 import { useEffect, useState } from 'preact/hooks';
 import Cookies from 'js-cookie';
-import { TOKEN_COOKIE_NAME } from '../../lib/constants';
+import {TOKEN_COOKIE_NAME} from "../../lib/jwt";
 
 export function TriggerVerifyAccount() {
   const [isLoading, setIsLoading] = useState(true);
diff --git a/src/components/Authenticator/authenticator.ts b/src/components/Authenticator/authenticator.ts
index 76f9b24bb..2de9a1d5d 100644
--- a/src/components/Authenticator/authenticator.ts
+++ b/src/components/Authenticator/authenticator.ts
@@ -1,5 +1,5 @@
 import Cookies from 'js-cookie';
-import { TOKEN_COOKIE_NAME } from '../../lib/constants';
+import {TOKEN_COOKIE_NAME} from "../../lib/jwt";
 
 function easeInElement(el: Element) {
   el.classList.add('opacity-0', 'transition-opacity', 'duration-300');
diff --git a/src/components/Navigation/Navigation.astro b/src/components/Navigation/Navigation.astro
index 66317528e..1e9cd4f22 100644
--- a/src/components/Navigation/Navigation.astro
+++ b/src/components/Navigation/Navigation.astro
@@ -91,11 +91,6 @@ import AccountDropdown from './AccountDropdown.astro';
         </li>
 
         <!-- Links for logged in users -->
-        <li data-auth-required class='hidden'>
-          <a href='/profile' class='text-xl hover:text-blue-300 md:text-lg'>
-            Profile
-          </a>
-        </li>
         <li data-auth-required class='hidden'>
           <a
             href='/settings/profile'
diff --git a/src/components/Navigation/navigation.ts b/src/components/Navigation/navigation.ts
index 82aaf9233..356bcbb1a 100644
--- a/src/components/Navigation/navigation.ts
+++ b/src/components/Navigation/navigation.ts
@@ -1,6 +1,6 @@
 import Cookies from 'js-cookie';
-import { TOKEN_COOKIE_NAME } from '../../lib/constants';
 import { handleAuthRequired } from '../Authenticator/authenticator';
+import {TOKEN_COOKIE_NAME} from "../../lib/jwt";
 
 function logout() {
   Cookies.remove(TOKEN_COOKIE_NAME);
diff --git a/src/components/Setting/ChangePasswordForm.tsx b/src/components/Setting/ChangePasswordForm.tsx
index bf1f5d019..d413e9987 100644
--- a/src/components/Setting/ChangePasswordForm.tsx
+++ b/src/components/Setting/ChangePasswordForm.tsx
@@ -1,7 +1,7 @@
 import { useCallback, useEffect, useState } from 'preact/hooks';
 import Cookies from 'js-cookie';
-import { TOKEN_COOKIE_NAME } from '../../lib/constants';
 import Spinner from '../Spinner';
+import {TOKEN_COOKIE_NAME} from "../../lib/jwt";
 
 export default function ChangePasswordForm() {
   const [authProvider, setAuthProvider] = useState<
diff --git a/src/components/Setting/UpdateProfileForm.tsx b/src/components/Setting/UpdateProfileForm.tsx
index dc05f0971..4256bd145 100644
--- a/src/components/Setting/UpdateProfileForm.tsx
+++ b/src/components/Setting/UpdateProfileForm.tsx
@@ -1,7 +1,7 @@
 import { useCallback, useEffect, useState } from 'preact/hooks';
-import { TOKEN_COOKIE_NAME } from '../../lib/constants';
 import Cookies from 'js-cookie';
 import Spinner from '../Spinner';
+import {TOKEN_COOKIE_NAME} from "../../lib/jwt";
 
 export default function UpdateProfileForm() {
   const [name, setName] = useState('');
diff --git a/src/hooks/use-auth.ts b/src/hooks/use-auth.ts
index 1e868a414..891903de2 100644
--- a/src/hooks/use-auth.ts
+++ b/src/hooks/use-auth.ts
@@ -1,7 +1,6 @@
 import { useEffect, useState } from 'preact/hooks';
-import { TokenPayload, decodeToken } from '../lib/jwt';
+import {TokenPayload, decodeToken, TOKEN_COOKIE_NAME} from '../lib/jwt';
 import Cookies from 'js-cookie';
-import { TOKEN_COOKIE_NAME } from '../lib/constants';
 
 export const useAuth = () => {
   const [user, setUser] = useState<TokenPayload | null>(null);
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
deleted file mode 100644
index b588cc3e6..000000000
--- a/src/lib/constants.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export const TOKEN_COOKIE_NAME = '__roadmapsh_jt__';
-
-export const INTERNAL_PATHS = [
-  '/login',
-  '/signup',
-  '/settings/profile',
-  '/settings/change-password',
-];
diff --git a/src/lib/http.ts b/src/lib/http.ts
index df60708d5..9e6c5a06b 100644
--- a/src/lib/http.ts
+++ b/src/lib/http.ts
@@ -1,5 +1,5 @@
 import Cookies from 'js-cookie';
-import { TOKEN_COOKIE_NAME } from './constants';
+import {TOKEN_COOKIE_NAME} from "./jwt";
 
 type AppResponse = Record<string, any>;
 type FetchError = {
diff --git a/src/lib/jwt.ts b/src/lib/jwt.ts
index a243053c3..2c909fc3f 100644
--- a/src/lib/jwt.ts
+++ b/src/lib/jwt.ts
@@ -1,5 +1,7 @@
 import * as jose from 'jose';
 
+export const TOKEN_COOKIE_NAME = '__roadmapsh_jt__';
+
 export type TokenPayload = {
   id: string;
   email: string;
diff --git a/src/pages/profile/index.astro b/src/pages/profile/index.astro
deleted file mode 100644
index ab34b445b..000000000
--- a/src/pages/profile/index.astro
+++ /dev/null
@@ -1,19 +0,0 @@
----
-import ProfileDetails from '../../components/Profile/profile-details';
-import BaseLayout from '../../layouts/BaseLayout.astro';
----
-
-<BaseLayout title='Profile'>
-  <div class='container'>
-    <ProfileDetails client:idle />
-  </div>
-</BaseLayout>
-
-<script>
-  import Cookies from 'js-cookie';
-  import { TOKEN_COOKIE_NAME } from '../../lib/constants';
-  const token = Cookies.get(TOKEN_COOKIE_NAME);
-  if (!token) {
-    window.location.href = '/';
-  }
-</script>
diff --git a/src/pages/settings/change-password.astro b/src/pages/settings/change-password.astro
index 984440f54..98c7dd3ee 100644
--- a/src/pages/settings/change-password.astro
+++ b/src/pages/settings/change-password.astro
@@ -9,13 +9,3 @@ import SettingLayout from '../../layouts/SettingLayout.astro';
     <ChangePasswordForm client:load />
   </SettingSidebar>
 </SettingLayout>
-
-<script>
-  import Cookies from 'js-cookie';
-  import { TOKEN_COOKIE_NAME } from '../../lib/constants';
-  const token = Cookies.get(TOKEN_COOKIE_NAME);
-
-  if (!token) {
-    window.location.href = '/';
-  }
-</script>
diff --git a/src/pages/settings/profile.astro b/src/pages/settings/profile.astro
index 2971c03aa..29f30f89f 100644
--- a/src/pages/settings/profile.astro
+++ b/src/pages/settings/profile.astro
@@ -9,13 +9,3 @@ import SettingLayout from '../../layouts/SettingLayout.astro';
     <UpdateProfileForm client:load />
   </SettingSidebar>
 </SettingLayout>
-
-<script>
-  import Cookies from 'js-cookie';
-  import { TOKEN_COOKIE_NAME } from '../../lib/constants';
-  const token = Cookies.get(TOKEN_COOKIE_NAME);
-
-  if (!token) {
-    window.location.href = '/';
-  }
-</script>