From a68c5a2e52a62600d3baf579afa484f85d51efb9 Mon Sep 17 00:00:00 2001 From: Vidhu Kant Sharma Date: Wed, 30 Aug 2023 13:18:41 +0530 Subject: added clients list --- css/manage/_client.scss | 36 ++++++++++++++ css/styles.scss | 2 + src/app/manage/client/list/address.rs | 35 ++++++++++++++ src/app/manage/client/list/list_item.rs | 49 +++++++++++++++++++ src/app/manage/client/list/mod.rs | 44 +++++++++++++++++ src/app/manage/client/mod.rs | 77 ++++++++++++++++++++++++++++++ src/app/manage/mod.rs | 2 + src/app/mod.rs | 2 +- src/main.rs | 2 + src/models/client.rs | 83 +++++++++++++++++++++++++++++++++ src/models/mod.rs | 18 +++++++ 11 files changed, 349 insertions(+), 1 deletion(-) create mode 100644 css/manage/_client.scss create mode 100644 src/app/manage/client/list/address.rs create mode 100644 src/app/manage/client/list/list_item.rs create mode 100644 src/app/manage/client/list/mod.rs create mode 100644 src/app/manage/client/mod.rs create mode 100644 src/models/client.rs create mode 100644 src/models/mod.rs diff --git a/css/manage/_client.scss b/css/manage/_client.scss new file mode 100644 index 0000000..7908333 --- /dev/null +++ b/css/manage/_client.scss @@ -0,0 +1,36 @@ +#manage-client-page { + //$h: calc(var(--nav-height) + calc(var(--main-padding) * 2)); + //height: calc(100vh - $h); + width: 100%; + + .clients-list-wrapper { + .clients-list { + .clients-list-item { + border-bottom: 1px solid var(--link-fg); + display: flex; + flex-direction: column; + + .header { + display: flex; + align-items: center; + gap: 0.5em; + font-size: 1.4em; + + .client-name { + font-weight: bold; + } + + .client-gstin { + font-size: 0.8em; + color: var(--body-fg-alt); + } + } + + .details { + width: 90%; + display: grid; + } + } + } + } +} diff --git a/css/styles.scss b/css/styles.scss index 900d4a5..b2f09ba 100644 --- a/css/styles.scss +++ b/css/styles.scss @@ -4,10 +4,12 @@ @import "navbar"; @import "menu_page"; +@import "manage/client"; :root { --body-bg: #282a36; --body-fg: #f8f8f8; + --body-fg-alt: lightgray; --nav-bg: #383a59; --nav-fg: #f8f8f8; diff --git a/src/app/manage/client/list/address.rs b/src/app/manage/client/list/address.rs new file mode 100644 index 0000000..c57ac89 --- /dev/null +++ b/src/app/manage/client/list/address.rs @@ -0,0 +1,35 @@ +/* openbills-web - Web client for Libre Billing Software + * Copyright (C) 2023 Vidhu Kant Sharma + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +use yew::prelude::*; + +use crate::models::client; + +#[derive(Properties, PartialEq)] +pub struct Props { + pub address: client::Address, +} + +#[function_component(Address)] +pub fn address(props: &Props) -> Html { + + html! { +
+ {props.address.address_text.clone()} +
+ } +} diff --git a/src/app/manage/client/list/list_item.rs b/src/app/manage/client/list/list_item.rs new file mode 100644 index 0000000..b2d9ca9 --- /dev/null +++ b/src/app/manage/client/list/list_item.rs @@ -0,0 +1,49 @@ +/* openbills-web - Web client for Libre Billing Software + * Copyright (C) 2023 Vidhu Kant Sharma + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +use yew::prelude::*; + +use crate::app::manage::client::list::address; + +use crate::models::client; + +#[derive(Properties, PartialEq)] +pub struct Props { + pub client: client::Client, +} + +#[function_component(ListItem)] +pub fn list_item(props: &Props) -> Html { + html! { +
+
+ {props.client.name.clone()} + {props.client.gstin.clone()} +
+ +
+
+
+ + + +
+
+
+
+ } +} diff --git a/src/app/manage/client/list/mod.rs b/src/app/manage/client/list/mod.rs new file mode 100644 index 0000000..2e13be6 --- /dev/null +++ b/src/app/manage/client/list/mod.rs @@ -0,0 +1,44 @@ +/* openbills-web - Web client for Libre Billing Software + * Copyright (C) 2023 Vidhu Kant Sharma + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +mod list_item; +mod address; + +use yew::prelude::*; + +use crate::models::client; + +#[derive(Properties, PartialEq)] +pub struct Props { + pub clients: Vec, +} + +#[function_component(ClientsList)] +pub fn clients_list(props: &Props) -> Html { + let list_items: Html = props.clients + .iter() + .map(|c| html!()) + .collect(); + + html! { +
+
+ {list_items} +
+
+ } +} diff --git a/src/app/manage/client/mod.rs b/src/app/manage/client/mod.rs new file mode 100644 index 0000000..de4ac4b --- /dev/null +++ b/src/app/manage/client/mod.rs @@ -0,0 +1,77 @@ +/* openbills-web - Web client for Libre Billing Software + * Copyright (C) 2023 Vidhu Kant Sharma + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +mod list; + +use yew::prelude::*; + +use crate::models::client; + +#[function_component(ManageClientPage)] +pub fn manage_client_page() -> Html { + let mut clients = Vec::new(); + + let mut c1: client::Client = client::Client::new(); + c1.id = 1; + c1.name = "MikunoNaka".to_string(); + c1.gstin = "AKSK821KASJ123LJF".to_string(); + c1.contact.contact_name = "Vidhu Kant".to_string(); + c1.contact.phone_number = "123810210293".to_string(); + c1.contact.email_address = "zt@vidhukant.com".to_string(); + c1.contact.website = "vidhukant.com".to_string(); + c1.billing_address.address_text = "Address".to_string(); + c1.billing_address.city = "City".to_string(); + c1.billing_address.state = "State".to_string(); + c1.billing_address.postal_code = "121212".to_string(); + c1.billing_address.country = "India".to_string(); + let mut c1s1 = client::Address::new(); + c1s1.address_text = "Shipping Address".to_string(); + c1s1.city = "City".to_string(); + c1s1.state = "State".to_string(); + c1s1.postal_code = "121212".to_string(); + c1s1.country = "India".to_string(); + c1.add_shipping_address(c1s1); + clients.push(c1); + + let mut c2: client::Client = client::Client::new(); + c2.id = 1; + c2.name = "Google Inc.".to_string(); + c2.gstin = "AKSK821KA12SJ123LJF".to_string(); + c2.contact.contact_name = "Google".to_string(); + c2.contact.phone_number = "490183212".to_string(); + c2.contact.email_address = "google@google.com".to_string(); + c2.contact.website = "google.com".to_string(); + c2.billing_address.address_text = "Address".to_string(); + c2.billing_address.city = "City".to_string(); + c2.billing_address.state = "State".to_string(); + c2.billing_address.postal_code = "121212".to_string(); + c2.billing_address.country = "India".to_string(); + let mut c2s1 = client::Address::new(); + c2s1.address_text = "Address".to_string(); + c2s1.city = "City".to_string(); + c2s1.state = "State".to_string(); + c2s1.postal_code = "121212".to_string(); + c2s1.country = "India".to_string(); + c2.add_shipping_address(c2s1); + clients.push(c2); + + html! { +
+ +
+ } +} diff --git a/src/app/manage/mod.rs b/src/app/manage/mod.rs index bdca731..ccaddc6 100644 --- a/src/app/manage/mod.rs +++ b/src/app/manage/mod.rs @@ -15,6 +15,8 @@ * along with this program. If not, see . */ +pub mod client; + use yew::prelude::*; use yew_icons::IconId; diff --git a/src/app/mod.rs b/src/app/mod.rs index 1f37a9f..68c4d0c 100644 --- a/src/app/mod.rs +++ b/src/app/mod.rs @@ -61,7 +61,7 @@ pub fn switch(routes: Route) -> Html { Route::Home => html! {}, Route::ManageMenu => html! {}, - Route::ManageClients => html! {

{ "Edit Clients (To Be Added)" }

}, + Route::ManageClients => html! {}, Route::ManageBrands => html! {

{ "Edit Brands (To Be Added)" }

}, Route::ManageItems => html! {

{ "Edit Items (To Be Added)" }

}, Route::ManageInvoices => html! {

{ "Edit Invoices (To Be Added)" }

}, diff --git a/src/main.rs b/src/main.rs index a95dffc..f6560ed 100644 --- a/src/main.rs +++ b/src/main.rs @@ -18,6 +18,8 @@ mod app; mod components; +mod models; + use app::App; fn main() { diff --git a/src/models/client.rs b/src/models/client.rs new file mode 100644 index 0000000..a76af70 --- /dev/null +++ b/src/models/client.rs @@ -0,0 +1,83 @@ +/* openbills-web - Web client for Libre Billing Software + * Copyright (C) 2023 Vidhu Kant Sharma + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#[derive(Clone, PartialEq)] +pub struct Address { + pub address_text: String, + pub city: String, + pub state: String, + pub postal_code: String, + pub country: String, +} + +impl Address { + pub fn new() -> Address { + Address { + address_text: String::new(), + city: String::new(), + state: String::new(), + postal_code: String::new(), + country: String::new(), + } + } +} + +#[derive(Clone, PartialEq)] +pub struct Contact { + pub contact_name: String, + pub phone_number: String, + pub email_address: String, + pub website: String, +} + +impl Contact { + pub fn new() -> Contact { + Contact { + contact_name: String::new(), + phone_number: String::new(), + email_address: String::new(), + website: String::new(), + } + } +} + +#[derive(Clone, PartialEq)] +pub struct Client { + pub id: u64, + pub name: String, + pub contact: Contact, + pub gstin: String, + pub billing_address: Address, + pub shipping_addresses: Vec
, +} + +impl Client { + pub fn new() -> Client { + Client { + id: 0, + name: String::new(), + contact: Contact::new(), + gstin: String::new(), + billing_address: Address::new(), + shipping_addresses: Vec::new(), + } + } + + pub fn add_shipping_address(&mut self, address: Address) { + self.shipping_addresses.push(address); + } +} diff --git a/src/models/mod.rs b/src/models/mod.rs new file mode 100644 index 0000000..514c03d --- /dev/null +++ b/src/models/mod.rs @@ -0,0 +1,18 @@ +/* openbills-web - Web client for Libre Billing Software + * Copyright (C) 2023 Vidhu Kant Sharma + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +pub mod client; -- cgit v1.2.3