diff --git a/Client/src/Components/ConfigBox/index.jsx b/Client/src/Components/ConfigBox/index.jsx index 7650dd47f..ed6082d02 100644 --- a/Client/src/Components/ConfigBox/index.jsx +++ b/Client/src/Components/ConfigBox/index.jsx @@ -29,10 +29,7 @@ const ConfigBox = styled(Stack)(({ theme }) => ({ }, "& h1, & h2": { color: theme.palette.text.secondary, - }, - "& p": { - color: theme.palette.text.tertiary, - }, + } })); export default ConfigBox; diff --git a/Client/src/Components/TabPanels/Status/ContentPanel.jsx b/Client/src/Components/TabPanels/Status/ContentPanel.jsx index 0aa72de2f..e08cd03cf 100644 --- a/Client/src/Components/TabPanels/Status/ContentPanel.jsx +++ b/Client/src/Components/TabPanels/Status/ContentPanel.jsx @@ -30,8 +30,8 @@ const ContentPanel = () => { const response = await networkService.getMonitorsByTeamId({ authToken: authToken, teamId: user.teamId, - limit: 50, - types: ["http", "ping", "pagespeed", "hardware"], + limit: null, // donot return any checks for the monitors + types: ["http"], // status page is available only for the uptime type }); if(response.data.data.monitors.length==0){ setErrors({monitors: "Please config monitors to setup status page"}) diff --git a/Client/src/Components/TabPanels/Status/GeneralSettingsPanel.jsx b/Client/src/Components/TabPanels/Status/GeneralSettingsPanel.jsx index c7756afcd..3fe0bc611 100644 --- a/Client/src/Components/TabPanels/Status/GeneralSettingsPanel.jsx +++ b/Client/src/Components/TabPanels/Status/GeneralSettingsPanel.jsx @@ -31,6 +31,7 @@ const GeneralSettingsPanel = () => { const intervalRef = useRef(null); const SUBDOAMIN_PREFIX = import.meta.env.VITE_STATUS_PAGE_SUBDOMAIN_PREFIX ?? "http://localhost/"; + const STATUS_PAGE = import.meta.env.VITE_STATU_PAGE_URL?? "status-page"; // Clears specific error from errors state const clearError = (err) => { @@ -91,19 +92,15 @@ const GeneralSettingsPanel = () => { let error = validateField({ type: pic?.type, size: pic?.size }, logoImageValidation); if (error) return; + const newLogo = { + src: URL.createObjectURL(pic), + name: pic.name, + type: pic.type, + size: pic.size, + } setProgress((prev) => ({ ...prev, isLoading: true })); - setLogo({ - src: URL.createObjectURL(pic), - name: pic.name, - type: pic.type, - size: pic.size, - }); - setForm({...form, logo: { - src: URL.createObjectURL(pic), - name: pic.name, - type: pic.type, - size: pic.size, - }}) + setLogo(newLogo); + setForm({ ...form, logo: newLogo }); intervalRef.current = setInterval(() => { const buffer = 12; setProgress((prev) => { @@ -118,12 +115,7 @@ const GeneralSettingsPanel = () => { return ( { - } + label="Your status page address" + disabled + value={SUBDOAMIN_PREFIX+ STATUS_PAGE} + // startAdornment={ + // + // } onChange={handleChange} onBlur={handleBlur} helperText={errors["url"]} @@ -217,7 +210,6 @@ const GeneralSettingsPanel = () => { loading={progress.isLoading && progress.value !== 100} onChange={handleLogo} isRound={false} - maxSize="640KB" /> {progress.isLoading || progress.value !== 0 || errors["logo"] ? ( 0; const [form, setForm] = useState( hasInitForm @@ -143,7 +143,7 @@ import { networkService } from "../../../main"; /> ))} - +