removed double login prevention

This commit is contained in:
Alex Holliday committed 2024-08-15 11:39:45 -07:00
1 parent 53ea08fc48
commit ae46527965
7 files changed
+26 -75

No files matched your search

+4 -22
View File
@@ -78,28 +78,10 @@ function Sidebar() {
*
*/
const logout = async () => {
try {
// Make request to BE to remove JWT from user
await axiosInstance.post(
"/auth/logout",
{ email: authState.user.email },
{
headers: {
Authorization: `Bearer ${authState.authToken}`,
"Content-Type": "application/json",
},
}
);
// Clear auth state
dispatch(clearAuthState());
dispatch(clearUptimeMonitorState());
navigate("/login");
} catch (error) {
createToast({
body: error.message,
});
}
// Clear auth state
dispatch(clearAuthState());
dispatch(clearUptimeMonitorState());
navigate("/login");
};
/**
+18 -6
View File
@@ -160,13 +160,12 @@ const Monitors = () => {
// Bool for sorting arrow
const [isSorted, setIsSorted] = useState(false);
// Function to handle sorting on click of status text
const handleSort = () => {
setSortOrder(prevOrder => prevOrder * -1);
setSortOrder((prevOrder) => prevOrder * -1);
// Sort existing monitors with start of ascending order
const monitors = [...monitorState.monitors].sort(a => {
const monitors = [...monitorState.monitors].sort((a) => {
return a.status ? -1 * sortOrder : 1 * sortOrder;
});
@@ -182,9 +181,21 @@ const Monitors = () => {
{
id: 2,
name: (
<Box width="max-content" onClick={handleSort} style={{ cursor: "pointer" }}>
<Box
width="max-content"
onClick={handleSort}
style={{ cursor: "pointer" }}
>
Status
{isSorted ? <span>{sortOrder === -1 ? <ArrowUpwardRoundedIcon /> : <ArrowDownwardRoundedIcon />}</span> : null}
{isSorted ? (
<span>
{sortOrder === -1 ? (
<ArrowUpwardRoundedIcon />
) : (
<ArrowDownwardRoundedIcon />
)}
</span>
) : null}
</Box>
),
},
@@ -195,6 +206,7 @@ const Monitors = () => {
rows: [],
};
console.log(monitorState.monitors);
// Render out sorted monitors/default monitors
data.rows = sortedMonitors.map((monitor, idx) => {
const params = {