From 177427b5821a67e141236e6aeb4db12d76b050a0 Mon Sep 17 00:00:00 2001 From: MikunoNaka Date: Wed, 7 Jul 2021 15:34:04 +0530 Subject: styled and added basic functionality to TransportForm --- src/components/Form/Form.scss | 24 +++++++++- src/components/Form/Transport/TransportForm.tsx | 64 +++++++++++++------------ src/components/Menu/InvoiceInfoMenu.tsx | 6 ++- src/components/Pages/BillingPage.tsx | 7 ++- 4 files changed, 66 insertions(+), 35 deletions(-) (limited to 'src/components') diff --git a/src/components/Form/Form.scss b/src/components/Form/Form.scss index 06d15ea..7642f75 100644 --- a/src/components/Form/Form.scss +++ b/src/components/Form/Form.scss @@ -160,14 +160,34 @@ input { } .TransportForm { - padding: 2rem; + padding: 1rem; + font-size: $fontSize1 + 0.25; +} + +.TransportForm label { + display: flex; + flex-direction: row; + justify-content: space-between; + min-width: 90%; +} + +.TransportForm .inputs { + height: 80%; display: flex; flex-direction: column; - justify-content: center /*space-between*/; + justify-content: space-around; align-items: center; } +.TransportForm .menu { + position: absolute; + + right: 1rem; + bottom: 1rem; + //border: 1px solid gray; +} + /*.ClientInfoDisplay { font-size: $fontSize1; }*/ diff --git a/src/components/Form/Transport/TransportForm.tsx b/src/components/Form/Transport/TransportForm.tsx index 0611cc1..60dfee3 100644 --- a/src/components/Form/Transport/TransportForm.tsx +++ b/src/components/Form/Transport/TransportForm.tsx @@ -6,11 +6,12 @@ * Copyright (c) 2021 Vidhu Kant Sharma */ -import React, { useState } from "react"; +import React, { useState, Dispatch, SetStateAction } from "react"; import { Transport } from "./../../../interfaces" interface Props { - setVisibility: any // this component's visibility + setVisibility: Dispatch> // this component's visibility + setTransporter: Dispatch> } const TransportForm: React.FC = (props) => { @@ -23,7 +24,6 @@ const TransportForm: React.FC = (props) => { const hideSelf = () => props.setVisibility(false); - const closeOnBGClicked = (event: any) => event.target.className === "floatingMenuBG" && hideSelf(); @@ -37,7 +37,7 @@ const TransportForm: React.FC = (props) => { GSTIN: transporterGSTIN, Builty: builtyNumber } - console.log(newTransport); + props.setTransporter(newTransport); hideSelf(); } @@ -45,37 +45,41 @@ const TransportForm: React.FC = (props) => { return (
- +
+ - + - + - + - + +
- +
+ +
); diff --git a/src/components/Menu/InvoiceInfoMenu.tsx b/src/components/Menu/InvoiceInfoMenu.tsx index ce61858..e51d0c2 100644 --- a/src/components/Menu/InvoiceInfoMenu.tsx +++ b/src/components/Menu/InvoiceInfoMenu.tsx @@ -17,7 +17,11 @@ const InvoiceInfoMenu: React.FC = (props) => { return ( <>
- props.setShowTransportForm(true)}/> + props.setShowTransportForm(true)} + />
); diff --git a/src/components/Pages/BillingPage.tsx b/src/components/Pages/BillingPage.tsx index 9f98cb9..3949beb 100644 --- a/src/components/Pages/BillingPage.tsx +++ b/src/components/Pages/BillingPage.tsx @@ -9,7 +9,7 @@ import React, { useState, useEffect } from "react"; import axios from "axios"; -import { Item, Person } from "../../interfaces"; +import { Item, Person, Transport } from "../../interfaces"; import AddNewItemForm from "./../Form/Items/AddNewItemForm"; import RegisterItemForm from "./../Form/Items/RegisterItemForm"; @@ -32,6 +32,8 @@ const BillingPage: React.FC = () => { const [items, setItems] = useState([]); const [invoiceNumber, setInvoiceNumber] = useState(1234); // get data from backend const [showTransportForm, setShowTransportForm] = useState(false); + const [transporter, setTransporter] = useState({Name: "", VehicleNum: "", Method: "", GSTIN: "", Builty: ""}) + console.log(transporter); const getRegisteredItems = () => axios.get(`/api/items/get-all`) @@ -72,9 +74,10 @@ const BillingPage: React.FC = () => { /> } - {showTransportForm && + {showTransportForm && } -- cgit v1.2.3