From 78cb65e054a74c283925c0dbb6704512962ea9d0 Mon Sep 17 00:00:00 2001 From: Adrien Date: Fri, 12 Apr 2024 12:49:07 +0200 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=20Move=20fonts=20and=20im?= =?UTF-8?q?ages=20directories=20in=20a=20common=20public=20on?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- {fonts => public/fonts}/Geist/Geist-Black.woff2 | Bin {fonts => public/fonts}/Geist/Geist-Bold.woff2 | Bin {fonts => public/fonts}/Geist/Geist-Light.woff2 | Bin .../fonts}/Geist/Geist-Medium.woff2 | Bin .../fonts}/Geist/Geist-Regular.woff2 | Bin .../fonts}/Geist/Geist-SemiBold.woff2 | Bin {fonts => public/fonts}/Geist/Geist-Thin.woff2 | Bin .../fonts}/Geist/Geist-UltraBlack.woff2 | Bin .../fonts}/Geist/Geist-UltraLight.woff2 | Bin .../fonts}/Geist/GeistVariableVF.ttf | Bin .../fonts}/Geist/GeistVariableVF.woff2 | Bin {fonts => public/fonts}/Geist/LICENSE.TXT | 0 {images => public/images}/add_user.png | Bin {images => public/images}/add_user2.png | Bin {images => public/images}/aerobutton_border.png | Bin .../images}/aerobutton_border_down.png | Bin {images => public/images}/ban_user.png | Bin {images => public/images}/brush.png | Bin {images => public/images}/button_border.png | Bin .../images}/button_border_disabled.png | Bin .../images}/button_border_focus.png | Bin {images => public/images}/default-avatar.png | Bin {images => public/images}/directory.png | Bin {images => public/images}/games.png | Bin {images => public/images}/letter.png | Bin .../images}/login-profile-placeholder.svg | 0 {images => public/images}/logo-msn.png | Bin {images => public/images}/medias.png | Bin .../images}/modal-default-critical-icon.svg | 0 .../images}/modal-default-ok-icon.svg | 0 .../images}/modal-default-warning-icon.svg | 0 {images => public/images}/news.png | Bin {images => public/images}/phone.png | Bin {images => public/images}/settings.png | Bin {images => public/images}/status_away.png | Bin {images => public/images}/status_busy.png | Bin {images => public/images}/status_online.png | Bin {images => public/images}/tbc_transfert.png | Bin {images => public/images}/wallpaper-pattern.svg | 0 {images => public/images}/webcam.svg | 0 {images => public/images}/wizz.png.old | Bin .../services/random_svg_generators.rs | 2 +- src/ui/_base.scss | 8 ++++---- src/ui/components/avatar_selector.rs | 2 +- src/ui/components/chats_window/mod.rs | 2 +- src/ui/components/chats_window/navbar.rs | 16 ++++++++-------- .../contacts_window/contacts_section.rs | 2 +- src/ui/components/contacts_window/mod.rs | 14 +++++++------- src/ui/components/header.rs | 2 +- 49 files changed, 24 insertions(+), 24 deletions(-) rename {fonts => public/fonts}/Geist/Geist-Black.woff2 (100%) rename {fonts => public/fonts}/Geist/Geist-Bold.woff2 (100%) rename {fonts => public/fonts}/Geist/Geist-Light.woff2 (100%) rename {fonts => public/fonts}/Geist/Geist-Medium.woff2 (100%) rename {fonts => public/fonts}/Geist/Geist-Regular.woff2 (100%) rename {fonts => public/fonts}/Geist/Geist-SemiBold.woff2 (100%) rename {fonts => public/fonts}/Geist/Geist-Thin.woff2 (100%) rename {fonts => public/fonts}/Geist/Geist-UltraBlack.woff2 (100%) rename {fonts => public/fonts}/Geist/Geist-UltraLight.woff2 (100%) rename {fonts => public/fonts}/Geist/GeistVariableVF.ttf (100%) rename {fonts => public/fonts}/Geist/GeistVariableVF.woff2 (100%) rename {fonts => public/fonts}/Geist/LICENSE.TXT (100%) rename {images => public/images}/add_user.png (100%) rename {images => public/images}/add_user2.png (100%) rename {images => public/images}/aerobutton_border.png (100%) rename {images => public/images}/aerobutton_border_down.png (100%) rename {images => public/images}/ban_user.png (100%) rename {images => public/images}/brush.png (100%) rename {images => public/images}/button_border.png (100%) rename {images => public/images}/button_border_disabled.png (100%) rename {images => public/images}/button_border_focus.png (100%) rename {images => public/images}/default-avatar.png (100%) rename {images => public/images}/directory.png (100%) rename {images => public/images}/games.png (100%) rename {images => public/images}/letter.png (100%) rename {images => public/images}/login-profile-placeholder.svg (100%) rename {images => public/images}/logo-msn.png (100%) rename {images => public/images}/medias.png (100%) rename {images => public/images}/modal-default-critical-icon.svg (100%) rename {images => public/images}/modal-default-ok-icon.svg (100%) rename {images => public/images}/modal-default-warning-icon.svg (100%) rename {images => public/images}/news.png (100%) rename {images => public/images}/phone.png (100%) rename {images => public/images}/settings.png (100%) rename {images => public/images}/status_away.png (100%) rename {images => public/images}/status_busy.png (100%) rename {images => public/images}/status_online.png (100%) rename {images => public/images}/tbc_transfert.png (100%) rename {images => public/images}/wallpaper-pattern.svg (100%) rename {images => public/images}/webcam.svg (100%) rename {images => public/images}/wizz.png.old (100%) diff --git a/fonts/Geist/Geist-Black.woff2 b/public/fonts/Geist/Geist-Black.woff2 similarity index 100% rename from fonts/Geist/Geist-Black.woff2 rename to public/fonts/Geist/Geist-Black.woff2 diff --git a/fonts/Geist/Geist-Bold.woff2 b/public/fonts/Geist/Geist-Bold.woff2 similarity index 100% rename from fonts/Geist/Geist-Bold.woff2 rename to public/fonts/Geist/Geist-Bold.woff2 diff --git a/fonts/Geist/Geist-Light.woff2 b/public/fonts/Geist/Geist-Light.woff2 similarity index 100% rename from fonts/Geist/Geist-Light.woff2 rename to public/fonts/Geist/Geist-Light.woff2 diff --git a/fonts/Geist/Geist-Medium.woff2 b/public/fonts/Geist/Geist-Medium.woff2 similarity index 100% rename from fonts/Geist/Geist-Medium.woff2 rename to public/fonts/Geist/Geist-Medium.woff2 diff --git a/fonts/Geist/Geist-Regular.woff2 b/public/fonts/Geist/Geist-Regular.woff2 similarity index 100% rename from fonts/Geist/Geist-Regular.woff2 rename to public/fonts/Geist/Geist-Regular.woff2 diff --git a/fonts/Geist/Geist-SemiBold.woff2 b/public/fonts/Geist/Geist-SemiBold.woff2 similarity index 100% rename from fonts/Geist/Geist-SemiBold.woff2 rename to public/fonts/Geist/Geist-SemiBold.woff2 diff --git a/fonts/Geist/Geist-Thin.woff2 b/public/fonts/Geist/Geist-Thin.woff2 similarity index 100% rename from fonts/Geist/Geist-Thin.woff2 rename to public/fonts/Geist/Geist-Thin.woff2 diff --git a/fonts/Geist/Geist-UltraBlack.woff2 b/public/fonts/Geist/Geist-UltraBlack.woff2 similarity index 100% rename from fonts/Geist/Geist-UltraBlack.woff2 rename to public/fonts/Geist/Geist-UltraBlack.woff2 diff --git a/fonts/Geist/Geist-UltraLight.woff2 b/public/fonts/Geist/Geist-UltraLight.woff2 similarity index 100% rename from fonts/Geist/Geist-UltraLight.woff2 rename to public/fonts/Geist/Geist-UltraLight.woff2 diff --git a/fonts/Geist/GeistVariableVF.ttf b/public/fonts/Geist/GeistVariableVF.ttf similarity index 100% rename from fonts/Geist/GeistVariableVF.ttf rename to public/fonts/Geist/GeistVariableVF.ttf diff --git a/fonts/Geist/GeistVariableVF.woff2 b/public/fonts/Geist/GeistVariableVF.woff2 similarity index 100% rename from fonts/Geist/GeistVariableVF.woff2 rename to public/fonts/Geist/GeistVariableVF.woff2 diff --git a/fonts/Geist/LICENSE.TXT b/public/fonts/Geist/LICENSE.TXT similarity index 100% rename from fonts/Geist/LICENSE.TXT rename to public/fonts/Geist/LICENSE.TXT diff --git a/images/add_user.png b/public/images/add_user.png similarity index 100% rename from images/add_user.png rename to public/images/add_user.png diff --git a/images/add_user2.png b/public/images/add_user2.png similarity index 100% rename from images/add_user2.png rename to public/images/add_user2.png diff --git a/images/aerobutton_border.png b/public/images/aerobutton_border.png similarity index 100% rename from images/aerobutton_border.png rename to public/images/aerobutton_border.png diff --git a/images/aerobutton_border_down.png b/public/images/aerobutton_border_down.png similarity index 100% rename from images/aerobutton_border_down.png rename to public/images/aerobutton_border_down.png diff --git a/images/ban_user.png b/public/images/ban_user.png similarity index 100% rename from images/ban_user.png rename to public/images/ban_user.png diff --git a/images/brush.png b/public/images/brush.png similarity index 100% rename from images/brush.png rename to public/images/brush.png diff --git a/images/button_border.png b/public/images/button_border.png similarity index 100% rename from images/button_border.png rename to public/images/button_border.png diff --git a/images/button_border_disabled.png b/public/images/button_border_disabled.png similarity index 100% rename from images/button_border_disabled.png rename to public/images/button_border_disabled.png diff --git a/images/button_border_focus.png b/public/images/button_border_focus.png similarity index 100% rename from images/button_border_focus.png rename to public/images/button_border_focus.png diff --git a/images/default-avatar.png b/public/images/default-avatar.png similarity index 100% rename from images/default-avatar.png rename to public/images/default-avatar.png diff --git a/images/directory.png b/public/images/directory.png similarity index 100% rename from images/directory.png rename to public/images/directory.png diff --git a/images/games.png b/public/images/games.png similarity index 100% rename from images/games.png rename to public/images/games.png diff --git a/images/letter.png b/public/images/letter.png similarity index 100% rename from images/letter.png rename to public/images/letter.png diff --git a/images/login-profile-placeholder.svg b/public/images/login-profile-placeholder.svg similarity index 100% rename from images/login-profile-placeholder.svg rename to public/images/login-profile-placeholder.svg diff --git a/images/logo-msn.png b/public/images/logo-msn.png similarity index 100% rename from images/logo-msn.png rename to public/images/logo-msn.png diff --git a/images/medias.png b/public/images/medias.png similarity index 100% rename from images/medias.png rename to public/images/medias.png diff --git a/images/modal-default-critical-icon.svg b/public/images/modal-default-critical-icon.svg similarity index 100% rename from images/modal-default-critical-icon.svg rename to public/images/modal-default-critical-icon.svg diff --git a/images/modal-default-ok-icon.svg b/public/images/modal-default-ok-icon.svg similarity index 100% rename from images/modal-default-ok-icon.svg rename to public/images/modal-default-ok-icon.svg diff --git a/images/modal-default-warning-icon.svg b/public/images/modal-default-warning-icon.svg similarity index 100% rename from images/modal-default-warning-icon.svg rename to public/images/modal-default-warning-icon.svg diff --git a/images/news.png b/public/images/news.png similarity index 100% rename from images/news.png rename to public/images/news.png diff --git a/images/phone.png b/public/images/phone.png similarity index 100% rename from images/phone.png rename to public/images/phone.png diff --git a/images/settings.png b/public/images/settings.png similarity index 100% rename from images/settings.png rename to public/images/settings.png diff --git a/images/status_away.png b/public/images/status_away.png similarity index 100% rename from images/status_away.png rename to public/images/status_away.png diff --git a/images/status_busy.png b/public/images/status_busy.png similarity index 100% rename from images/status_busy.png rename to public/images/status_busy.png diff --git a/images/status_online.png b/public/images/status_online.png similarity index 100% rename from images/status_online.png rename to public/images/status_online.png diff --git a/images/tbc_transfert.png b/public/images/tbc_transfert.png similarity index 100% rename from images/tbc_transfert.png rename to public/images/tbc_transfert.png diff --git a/images/wallpaper-pattern.svg b/public/images/wallpaper-pattern.svg similarity index 100% rename from images/wallpaper-pattern.svg rename to public/images/wallpaper-pattern.svg diff --git a/images/webcam.svg b/public/images/webcam.svg similarity index 100% rename from images/webcam.svg rename to public/images/webcam.svg diff --git a/images/wizz.png.old b/public/images/wizz.png.old similarity index 100% rename from images/wizz.png.old rename to public/images/wizz.png.old diff --git a/src/infrastructure/services/random_svg_generators.rs b/src/infrastructure/services/random_svg_generators.rs index 253e732..ed1a7c8 100644 --- a/src/infrastructure/services/random_svg_generators.rs +++ b/src/infrastructure/services/random_svg_generators.rs @@ -147,7 +147,7 @@ async fn fetch_dicebear_svg( #[cfg(feature = "desktop")] fn gen_placeholder_fetcher<'a>(path: &'static str) -> Box>> { - let path = format!(".{}", &path); + let path = format!("./public/{}", &path); Box::new(async move { match read_to_string(&path).await { Ok(content) => Some(content), diff --git a/src/ui/_base.scss b/src/ui/_base.scss index 415f098..0f4e718 100644 --- a/src/ui/_base.scss +++ b/src/ui/_base.scss @@ -230,10 +230,10 @@ body { margin-right: 1%; } .aeroButton:hover { - border-image: url(./images/aerobutton_border.png) 2 round; + border-image: url(/public/images/aerobutton_border.png) 2 round; } .aeroButton:active { - border-image: url(./images/aerobutton_border_down.png) 2 round; + border-image: url(/public/images/aerobutton_border_down.png) 2 round; } .button { @@ -246,8 +246,8 @@ body { margin-right: 1%; } .button:hover { - border-image: url(./images/button_border.png) 2 round; + border-image: url(/public/images/button_border.png) 2 round; } .button:active { - border-image: url(./images/button_border_down.png) 2 round; + border-image: url(/public/images/button_border_down.png) 2 round; } diff --git a/src/ui/components/avatar_selector.rs b/src/ui/components/avatar_selector.rs index bf9ba91..cca0bdc 100644 --- a/src/ui/components/avatar_selector.rs +++ b/src/ui/components/avatar_selector.rs @@ -47,7 +47,7 @@ pub fn AvatarSelector() -> Element { }, img { class: ClassName::AVATAR_SELECTOR_PICTURE, - src: "./images/default-avatar.png", + src: "/public/images/default-avatar.png", }, }, } diff --git a/src/ui/components/chats_window/mod.rs b/src/ui/components/chats_window/mod.rs index fd4ee63..3549f18 100644 --- a/src/ui/components/chats_window/mod.rs +++ b/src/ui/components/chats_window/mod.rs @@ -48,7 +48,7 @@ fn render_rooms_tabs( class: ClassName::TAB, button { img { - src: "./images/status_online.png", + src: "/public/images/status_online.png", }, "{room_name}", }, diff --git a/src/ui/components/chats_window/navbar.rs b/src/ui/components/chats_window/navbar.rs index 0e5a687..ee463ab 100644 --- a/src/ui/components/chats_window/navbar.rs +++ b/src/ui/components/chats_window/navbar.rs @@ -13,37 +13,37 @@ pub fn Navbar() -> Element { class: ClassName::NAVBAR, button { - style: "background: url(./images/add_user2.png) center no-repeat", + style: "background: url(/public/images/add_user2.png) center no-repeat", }, button { - style: "background: url(./images/directory.png) center no-repeat", + style: "background: url(/public/images/directory.png) center no-repeat", }, button { - style: "background: url(./images/phone.png) center no-repeat", + style: "background: url(/public/images/phone.png) center no-repeat", }, button { - style: "background: url(./images/medias.png) center no-repeat", + style: "background: url(/public/images/medias.png) center no-repeat", }, button { - style: "background: url(./images/games.png) center no-repeat", + style: "background: url(/public/images/games.png) center no-repeat", }, button { - style: "background: url(./images/ban_user.png) center no-repeat", + style: "background: url(/public/images/ban_user.png) center no-repeat", }, button { class: ClassName::FLEX_RIGHT_AERO_BUTTON, - style: "background: url(./images/brush.png) center no-repeat", + style: "background: url(/public/images/brush.png) center no-repeat", }, button { class: ClassName::FLEX_LAST_BUTTON, - style: "background: url(./images/settings.png) center no-repeat", + style: "background: url(/public/images/settings.png) center no-repeat", }, }, } diff --git a/src/ui/components/contacts_window/contacts_section.rs b/src/ui/components/contacts_window/contacts_section.rs index b1fd1f6..83fc4e3 100644 --- a/src/ui/components/contacts_window/contacts_section.rs +++ b/src/ui/components/contacts_window/contacts_section.rs @@ -110,7 +110,7 @@ pub fn ContactsSection(props: ContactsSectionProps) -> Element { li { onclick: move |_| on_clicked_room(&id, &CHATS_WIN_INTERFACE), img { - src: "./images/status_online.png", + src: "/public/images/status_online.png", }, p { {formatted}, diff --git a/src/ui/components/contacts_window/mod.rs b/src/ui/components/contacts_window/mod.rs index 90cd2d5..a5abe64 100644 --- a/src/ui/components/contacts_window/mod.rs +++ b/src/ui/components/contacts_window/mod.rs @@ -40,24 +40,24 @@ pub fn ContactsWindow() -> Element { button { class: ClassName::AERO_BUTTON, - style: "background: url(./images/letter.png) center no-repeat", + style: "background: url(/public/images/letter.png) center no-repeat", }, button { class: ClassName::AERO_BUTTON, - style: "background: url(./images/directory.png) no-repeat center", + style: "background: url(/public/images/directory.png) no-repeat center", }, button { class: ClassName::AERO_BUTTON, - style: "background: url(./images/news.png) no-repeat center", + style: "background: url(/public/images/news.png) no-repeat center", }, button { class: ClassName::FLEX_RIGHT_AERO_BUTTON, - style: "background: url(./images/brush.png) no-repeat center", + style: "background: url(/public/images/brush.png) no-repeat center", }, button { class: ClassName::AERO_BUTTON, - style: "background: url(./images/settings.png) no-repeat center", + style: "background: url(/public/images/settings.png) no-repeat center", }, }, @@ -78,12 +78,12 @@ pub fn ContactsWindow() -> Element { button { class: ClassName::BUTTON, - style: "background: url(./images/add_user.png) no-repeat center", + style: "background: url(/public/images/add_user.png) no-repeat center", }, button { class: ClassName::BUTTON, - style: "background: url(./images/tbc_transfert.png) no-repeat center", + style: "background: url(/public/images/tbc_transfert.png) no-repeat center", }, }, }, diff --git a/src/ui/components/header.rs b/src/ui/components/header.rs index 394ad5b..22294ee 100644 --- a/src/ui/components/header.rs +++ b/src/ui/components/header.rs @@ -9,7 +9,7 @@ pub fn Header() -> Element { div { class: ClassName::ROOT, img { - src: "./images/logo-msn.png" + src: "/public/images/logo-msn.png" } svg { view_box: "0 0 100 10",