diff --git a/docker-compose.yml b/docker-compose.yml index 17babfb0..325f3c52 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -53,9 +53,7 @@ services: upload-scripts web-authn client-policies - dynamic-scopes - volumes: - - /etc/localtime:/etc/localtime:ro + dynamic-scopes depends_on: - postgres command: start diff --git a/packages/client/src/App.tsx b/packages/client/src/App.tsx index 85f2a5ff..15af1fb1 100644 --- a/packages/client/src/App.tsx +++ b/packages/client/src/App.tsx @@ -13,20 +13,21 @@ import { MuiThemeProvider } from "@material-ui/core/styles"; import ResetScroll from "components/ResetScroll"; import { BrowserRouter, Routes, Route } from "react-router-dom"; -import { MuiPickersUtilsProvider } from '@material-ui/pickers'; +import { MuiPickersUtilsProvider } from "@material-ui/pickers"; import en from "i18n/en"; import fr from "i18n/fr"; import * as i18next from "i18next"; -import MomentUtils from 'material-ui-pickers/utils/moment-utils'; +import MomentUtils from "material-ui-pickers/utils/moment-utils"; import { initReactI18next } from "react-i18next"; import { Provider } from "react-redux"; -import createAppStore from "store"; +import createAppStore, { history } from "store"; import { Bright } from "utils/ThemeUtils"; import LanguageDetector from "i18next-browser-languagedetector"; import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; import { About } from "components/About"; +import { ConnectedRouter } from "connected-react-router"; const queryClient = new QueryClient(); @@ -62,6 +63,7 @@ const styles = createStyles({ const Content = () => { return ( + {/* */} {/* */} @@ -70,7 +72,7 @@ const Content = () => { - + { {/* */} + {/* */} ); }; diff --git a/packages/client/src/actions/ProjectActions.ts b/packages/client/src/actions/ProjectActions.ts index 9b7ed619..ce0a6358 100644 --- a/packages/client/src/actions/ProjectActions.ts +++ b/packages/client/src/actions/ProjectActions.ts @@ -120,7 +120,7 @@ export const createProjectThunk = dispatch(triggerUpsertProjectLoading()); return ProjectService.create(data) .then(project => { - dispatch(push(`/projects/${project.id}`)); + // dispatch(push(`/projects/${project.id}`)); dispatch(discardNewVideo()); return dispatch(succeedUpsertProject(project)); }) diff --git a/packages/client/src/actions/Signin/UserActions.tsx b/packages/client/src/actions/Signin/UserActions.tsx index fd8ba906..716a53bc 100644 --- a/packages/client/src/actions/Signin/UserActions.tsx +++ b/packages/client/src/actions/Signin/UserActions.tsx @@ -28,9 +28,12 @@ export const fetchCurrentUserThunk = () => (dispatch: Dispatch) => { }; export const doLogoutThunk = () => (dispatch: Dispatch) => { + + console.log("doLogoutThunk") return UserService .logout() .then(() => { + console.log("logout result") return dispatch(succeedCurrentUser()); }) .catch(error => { diff --git a/packages/client/src/scenes/Home/components/NewProject/NewProjectContainer.tsx b/packages/client/src/scenes/Home/components/NewProject/NewProjectContainer.tsx index 69dd9a8e..e528e330 100644 --- a/packages/client/src/scenes/Home/components/NewProject/NewProjectContainer.tsx +++ b/packages/client/src/scenes/Home/components/NewProject/NewProjectContainer.tsx @@ -53,6 +53,7 @@ import { AppState } from "types/StateTypes"; import { PeertubeVideoInfo } from "types/YoutubeTypes"; import { useState } from "react"; import { useTranslation } from "react-i18next"; +import { useNavigate } from "react-router-dom"; const styles = ({ spacing }: Theme) => createStyles({ @@ -161,6 +162,7 @@ const NewProjectContainer: React.FC = ({ onCancel, onNewTag, }) => { + const navigate = useNavigate(); const { t } = useTranslation(); const [state, setState] = useState({ project: { @@ -216,6 +218,14 @@ const NewProjectContainer: React.FC = ({ }); }; + const handleSubmit = async (project: ProjectCreateData)=>{ + const {error, payload} = await onSubmit(project); + if(!error){ + navigate(`/projects/${(payload as ProjectGraphRecord).id}`); + } + + + } if (video && user && user.role !== "Student") { return ( = ({