merged upstream master, resolved conflicts
This commit is contained in:
commit
6fcf07d5b5
7 files changed
+226
-8
No files matched your search
@@ -1,19 +1,20 @@
|
||||
import React from "react";
|
||||
import DropdownTeamMember from "../../Components/DropdownTeamMember";
|
||||
import "./index.css";
|
||||
import Button from "../../Components/Button";
|
||||
import Link from "../../Components/Link";
|
||||
import ColoredLabel from "../../Components/Label/ColoredLabel";
|
||||
import { useTheme } from "@mui/material";
|
||||
import StatusLabel from "../../Components/Label/StautsLabel";
|
||||
import Avatar from "../../Components/Avatar/Avatar";
|
||||
import avatarImage from "../../assets/Images/avatar_placeholder.png";
|
||||
|
||||
const Home = () => {
|
||||
const theme = useTheme();
|
||||
return (
|
||||
<>
|
||||
<div>Home</div>
|
||||
<DropdownTeamMember />
|
||||
<div
|
||||
style={{ display: "flex", flexDirection: "column", marginTop: "2rem" }}
|
||||
>
|
||||
<div>
|
||||
<h4>Buttons</h4>
|
||||
<div>
|
||||
<Button level="primary" label="Primary" />
|
||||
@@ -35,6 +36,21 @@ const Home = () => {
|
||||
url={"https://www.google.com"}
|
||||
/>
|
||||
</div>
|
||||
<h4>Labels</h4>
|
||||
<div>
|
||||
<ColoredLabel label="Label" color={theme.palette.labelGray.color} />
|
||||
<ColoredLabel label="Label" color={theme.palette.labelPurple.color} />
|
||||
<ColoredLabel label="Label" color={theme.palette.labelGreen.color} />
|
||||
<ColoredLabel label="Label" color={theme.palette.labelOrange.color} />
|
||||
</div>
|
||||
|
||||
<h4>Status Lables</h4>
|
||||
<div>
|
||||
<StatusLabel status="Seen" />
|
||||
<StatusLabel status="Waiting" />
|
||||
<StatusLabel status="New" />
|
||||
<StatusLabel status="Active" />
|
||||
</div>
|
||||
<h4>Avatar</h4>
|
||||
<div style={{ display: "flex" }}>
|
||||
<Avatar src={avatarImage} firstName="Alex" lastName="Holliday" />
|
||||
|
||||
Reference in new issue
Block a user