Merge branch 'master' into 'jonathan'

# Conflicts:
#   public/index.html

public/index.html

@@ -11,7 +11,7 @@
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
-      content="Forum based website created for Functional Programming courses project"
+      content="Forum based website created for Functional Programming course project"
     />
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
     <!--

src/components/thread/Post.jsx

@@ -130,11 +130,7 @@ export default function Post(props) {
         <div className="likeSection">
           {loggedIn && (
             <button className="likeButton" onClick={handleLike}>
-              {isLiked ? (
-                <i className="far fa-thumbs-up active" />
-              ) : (
-                <i className="far fa-thumbs-up inactive" />
-              )}
+              <i className={`far fa-thumbs-up ${isLiked ? 'active' : 'inactive'}`} />
             </button>
           )}
           <div className="pointContainer">

src/components/topic/CreateTopicForm.jsx

+/* eslint-disable eqeqeq */
 import axios from 'axios';
 import React, { useState } from 'react';
 import { useInput } from '../../helpers/hooks/input-hook';

src/components/topic/Topic.jsx

+/* eslint-disable eqeqeq */
 import React, { useEffect, useState } from 'react';
 import axios from 'axios';
 import ThreadList from '../thread/ThreadList';

src/components/topic/TopicList.jsx

+/* eslint-disable eqeqeq */
 import React, { useEffect, useState } from 'react';
 import axios from 'axios';
 import { Link } from 'react-router-dom';

src/helpers/services/authHeader.service.js

 export default function authHeader() {
   const user = JSON.parse(localStorage.getItem('user'));
 
-  if (user && user.tokenId)
-    return { Authorization: `Bearer ${user.accessToken}` };
-  else if (user && user.data.token)
+  if (user?.tokenId)
+    return { Authorization: `Bearer ${user?.accessToken}` };
+  else if (user?.data?.token)
     // kalo make google
-    return { Authorization: `Bearer ${user.data.token}` };
+    return { Authorization: `Bearer ${user?.data.token}` };
   // if (user && user.token)
   //     return { Authorization: `Bearer ${user.token}` }
   else return {};