Skip to content

Commit c30bd80

Browse files
Mathias-aSnorre98
authored andcommitted
1715-improve infopage form and display styling (#1716)
* fix react router imports * better dark mode handeling * make form a little nicer --------- Co-authored-by: Snorre Sæther <[email protected]>
1 parent 9d9f516 commit c30bd80

File tree

68 files changed

+180
-151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+180
-151
lines changed

frontend/.storybook/preview.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import '~/global.scss';
22

33
import { useEffect } from 'react';
44
import { useTranslation } from 'react-i18next';
5-
import { BrowserRouter } from 'react-router-dom';
5+
import { BrowserRouter } from 'react-router';
66
import { THEME } from '~/constants';
77
import { AuthContextProvider } from '~/context/AuthContext';
88
import { GlobalContextProvider } from '~/context/GlobalContextProvider';

frontend/src/App.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import { Helmet, HelmetProvider } from 'react-helmet-async';
2-
import { Outlet } from 'react-router-dom';
2+
import { Outlet } from 'react-router';
33
import { ToastContainer } from 'react-toastify';
44
import { useGoatCounter, useIsDarkTheme } from '~/hooks';
55

66
import 'react-toastify/dist/ReactToastify.min.css';
77

88
// Neccessary import for translations.
9-
import { CommandMenu, UserFeedback, useScrollToTop } from './Components';
10-
import './i18n/i18n';
119
import { useTranslation } from 'react-i18next';
1210
import { z } from 'zod';
1311
import { makeZodI18nMap } from 'zod-i18n-map';
12+
import { CommandMenu, UserFeedback, useScrollToTop } from './Components';
13+
import './i18n/i18n';
1414

1515
export function App() {
1616
const goatCounterCode = import.meta.env.VITE_GOATCOUNTER_CODE;

frontend/src/Components/Breadcrumb/Breadcrumb.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Icon } from '@iconify/react';
22
import type { ReactNode } from 'react';
3-
import { type UIMatch, useMatches } from 'react-router-dom';
3+
import { type UIMatch, useMatches } from 'react-router';
44
import { Link } from '~/Components';
55
import { ROUTES } from '~/routes';
66
import styles from './Breadcrumb.module.scss';

frontend/src/Components/Button/Button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { default as classnames } from 'classnames';
2-
import { Link } from 'react-router-dom';
2+
import { Link } from 'react-router';
33
import type { ButtonType, Children } from '~/types';
44
import styles from './Button.module.scss';
55
import type { ButtonDisplay, ButtonTheme } from './types';

frontend/src/Components/DynamicOrgOutlet/DynamicOrgOutlet.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useRouteLoaderData } from 'react-router-dom';
1+
import { useRouteLoaderData } from 'react-router';
22
import type { RecruitmentLoader } from '~/router/loaders';
33
import { OrgNameType } from '~/types';
44
import { IsNumber } from '~/utils';

frontend/src/Components/IsfitOutlet/IsfitNavbar/IsfitNavbar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Link } from 'react-router-dom';
1+
import { Link } from 'react-router';
22
import { ROUTES } from '~/routes';
33
import { IsfitLogo } from '../../Logo/components';
44
import styles from './IsfitNavbar.module.scss';

frontend/src/Components/IsfitOutlet/IsfitOutlet.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Outlet } from 'react-router-dom';
1+
import { Outlet } from 'react-router';
22
import { IsfitNavbar } from './IsfitNavbar/IsfitNavbar';
33
import styles from './IsfitOutlet.module.scss';
44

frontend/src/Components/Navbar/Navbar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { default as classNames } from 'classnames';
33
import { useEffect, useState } from 'react';
44
import { useCookies } from 'react-cookie';
55
import { useTranslation } from 'react-i18next';
6-
import { useLocation, useNavigate } from 'react-router-dom';
6+
import { useLocation, useNavigate } from 'react-router';
77
import { Button, Link, ThemeSwitch } from '~/Components';
88
import { getActiveRecruitments, logout, stopImpersonatingUser } from '~/api';
99
import { logoWhite } from '~/assets';

frontend/src/Components/Navbar/components/NavbarItem/NavbarItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Icon } from '@iconify/react';
22
import classNames from 'classnames';
3-
import { Link } from 'react-router-dom';
3+
import { Link } from 'react-router';
44
import { useGlobalContext } from '~/context/GlobalContextProvider';
55
import { useClickOutside, useDesktop } from '~/hooks';
66
import type { Children, SetState } from '~/types';

frontend/src/Components/ProtectedRoute/ProtectedRoute.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { ReactNode } from 'react';
2-
import { Navigate, useLocation } from 'react-router-dom';
2+
import { Navigate, useLocation } from 'react-router';
33
import { useAuthContext } from '~/context/AuthContext';
44
import { ROUTES } from '~/routes';
55
import { hasPermissions } from '~/utils';

0 commit comments

Comments
 (0)