From fc53cf93c5b5637cce75b2bc2ead324260757d42 Mon Sep 17 00:00:00 2001
From: Lucas Schoenfelder <les17@inf.ufpr.br>
Date: Fri, 29 Jan 2021 11:35:26 -0300
Subject: [PATCH] fixed merge error
---
src/Components/HelperFunctions/getAxiosConfig.js | 2 +-
src/Components/TabPanels/UserPageTabs/PanelAtividades.js | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/Components/HelperFunctions/getAxiosConfig.js b/src/Components/HelperFunctions/getAxiosConfig.js
index 0286868f..0d83716d 100644
--- a/src/Components/HelperFunctions/getAxiosConfig.js
+++ b/src/Components/HelperFunctions/getAxiosConfig.js
@@ -11,7 +11,7 @@ export const getAxiosConfig = () => {
config.headers["Access-Token"] = sessionStorage.getItem('@portalmec/accessToken');
config.headers.Client = sessionStorage.getItem('@portalmec/clientToken')
config.headers.Uid = sessionStorage.getItem('@portalmec/uid')
-
+ config.headers.Expiry = sessionStorage.getItem('@portalmec/expiry')
return config
}
diff --git a/src/Components/TabPanels/UserPageTabs/PanelAtividades.js b/src/Components/TabPanels/UserPageTabs/PanelAtividades.js
index 770b03b5..76a45f83 100644
--- a/src/Components/TabPanels/UserPageTabs/PanelAtividades.js
+++ b/src/Components/TabPanels/UserPageTabs/PanelAtividades.js
@@ -50,6 +50,7 @@ export default function TabPanelAtividades (props) {
const url = `/feed?offset=0&limit=30`
makeAxiosGetRequest(url, handleSuccess, (error) => {console.log(error)})
+
}, [])
return (
--
GitLab