diff --git a/src/App.js b/src/App.js index 5f23ceaa5a4823aa5c854c155d6271efcee540e0..c06b1193cd2e0348f52a3c485fa5d15d7a643cba 100644 --- a/src/App.js +++ b/src/App.js @@ -40,6 +40,7 @@ const TabResourseFind = React.lazy(() => import("./Pages/TabsHelp/TabResourseFin const TabNetPart = React.lazy(() => import("./Pages/TabsHelp/TabNetPart")); const TabManageAc = React.lazy(() => import("./Pages/TabsHelp/TabManageAc")); const PasswordRecoveryPage = React.lazy(() => import("./Pages/PasswordRecoveryPage.js")); +const ChangePasswordPage = React.lazy(() => import("./Pages/ChangePasswordPage.js")); const PageProfessor = React.lazy(() => import("./Pages/PageProfessor.js")); const ResourcePage = React.lazy(() => import("./Pages/ResourcePage")); const TermsPage = React.lazy(() => import("./Pages/TermsPage.js")); @@ -208,6 +209,7 @@ export default function App() { <Route path="/participando-da-rede" component={TabNetPart} /> <Route path="/gerenciando-conta" component={TabManageAc} /> <Route path="/plataforma-mec" component={TabPlataformaMEC} /> + <Route path="/recuperar-senha/alterar-senha" component={ChangePasswordPage} /> <Route path="/recuperar-senha" component={PasswordRecoveryPage} /> <Route path="/usuario-publico/:userId" component={PublicUserPage} /> <Route diff --git a/src/Components/Notifications.js b/src/Components/Notifications.js index 854eb9807fa63dcee9367dc54fc78249b68e369b..d6973d15a49070fae58e2d226005b9b3162937eb 100644 --- a/src/Components/Notifications.js +++ b/src/Components/Notifications.js @@ -204,8 +204,8 @@ export default function Notification(props) { </div> { notifications.map((notification) => + (notification.recipient !== null) && (notification.viewed === false) && - (notification.recipient_type !== "NilClass") && <ActivityListItem onMenuBar={true} avatar={notification.owner.avatar ? apiDomain + notification.owner.avatar : null} diff --git a/src/Components/TabPanels/UserPageTabs/PanelAtividades.js b/src/Components/TabPanels/UserPageTabs/PanelAtividades.js index 90b6268081f645b6643444b5427c238de7eb013a..ff2126a3a850ea9e949656f35edec15719c65008 100644 --- a/src/Components/TabPanels/UserPageTabs/PanelAtividades.js +++ b/src/Components/TabPanels/UserPageTabs/PanelAtividades.js @@ -188,7 +188,7 @@ export default function TabPanelAtividades(props) { <List height={400} width={300}> { notifications.map((notification, id) => - (notification.recipient_type !== "NilClass") && + (notification.recipient !== null) && <ActivityListItem key={id} onMenuBar={false} diff --git a/src/Pages/PasswordRecoveryPage.js b/src/Pages/PasswordRecoveryPage.js index 4a6b25728b3353b725ab5ad31287d67b3baf7abc..1ed9b8ccc586b4e7ac96150bd434a27cd2f2815c 100644 --- a/src/Pages/PasswordRecoveryPage.js +++ b/src/Pages/PasswordRecoveryPage.js @@ -48,7 +48,7 @@ export default function PasswordRecoveryPage (props) { const payload = { "email" : formEmail.value, - "redirect_url" : "http://localhost:4000/recuperar-senha/alterar-senha" // ### arrumar "https://plataformaintegrada.mec.gov.br/recuperar-senha/alterar-senha" + "redirect_url" : "https://plataformaintegrada.mec.gov.br/recuperar-senha/alterar-senha" //"http://localhost:4000/recuperar-senha/alterar-senha" } postRequest(url, payload, handleSuccessfulSubmit, (error) => {console.log(error)}) diff --git a/src/Pages/ResourcePage.js b/src/Pages/ResourcePage.js index e4a6c80f472493170804393c3b07410b55345bf1..37d96115166a1ae2cb2ae97c9b83108c9427fbcc 100644 --- a/src/Pages/ResourcePage.js +++ b/src/Pages/ResourcePage.js @@ -138,7 +138,8 @@ export default function LearningObjectPage(props) { setRecurso(data); }, (error) => { - handleSnackbar(7) + handleSnackbar(7); + setErro(true); } ); };