Change placement of constant

m-a-n-o · Apr 10, 2023 · 44ce3a3 · 44ce3a3
1 parent 3072e42
commit 44ce3a3
Show file tree

Hide file tree

Showing 17 changed files with 13 additions and 64 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
diff --git 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
@@ -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>