From 5941662069fac56ea51e865a44c99b094421f94d Mon Sep 17 00:00:00 2001 From: Franz Dietrich Date: Thu, 12 Aug 2021 11:47:04 +0200 Subject: [PATCH] renaming of shared in app --- app/src/i18n.rs | 2 +- app/src/lib.rs | 7 ++++--- app/src/navigation.rs | 4 ++-- app/src/pages/list_links.rs | 4 ++-- app/src/pages/list_users.rs | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/src/i18n.rs b/app/src/i18n.rs index b97c0d0..13e1a0d 100644 --- a/app/src/i18n.rs +++ b/app/src/i18n.rs @@ -2,7 +2,7 @@ use std::sync::Arc; use fluent::{FluentArgs, FluentBundle, FluentResource}; -use shared::datatypes::Lang; +use pslink_shared::datatypes::Lang; use unic_langid::LanguageIdentifier; /// A struct containing the data, functions and the current language to query the localized strings. diff --git a/app/src/lib.rs b/app/src/lib.rs index 108344c..42e2ff4 100644 --- a/app/src/lib.rs +++ b/app/src/lib.rs @@ -5,12 +5,13 @@ pub mod pages; use pages::list_links; use pages::list_users; +use pslink_shared::{ + apirequests::users::LoginUser, + datatypes::{Lang, Loadable, User}, +}; use seed::window; use seed::IF; use seed::{attrs, button, div, input, label, log, prelude::*, App, Url, C}; -use shared::apirequests::users::LoginUser; -use shared::datatypes::Lang; -use shared::datatypes::{Loadable, User}; use crate::i18n::I18n; diff --git a/app/src/navigation.rs b/app/src/navigation.rs index b4cc347..057da8f 100644 --- a/app/src/navigation.rs +++ b/app/src/navigation.rs @@ -1,10 +1,10 @@ //! Create the top menu of the app use fluent::fluent_args; -use seed::{a, attrs, div, li, nav, nodes, ol, prelude::*, Url, C}; -use shared::{ +use pslink_shared::{ apirequests::users::Role, datatypes::{Lang, User}, }; +use seed::{a, attrs, div, li, nav, nodes, ol, prelude::*, Url, C}; use crate::{i18n::I18n, Msg}; diff --git a/app/src/pages/list_links.rs b/app/src/pages/list_links.rs index a8aedb8..423a15e 100644 --- a/app/src/pages/list_links.rs +++ b/app/src/pages/list_links.rs @@ -11,7 +11,7 @@ use seed::{ }; use web_sys::{IntersectionObserver, IntersectionObserverEntry, IntersectionObserverInit}; -use shared::{ +use pslink_shared::{ apirequests::general::Ordering, apirequests::{ general::{EditMode, Message, Operation, Status}, @@ -729,7 +729,7 @@ fn view_link_table_filter_input String>(model: &Model, t: F) -> N /// display a single table row containing one link fn view_link(l: &Cached, logged_in_user: &User) -> Node { - use shared::apirequests::users::Role; + use pslink_shared::apirequests::users::Role; let link = LinkDelta::from(l.data.clone()); tr![ IF! (logged_in_user.role == Role::Admin diff --git a/app/src/pages/list_users.rs b/app/src/pages/list_users.rs index 7e41446..bcc9ba0 100644 --- a/app/src/pages/list_users.rs +++ b/app/src/pages/list_users.rs @@ -1,8 +1,7 @@ //! List all users in case an admin views it, list the "self" user otherwise. use enum_map::EnumMap; -use seed::{a, attrs, div, h1, input, log, p, prelude::*, section, table, td, th, tr, Url, C, IF}; -use shared::{ +use pslink_shared::{ apirequests::general::{Operation, Ordering}, apirequests::{ general::{EditMode, Status}, @@ -10,6 +9,7 @@ use shared::{ }, datatypes::{Lang, User}, }; +use seed::{a, attrs, div, h1, input, log, p, prelude::*, section, table, td, th, tr, Url, C, IF}; /* * init */