Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/Admin/EditUser/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import clsx from 'clsx';
import styles from './styles.module.scss';
import { observer } from 'mobx-react-lite';
import { Role, RoleAccessLevel, RoleNames, User as UserProps } from '@tdev-api/user';
import { Role, RoleAccessLevel, RoleNames } from '@tdev-api/user';
import Card from '@tdev-components/shared/Card';
import TextInput from '@tdev-components/shared/TextInput';
import Button from '@tdev-components/shared/Button';
Expand Down
1 change: 0 additions & 1 deletion src/models/User.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { action, computed, observable } from 'mobx';
import { AuthProvider, Role, RoleAccessLevel, User as UserProps } from '@tdev-api/user';
import { UserStore } from '@tdev-stores/UserStore';
import siteConfig from '@generated/docusaurus.config';

export default class User {
readonly store: UserStore;
Expand Down
8 changes: 4 additions & 4 deletions src/pages/login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const LoginPage = observer(() => {
const { data: session } = authClient.useSession();
const signInPage = useBaseUrl('/signIn');
if (session?.user || NO_AUTH) {
return <Redirect to={'/user'} />;
return <Redirect to={'/'} />;
}
return (
<Layout>
Expand All @@ -41,7 +41,7 @@ const LoginPage = observer(() => {
onClick={() =>
authClient.signIn.social({
provider: 'microsoft',
callbackURL: `${APP_URL}/user`
callbackURL: APP_URL
})
}
text="Schul-Account"
Expand All @@ -55,7 +55,7 @@ const LoginPage = observer(() => {
onClick={() =>
authClient.signIn.social({
provider: 'github',
callbackURL: `${APP_URL}/user`
callbackURL: APP_URL
})
}
text="Github"
Expand All @@ -81,7 +81,7 @@ const Login = observer(() => {
const { data: session } = authClient.useSession();

if (session?.user || NO_AUTH) {
return <Redirect to={'/user'} />;
return <Redirect to={'/'} />;
}
return <LoginPage />;
});
Expand Down
8 changes: 3 additions & 5 deletions src/pages/signIn/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,22 @@ import clsx from 'clsx';
import Layout from '@theme/Layout';

import styles from './styles.module.scss';
import { useStore } from '../../hooks/useStore';
import Button from '../../components/shared/Button';
import { authClient } from '@site/src/auth-client';
import { Redirect } from '@docusaurus/router';
import useBaseUrl from '@docusaurus/useBaseUrl';
import TextInput from '@tdev-components/shared/TextInput';
import { observer } from 'mobx-react-lite';
import { useStore } from '@tdev-hooks/useStore';
import Button from '@tdev-components/shared/Button';

const SignIn = observer((): React.ReactNode => {
const [email, setEmail] = React.useState('');
const [password, setPassword] = React.useState('');
const authStore = useStore('authStore');

const { data: session } = authClient.useSession();
const userPage = useBaseUrl('/user');

if (session?.user) {
return <Redirect to={userPage} />;
return <Redirect to={'/'} />;
}

return (
Expand Down
13 changes: 2 additions & 11 deletions src/pages/user/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,36 +6,27 @@ import { observer } from 'mobx-react-lite';
import { Redirect } from '@docusaurus/router';
import {
mdiArrowRightThin,
mdiBackupRestore,
mdiCircle,
mdiCloudQuestion,
mdiDeleteEmptyOutline,
mdiHarddiskRemove,
mdiLogout,
mdiMoonWaxingCrescent,
mdiRefresh,
mdiThemeLightDark,
mdiWhiteBalanceSunny
mdiLogout
} from '@mdi/js';
import siteConfig from '@generated/docusaurus.config';
import { useStore } from '@tdev-hooks/useStore';
import Button from '@tdev-components/shared/Button';
import Loader from '@tdev-components/Loader';
import DefinitionList from '@tdev-components/DefinitionList';
import Icon from '@mdi/react';
import UserTable from '@tdev-components/Admin/UserTable';
import NavReloadRequest from '@tdev-components/Admin/ActionRequest/NavReloadRequest';
import Storage from '@tdev-stores/utils/Storage';
import { AuthProviderColor, AuthProviderIcons, logout } from '@tdev-api/user';
import SelectInput from '@tdev-components/shared/SelectInput';
import { AuthProviderColor, AuthProviderIcons } from '@tdev-api/user';
import useIsBrowser from '@docusaurus/useIsBrowser';
import { useIsLive } from '@tdev-hooks/useIsLive';
import Badge from '@tdev-components/shared/Badge';
import { SIZE_M, SIZE_XS } from '@tdev-components/shared/iconSizes';
import { Confirm } from '@tdev-components/shared/Button/Confirm';
import api from '@tdev-api/base';
import { authClient } from '@tdev/auth-client';
import useCodeTheme from '@tdev-hooks/useCodeTheme';
import CodeThemeToggle from '@tdev-components/util/CodeThemeToggle';

const { NO_AUTH, OFFLINE_API, TEST_USER } = siteConfig.customFields as {
Expand Down