Skip to content

Add new screens #83

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

Open
jaythebeez wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add new screens #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8ea6e2
Add new screens
jaythebeez Sep 1, 2022
71c895e
fix create invoice issues
jaythebeez Sep 2, 2022
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
4 changes: 4 additions & 0 deletions src/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,10 @@ input {
font-size: 14px;
}

.font-18{
font-size: 18;
}

.font-16 {
font-size: 16px;
}
Expand Down
25 changes: 25 additions & 0 deletions src/Components/CannotViewModal/CannotView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import Modal from "../Modal/modal";
import ErrorImage from "../../assets/view-error.png";
import { useNavigate } from "react-router-dom";

import "./cannotviewmodal.css";

const CannotViewModal = () =>{

const navigate = useNavigate();

const handleNavigate = () => {
navigate("/");
}

return(
<Modal>
<div className="cannot-view-modal flex flex-col items-center text-center">
<img src={ErrorImage} alt="" />
<span className="font-18">You do not have permission to view the contents of this page.</span>
<button className="xeggo-btn" onClick={handleNavigate} >Go To Dashboard</button>
</div>
</Modal>
)
}
export default CannotViewModal;
5 changes: 5 additions & 0 deletions src/Components/CannotViewModal/cannotviewmodal.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.cannot-view-modal{
width: 464px;
padding: 70px 30px 50px 30px;
gap:30px;
}
21 changes: 15 additions & 6 deletions src/Components/InvoiceButton.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ import { ethers } from "ethers";
import { networks } from "../network.config.json";
import { useSelector } from "react-redux/es/exports";
import { initWeb3 } from "../utils/init";
import { useState } from 'react';
import ReceiptModal from './ReceiptModal/ReceiptModal';

