Merge pull request #862 from bluewave-labs/develop

Develop -> Master
This commit is contained in:
Alexander Holliday authored and GitHub committed 2024-09-23 21:09:26 -07:00
commit 35c1dfd107
20 files changed
+610 -322

No files matched your search

+4 -4
View File
@@ -83,14 +83,14 @@ function App() {
path="integrations" path="integrations"
element={<ProtectedRoute Component={Integrations} />} element={<ProtectedRoute Component={Integrations} />}
/> />
<Route {/* <Route
path="maintenance" path="maintenance"
element={<ProtectedRoute Component={MaintenanceWithAdminProp} />} element={<ProtectedRoute Component={MaintenanceWithAdminProp} />}
/> /> */}
<Route {/* <Route
path="/maintenance/create" path="/maintenance/create"
element={<CreateNewMaintenanceWindow />} element={<CreateNewMaintenanceWindow />}
/> /> */}
<Route <Route
path="settings" path="settings"
element={<ProtectedRoute Component={SettingsWithAdminProp} />} element={<ProtectedRoute Component={SettingsWithAdminProp} />}
+1 -1
View File
@@ -55,7 +55,7 @@ const menu = [
}, },
{ name: "Incidents", path: "incidents", icon: <Incidents /> }, { name: "Incidents", path: "incidents", icon: <Incidents /> },
// { name: "Status pages", path: "status", icon: <StatusPages /> }, // { name: "Status pages", path: "status", icon: <StatusPages /> },
{ name: "Maintenance", path: "maintenance", icon: <Maintenance /> }, // { name: "Maintenance", path: "maintenance", icon: <Maintenance /> },
// { name: "Integrations", path: "integrations", icon: <Integrations /> }, // { name: "Integrations", path: "integrations", icon: <Integrations /> },
{ {
name: "Account", name: "Account",
@@ -55,7 +55,9 @@ const TeamPanel = () => {
useEffect(() => { useEffect(() => {
const fetchTeam = async () => { const fetchTeam = async () => {
try { try {
const response = await networkService.getAllUsers(authToken); const response = await networkService.getAllUsers({
authToken: authToken,
});
setMembers(response.data.data); setMembers(response.data.data);
} catch (error) { } catch (error) {
createToast({ createToast({
@@ -187,11 +189,11 @@ const TeamPanel = () => {
} }
try { try {
await networkService.requestInvitationToken( await networkService.requestInvitationToken({
authToken, authToken: authToken,
toInvite.email, email: toInvite.email,
toInvite.role role: toInvite.role,
); });
closeInviteModal(); closeInviteModal();
createToast({ createToast({
body: "Member invited. They will receive an email with details on how to create their account.", body: "Member invited. They will receive an email with details on how to create their account.",
+14 -5
View File
@@ -66,8 +66,11 @@ export const update = createAsyncThunk(
form.deleteProfileImage && form.deleteProfileImage &&
fd.append("deleteProfileImage", form.deleteProfileImage); fd.append("deleteProfileImage", form.deleteProfileImage);
const res = await networkService.updateUser(token, user._id, fd); const res = await networkService.updateUser({
console.log(res); authToken: token,
userId: user._id,
form: fd,
});
return res.data; return res.data;
} catch (error) { } catch (error) {
if (error.response && error.response.data) { if (error.response && error.response.data) {
@@ -88,7 +91,10 @@ export const deleteUser = createAsyncThunk(
const user = jwtDecode(data); const user = jwtDecode(data);
try { try {
const res = await networkService.deleteUser(data, user._id); const res = await networkService.deleteUser({
authToken: data,
userId: user._id,
});
return res.data; return res.data;
} catch (error) { } catch (error) {
if (error.response && error.response.data) { if (error.response && error.response.data) {
@@ -127,8 +133,11 @@ export const setNewPassword = createAsyncThunk(
async (data, thunkApi) => { async (data, thunkApi) => {
const { token, form } = data; const { token, form } = data;
try { try {
await networkService.validateRecoveryToken(token); await networkService.validateRecoveryToken({ recoveryToken: token });
const res = await networkService.setNewPassword(token, form); const res = await networkService.setNewPassword({
recoveryToken: token,
form: form,
});
return res.data; return res.data;
} catch (error) { } catch (error) {
if (error.response.data) { if (error.response.data) {
@@ -13,7 +13,10 @@ export const createPageSpeed = createAsyncThunk(
async (data, thunkApi) => { async (data, thunkApi) => {
try { try {
const { authToken, monitor } = data; const { authToken, monitor } = data;
const res = await networkService.createMonitor(authToken, monitor); const res = await networkService.createMonitor({
authToken: authToken,
monitor: monitor,
});
return res.data; return res.data;
} catch (error) { } catch (error) {
if (error.response && error.response.data) { if (error.response && error.response.data) {
@@ -33,7 +36,10 @@ export const getPagespeedMonitorById = createAsyncThunk(
async (data, thunkApi) => { async (data, thunkApi) => {
try { try {
const { authToken, monitorId } = data; const { authToken, monitorId } = data;
const res = await networkService.getMonitorByid(authToken, monitorId); const res = await networkService.getMonitorById({
authToken: authToken,
monitorId: monitorId,
});
return res.data; return res.data;
} catch (error) { } catch (error) {
if (error.response && error.response.data) { if (error.response && error.response.data) {
@@ -53,11 +59,11 @@ export const getPageSpeedByTeamId = createAsyncThunk(
async (token, thunkApi) => { async (token, thunkApi) => {
const user = jwtDecode(token); const user = jwtDecode(token);
try { try {
const res = await networkService.getMonitorsAndSummaryByTeamId( const res = await networkService.getMonitorsAndSummaryByTeamId({
token, authToken: token,
user.teamId, teamId: user.teamId,
["pagespeed"] types: ["pagespeed"],
); });
return res.data; return res.data;
} catch (error) { } catch (error) {
@@ -84,11 +90,11 @@ export const updatePageSpeed = createAsyncThunk(
interval: monitor.interval, interval: monitor.interval,
// notifications: monitor.notifications, // notifications: monitor.notifications,
}; };
const res = await networkService.updateMonitor( const res = await networkService.updateMonitor({
authToken, authToken: authToken,
monitor._id, monitorId: monitor._id,
updatedFields updatedFields: updatedFields,
); });
return res.data; return res.data;
} catch (error) { } catch (error) {
if (error.response && error.response.data) { if (error.response && error.response.data) {
@@ -108,10 +114,10 @@ export const deletePageSpeed = createAsyncThunk(
async (data, thunkApi) => { async (data, thunkApi) => {
try { try {
const { authToken, monitor } = data; const { authToken, monitor } = data;
const res = await networkService.deleteMonitorById( const res = await networkService.deleteMonitorById({
authToken, authToken: authToken,
monitor._id monitorId: monitor._id,
); });
return res.data; return res.data;
} catch (error) { } catch (error) {
if (error.response && error.response.data) { if (error.response && error.response.data) {
@@ -130,7 +136,10 @@ export const pausePageSpeed = createAsyncThunk(
async (data, thunkApi) => { async (data, thunkApi) => {
try { try {
const { authToken, monitorId } = data; const { authToken, monitorId } = data;
const res = await networkService.pauseMonitorById(authToken, monitorId); const res = await networkService.pauseMonitorById({
authToken: authToken,
monitorId: monitorId,
});
return res.data; return res.data;
} catch (error) { } catch (error) {
if (error.response && error.response.data) { if (error.response && error.response.data) {
@@ -13,7 +13,10 @@ export const createUptimeMonitor = createAsyncThunk(
async (data, thunkApi) => { async (data, thunkApi) => {
try { try {
const { authToken, monitor } = data; const { authToken, monitor } = data;
const res = await networkService.createMonitor(authToken, monitor); const res = await networkService.createMonitor({
authToken: authToken,
monitor: monitor,
});
return res.data; return res.data;
} catch (error) { } catch (error) {
if (error.response && error.response.data) { if (error.response && error.response.data) {
@@ -33,7 +36,10 @@ export const getUptimeMonitorById = createAsyncThunk(
async (data, thunkApi) => { async (data, thunkApi) => {
try { try {
const { authToken, monitorId } = data; const { authToken, monitorId } = data;
const res = await networkService.getMonitorByid(authToken, monitorId); const res = await networkService.getMonitorById({
authToken: authToken,
monitorId: monitorId,
});
return res.data; return res.data;
} catch (error) { } catch (error) {
if (error.response && error.response.data) { if (error.response && error.response.data) {
@@ -53,11 +59,11 @@ export const getUptimeMonitorsByTeamId = createAsyncThunk(
async (token, thunkApi) => { async (token, thunkApi) => {
const user = jwtDecode(token); const user = jwtDecode(token);
try { try {
const res = await networkService.getMonitorsAndSummaryByTeamId( const res = await networkService.getMonitorsAndSummaryByTeamId({
token, authToken: token,
user.teamId, teamId: user.teamId,
["http", "ping"] types: ["http", "ping"],
); });
return res.data; return res.data;
} catch (error) { } catch (error) {
if (error.response && error.response.data) { if (error.response && error.response.data) {
@@ -83,11 +89,11 @@ export const updateUptimeMonitor = createAsyncThunk(
interval: monitor.interval, interval: monitor.interval,
notifications: monitor.notifications, notifications: monitor.notifications,
}; };
const res = await networkService.updateMonitor( const res = await networkService.updateMonitor({
authToken, authToken: authToken,
monitor._id, monitorId: monitor._id,
updatedFields updatedFields: updatedFields,
); });
return res.data; return res.data;
} catch (error) { } catch (error) {
if (error.response && error.response.data) { if (error.response && error.response.data) {
@@ -107,10 +113,10 @@ export const deleteUptimeMonitor = createAsyncThunk(
async (data, thunkApi) => { async (data, thunkApi) => {
try { try {
const { authToken, monitor } = data; const { authToken, monitor } = data;
const res = await networkService.deleteMonitorById( const res = await networkService.deleteMonitorById({
authToken, authToken: authToken,
monitor._id monitorId: monitor._id,
); });
return res.data; return res.data;
} catch (error) { } catch (error) {
if (error.response && error.response.data) { if (error.response && error.response.data) {
@@ -130,7 +136,10 @@ export const pauseUptimeMonitor = createAsyncThunk(
async (data, thunkApi) => { async (data, thunkApi) => {
try { try {
const { authToken, monitorId } = data; const { authToken, monitorId } = data;
const res = await networkService.pauseMonitorById(authToken, monitorId); const res = await networkService.pauseMonitorById({
authToken: authToken,
monitorId: monitorId,
});
return res.data; return res.data;
} catch (error) { } catch (error) {
if (error.response && error.response.data) { if (error.response && error.response.data) {
@@ -150,7 +159,10 @@ export const deleteMonitorChecksByTeamId = createAsyncThunk(
async (data, thunkApi) => { async (data, thunkApi) => {
try { try {
const { authToken, teamId } = data; const { authToken, teamId } = data;
const res = await networkService.deleteChecksByTeamId(authToken, teamId); const res = await networkService.deleteChecksByTeamId({
authToken: authToken,
teamId: teamId,
});
return res.data; return res.data;
} catch (error) { } catch (error) {
if (error.response && error.response.data) { if (error.response && error.response.data) {
@@ -169,7 +181,9 @@ export const addDemoMonitors = createAsyncThunk(
async (data, thunkApi) => { async (data, thunkApi) => {
try { try {
const { authToken } = data; const { authToken } = data;
const res = await networkService.addDemoMonitors(authToken); const res = await networkService.addDemoMonitors({
authToken: authToken,
});
return res.data; return res.data;
} catch (error) { } catch (error) {
if (error.response && error.response.data) { if (error.response && error.response.data) {
@@ -188,7 +202,9 @@ export const deleteAllMonitors = createAsyncThunk(
async (data, thunkApi) => { async (data, thunkApi) => {
try { try {
const { authToken } = data; const { authToken } = data;
const res = await networkService.deleteAllMonitors(authToken); const res = await networkService.deleteAllMonitors({
authToken: authToken,
});
return res.data; return res.data;
} catch (error) { } catch (error) {
if (error.response && error.response.data) { if (error.response && error.response.data) {
@@ -53,27 +53,27 @@ const IncidentTable = ({ monitors, selectedMonitor, filter }) => {
try { try {
let res; let res;
if (selectedMonitor === "0") { if (selectedMonitor === "0") {
res = await networkService.getChecksByTeam( res = await networkService.getChecksByTeam({
authToken, authToken: authToken,
user.teamId, userId: user.teamId,
"desc", sortOrder: "desc",
null, limit: null,
null, dateRange: null,
filter, filter: filter,
paginationController.page, page: paginationController.page,
paginationController.rowsPerPage rowsPerPage: paginationController.rowsPerPage,
); });
} else { } else {
res = await networkService.getChecksByMonitor( res = await networkService.getChecksByMonitor({
authToken, authToken: authToken,
selectedMonitor, monitorId: selectedMonitor,
"desc", sortOrder: "desc",
null, limit: null,
null, dateRange: null,
filter, sitler: filter,
paginationController.page, page: paginationController.page,
paginationController.rowsPerPage rowsPerPage: paginationController.rowsPerPage,
); });
} }
setChecks(res.data.data.checks); setChecks(res.data.data.checks);
setChecksCount(res.data.data.checksCount); setChecksCount(res.data.data.checksCount);
@@ -40,16 +40,16 @@ const PaginationTable = ({ monitorId, dateRange }) => {
useEffect(() => { useEffect(() => {
const fetchPage = async () => { const fetchPage = async () => {
try { try {
const res = await networkService.getChecksByMonitor( const res = await networkService.getChecksByMonitor({
authToken, authToken: authToken,
monitorId, monitoirId: monitorId,
"desc", sortOrder: "desc",
null, limit: null,
dateRange, dateRange: dateRange,
null, filter: null,
paginationController.page, page: paginationController.page,
paginationController.rowsPerPage rowsPerPage: paginationController.rowsPerPage,
); });
setChecks(res.data.data.checks); setChecks(res.data.data.checks);
setChecksCount(res.data.data.checksCount); setChecksCount(res.data.data.checksCount);
} catch (error) { } catch (error) {
+13 -13
View File
@@ -63,15 +63,15 @@ const DetailsPage = ({ isAdmin }) => {
const fetchMonitor = useCallback(async () => { const fetchMonitor = useCallback(async () => {
try { try {
const res = await networkService.getStatsByMonitorId( const res = await networkService.getStatsByMonitorId({
authToken, authToken: authToken,
monitorId, monitorId: monitorId,
null, sortOrder: null,
null, limit: null,
dateRange, dateRange: dateRange,
50, numToDisplay: 50,
true normalize: true,
); });
setMonitor(res?.data?.data ?? {}); setMonitor(res?.data?.data ?? {});
} catch (error) { } catch (error) {
logger.error(error); logger.error(error);
@@ -89,10 +89,10 @@ const DetailsPage = ({ isAdmin }) => {
return; return;
} }
try { try {
const res = await networkService.getCertificateExpiry( const res = await networkService.getCertificateExpiry({
authToken, authToken: authToken,
monitorId monitorId: monitorId,
); });
if (res?.data?.data?.certificateDate) { if (res?.data?.data?.certificateDate) {
let [month, day, year] = res.data.data.certificateDate.split("/"); let [month, day, year] = res.data.data.certificateDate.split("/");
@@ -17,7 +17,7 @@ import ArrowDownwardRoundedIcon from "@mui/icons-material/ArrowDownwardRounded";
import ArrowUpwardRoundedIcon from "@mui/icons-material/ArrowUpwardRounded"; import ArrowUpwardRoundedIcon from "@mui/icons-material/ArrowUpwardRounded";
import { setRowsPerPage } from "../../../../Features/UI/uiSlice"; import { setRowsPerPage } from "../../../../Features/UI/uiSlice";
import { useState, useEffect, memo } from "react"; import { useState, useEffect, memo, useCallback, useRef } from "react";
import { useNavigate } from "react-router"; import { useNavigate } from "react-router";
import { logger } from "../../../../Utils/Logger"; import { logger } from "../../../../Utils/Logger";
import Host from "../host"; import Host from "../host";
@@ -49,7 +49,6 @@ import useUtils from "../../utils";
*/ */
const TablePaginationActions = (props) => { const TablePaginationActions = (props) => {
const { count, page, rowsPerPage, onPageChange } = props; const { count, page, rowsPerPage, onPageChange } = props;
const handleFirstPageButtonClick = (event) => { const handleFirstPageButtonClick = (event) => {
onPageChange(event, 0); onPageChange(event, 0);
}; };
@@ -108,7 +107,7 @@ TablePaginationActions.propTypes = {
onPageChange: PropTypes.func.isRequired, onPageChange: PropTypes.func.isRequired,
}; };
const MonitorTable = ({ isAdmin, filter }) => { const MonitorTable = ({ isAdmin, filter, setLoading }) => {
const theme = useTheme(); const theme = useTheme();
const navigate = useNavigate(); const navigate = useNavigate();
const dispatch = useDispatch(); const dispatch = useDispatch();
@@ -121,6 +120,7 @@ const MonitorTable = ({ isAdmin, filter }) => {
const authState = useSelector((state) => state.auth); const authState = useSelector((state) => state.auth);
const [updateTrigger, setUpdateTrigger] = useState(false); const [updateTrigger, setUpdateTrigger] = useState(false);
const [sort, setSort] = useState({}); const [sort, setSort] = useState({});
const prevFilter = useRef(filter);
const handleActionMenuDelete = () => { const handleActionMenuDelete = () => {
setUpdateTrigger((prev) => !prev); setUpdateTrigger((prev) => !prev);
@@ -140,33 +140,53 @@ const MonitorTable = ({ isAdmin, filter }) => {
setPage(0); setPage(0);
}; };
const fetchPage = useCallback(async () => {
try {
const { authToken } = authState;
const user = jwtDecode(authToken);
const res = await networkService.getMonitorsByTeamId({
authToken,
teamId: user.teamId,
limit: 25,
types: ["http", "ping"],
status: null,
checkOrder: "desc",
normalize: true,
page: page,
rowsPerPage: rowsPerPage,
filter: filter,
field: sort.field,
order: sort.order,
});
setMonitors(res?.data?.data?.monitors ?? []);
setMonitorCount(res?.data?.data?.monitorCount ?? 0);
setLoading(false);
} catch (error) {
logger.error(error);
}
}, [authState, page, rowsPerPage, filter, sort, setLoading]);
useEffect(() => { useEffect(() => {
const fetchPage = async () => {
try {
const { authToken } = authState;
const user = jwtDecode(authToken);
const res = await networkService.getMonitorsByTeamId({
authToken,
teamId: user.teamId,
limit: 25,
types: ["http", "ping"],
status: null,
checkOrder: "desc",
normalize: true,
page: page,
rowsPerPage: rowsPerPage,
filter: filter,
field: sort.field,
order: sort.order,
});
setMonitors(res?.data?.data?.monitors ?? []);
setMonitorCount(res?.data?.data?.monitorCount ?? 0);
} catch (error) {
logger.error(error);
}
};
fetchPage(); fetchPage();
}, [updateTrigger, authState, page, rowsPerPage, filter, sort]); }, [
updateTrigger,
authState,
page,
rowsPerPage,
filter,
sort,
setLoading,
fetchPage,
]);
// Listen for changes in filter, if new value reset the page
useEffect(() => {
if (prevFilter.current !== filter) {
setPage(0);
fetchPage();
}
prevFilter.current = filter;
}, [filter, fetchPage]);
/** /**
* Helper function to calculate the range of displayed rows. * Helper function to calculate the range of displayed rows.
@@ -407,6 +427,7 @@ const MonitorTable = ({ isAdmin, filter }) => {
MonitorTable.propTypes = { MonitorTable.propTypes = {
isAdmin: PropTypes.bool, isAdmin: PropTypes.bool,
filter: PropTypes.string, filter: PropTypes.string,
setLoading: PropTypes.func,
}; };
const MemoizedMonitorTable = memo(MonitorTable); const MemoizedMonitorTable = memo(MonitorTable);
+52 -3
View File
@@ -4,7 +4,13 @@ import { useSelector, useDispatch } from "react-redux";
import { getUptimeMonitorsByTeamId } from "../../../Features/UptimeMonitors/uptimeMonitorsSlice"; import { getUptimeMonitorsByTeamId } from "../../../Features/UptimeMonitors/uptimeMonitorsSlice";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import { useTheme } from "@emotion/react"; import { useTheme } from "@emotion/react";
import { Box, Button, Stack, Typography } from "@mui/material"; import {
Box,
Button,
CircularProgress,
Stack,
Typography,
} from "@mui/material";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import SkeletonLayout from "./skeleton"; import SkeletonLayout from "./skeleton";
import Fallback from "./fallback"; import Fallback from "./fallback";
@@ -21,12 +27,19 @@ const Monitors = ({ isAdmin }) => {
const monitorState = useSelector((state) => state.uptimeMonitors); const monitorState = useSelector((state) => state.uptimeMonitors);
const authState = useSelector((state) => state.auth); const authState = useSelector((state) => state.auth);
const [search, setSearch] = useState(""); const [search, setSearch] = useState("");
const [isSearching, setIsSearching] = useState(false);
const dispatch = useDispatch({}); const dispatch = useDispatch({});
const debouncedFilter = useDebounce(search, 500); const debouncedFilter = useDebounce(search, 500);
const handleSearch = (value) => {
setIsSearching(true);
setSearch(value);
};
useEffect(() => { useEffect(() => {
dispatch(getUptimeMonitorsByTeamId(authState.authToken)); dispatch(getUptimeMonitorsByTeamId(authState.authToken));
}, [authState.authToken, dispatch]); }, [authState.authToken, dispatch]);
let loading = let loading =
monitorState?.isLoading && monitorState?.isLoading &&
monitorState?.monitorsSummary?.monitors?.length === 0; monitorState?.monitorsSummary?.monitors?.length === 0;
@@ -124,11 +137,47 @@ const Monitors = ({ isAdmin }) => {
options={monitorState?.monitorsSummary.monitors} options={monitorState?.monitorsSummary.monitors}
filteredBy="name" filteredBy="name"
value={search} value={search}
handleInputChange={setSearch} handleInputChange={handleSearch}
/> />
</Box> </Box>
</Stack> </Stack>
<MonitorTable isAdmin={isAdmin} filter={debouncedFilter} /> <Box position="relative">
{isSearching && (
<>
<Box
width="100%"
height="100%"
position="absolute"
sx={{
backgroundColor: theme.palette.background.main,
opacity: 0.8,
zIndex: 100,
}}
/>
<Box
height="100%"
position="absolute"
top="20%"
left="50%"
sx={{
transform: "translateX(-50%)",
zIndex: 101,
}}
>
<CircularProgress
sx={{
color: theme.palette.other.icon,
}}
/>
</Box>
</>
)}
<MonitorTable
isAdmin={isAdmin}
filter={debouncedFilter}
setLoading={setIsSearching}
/>
</Box>
</Box> </Box>
</> </>
)} )}
+9 -9
View File
@@ -44,15 +44,15 @@ const PageSpeedDetails = () => {
useEffect(() => { useEffect(() => {
const fetchMonitor = async () => { const fetchMonitor = async () => {
try { try {
const res = await networkService.getStatsByMonitorId( const res = await networkService.getStatsByMonitorId({
authToken, authToken: authToken,
monitorId, monitorId: monitorId,
"desc", sortOrder: "desc",
50, limit: 50,
"day", dateRange: "day",
null, numToDisplay: null,
null normalize: null,
); });
setMonitor(res?.data?.data ?? {}); setMonitor(res?.data?.data ?? {});
setAudits(res?.data?.data?.checks?.[0]?.audits ?? []); setAudits(res?.data?.data?.checks?.[0]?.audits ?? []);
} catch (error) { } catch (error) {
+4 -1
View File
@@ -69,7 +69,10 @@ const Settings = ({ isAdmin }) => {
const handleSave = async () => { const handleSave = async () => {
try { try {
setChecksIsLoading(true); setChecksIsLoading(true);
await networkService.updateChecksTTL(authToken, form.ttl); await networkService.updateChecksTTL({
authToken: authToken,
ttl: form.ttl,
});
const updatedUser = { ...user, checkTTL: form.ttl }; const updatedUser = { ...user, checkTTL: form.ttl };
const action = await dispatch( const action = await dispatch(
update({ authToken, localData: updatedUser }) update({ authToken, localData: updatedUser })
+190 -180
View File
@@ -24,15 +24,16 @@ class NetworkService {
* ************************************ * ************************************
* *
* @async * @async
* @param {string} authToken - The authorization token to be used in the request header. * @param {Object} config - The configuration object.
* @param {string} monitorId - The monitor ID to be sent in the param. * @param {string} config.authToken - The authorization token to be used in the request header.
* @param {string} config.monitorId - The monitor ID to be sent in the param.
* @returns {Promise<AxiosResponse>} The response from the axios GET request. * @returns {Promise<AxiosResponse>} The response from the axios GET request.
*/ */
async getMonitorByid(authToken, monitorId) { async getMonitorById(config) {
return this.axiosInstance.get(`/monitors/${monitorId}`, { return this.axiosInstance.get(`/monitors/${config.monitorId}`, {
headers: { headers: {
Authorization: `Bearer ${authToken}`, Authorization: `Bearer ${config.authToken}`,
"Content-Type": "application/json", "Content-Type": "application/json",
}, },
}); });
@@ -45,32 +46,46 @@ class NetworkService {
* ************************************ * ************************************
* *
* @async * @async
* @param {string} authToken - The authorization token to be used in the request header. * @param {Object} config - The configuration object.
* @param {Object} monitor - The monitor object to be sent in the request body. * @param {string} config.authToken - The authorization token to be used in the request header.
* @param {Object} config.monitor - The monitor object to be sent in the request body.
* @returns {Promise<AxiosResponse>} The response from the axios POST request. * @returns {Promise<AxiosResponse>} The response from the axios POST request.
*/ */
async createMonitor(authToken, monitor) { async createMonitor(config) {
return this.axiosInstance.post(`/monitors`, monitor, { return this.axiosInstance.post(`/monitors`, config.monitor, {
headers: { headers: {
Authorization: `Bearer ${authToken}`, Authorization: `Bearer ${config.authToken}`,
"Content-Type": "application/json", "Content-Type": "application/json",
}, },
}); });
} }
async getMonitorsAndSummaryByTeamId(authToken, teamId, types) { /**
*
* ************************************
* Gets monitors and summary of stats by TeamID
* ************************************
*
* @async
* @param {Object} config - The configuration object.
* @param {string} config.authToken - The authorization token to be used in the request header.
* @param {string} config.teamId - Team ID
* @param {Array<string>} config.types - Array of monitor types
* @returns {Promise<AxiosResponse>} The response from the axios POST request.
*/
async getMonitorsAndSummaryByTeamId(config) {
const params = new URLSearchParams(); const params = new URLSearchParams();
if (types) { if (config.types) {
types.forEach((type) => { config.types.forEach((type) => {
params.append("type", type); params.append("type", type);
}); });
} }
return this.axiosInstance.get( return this.axiosInstance.get(
`/monitors/team/summary/${teamId}?${params.toString()}`, `/monitors/team/summary/${config.teamId}?${params.toString()}`,
{ {
headers: { headers: {
Authorization: `Bearer ${authToken}`, Authorization: `Bearer ${config.authToken}`,
"Content-Type": "application/json", "Content-Type": "application/json",
}, },
} }
@@ -148,61 +163,29 @@ class NetworkService {
* ************************************ * ************************************
* *
* @async * @async
* @param {string} authToken - The authorization token to be used in the request header. * @param {Object} config - The configuration object.
* @param {string} monitorId - The ID of the monitor whose statistics are to be retrieved. * @param {string} config.authToken - The authorization token to be used in the request header.
* @param {string} [sortOrder] - The order in which to sort the retrieved statistics. * @param {string} config.monitorId - The ID of the monitor whose statistics are to be retrieved.
* @param {number} [limit] - The maximum number of statistics to retrieve. * @param {string} config.sortOrder - The order in which to sort the retrieved statistics.
* @param {string} [dateRange] - The date range for which to retrieve statistics. * @param {number} config.limit - The maximum number of statistics to retrieve.
* @param {number} [numToDisplay] - The number of checks to display. * @param {string} config.dateRange - The date range for which to retrieve statistics.
* @param {boolean} [normalize] - Whether to normalize the retrieved statistics. * @param {number} config.numToDisplay - The number of checks to display.
* @param {boolean} config.normalize - Whether to normalize the retrieved statistics.
* @returns {Promise<AxiosResponse>} The response from the axios GET request. * @returns {Promise<AxiosResponse>} The response from the axios GET request.
*/ */
async getStatsByMonitorId( async getStatsByMonitorId(config) {
authToken,
monitorId,
sortOrder,
limit,
dateRange,
numToDisplay,
normalize
) {
const params = new URLSearchParams(); const params = new URLSearchParams();
if (sortOrder) params.append("sortOrder", sortOrder); if (config.sortOrder) params.append("sortOrder", config.sortOrder);
if (limit) params.append("limit", limit); if (config.limit) params.append("limit", config.limit);
if (dateRange) params.append("dateRange", dateRange); if (config.dateRange) params.append("dateRange", config.dateRange);
if (numToDisplay) params.append("numToDisplay", numToDisplay); if (config.numToDisplay) params.append("numToDisplay", config.numToDisplay);
if (normalize) params.append("normalize", normalize); if (config.normalize) params.append("normalize", config.normalize);
return this.axiosInstance.get( return this.axiosInstance.get(
`/monitors/stats/${monitorId}?${params.toString()}`, `/monitors/stats/${config.monitorId}?${params.toString()}`,
{ {
headers: { headers: {
Authorization: `Bearer ${authToken}`, Authorization: `Bearer ${config.authToken}`,
},
}
);
}
/**
* ************************************
* Gets aggregate stats by monitor ID
* ************************************
*
* @async
* @param {string} authToken - The authorization token to be used in the request header.
* @param {string} monitorId - The ID of the monitor whose certificate expiry is to be retrieved.
* @returns {Promise<AxiosResponse>} The response from the axios GET request.
*
*/
async getAggregateStatsById(authToken, monitorId, dateRange) {
const params = new URLSearchParams();
if (dateRange) params.append("dateRange", dateRange);
return this.axiosInstance.get(
`/monitors/aggregate/${monitorId}?${params.toString()}`,
{
headers: {
Authorization: `Bearer ${authToken}`,
}, },
} }
); );
@@ -214,18 +197,23 @@ class NetworkService {
* ************************************ * ************************************
* *
* @async * @async
* @param {string} authToken - The authorization token to be used in the request header. * @param {Object} config - The configuration object.
* @param {string} monitorId - The ID of the monitor to be updated. * @param {string} config.authToken - The authorization token to be used in the request header.
* @param {Object} updatedFields - The fields to be updated for the monitor. * @param {string} config.monitorId - The ID of the monitor to be updated.
* @param {Object} config.updatedFields - The fields to be updated for the monitor.
* @returns {Promise<AxiosResponse>} The response from the axios PUT request. * @returns {Promise<AxiosResponse>} The response from the axios PUT request.
*/ */
async updateMonitor(authToken, monitorId, updatedFields) { async updateMonitor(config) {
return this.axiosInstance.put(`/monitors/${monitorId}`, updatedFields, { return this.axiosInstance.put(
headers: { `/monitors/${config.monitorId}`,
Authorization: `Bearer ${authToken}`, config.updatedFields,
"Content-Type": "application/json", {
}, headers: {
}); Authorization: `Bearer ${config.authToken}`,
"Content-Type": "application/json",
},
}
);
} }
/** /**
@@ -234,14 +222,15 @@ class NetworkService {
* ************************************ * ************************************
* *
* @async * @async
* @param {string} authToken - The authorization token to be used in the request header. * @param {Object} config - The configuration object.
* @param {string} monitorId - The ID of the monitor to be deleted. * @param {string} config.authToken - The authorization token to be used in the request header.
* @param {string} config.monitorId - The ID of the monitor to be deleted.
* @returns {Promise<AxiosResponse>} The response from the axios DELETE request. * @returns {Promise<AxiosResponse>} The response from the axios DELETE request.
*/ */
async deleteMonitorById(authToken, monitorId) { async deleteMonitorById(config) {
return this.axiosInstance.delete(`/monitors/${monitorId}`, { return this.axiosInstance.delete(`/monitors/${config.monitorId}`, {
headers: { headers: {
Authorization: `Bearer ${authToken}`, Authorization: `Bearer ${config.authToken}`,
"Content-Type": "application/json", "Content-Type": "application/json",
}, },
}); });
@@ -253,14 +242,15 @@ class NetworkService {
* ************************************ * ************************************
* *
* @async * @async
* @param {string} authToken - The authorization token to be used in the request header. * @param {Object} config - The configuration object.
* @param {string} monitorId - The ID of the monitor to be deleted. * @param {string} config.authToken - The authorization token to be used in the request header.
* @param {string} config.teamId - The team ID of the monitors to be deleted.
* @returns {Promise<AxiosResponse>} The response from the axios DELETE request. * @returns {Promise<AxiosResponse>} The response from the axios DELETE request.
*/ */
async deleteChecksByTeamId(authToken, teamId) { async deleteChecksByTeamId(config) {
return this.axiosInstance.delete(`/checks/team/${teamId}`, { return this.axiosInstance.delete(`/checks/team/${config.teamId}`, {
headers: { headers: {
Authorization: `Bearer ${authToken}`, Authorization: `Bearer ${config.authToken}`,
"Content-Type": "application/json", "Content-Type": "application/json",
}, },
}); });
@@ -271,17 +261,18 @@ class NetworkService {
* ************************************ * ************************************
* *
* @async * @async
* @param {string} authToken - The authorization token to be used in the request header. * @param {Object} config - The configuration object.
* @param {string} monitorId - The ID of the monitor to be paused. * @param {string} config.authToken - The authorization token to be used in the request header.
* @param {string} config.monitorId - The ID of the monitor to be paused.
* @returns {Promise<AxiosResponse>} The response from the axios POST request. * @returns {Promise<AxiosResponse>} The response from the axios POST request.
*/ */
async pauseMonitorById(authToken, monitorId) { async pauseMonitorById(config) {
return this.axiosInstance.post( return this.axiosInstance.post(
`/monitors/pause/${monitorId}`, `/monitors/pause/${config.monitorId}`,
{}, {},
{ {
headers: { headers: {
Authorization: `Bearer ${authToken}`, Authorization: `Bearer ${config.authToken}`,
"Content-Type": "application/json", "Content-Type": "application/json",
}, },
} }
@@ -294,16 +285,17 @@ class NetworkService {
* ************************************ * ************************************
* *
* @async * @async
* @param {string} authToken - The authorization token to be used in the request header. * @param {Object} config - The configuration object.
* @param {string} config.authToken - The authorization token to be used in the request header.
* @returns {Promise<AxiosResponse>} The response from the axios POST request. * @returns {Promise<AxiosResponse>} The response from the axios POST request.
*/ */
async addDemoMonitors(authToken) { async addDemoMonitors(config) {
return this.axiosInstance.post( return this.axiosInstance.post(
`/monitors/demo`, `/monitors/demo`,
{}, {},
{ {
headers: { headers: {
Authorization: `Bearer ${authToken}`, Authorization: `Bearer ${config.authToken}`,
"Content-Type": "application/json", "Content-Type": "application/json",
}, },
} }
@@ -316,13 +308,14 @@ class NetworkService {
* ************************************ * ************************************
* *
* @async * @async
* @param {string} authToken - The authorization token to be used in the request header. * @param {Object} config - The configuration object.
* @param {string} config.authToken - The authorization token to be used in the request header.
* @returns {Promise<AxiosResponse>} The response from the axios DELETE request. * @returns {Promise<AxiosResponse>} The response from the axios DELETE request.
*/ */
async deleteAllMonitors(authToken) { async deleteAllMonitors(config) {
return this.axiosInstance.delete(`/monitors/`, { return this.axiosInstance.delete(`/monitors/`, {
headers: { headers: {
Authorization: `Bearer ${authToken}`, Authorization: `Bearer ${config.authToken}`,
"Content-Type": "application/json", "Content-Type": "application/json",
}, },
}); });
@@ -334,15 +327,16 @@ class NetworkService {
* ************************************ * ************************************
* *
* @async * @async
* @param {string} authToken - The authorization token to be used in the request header. * @param {Object} config - The configuration object.
* @param {string} monitorId - The ID of the monitor whose certificate expiry is to be retrieved. * @param {string} config.authToken - The authorization token to be used in the request header.
* @param {string} config.monitorId - The ID of the monitor whose certificate expiry is to be retrieved.
* @returns {Promise<AxiosResponse>} The response from the axios GET request. * @returns {Promise<AxiosResponse>} The response from the axios GET request.
* *
*/ */
async getCertificateExpiry(authToken, monitorId) { async getCertificateExpiry(config) {
return this.axiosInstance.get(`/monitors/certificate/${monitorId}`, { return this.axiosInstance.get(`/monitors/certificate/${config.monitorId}`, {
headers: { headers: {
Authorization: `Bearer ${authToken}`, Authorization: `Bearer ${config.authToken}`,
}, },
}); });
} }
@@ -380,23 +374,35 @@ class NetworkService {
* ************************************ * ************************************
* *
* @async * @async
* @param {string} authToken - The authorization token to be used in the request header. * @param {Object} config - The configuration object.
* @param {string} userId - The ID of the user to be updated. * @param {string} config.authToken - The authorization token to be used in the request header.
* @param {Object} form - The form data for the user to be updated. * @param {string} config.userId - The ID of the user to be updated.
* @param {Object} config.form - The form data for the user to be updated.
* @returns {Promise<AxiosResponse>} The response from the axios PUT request. * @returns {Promise<AxiosResponse>} The response from the axios PUT request.
* *
*/ */
async updateUser(authToken, userId, form) { async updateUser(config) {
return this.axiosInstance.put(`/auth/user/${userId}`, form, { return this.axiosInstance.put(`/auth/user/${config.userId}`, config.form, {
headers: { headers: {
Authorization: `Bearer ${authToken}`, Authorization: `Bearer ${config.authToken}`,
}, },
}); });
} }
async deleteUser(authToken, userId) { /**
return this.axiosInstance.delete(`/auth/user/${userId}`, { * ************************************
headers: { Authorization: `Bearer ${authToken}` }, * Deletes a user
* ************************************
*
* @async
* @param {Object} config - The configuration object.
* @param {string} config.authToken - The authorization token to be used in the request header.
* @param {string} config.userId - The ID of the user to be deleted.
*
**/
async deleteUser(config) {
return this.axiosInstance.delete(`/auth/user/${config.userId}`, {
headers: { Authorization: `Bearer ${config.authToken}` },
}); });
} }
@@ -420,13 +426,14 @@ class NetworkService {
* ************************************ * ************************************
* *
* @async * @async
* @param {string} recoveryToken - The recovery token to be validated. * @param {Object} config - The configuration object.
* @param {string} config.recoveryToken - The recovery token to be validated.
* @returns {Promise<AxiosResponse>} The response from the axios POST request. * @returns {Promise<AxiosResponse>} The response from the axios POST request.
* *
*/ */
async validateRecoveryToken(recoveryToken) { async validateRecoveryToken(config) {
return this.axiosInstance.post("/auth/recovery/validate", { return this.axiosInstance.post("/auth/recovery/validate", {
recoveryToken, recoveryToken: config.recoveryToken,
}); });
} }
@@ -436,14 +443,16 @@ class NetworkService {
* ************************************ * ************************************
* *
* @async * @async
* @param {Object} form - The form data for the password recovery request. * @param {Object} config - The configuration object.
* @param {string} config.recoveryToken - The token for recovery request.
* @param {Object} config.form - The form data for the password recovery request.
* @returns {Promise<AxiosResponse>} The response from the axios POST request. * @returns {Promise<AxiosResponse>} The response from the axios POST request.
* *
*/ */
async setNewPassword(recoveryToken, form) { async setNewPassword(config) {
return this.axiosInstance.post("/auth/recovery/reset", { return this.axiosInstance.post("/auth/recovery/reset", {
...form, ...config.form,
recoveryToken, recoveryToken: config.recoveryToken,
}); });
} }
@@ -466,13 +475,14 @@ class NetworkService {
* ************************************ * ************************************
* *
* @async * @async
* @param {string} authToken - The authorization token to be used in the request header. * @param {Object} config - The configuration object.
* @param {string} config.authToken - The authorization token to be used in the request header.
* @returns {Promise<AxiosResponse>} The response from the axios GET request. * @returns {Promise<AxiosResponse>} The response from the axios GET request.
* *
*/ */
async getAllUsers(authToken) { async getAllUsers(config) {
return this.axiosInstance.get("/auth/users", { return this.axiosInstance.get("/auth/users", {
headers: { Authorization: `Bearer ${authToken}` }, headers: { Authorization: `Bearer ${config.authToken}` },
}); });
} }
@@ -482,18 +492,19 @@ class NetworkService {
* ************************************ * ************************************
* *
* @async * @async
* @param {string} authToken - The authorization token to be used in the request header. * @param {Object} config - The configuration object.
* @param {string} email - The email of the user to be invited. * @param {string} config.authToken - The authorization token to be used in the request header.
* @param {string} role - The role of the user to be invited. * @param {string} config.email - The email of the user to be invited.
* @param {string} config.role - The role of the user to be invited.
* @returns {Promise<AxiosResponse>} The response from the axios POST request. * @returns {Promise<AxiosResponse>} The response from the axios POST request.
* *
*/ */
async requestInvitationToken(authToken, email, role) { async requestInvitationToken(config) {
return this.axiosInstance.post( return this.axiosInstance.post(
`/invite`, `/invite`,
{ email, role }, { email: config.email, role: config.role },
{ {
headers: { Authorization: `Bearer ${authToken}` }, headers: { Authorization: `Bearer ${config.authToken}` },
} }
); );
} }
@@ -520,39 +531,34 @@ class NetworkService {
* ************************************ * ************************************
* *
* @async * @async
* @param {string} authToken - The authorization token to be used in the request header. * @param {Object} config - The configuration object.
* @param {string} monitorId - The ID of the monitor. * @param {string} config.authToken - The authorization token to be used in the request header.
* @param {string} sortOrder - The order in which to sort the checks. * @param {string} config.monitorId - The ID of the monitor.
* @param {number} limit - The maximum number of checks to retrieve. * @param {string} config.sortOrder - The order in which to sort the checks.
* @param {string} dateRange - The range of dates for which to retrieve checks. * @param {number} config.limit - The maximum number of checks to retrieve.
* @param {string} filter - The filter to apply to the checks. * @param {string} config.dateRange - The range of dates for which to retrieve checks.
* @param {number} page - The page number to retrieve in a paginated list. * @param {string} config.filter - The filter to apply to the checks.
* @param {number} rowsPerPage - The number of rows per page in a paginated list. * @param {number} config.page - The page number to retrieve in a paginated list.
* @param {number} config.rowsPerPage - The number of rows per page in a paginated list.
* @returns {Promise<AxiosResponse>} The response from the axios GET request. * @returns {Promise<AxiosResponse>} The response from the axios GET request.
* *
*/ */
async getChecksByMonitor( async getChecksByMonitor(config) {
authToken,
monitorId,
sortOrder,
limit,
dateRange,
filter,
page,
rowsPerPage
) {
const params = new URLSearchParams(); const params = new URLSearchParams();
if (sortOrder) params.append("sortOrder", sortOrder); if (config.sortOrder) params.append("sortOrder", config.sortOrder);
if (limit) params.append("limit", limit); if (config.limit) params.append("limit", config.limit);
if (dateRange) params.append("dateRange", dateRange); if (config.dateRange) params.append("dateRange", config.dateRange);
if (filter) params.append("filter", filter); if (config.filter) params.append("filter", config.filter);
if (page) params.append("page", page); if (config.page) params.append("page", config.page);
if (rowsPerPage) params.append("rowsPerPage", rowsPerPage); if (config.rowsPerPage) params.append("rowsPerPage", config.rowsPerPage);
return this.axiosInstance.get(`/checks/${monitorId}?${params.toString()}`, { return this.axiosInstance.get(
headers: { Authorization: `Bearer ${authToken}` }, `/checks/${config.monitorId}?${params.toString()}`,
}); {
headers: { Authorization: `Bearer ${config.authToken}` },
}
);
} }
/** /**
@@ -561,49 +567,53 @@ class NetworkService {
* ************************************ * ************************************
* *
* @async * @async
* @param {string} authToken - The authorization token to be used in the request header. * @param {Object} config - The configuration object.
* @param {string} userId - The ID of the user. * @param {string} config.authToken - The authorization token to be used in the request header.
* @param {string} sortOrder - The order in which to sort the checks. * @param {string} config.userId - The ID of the user.
* @param {number} limit - The maximum number of checks to retrieve. * @param {string} config.sortOrder - The order in which to sort the checks.
* @param {string} dateRange - The range of dates for which to retrieve checks. * @param {number} config.limit - The maximum number of checks to retrieve.
* @param {string} filter - The filter to apply to the checks. * @param {string} config.dateRange - The range of dates for which to retrieve checks.
* @param {number} page - The page number to retrieve in a paginated list. * @param {string} config.filter - The filter to apply to the checks.
* @param {number} rowsPerPage - The number of rows per page in a paginated list. * @param {number} config.page - The page number to retrieve in a paginated list.
* @param {number} config.rowsPerPage - The number of rows per page in a paginated list.
* @returns {Promise<AxiosResponse>} The response from the axios GET request. * @returns {Promise<AxiosResponse>} The response from the axios GET request.
* *
*/ */
async getChecksByTeam( async getChecksByTeam(config) {
authToken,
teamId,
sortOrder,
limit,
dateRange,
filter,
page,
rowsPerPage
) {
const params = new URLSearchParams(); const params = new URLSearchParams();
if (sortOrder) params.append("sortOrder", sortOrder); if (config.sortOrder) params.append("sortOrder", config.sortOrder);
if (limit) params.append("limit", limit); if (config.limit) params.append("limit", config.limit);
if (dateRange) params.append("dateRange", dateRange); if (config.dateRange) params.append("dateRange", config.dateRange);
if (filter) params.append("filter", filter); if (config.filter) params.append("filter", config.filter);
if (page) params.append("page", page); if (config.page) params.append("page", config.page);
if (rowsPerPage) params.append("rowsPerPage", rowsPerPage); if (config.rowsPerPage) params.append("rowsPerPage", config.rowsPerPage);
return this.axiosInstance.get( return this.axiosInstance.get(
`/checks/team/${teamId}?${params.toString()}`, `/checks/team/${config.teamId}?${params.toString()}`,
{ {
headers: { Authorization: `Bearer ${authToken}` }, headers: { Authorization: `Bearer ${config.authToken}` },
} }
); );
} }
async updateChecksTTL(authToken, ttl) { /**
* ************************************
* Get all checks for a given user
* ************************************
*
* @async
* @param {Object} config - The configuration object.
* @param {string} config.authToken - The authorization token to be used in the request header.
* @param {number} config.ttl - TTL for checks
* @returns {Promise<AxiosResponse>} The response from the axios GET request.
*
*/
async updateChecksTTL(config) {
return this.axiosInstance.put( return this.axiosInstance.put(
`/checks/ttl`, `/checks/ttl`,
{ ttl }, { ttl: config.ttl },
{ {
headers: { headers: {
Authorization: `Bearer ${authToken}`, Authorization: `Bearer ${config.authToken}`,
"Content-Type": "application/json", "Content-Type": "application/json",
}, },
} }
+1
View File
@@ -1,4 +1,5 @@
*.sh *.sh
!quickstart.sh
!build_images.sh !build_images.sh
mongo/data/* mongo/data/*
redis/data/* redis/data/*
+1
View File
@@ -1,3 +1,4 @@
FROM mongo FROM mongo
COPY ./Docker/mongo/init/create_users.js /docker-entrypoint-initdb.d/
EXPOSE 27017 EXPOSE 27017
CMD ["mongod"] CMD ["mongod"]
+34
View File
@@ -0,0 +1,34 @@
services:
client:
image: bluewaveuptime/uptime_client:latest
ports:
- "80:80"
- "443:443"
depends_on:
- server
volumes:
- ./nginx/conf.d:/etc/nginx/conf.d/:ro
server:
image: bluewaveuptime/uptime_server:latest
ports:
- "5000:5000"
env_file:
- server.env
depends_on:
- redis
- mongodb
redis:
image: bluewaveuptime/uptime_redis:latest
ports:
- "6379:6379"
volumes:
- ./redis/data:/data
mongodb:
image: bluewaveuptime/uptime_database_mongo:latest
command: ["mongod", "--quiet", "--auth"]
ports:
- "27017:27017"
volumes:
- ./mongo/data:/data/db
env_file:
- mongo.env
+123
View File
@@ -0,0 +1,123 @@
default_server_base_url="http://localhost:5000/api/v1"
default_client_host="http://localhost"
default_jwt_secret="my_secret"
default_db_type="MongoDB"
default_redis_host="redis"
default_redis_port=6379
default_token_ttl="99d"
default_db_username="uptime_user"
default_db_password="uptime_password"
default_system_email_host="smtp.gmail.com"
default_system_email_port=465
echo "Welcome to the Uptime Monitor Setup Script! \n"
echo
echo "Configuring server"
printf '%*s\n' "${COLUMNS:-$(tput cols)}" '' | tr ' ' '*'
echo
db_type=$default_db_type
redis_host=$default_redis_host
redis_port=$default_redis_port
jwt_secret=$default_jwt_secret
read -p "Enter a username for your database [$default_db_username]: " db_username
db_username="${db_username:-$default_db_username}"
read -p "Enter a password for your database [$default_db_password]: " db_password
db_password="${db_password:-$default_db_password}"
read -p "Enter your system email host [$default_system_email_host]: " system_email_host
system_email_host="${system_email_host:-$default_system_email_host}"
echo "System email host: $system_email_host"
echo
read -p "Enter your DB connection string [$default_db_connection_string]: " db_connection_string
db_connection_string="mongodb://${db_username}:${db_password}@mongodb:27017/uptime_db"
echo "DB connection string: $db_connection_string"
echo
read -p "Enter your system email port [$default_system_email_port]: " system_email_port
system_email_port="${system_email_port:-$default_system_email_port}"
echo "System email port: $system_email_port"
echo
read -p "Enter your system email address: " system_email_address
echo "System email address: $system_email_address"
echo
read -p "Enter your system email password: " system_email_password
echo "System email password: $system_email_password"
echo
read -p "Enter your Token TTL [$default_token_ttl]: " token_ttl
token_ttl="${token_ttl:-$default_token_ttl}"
echo "Token TTL: $token_ttl"
echo
read -p "Enter your Pagespeed API key: " pagespeed_api_key
echo "Pagespeed API key: $pagespeed_api_key"
echo
echo "Writing to ./server.env"
echo
{
echo "CLIENT_HOST=\"$client_host\""
echo "JWT_SECRET=\"$jwt_secret\""
echo "DB_TYPE=\"$db_type\""
echo "DB_CONNECTION_STRING=\"$db_connection_string\""
echo "REDIS_HOST=\"$redis_host\""
echo "REDIS_PORT=$redis_port"
echo "SYSTEM_EMAIL_HOST=\"$system_email_host\""
echo "SYSTEM_EMAIL_PORT=$system_email_port"
echo "SYSTEM_EMAIL_ADDRESS=\"$system_email_address\""
echo "SYSTEM_EMAIL_PASSWORD=\"$system_email_password\""
echo "TOKEN_TTL=\"$token_ttl\""
echo "PAGESPEED_API_KEY=\"$pagespeed_api_key\""
} > ./server.env
echo
{
echo USERNAME_ENV_VAR=${db_username}
echo PASSWORD_ENV_VAR=${db_password}
} > ./mongo.env
mkdir -p ./nginx/conf.d/
cat <<EOL > ./nginx/conf.d/default.conf
server {
listen 80;
listen [::]:80;
server_name uptime-demo.bluewavelabs.ca;
server_tokens off;
location /.well-known/acme-challenge/ {
root /var/www/certbot;
}
location / {
root /usr/share/nginx/html;
index index.html index.htm;
try_files \$uri \$uri/ /index.html;
}
location /api/ {
proxy_pass http://server:5000/api/;
proxy_http_version 1.1;
proxy_set_header Host \$host;
proxy_set_header X-Real-IP \$remote_addr;
proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto \$scheme;
}
}
EOL
+14
View File
@@ -15,6 +15,10 @@
BlueWave Uptime is an open source server monitoring application used to track the operational status and performance of servers and websites. It regularly checks whether a server/website is accessible and performs optimally, providing real-time alerts and reports on the monitored services' availability, downtime, and response time. BlueWave Uptime is an open source server monitoring application used to track the operational status and performance of servers and websites. It regularly checks whether a server/website is accessible and performs optimally, providing real-time alerts and reports on the monitored services' availability, downtime, and response time.
## Demo
See [BlueWave Uptime](https://uptime-demo.bluewavelabs.ca/) in action. The username is uptimedemo@demo.com and the password is Demouser1!
## Features ## Features
- [x] Completely open source, deployable on your servers - [x] Completely open source, deployable on your servers
@@ -74,6 +78,7 @@ Also check other developer and contributor-friendly projects of BlueWave:
- Clone this repository to your local machine - Clone this repository to your local machine
1. [Quickstart for Users](#user-quickstart)
1. [Quickstart for Developers](#dev-quickstart) 1. [Quickstart for Developers](#dev-quickstart)
1. [Docker Compose](#docker-compose) 1. [Docker Compose](#docker-compose)
1. [Installation (Client)](#client) 1. [Installation (Client)](#client)
@@ -129,6 +134,15 @@ Also check other developer and contributor-friendly projects of BlueWave:
--- ---
#### <u> Quickstart for Users</u><a id="user-quickstart"></a>
1. Download our [Docker Compose File](/Docker/quickstart/docker-compose.yaml)
2. Download our [Quickstart script](/Docker/quickstart/quickstart.sh)
3. Place these files in a directory of your choice
4. Run `quickstart.sh` and generate config files
5. Run `docker compose up` to start the application
6. Application is running at `http://localhost`
#### <u>Quickstart for Developers</u> <a id="dev-quickstart"></a> #### <u>Quickstart for Developers</u> <a id="dev-quickstart"></a>
<span style="color: red; font-weight: bold;">MAKE SURE YOU CD TO THE SPECIFIED DIRECTORIES AS PATHS IN COMMANDS ARE RELATIVE</span> <span style="color: red; font-weight: bold;">MAKE SURE YOU CD TO THE SPECIFIED DIRECTORIES AS PATHS IN COMMANDS ARE RELATIVE</span>
+1 -5
View File
@@ -13,10 +13,6 @@ router.post(
verifyJWT, verifyJWT,
inviteController inviteController
); );
router.post( router.post("/verify", inviteVerifyController);
"/verify",
isAllowed(["admin", "superadmin"]),
inviteVerifyController
);
module.exports = router; module.exports = router;