Merge branch 'issue/30' into 'development'

Issue #30: Add redirects and adjusting others

See merge request !32

src/components/header/header.jsx

@@ -109,7 +109,11 @@ export default function Header() {
             </Grid>
           </Grid>
           <Grid container item xs={6} sm={6} md={4} justify="center">
-            <a className={classes.link}>
+            <a
+              href="https://genforms.c3sl.ufpr.br/"
+              title="Home"
+              className={classes.link}
+            >
               <h2 className={classes.form_creator}>
                 Gerenciador de Formulários
               </h2>

src/contexts/useForm.js

@@ -8,7 +8,7 @@ import {
   selectOptionsTesting,
   testSubformSchema,
   selectOptionTextTesting,
-  testTextValidation,
+  testTextValidation
 } from "../components/fieldsDisplayForm/utils/schemas";
 import {
   pushTitle,
@@ -16,7 +16,7 @@ import {
   pushSelect,
   pushRadio,
   pushCheckbox,
-  pushSubform,
+  pushSubform
 } from "../components/fieldsDisplayForm/utils/FormComposition";
 
 import api from "../api";
@@ -238,7 +238,7 @@ const useForm = () => {
    */
   async function setId() {
     const fetchData = async () => {
-      await api.get(`/form/${routeId}`).then(async function (res) {
+      await api.get(`/form/${routeId}`).then(async function(res) {
         let backForm = createFrontendForm(res.data);
         for (let i = 1; i < backForm.length; i++) {
           for (let j = 1; j < form.length; j++) {
@@ -248,13 +248,13 @@ const useForm = () => {
                   "question",
                   "description",
                   "options",
-                  "subformId",
+                  "subformId"
                 ]) !==
                   JSON.stringify(form[j], [
                     "question",
                     "description",
                     "options",
-                    "subformId",
+                    "subformId"
                   ]) ||
                 differentValidation(backForm[i], form[j])
               ) {
@@ -279,14 +279,17 @@ const useForm = () => {
       const post_response = await api
         .put(`/form/${routeId}`, data, {
           headers: {
-            authorization: `bearer ${window.sessionStorage.getItem("token")}`,
-          },
+            authorization: `bearer ${window.sessionStorage.getItem("token")}`
+          }
         })
-        .then(function (error) {
-          if (!error.response)
+        .then(function(error) {
+          if (!error.response) {
             alert("Seu formulário foi atualizado com sucesso.");
+            let path = `/signin`;
+            history.push(path);
+          }
         })
-        .catch(function (error) {
+        .catch(function(error) {
           if (error.response.status === 401) {
             let path = `/signin`;
             history.push(path);
@@ -304,13 +307,17 @@ const useForm = () => {
       const post_response = await api
         .post(`/form`, await createBackendForm(form), {
           headers: {
-            authorization: `bearer ${window.sessionStorage.getItem("token")}`,
-          },
+            authorization: `bearer ${window.sessionStorage.getItem("token")}`
+          }
         })
-        .then(function (error) {
-          if (!error.response) alert("Seu formulário foi criado com sucesso.");
+        .then(function(error) {
+          if (!error.response) {
+            alert("Seu formulário foi criado com sucesso.");
+            let path = `/signin`;
+            history.push(path);
+          }
         })
-        .catch(function (error) {
+        .catch(function(error) {
           alert("Um erro ocorreu.");
         });
     }
@@ -336,7 +343,7 @@ const useForm = () => {
     setValidationValue,
     removeValidation,
     onDragEnd,
-    submit,
+    submit
   };
 };