Skip to content

Commit

Permalink
Update BrandColors imports to use Green instead of Green500
Browse files Browse the repository at this point in the history
  • Loading branch information
simlarsen committed Apr 19, 2024
1 parent fb070b9 commit d7a9adf
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 28 deletions.
1 change: 0 additions & 1 deletion Common/Types/BrandColors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ export const Violet500: Color = Color.fromString('#8b5cf6');
export const Fuchsia500: Color = Color.fromString('#d946ef');
export const Rose500: Color = Color.fromString('#f43f5e');


export const BrightColors: Color[] = [
Black,
Indigo500,
Expand Down
8 changes: 1 addition & 7 deletions CommonServer/Services/ProjectService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,7 @@ import QueryHelper from '../Types/Database/QueryHelper';
import ObjectID from 'Common/Types/ObjectID';
import OneUptimeDate from 'Common/Types/Date';
import MonitorStatus from 'Model/Models/MonitorStatus';
import {
Yellow,
Green,
Red,
Moroon500,
Black,
} from 'Common/Types/BrandColors';
import { Yellow, Green, Red, Moroon500, Black } from 'Common/Types/BrandColors';
import MonitorStatusService from './MonitorStatusService';
import IncidentState from 'Model/Models/IncidentState';
import IncidentStateService from './IncidentStateService';
Expand Down
2 changes: 1 addition & 1 deletion CommonUI/src/Components/ColorCircle/ColorCircle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const ColorCircle: FunctionComponent<ComponentProps> = (
return (
<Tooltip text={props.tooltip}>
<div
className="rounded-max h-3 w-3"
className="rounded-full h-3 w-3"
style={{
backgroundColor: props.color.toString(),
}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,7 @@ const ExecutionLogsTable: FunctionComponent<ComponentProps> = (
);
}

return (
<Pill color={Red} text={OnCallDutyPolicyStatus.Error} />
);
return <Pill color={Red} text={OnCallDutyPolicyStatus.Error} />;
},
},
{
Expand Down
6 changes: 1 addition & 5 deletions Dashboard/src/Components/Probe/ProbeStatus.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,7 @@ const ProbeStatusElement: FunctionComponent<ComponentProps> = (
}

return (
<Statusbubble
text={'Disconnected'}
color={Red}
shouldAnimate={false}
/>
<Statusbubble text={'Disconnected'} color={Red} shouldAnimate={false} />
);
};

Expand Down
5 changes: 1 addition & 4 deletions Dashboard/src/Pages/Settings/TeamView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,7 @@ const TeamView: FunctionComponent<PageComponentProps> = (
return <Pill text="Member" color={Green} />;
}
return (
<Pill
text="Invitation Sent"
color={Yellow}
/>
<Pill text="Invitation Sent" color={Yellow} />
);
},
},
Expand Down
4 changes: 1 addition & 3 deletions Dashboard/src/Pages/StatusPages/View/PrivateUser.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,7 @@ const StatusPageDelete: FunctionComponent<PageComponentProps> = (
<Pill color={Green} text={'Signed up'} />
);
}
return (
<Pill color={Yellow} text={'Invite Sent'} />
);
return <Pill color={Yellow} text={'Invite Sent'} />;
},
},
]}
Expand Down
8 changes: 4 additions & 4 deletions Dashboard/src/Pages/Telemetry/Services/View/Traces/Index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import SortOrder from 'Common/Types/BaseDatabase/SortOrder';
import DropdownUtil from 'CommonUI/src/Utils/Dropdown';
import { DropdownOption } from 'CommonUI/src/Components/Dropdown/Dropdown';
import { JSONObject } from 'Common/Types/JSON';
import ColorSquareCube from 'CommonUI/src/Components/ColorSquareCube/ColorSquareCube';
import ColorCircle from 'CommonUI/src/Components/ColorCircle/ColorCircle';
import AnalyticsBaseModel from 'Common/AnalyticsModels/BaseModel';
import { Green, Red } from 'Common/Types/BrandColors';

Expand Down Expand Up @@ -122,7 +122,7 @@ const TracesList: FunctionComponent<PageComponentProps> = (
(spanObj.statusCode ===
SpanStatus.Unset ||
!spanObj.statusCode) ? (
<ColorSquareCube
<ColorCircle
color={Green}
tooltip="Span Status: Unset"
/>
Expand All @@ -132,7 +132,7 @@ const TracesList: FunctionComponent<PageComponentProps> = (
{spanObj &&
spanObj.statusCode ===
SpanStatus.Ok ? (
<ColorSquareCube
<ColorCircle
color={Green}
tooltip="Span Status: Ok"
/>
Expand All @@ -142,7 +142,7 @@ const TracesList: FunctionComponent<PageComponentProps> = (
{spanObj &&
spanObj.statusCode ===
SpanStatus.Error ? (
<ColorSquareCube
<ColorCircle
color={Red}
tooltip="Span Status: Error"
/>
Expand Down

0 comments on commit d7a9adf

Please sign in to comment.