Fixing merge conflicts

Author: Simeranjeet Sandhu

src/__tests__/components/buttons/ExternalButton.test.js

@@ -1,3 +1,5 @@
+'use strict';
+
 import { render, screen } from '@testing-library/react';
 
 import ExternalBtn from '@/components/buttons/ExternalBtn';

src/__tests__/hooks/useSubscribedLists.test.js

@@ -1,5 +1,7 @@
 'use strict';
 
+'use strict';
+
 // tests for hooks/useSubscribedLists.js
 import { renderHook } from '@testing-library/react-hooks';
 import mockAxios from 'jest-mock-axios';

src/config/xAPIConfig.js

@@ -1,5 +1,7 @@
 'use strict';
 
+'use strict';
+
 export const endpoint = process.env.NEXT_PUBLIC_XAPI_LRS_ENDPOINT;
 export const key = process.env.NEXT_PUBLIC_XAPI_LRS_KEY;
 export const secret = process.env.NEXT_PUBLIC_XAPI_LRS_SECRET;

src/hooks/useStorage.js

@@ -14,6 +14,15 @@ function useStorage(key, defaultValue, storageObject) {
       }
       return parseJSON;
     }
+    if (jsonValue != null) {
+      let parseJSON = null;
+      try{
+        parseJSON = JSON.parse(jsonValue);
+      }catch(error){
+        console.log("Storage parsing was not able to be processed!")
+      }
+      return parseJSON;
+    }
 
     if (typeof initialValue === 'function') {
       return defaultValue();

src/pages/lists/edit/[listId].js

@@ -1,5 +1,7 @@
 'use strict';
 
+'use strict';
+
 import {
   EyeIcon,
   EyeOffIcon,

src/pages/login.js

@@ -91,6 +91,8 @@ export default function Login() {
             placeholder='Email'
             maxLength="200"
             onKeyPress={(e)=>checkSpecialChar(e)}
+            maxLength="200"
+            onKeyPress={(e)=>checkSpecialChar(e)}
             className='shadow focus:shadow-md rounded-md p-2 w-full border border-gray-200 text-gray-700 focus:ring-2 ring-blue-400 outline-none  transition-all  duration-200'
           />
           <input

src/pages/register.js

@@ -1,5 +1,7 @@
 'use strict';
 
+'use strict';
+
 import {
   CheckCircleIcon,
   RefreshIcon,
@@ -180,6 +182,7 @@ export default function Register() {
       })
       .catch((err) => {
         console.log("Account registration failed.");
+        console.log("Account registration failed.");
       })
       .finally(() => {
         setLoading(false);

src/utils/xapi/xAPIMapper.js

@@ -1,5 +1,7 @@
 'use strict';
 
+'use strict';
+
 import { endpoint, key, secret } from '@/config/xAPIConfig';
 import XAPI from "@xapi/xapi";
 

src/utils/xapi/xAPIWrapper.js

@@ -1,5 +1,7 @@
 'use strict';
 
+'use strict';
+
 import xAPIMapper from "./xAPIMapper";
 
 /**