const InvoiceButton = ({ invoice, account, contract }) => {
const InvoiceButton = ({ invoice, invoiceData, account, contract }) => {
const { chainId, isSupported } = useSelector((state) => state.network);
const web3 = initWeb3();

console.log(invoice)
const [modal, setModal] = useState(false);

const payHandler = async (
e,
Expand Down Expand Up @@ -65,16 +67,21 @@ const InvoiceButton = ({ invoice, account, contract }) => {
}
};

const openDownloadModal = () => {
setModal(true);
}

return (
<>
<div>
{invoice.invoiceCreator === account ? (
<div onClick={(e) => e.stopPropagation()}>
{invoice.isCancelled ? (
<button className='xeggo-button'>
<button className='xeggo-button' onClick={openDownloadModal}>
Cancelled
</button>
) : invoice.isPaid ? (
<button className='xeggo-button'>
<button className='xeggo-button' onClick={openDownloadModal}>
Paid
</button>
) : (
Expand All @@ -89,11 +96,11 @@ const InvoiceButton = ({ invoice, account, contract }) => {
) : (
<div onClick={(e) => e.stopPropagation()}>
{invoice.isPaid ? (
<button className='xeggo-button'>
<button className='xeggo-button' onClick={openDownloadModal}>
Paid
</button>
) : invoice.isCancelled ? (
<button className='xeggo-button'>
<button className='xeggo-button' onClick={openDownloadModal}>
Cancelled
</button>
) : (
Expand All @@ -107,6 +114,8 @@ const InvoiceButton = ({ invoice, account, contract }) => {
</div>
)}
</div>
{modal && <ReceiptModal invoice={invoice} invoiceData={invoiceData} closeModal={()=>setModal(false)} />}
</>
);
};

Expand Down
1 change: 0 additions & 1 deletion src/Components/LinksModal/LinksModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ const LinksModal = ({closeModal, link}) => {
</div>
<div className="modal-nav">
<span className="modal-nav-link active">Share Link</span>
<span className="modal-nav-link ">Download</span>
</div>
<div className="mb-20">
<span className="font-12 line-18 width-230 inline-block">Share the payment link by copying the web address below</span>
Expand Down
2 changes: 1 addition & 1 deletion src/Components/ProfileDetails/profiledetails.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
.modal-button button {
width: 100%;
height: 60px;
background: var(--content-background);
background: var(--xeggo-gradient);
border: 1px solid var(--border-color);
border-radius: 10px;
font-size: 16px;
Expand Down
65 changes: 65 additions & 0 deletions src/Components/ReceiptModal/ReceiptModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import { useEffect } from "react";
import Modal from "../Modal/modal";

import "./receiptmodal.css"

const ReceiptModal = ({invoice,invoiceData, closeModal}) => {

useEffect(()=>{
console.log({invoice, invoiceData}, "This is my invoice data")
}, [invoice])
return (
<Modal closeFunction={closeModal}>
<div className="receipt-modal">
<div className="mb-50">
<div className="weight-600">You have successfully paid for</div>
<div className="weight-600">Invoice #{invoiceData.invoice_id}</div>
</div>
<div className="modal-nav">
<span className="modal-nav-link active">Invoice Details</span>
</div>
<div>
<div className="flex space-between mb-10">
<span className="font-12 line-18 weight-600">Invoice Paid To:</span>
<span className="font-12 line-18 weight-600" >{invoiceData.sender_name}</span>
</div>
<div className="flex space-between mb-10">
<span className="font-12 line-18 weight-600">Invoice No:</span>
<span className="font-12 line-18 weight-600" >#{invoiceData.invoice_id}</span>
</div>
<div className="flex space-between mb-10">
<span className="font-12 line-18 weight-600">Asset:</span>
<span className="font-12 line-18 weight-600" >cUSD(Celo)</span>
</div>
<div className="flex space-between mb-10">
<span className="font-12 line-18 weight-600">Item Description:</span>
<span className="font-12 line-18 weight-600" >Amount</span>
</div>
{invoiceData.items.map(item=>(
<div className="flex space-between mb-10">
<span className="faded font-12 line-18 weight-600">{item.item} x{item.quantity}:</span>
<span className="font-12 line-18 faded weight-600" >{item.price}</span>
</div>
))}
<div className="flex space-between mb-10">
<span className="font-12 line-18 weight-600">Total Net Amount:</span>
<span className="font-12 line-18 faded weight-600" >{invoiceData.net_amount}</span>
</div>
<div className="flex space-between mb-10">
<span className="font-12 line-18 weight-600">Total Vat Amount:</span>
<span className="font-12 line-18 faded weight-600" >{invoiceData.vat_amount}</span>
</div>
<div className="flex space-between mb-30">
<span className="font-12 line-18 weight-600">Total Gross Amount:</span>
<span className="font-12 line-18 faded weight-600" >{invoiceData.gross_amount}</span>
</div>
</div>
<div className="text-center">
<button className="xeggo-btn">Download as PDF</button>
</div>
</div>
</Modal>
);
}

export default ReceiptModal;
47 changes: 47 additions & 0 deletions src/Components/ReceiptModal/receiptmodal.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
.receipt-modal{
width: 380px;
padding: 45px 25px 25px 25px;
}

.receipt-modal .text{
width: 250px;
}

.modal-nav{
border-bottom: 1px solid var(--light-dark);
margin-bottom: 30px;
}


.modal-nav-link {
display: inline-block;
font-weight: 600;
font-size: 12px;
line-height: 18px;
color: var(--nav-link-text);
margin-right: 30px;
cursor: pointer;
}

.modal-nav-link.active{
font-weight: 500;
color: var(--secondary-text);
position: relative;
cursor: default;
}

.modal-nav-link.active::after {
position: absolute;
bottom: -3.5px;
left:0;
display: block;
content: "";
width: 100%;
height: 3px;
background: var(--xeggo-gradient);
border-radius: 10px;
}

.faded{
color: #BABABA;
}
4 changes: 2 additions & 2 deletions src/Pages/CreateInvoice/CreateInvoice.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,8 +355,8 @@ const CreateInvoice = ({contract, account}) => {
<input type="text" value={row.vat_rate} onChange={(e)=>handleRow(e,i,"vat_rate")} placeholder='-' className='center-input pr-10' />
<span className='vat' >%</span>
</td>
<td><input type="number" value={amounts[i].vat_amount} onChange={(e)=>handleRow(e,i,"vat_amount")} placeholder='-' className='center-input' /></td>
<td><input type="number" value={amounts[i].gross_amount} onChange={(e)=>handleRow(e,i,"gross_amount")} placeholder='-' className='center-input' /></td>
<td><input type="number" value={amounts[i].vat_amount} onChange={(e)=>handleRow(e,i,"vat_amount")} placeholder='-' className='center-input' readOnly /></td>
<td><input type="number" value={amounts[i].gross_amount} onChange={(e)=>handleRow(e,i,"gross_amount")} placeholder='-' className='center-input' readOnly /></td>
{i > 0 && <td><span className='pointer' onClick={()=>removeRow(i)}><img src={BinIcon} alt="Delete" /></span></td>}
</tr>
</tbody>
Expand Down
27 changes: 18 additions & 9 deletions src/Pages/InvoicePage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ import moment from 'moment';
import TickIcon from "../assets/tick.svg";
import { getParticularInvoice } from "../utils/dbQueries";
import LinksModal from "../Components/LinksModal/LinksModal";
import CannotViewModal from "../Components/CannotViewModal/CannotView";


const InvoicePage = ({invoices, account, contract, web3}) => {
const { id } = useParams();
const [invoice, setInvoice] = useState(false);
const [invoiceData, setInvoiceData] = useState(false);
const [link, setLink] = useState("");
const [loading, setLoading] = useState(true)

useEffect(()=>{
const accountInvoice = invoices.find((invoice) => {
Expand All @@ -22,7 +24,12 @@ const InvoicePage = ({invoices, account, contract, web3}) => {
}, [invoices]);

useEffect(()=>{
handleInvoiceData(invoice.invoiceID);
(async ()=>{
if(invoice){
await handleInvoiceData(invoice.invoiceID);
await setLoading(false)
}
})()
},[invoice])

const handleInvoiceData = async (invoice_id) => {
Expand Down Expand Up @@ -130,14 +137,14 @@ const InvoicePage = ({invoices, account, contract, web3}) => {
{invoiceData.total_items?.map((row,i) => (
<tr key={i}>
<td><input value={row.item} type="text" placeholder='Enter Item Description' /></td>
<td><input value={row.quantity} type="number" placeholder='-' className='center-input' /></td>
<td><input value={row.price} type="number" placeholder='-' className='center-input' /></td>
<td><input value={row.quantity} type="number" placeholder='-' className='center-input' readOnly /></td>
<td><input value={row.price} type="number" placeholder='-' className='center-input' readOnly /></td>
<td className='relative'>
<input type="text" value={row.vat_rate} placeholder='-' className='center-input pr-10' />
<input type="text" value={row.vat_rate} placeholder='-' className='center-input pr-10' readOnly />
<span className='vat' >%</span>
</td>
<td><input type="number" value={row.vat_amount} placeholder='-' className='center-input' /></td>
<td><input type="number" value={row.gross_amount} placeholder='-' className='center-input' /></td>
<td><input type="number" value={row.vat_amount} placeholder='-' className='center-input' readOnly /></td>
<td><input type="number" value={row.gross_amount} placeholder='-' className='center-input' readOnly /></td>
</tr>
))}
</tbody>
Expand Down Expand Up @@ -194,14 +201,16 @@ const InvoicePage = ({invoices, account, contract, web3}) => {
<div className="invoice-buttons">
<div className="flex gap-20">
<button className='xeggo-btn-outline' onClick={openLinksModal}>Generate Payment Link</button>
<InvoiceButton invoice={invoice} contract={contract} account={account} />
<InvoiceButton invoice={invoice} invoiceData={invoiceData} contract={contract} account={account} />
</div>
</div>
</div>
</div>
</div>
) : (
<h1>Loading...</h1>
) : !loading && (
<div className="body-container">
<CannotViewModal />
</div>
)}
{link.length > 0 && <LinksModal closeModal={()=>setLink(false)} link={link} />}
</>
Expand Down
Binary file added src/assets/error-circle.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/view-error.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.