Lucas/t 369 on comment drawer i can reply to a comment thread and it (#206)
* Added prisma to suggested extension in container * Added comments and authors on drawer with proper resolving * Fix lint * Fix console log * Fixed generated front graphql from rebase * Fixed right drawer width and shared in theme * Added date packages and tooltip * Added date utils and tests * Added comment thread components * Fixed comment chip * wip * wip 2 * - Added string typing for DateTime scalar - Refactored user in a recoil state and workspace using it - Added comment creation * Prepared EditableCell refactor * Fixed line height and tooltip * Fix lint
This commit is contained in:
@ -1,43 +1,18 @@
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import { Navigate, Route, Routes } from 'react-router-dom';
|
||||
import { ThemeProvider } from '@emotion/react';
|
||||
|
||||
import { browserPrefersDarkMode } from '@/utils/utils';
|
||||
|
||||
import { RequireAuth } from './modules/auth/components/RequireAuth';
|
||||
import { getUserIdFromToken } from './modules/auth/services/AuthService';
|
||||
import { AppLayout } from './modules/ui/layout/AppLayout';
|
||||
import { darkTheme, lightTheme } from './modules/ui/layout/styles/themes';
|
||||
import { mapToUser, User } from './modules/users/interfaces/user.interface';
|
||||
import { useGetCurrentUserQuery } from './modules/users/services';
|
||||
import AuthCallback from './pages/auth/Callback';
|
||||
import { AuthCallback } from './pages/auth/AuthCallback';
|
||||
import { Login } from './pages/auth/Login';
|
||||
import { Companies } from './pages/companies/Companies';
|
||||
import { Opportunities } from './pages/opportunities/Opportunities';
|
||||
import { People } from './pages/people/People';
|
||||
|
||||
type AppProps = {
|
||||
themeEnabled?: boolean;
|
||||
};
|
||||
|
||||
export function App({ themeEnabled = true }: AppProps) {
|
||||
const [user, setUser] = useState<User | undefined>(undefined);
|
||||
|
||||
const userIdFromToken = getUserIdFromToken();
|
||||
const { data } = useGetCurrentUserQuery(userIdFromToken);
|
||||
|
||||
useEffect(() => {
|
||||
if (data?.users[0]) {
|
||||
setUser(mapToUser(data?.users[0]));
|
||||
}
|
||||
}, [data]);
|
||||
|
||||
const defaultTheme = browserPrefersDarkMode() ? darkTheme : lightTheme;
|
||||
|
||||
const app = (
|
||||
export function App() {
|
||||
return (
|
||||
<>
|
||||
{
|
||||
<AppLayout user={user}>
|
||||
<AppLayout>
|
||||
<Routes>
|
||||
<Route
|
||||
path="/"
|
||||
@ -78,14 +53,4 @@ export function App({ themeEnabled = true }: AppProps) {
|
||||
}
|
||||
</>
|
||||
);
|
||||
|
||||
return (
|
||||
<>
|
||||
{themeEnabled ? (
|
||||
<ThemeProvider theme={defaultTheme}>{app}</ThemeProvider>
|
||||
) : (
|
||||
app
|
||||
)}
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user