Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added reports page #15

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Added reports page #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { Apps } from './scenes/apps';
import { Urls } from './scenes/urls';
import { Projects } from './scenes/projects';
import { Teams } from './scenes/teams';
import { CardLayout } from './scenes/reports/AllReports';


function App() {
Expand All @@ -30,7 +31,9 @@ function App() {
<Route path='/apps' element={ <Apps /> } />
<Route path='/urls' element={ <Urls /> } />
<Route path='/projects' element={ <Projects /> } />
<Route path='/teams' element={ <Teams /> } />
<Route path='/teams' element={<Teams />} />
<Route path='/reports' element={ <CardLayout /> } />

</Routes>
</Layout>
</Layout>
Expand Down
48 changes: 24 additions & 24 deletions src/scenes/global/sidebar/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,26 +69,26 @@ export const Sidebar = () => {
]

const reportsMenu = [
{
label: "Time & activity",
key: "timeandactivity",
link: '/timeandactivity'
},
{
label: "Daily totals (Weekly)",
key: "dailytotals",
link: '/dailytotals'
},
{
label: "Amounts owed",
key: "amountsowed",
link: '/amountsowed'
},
{
label: "Payments",
key: "payments",
link: '/payments'
},
// {
// label: "Time & activity",
// key: "timeandactivity",
// link: '/timeandactivity'
// },
// {
// label: "Daily totals (Weekly)",
// key: "dailytotals",
// link: '/dailytotals'
// },
// {
// label: "Amounts owed",
// key: "amountsowed",
// link: '/amountsowed'
// },
// {
// label: "Payments",
// key: "payments",
// link: '/payments'
// },
{
label: "All reports",
key: "allreports",
Expand Down Expand Up @@ -184,11 +184,11 @@ export const Sidebar = () => {
</SubMenu>
</Menu>

<Menu theme="light" mode="inline">
{/* <Menu theme="light" mode="inline">
<Menu.Item key="insights" icon={<TiLightbulb size={21} />} >
<Link to='/insights'>Insights</Link>
</Menu.Item>
</Menu>
</Menu> */}

<Menu theme="light" mode="inline">
<SubMenu key="projectManagement" icon={<IoMdCheckboxOutline size={21} />} title="Project Management">
Expand Down Expand Up @@ -216,11 +216,11 @@ export const Sidebar = () => {
</Menu.Item>
</Menu>

<Menu theme="light" mode="inline">
{/* <Menu theme="light" mode="inline">
<Menu.Item key="transactions" icon={<HiOutlineCurrencyRupee size={21} />} >
<Link to='/expenses'>Expenses</Link>
</Menu.Item>
</Menu>
</Menu> */}
</Sider>
</div>
)
Expand Down
83 changes: 83 additions & 0 deletions src/scenes/reports/AllReports.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
.reports{
margin: 20px;
padding: 10px 30px;
}
.reports-header-wrapper {
min-height: max-content;
}
.reports-header-container {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.reports-header-container p {
color: #2b343f;
font-size: 28px;
margin: 0;
}
.reports-header-container span {
color: #2b343f;
font-size: 13px;
margin: 0;
}

.reports-cards-container {
display: flex;
flex-direction: row;
/* justify-content: space-between; */
align-items: left;
width: auto;
flex-wrap: wrap;
}
.reports-each-card {
background-color: #ffffff;
display: flex;
flex-direction: column;
align-items: left;
width: 293px;
padding: 10px 8px;
margin-right: 22px;
margin-bottom: 20px;
border: 1px solid #e9edf2;
border-radius: 10px;
}

.reports-each-card div {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
padding: 0 8px;
}

.reports-each-card div p {
color: #687484;
font-size: 14px;
font-weight: bold;
}

.reports-each-card div h5 {
color: #2b343f;
font-size: 20px;
margin: 10px 0;
line-height: 14px;
font-weight: lighter;
padding: 8px 0;
}

.fa-star {
color: rgb(206, 206, 5);
}

.clock {
display: flex;
width: "30px";
height: "30px";
color: "#2aa7ff";
}

.header p {
font-weight: bold;
font-size: 20px;
}
169 changes: 169 additions & 0 deletions src/scenes/reports/AllReports.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
import React from "react";
import "../reports/AllReports.css"
import { FaStar } from "react-icons/fa";
import { LuClock3 } from "react-icons/lu";
import { AiOutlineAlignLeft } from "react-icons/ai";
import { MdOutlinePayment } from "react-icons/md";
import { PiCalculatorBold } from "react-icons/pi";

const cardDetails = [
{
key: "1",
title: "Time & activity",
value:
"See team members time worked,activity levels,and amounts earned per project or to-do",
},
{
key: "2",
title: "Daily totals (Weekly)",
value:
"See team members time worked,activity levels,and amounts earned per project or to-do",
},
{
key: "3",
title: "Work sessions",
value:
"See team members time worked,activity levels,and amounts earned per project or to-do",
},
{
key: "4",
title: "Apps & URLs",
value:
"See team members time worked,activity levels,and amounts earned per project or to-do",
},
{
key: "5",
title: "Manual time edits",
value:
"See team members time worked,activity levels,and amounts earned per project or to-do",
},
{
key: "6",
title: "Timesheet approvals",
value: "See team members timesheets and their status",
},
{
key: "7",
title: "Expenses",
value: "See how much has been spent on expenses by member and project",
},
{
key: "8",
title: "Work breaks",
value: "See how many work breaks team members are taking",
},
];

const paymentDetails = [
{
key: "1",
title: "Time & activity",
value:
"See team members time worked,activity levels,and amounts earned per project or to-do",
},
{
key: "2",
title: "Daily totals (Weekly)",
value:
"See team members time worked,activity levels,and amounts earned per project or to-do",
},

];

const BudgetDetails = [
{
key: "1",
title: "Time & activity",
value:
"See team members time worked,activity levels,and amounts earned per project or to-do",
},
{
key: "2",
title: "Daily totals (Weekly)",
value:
"See team members time worked,activity levels,and amounts earned per project or to-do",
},

];

export const CardLayout: React.FC = () => (

<div className="reports">
<div className="reports-header-wrapper">
<div className="reports-header-container">
<div>
<p>Reports</p>
</div>
<div style={{ cursor: "pointer", display:"flex"}} className="clock">
<LuClock3
style={{ width: "20px", height: "20px", color: "#2aa7ff"}}
/>
<p style={{color:"#2aa7ff", fontSize:"medium"}}>Scheduled Reports</p>
</div>
</div>
</div>

<div className="header">
<p><span><AiOutlineAlignLeft style={{color:"blue"}}/></span>General</p>
</div>

<div className="reports-cards-container">
{cardDetails.map((card, key) => (
<div className="reports-each-card" key={key}>
<div>
<h5>{card.title} </h5>
<div>
<FaStar className="fa-star" />
</div>
</div>
<div>
<p>{card.value}</p>
</div>
</div>
))}
</div>

<div className="header">
<p><span><MdOutlinePayment style={{color:"red"}}/></span>Payment</p>
</div>

<div className="reports-cards-container">
{paymentDetails.map((card, key) => (
<div className="reports-each-card" key={key}>
<div>
<h5>{card.title} </h5>
<div>
<FaStar className="fa-star" />
</div>
</div>
<div>
<p>{card.value}</p>
</div>
</div>
))}
</div>

<div className="header">
<p> <span><PiCalculatorBold style={{color:"green"}}/></span>Budgets and Limits</p>
</div>

<div className="reports-cards-container">
{BudgetDetails.map((card, key) => (
<div className="reports-each-card" key={key}>
<div>
<h5>{card.title} </h5>
<div>
<FaStar className="fa-star" />
</div>
</div>
<div>
<p>{card.value}</p>
</div>
</div>
))}
</div>
</div>

);

// export default CardLayout;