From 0d7d20829623b14c8ea5284bc24e63f7c31d61b7 Mon Sep 17 00:00:00 2001 From: Vidhu Kant Sharma Date: Wed, 30 Aug 2023 15:15:31 +0530 Subject: renamed client to customer --- src/app/manage/client/list/address.rs | 37 -------------- src/app/manage/client/list/list_item.rs | 38 -------------- src/app/manage/client/list/mod.rs | 51 ------------------- src/app/manage/client/mod.rs | 81 ------------------------------ src/app/manage/customer/list/address.rs | 37 ++++++++++++++ src/app/manage/customer/list/list_item.rs | 38 ++++++++++++++ src/app/manage/customer/list/mod.rs | 51 +++++++++++++++++++ src/app/manage/customer/mod.rs | 81 ++++++++++++++++++++++++++++++ src/app/manage/mod.rs | 8 +-- src/app/mod.rs | 6 +-- src/components/navbar/nav.rs | 20 ++++++-- src/models/client.rs | 83 ------------------------------- src/models/customer.rs | 83 +++++++++++++++++++++++++++++++ src/models/mod.rs | 2 +- 14 files changed, 315 insertions(+), 301 deletions(-) delete mode 100644 src/app/manage/client/list/address.rs delete mode 100644 src/app/manage/client/list/list_item.rs delete mode 100644 src/app/manage/client/list/mod.rs delete mode 100644 src/app/manage/client/mod.rs create mode 100644 src/app/manage/customer/list/address.rs create mode 100644 src/app/manage/customer/list/list_item.rs create mode 100644 src/app/manage/customer/list/mod.rs create mode 100644 src/app/manage/customer/mod.rs delete mode 100644 src/models/client.rs create mode 100644 src/models/customer.rs (limited to 'src') diff --git a/src/app/manage/client/list/address.rs b/src/app/manage/client/list/address.rs deleted file mode 100644 index 233de92..0000000 --- a/src/app/manage/client/list/address.rs +++ /dev/null @@ -1,37 +0,0 @@ -/* 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, - pub title: String, -} - -#[function_component(Address)] -pub fn address(props: &Props) -> Html { - - html! { -
- {props.title.clone()} - {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 deleted file mode 100644 index 2e6fed0..0000000 --- a/src/app/manage/client/list/list_item.rs +++ /dev/null @@ -1,38 +0,0 @@ -/* 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 client: client::Client, - pub s_no: usize, -} - -#[function_component(ListItem)] -pub fn list_item(props: &Props) -> Html { - html! { -
- {props.s_no} - {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 deleted file mode 100644 index 1c00f0a..0000000 --- a/src/app/manage/client/list/mod.rs +++ /dev/null @@ -1,51 +0,0 @@ -/* 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() - .enumerate() - .map(|(id, c)| html!()) - .collect(); - - html! { -
-
- {"S. No"} - {"Client Name"} - {"GSTIN"} - -
-
- {list_items} -
-
- } -} diff --git a/src/app/manage/client/mod.rs b/src/app/manage/client/mod.rs deleted file mode 100644 index e81f9a5..0000000 --- a/src/app/manage/client/mod.rs +++ /dev/null @@ -1,81 +0,0 @@ -/* 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); - - for _ in 0..1000 { - clients.push(c2.clone()); - } - - html! { -
-

{"To Add: Searching, Viewing, Editing, Deletion, Batch Deletion"}

- -
- } -} diff --git a/src/app/manage/customer/list/address.rs b/src/app/manage/customer/list/address.rs new file mode 100644 index 0000000..8498530 --- /dev/null +++ b/src/app/manage/customer/list/address.rs @@ -0,0 +1,37 @@ +/* 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::customer; + +#[derive(Properties, PartialEq)] +pub struct Props { + pub address: customer::Address, + pub title: String, +} + +#[function_component(Address)] +pub fn address(props: &Props) -> Html { + + html! { +
+ {props.title.clone()} + {props.address.address_text.clone()} +
+ } +} diff --git a/src/app/manage/customer/list/list_item.rs b/src/app/manage/customer/list/list_item.rs new file mode 100644 index 0000000..26ac51d --- /dev/null +++ b/src/app/manage/customer/list/list_item.rs @@ -0,0 +1,38 @@ +/* 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::customer; + +#[derive(Properties, PartialEq)] +pub struct Props { + pub customer: customer::Customer, + pub s_no: usize, +} + +#[function_component(ListItem)] +pub fn list_item(props: &Props) -> Html { + html! { +
+ {props.s_no} + {props.customer.name.clone()} + {props.customer.gstin.clone()} + +
+ } +} diff --git a/src/app/manage/customer/list/mod.rs b/src/app/manage/customer/list/mod.rs new file mode 100644 index 0000000..00beb63 --- /dev/null +++ b/src/app/manage/customer/list/mod.rs @@ -0,0 +1,51 @@ +/* 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::customer; + +#[derive(Properties, PartialEq)] +pub struct Props { + pub customers: Vec, +} + +#[function_component(CustomersList)] +pub fn customers_list(props: &Props) -> Html { + let list_items: Html = props.customers + .iter() + .enumerate() + .map(|(id, c)| html!()) + .collect(); + + html! { +
+
+ {"S. No"} + {"Customer Name"} + {"GSTIN"} + +
+
+ {list_items} +
+
+ } +} diff --git a/src/app/manage/customer/mod.rs b/src/app/manage/customer/mod.rs new file mode 100644 index 0000000..8f5f6fb --- /dev/null +++ b/src/app/manage/customer/mod.rs @@ -0,0 +1,81 @@ +/* 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::customer; + +#[function_component(ManageCustomerPage)] +pub fn manage_customer() -> Html { + let mut customers = Vec::new(); + + let mut c1: customer::Customer = customer::Customer::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 = customer::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); + customers.push(c1); + + let mut c2: customer::Customer = customer::Customer::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 = customer::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); + + for _ in 0..1000 { + customers.push(c2.clone()); + } + + html! { +
+

{"To Add: Searching, Viewing, Editing, Deletion, Batch Deletion"}

+ +
+ } +} diff --git a/src/app/manage/mod.rs b/src/app/manage/mod.rs index ccaddc6..354d9d3 100644 --- a/src/app/manage/mod.rs +++ b/src/app/manage/mod.rs @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -pub mod client; +pub mod customer; use yew::prelude::*; use yew_icons::IconId; @@ -28,8 +28,8 @@ pub fn manage_menu_page() -> Html { let page_menu_items = Vec::from([ menu_items::Item { icon: IconId::FontAwesomeSolidUser, - label: String::from("Edit Clients"), - to: Route::ManageClients, + label: String::from("Edit Customers"), + to: Route::ManageCustomers, }, menu_items::Item { icon: IconId::FontAwesomeSolidIndustry, @@ -58,7 +58,7 @@ pub fn manage_menu_page() -> Html {

{ "Manage OpenBills Data" }

-

{ "Here you can add/modify/delete OpenBills data (clients, invoices, etc)" }

+

{ "Here you can add/modify/delete OpenBills data (customers, invoices, etc)" }

 diff --git a/src/app/mod.rs b/src/app/mod.rs index 68c4d0c..ac4b57f 100644 --- a/src/app/mod.rs +++ b/src/app/mod.rs @@ -30,8 +30,8 @@ pub enum Route { #[at("/manage")] ManageMenu, - #[at("/manage/clients")] - ManageClients, + #[at("/manage/customers")] + ManageCustomers, #[at("/manage/brands")] ManageBrands, #[at("/manage/items")] @@ -61,7 +61,7 @@ pub fn switch(routes: Route) -> Html { Route::Home => html! {}, Route::ManageMenu => html! {}, - Route::ManageClients => html! {}, + Route::ManageCustomers => 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/components/navbar/nav.rs b/src/components/navbar/nav.rs index dd215a0..5249b60 100644 --- a/src/components/navbar/nav.rs +++ b/src/components/navbar/nav.rs @@ -17,6 +17,7 @@ use yew::prelude::*; use yew_router::prelude::*; +use gloo::utils::document; use crate::app::Route; use crate::components::navbar::nav_link::NavLink; @@ -58,8 +59,8 @@ pub fn nav() -> Html { to: Route::Home, }, Link { - label: String::from("Clients"), - to: Route::ManageClients, + label: String::from("Customers"), + to: Route::ManageCustomers, }, Link { label: String::from("Brands"), @@ -76,7 +77,7 @@ pub fn nav() -> Html { ]); let links_html: Html = match current_route { - Route::ManageClients + Route::ManageCustomers | Route::ManageBrands | Route::ManageItems | Route::ManageInvoices => manage_links, @@ -86,6 +87,19 @@ pub fn nav() -> Html { .map(|link| html!()) .collect(); + // set document title + document().set_title(match current_route { + Route::Home => "", + + Route::ManageMenu => "Manage OpenBills Data", + Route::ManageCustomers => "Manage OpenBills Customers", + Route::ManageBrands => "Manage OpenBills Brands", + Route::ManageItems => "Manage OpenBills Items", + Route::ManageInvoices => "Manage OpenBills Invoices", + + _ => "Hello World", + }); + html! {