this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

feat: Mount assets into server and use fonts.

+41 -9
+1
build.Dockerfile
··· 18 18 RUN apk add --no-cache ca-certificates 19 19 WORKDIR /app 20 20 COPY --from=builder /build/target/output/lumina-server /app/lumina-server 21 + COPY assets /app/assets 21 22 EXPOSE 8085 22 23 CMD ["/app/lumina-server"]
+32 -2
client/app.css
··· 3 3 @source "./src/**/*.gleam"; 4 4 5 5 @font-face { 6 + /* The Josefin Sans is used for: 7 + * Menu items 8 + */ 6 9 font-family: "Josefin Sans"; 7 - src: url(/fonts/Josefin_Sans/JosefinSans-VariableFont_wght.ttf); 10 + src: url(/assets/fonts/Josefin_Sans/JosefinSans-VariableFont_wght.ttf); 11 + } 12 + @font-face { 13 + /* The Syne Font is used for: 14 + * Main theme 15 + */ 16 + font-family: "Syne"; 17 + src: url(/assets/fonts/Syne/Syne-VariableFont_wght.ttf); 18 + } 19 + 20 + @font-face { 21 + /* The Gantari font is used for: 22 + * 'Lumina' name typography 23 + */ 24 + font-family: "Gantari"; 25 + src: url(/assets/fonts/Gantari/Gantari-VariableFont_wght.ttf); 26 + } 27 + 28 + @font-face { 29 + /* The Elms sans is used for: 30 + * (User-generated) Content on pages. 31 + */ 32 + font-family: "Elms Sans"; 33 + src: url(/assets/fonts/Elms_Sans/ElmsSans-VariableFont_wght.ttf); 8 34 } 9 35 10 36 @theme { 11 - --font-display: "Josefin Sans"; 37 + --font-display: "Syne"; 38 + --font-logo: "Gantari"; 39 + --font-content: "Elms Sans"; 40 + --font-menuitems: "Josefin Sans"; 41 + --font-script: ""; 12 42 } 13 43 14 44 @plugin "daisyui" {
+3 -3
client/src/lumina_client/view/common_view_parts.gleam
··· 7 7 main_body: List(Element(Msg)), 8 8 with_menu menuitems: List(Element(Msg)), 9 9 ) { 10 - html.div([], [ 10 + html.div([attribute.class("font-display")], [ 11 11 html.div( 12 12 [attribute.class("navbar bg-base-100 dark:bg-neutral-800 shadow-sm")], 13 13 [ ··· 21 21 ]), 22 22 ]), 23 23 html.div([attribute.class("flex-1")], [ 24 - html.a([attribute.class("btn btn-ghost text-xl")], [ 24 + html.a([attribute.class("btn btn-ghost text-xl font-logo")], [ 25 25 element.text("Lumina"), 26 26 ]), 27 27 ]), 28 28 html.div([attribute.class("flex-none")], [ 29 - html.ul([attribute.class("menu menu-horizontal px-1")], menuitems), 29 + html.ul([attribute.class("menu menu-horizontal px-1 font-menuitems")], menuitems), 30 30 ]), 31 31 ], 32 32 ),
+3 -3
mise/tasks/run.toml
··· 1 1 [local-devel] 2 2 description = "Run the server in development mode" 3 3 depends = "build-server" 4 - run = ["../target/debug/lumina-server"] 5 - run_windows = "..\\target\\debug\\lumina-server.exe" 6 - dir = "{{config_root}}/data/" 4 + run = ["./target/debug/lumina-server"] 5 + run_windows = ".\\target\\debug\\lumina-server.exe" 6 + dir = "{{config_root}}/" 7 7 env.LUMINA_POSTGRES_PASSWORD = "lumina_pw" 8 8 9 9 [local-devel-watch]
+2 -1
server/src/main.rs
··· 12 12 use helpers::message_prefixes; 13 13 use rocket::config::LogLevel; 14 14 use std::io::ErrorKind; 15 - use std::{net::IpAddr, process, sync::Arc}; 15 + use std::{net::IpAddr, path, process, sync::Arc}; 16 16 use tokio::sync::Mutex; 17 17 use uuid::Uuid; 18 18 mod user; ··· 286 286 staticroutes::favicon, 287 287 ], 288 288 ) 289 + .mount("/assets", rocket::fs::FileServer::from("./assets")) 289 290 .manage(appstate) 290 291 .manage(rate_limiter) 291 292 .manage(auth_rate_limiter)