updated translations and oauth

components/homepage/casesearch.js

@@ -76,22 +76,22 @@ let CaseSearch = (props) => {
     const router = useRouter();
     const { locale } = router;
 
-    const [showSpinnerState, setShowSpinnerState] = useState(false);
+    //const [showSpinnerState, setShowSpinnerState] = useState(false);
 
-    let spinnerState = () => {
-        showSpinnerState == true
-            ? setShowSpinnerState(false)
-            : setShowSpinnerState(true);
-    };
+    // let spinnerState = () => {
+    //     showSpinnerState == true
+    //         ? setShowSpinnerState(false)
+    //         : setShowSpinnerState(true);
+    // };
 
     const onHandleSubmit = (values) => {
-        spinnerState();
+        // spinnerState();
         router.replace({
             pathname:
                 router.locale == "cy"
                     ? "/canlyniadauchwilio"
                     : "/searchresults",
-            query: { q: values.basicSearch },
+            query: { q: values.basicSearch.trim() },
             shallow: true,
         });
     };
@@ -151,11 +151,11 @@ let CaseSearch = (props) => {
                         </Link>
                     </div>
                 </form>
-                <LoadingOverlay
+                {/* <LoadingOverlay
                     active={showSpinnerState}
                     spinner
                     text={t("common:spinner-searching")}
-                />
+                /> */}
             </div>
         </>
     );

components/homepage/dns.js

@@ -6,16 +6,16 @@ import LoadingOverlay from "react-loading-overlay";
 
 export default function Dns() {
     let { t } = useTranslation();
-    const [showSpinnerState, setShowSpinnerState] = useState(false);
+    //const [showSpinnerState, setShowSpinnerState] = useState(false);
 
     const router = useRouter();
     const { locale } = router;
 
-    let spinnerState = () => {
-        showSpinnerState == true
-            ? setShowSpinnerState(false)
-            : setShowSpinnerState(true);
-    };
+    // let spinnerState = () => {
+    //     showSpinnerState == true
+    //         ? setShowSpinnerState(false)
+    //         : setShowSpinnerState(true);
+    // };
     return (
         <div className="card" id="casesearch-card">
             <div className="card-body">
@@ -37,20 +37,20 @@ export default function Dns() {
                     >
                         <a
                             className="govuk-button withChevron govuk-button-cta"
-                            onClick={() => {
-                                spinnerState();
-                            }}
+                            // onClick={() => {
+                            //     spinnerState();
+                            // }}
                         >
                             {t("home:dns-card-button")}
                         </a>
                     </Link>
                 </div>
             </div>
-            <LoadingOverlay
+            {/* <LoadingOverlay
                 active={showSpinnerState}
                 spinner
                 text={t("common:spinner-loading")}
-            />
+            /> */}
         </div>
     );
 }

components/homepage/login.js

@@ -114,17 +114,22 @@ let Login = (props) => {
     const router = useRouter();
     const { locale } = router;
 
-    const [showSpinnerState, setShowSpinnerState] = useState(false);
+    // const [showSpinnerState, setShowSpinnerState] = useState(false);
     const [validLoginID, setValidLoginID] = useState(null);
 
-    let spinnerState = () => {
-        showSpinnerState == true
-            ? setShowSpinnerState(false)
-            : setShowSpinnerState(true);
-    };
+    // let spinnerState = () => {
+    //     showSpinnerState == true
+    //         ? setShowSpinnerState(false)
+    //         : setShowSpinnerState(true);
+    // };
 
     const onHandleSubmit = (values) => {
-        spinnerState();
+        //spinnerState();
+
+        let now = new Date();
+        let expDate = new Date(now);
+
+        expDate.setDate(now.getDate() + 1);
 
         getLogin(values.loginUserID, values.loginUserPassword).then((data) => {
             data.value.length != 0
@@ -132,14 +137,16 @@ let Login = (props) => {
                   setLoggedInUserId(data.value[0].contactid),
                   setCookie(null, "pinsUser", data.value[0].contactid, {
                       path: "/",
+                      expires: expDate,
                   }),
-                  spinnerState(),
+                  //   spinnerState(),
                   router.replace({
                       pathname:
                           router.locale == "cy" ? "/fymhorth" : "/myportal",
                       shallow: true,
                   }))
-                : (setShowSpinnerState(false), setValidLoginID(false));
+                : //setShowSpinnerState(false),
+                  setValidLoginID(false);
         });
     };
 
@@ -147,12 +154,12 @@ let Login = (props) => {
 
     useEffect(() => {
         cookies.pinsUser != null || typeof cookies.pinsUser != "undefined"
-            ? (spinnerState(),
+            ? // spinnerState(),
               router.replace("/myportal", null, {
                   shallow: true,
-              }))
+              })
             : "";
-    }, []);
+    }, [cookies.pinsUser, router]);
 
     return (
         <div className="card" id="login-card">
@@ -243,11 +250,11 @@ let Login = (props) => {
                     </div>
                 </div>
             </form>
-            <LoadingOverlay
+            {/* <LoadingOverlay
                 active={showSpinnerState}
                 spinner
                 text="Logging in"
-            />
+            /> */}
         </div>
     );
 };