Change placement of constant

pull/3813/head
Kamran Ahmed 2 years ago
parent 3072e42b0a
commit 44ce3a3c98
  1. 2
      src/components/AuthenticationFlow/EmailLoginForm.tsx
  2. 2
      src/components/AuthenticationFlow/GitHubButton.tsx
  3. 2
      src/components/AuthenticationFlow/GoogleButton.tsx
  4. 2
      src/components/AuthenticationFlow/ResetPasswordForm.tsx
  5. 2
      src/components/AuthenticationFlow/TriggerVerifyAccount.tsx
  6. 2
      src/components/Authenticator/authenticator.ts
  7. 5
      src/components/Navigation/Navigation.astro
  8. 2
      src/components/Navigation/navigation.ts
  9. 2
      src/components/Setting/ChangePasswordForm.tsx
  10. 2
      src/components/Setting/UpdateProfileForm.tsx
  11. 3
      src/hooks/use-auth.ts
  12. 8
      src/lib/constants.ts
  13. 2
      src/lib/http.ts
  14. 2
      src/lib/jwt.ts
  15. 19
      src/pages/profile/index.astro
  16. 10
      src/pages/settings/change-password.astro
  17. 10
      src/pages/settings/profile.astro

@ -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>('');

@ -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 = {};

@ -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 = {};

@ -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('');

@ -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);

@ -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');

@ -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'

@ -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);

@ -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<

@ -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('');

@ -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);

@ -1,8 +0,0 @@
export const TOKEN_COOKIE_NAME = '__roadmapsh_jt__';
export const INTERNAL_PATHS = [
'/login',
'/signup',
'/settings/profile',
'/settings/change-password',
];

@ -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 = {

@ -1,5 +1,7 @@
import * as jose from 'jose';
export const TOKEN_COOKIE_NAME = '__roadmapsh_jt__';
export type TokenPayload = {
id: string;
email: string;

@ -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>

@ -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>

@ -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>

Loading…
Cancel
Save