From e9846016e60fbc6a92e9097fc09e264b46144322 Mon Sep 17 00:00:00 2001 From: trisua Date: Sat, 31 May 2025 20:42:11 -0400 Subject: [PATCH] add: rewrite macros.html --- crates/app/src/assets.rs | 9 +- crates/app/src/public/html/macros.html | 238 ------------------------- crates/app/src/public/html/macros.lisp | 216 ++++++++++++++++++++++ crates/app/src/public/html/root.lisp | 7 +- 4 files changed, 224 insertions(+), 246 deletions(-) delete mode 100644 crates/app/src/public/html/macros.html create mode 100644 crates/app/src/public/html/macros.lisp diff --git a/crates/app/src/assets.rs b/crates/app/src/assets.rs index 5ddab89..47bc41d 100644 --- a/crates/app/src/assets.rs +++ b/crates/app/src/assets.rs @@ -40,7 +40,7 @@ pub const STREAMS_JS: &str = include_str!("./public/js/streams.js"); // html pub const ROOT: &str = include_str!("./public/html/root.lisp"); -pub const MACROS: &str = include_str!("./public/html/macros.html"); +pub const MACROS: &str = include_str!("./public/html/macros.lisp"); pub const COMPONENTS: &str = include_str!("./public/html/components.html"); pub const MISC_ERROR: &str = include_str!("./public/html/misc/error.lisp"); @@ -239,7 +239,6 @@ pub(crate) async fn replace_in_html( for cap in icon_without_class.captures_iter(&input.clone()) { let icon = &cap.get(3).unwrap().as_str().replace("\"", ""); - pull_icon(icon, &config.dirs.icons).await; let reader = ICONS.read().await; @@ -261,14 +260,14 @@ pub(crate) fn lisp_plugins() -> HashMap Elemen plugins.insert( "icon".to_string(), - Box::new(|e: Element| text!(format!("{{{{ icon \"{}\" }}}}", read_param!(e, 0)))) as _, + Box::new(|e: Element| text!(format!("\n{{{{ icon \"{}\" }}}}\n", read_param!(e, 0)))) as _, ); plugins.insert( "icon_class".to_string(), Box::new(|e: Element| { text!(format!( - "{{{{ icon \"{}\" c({}) }}}}", + "\n{{{{ icon \"{}\" c({}) }}}}\n", read_param!(e, 0), read_param!(e, 1) )) @@ -293,7 +292,7 @@ pub(crate) async fn write_assets(config: &Config) -> PathBufD { let html_path = PathBufD::current().join(&config.dirs.templates); write_template!(html_path->"root.html"(crate::assets::ROOT) --config=config --lisp plugins); - write_template!(html_path->"macros.html"(crate::assets::MACROS) --config=config); + write_template!(html_path->"macros.html"(crate::assets::MACROS) --config=config --lisp plugins); write_template!(html_path->"components.html"(crate::assets::COMPONENTS) --config=config); write_template!(html_path->"misc/error.html"(crate::assets::MISC_ERROR) -d "misc" --config=config --lisp plugins); diff --git a/crates/app/src/public/html/macros.html b/crates/app/src/public/html/macros.html deleted file mode 100644 index f188776..0000000 --- a/crates/app/src/public/html/macros.html +++ /dev/null @@ -1,238 +0,0 @@ -{% macro nav(selected="", show_lhs=true, hide_user_menu=false) -%} - -{%- endmacro %} {% macro timelines_nav(selected="") -%} -
-
- {% if user -%} - - {{ icon "newspaper" }} - {{ text "general:link.home" }} - - - - {{ icon "layers" }} - {{ text "stacks:link.stacks" }} - - {% else %} - - {{ icon "earth" }} - {{ text "general:link.all" }} - - {%- endif %} - - - {{ icon "trending-up" }} - {{ text "general:link.popular" }} - -
- -
- {% if user -%} - - {{ icon "rss" }} - {{ text "general:link.following" }} - - - - {{ icon "search" }} - {{ text "general:link.search" }} - - - - {{ icon "earth" }} - {{ text "general:link.all" }} - - {%- endif %} -
-
-{%- endmacro %} {% macro timelines_secondary_nav(posts="", questions="", -selected="posts") -%} {% if user -%} -
- - {{ icon "newspaper" }} - {{ text "communities:label.posts" }} - - - - {{ icon "message-circle-heart" }} - {{ text "communities:label.questions" }} - -
-{%- endif %} {%- endmacro %} {% macro community_nav(community, selected="") -%} -{% if community.context.enable_questions -%} -
- - {{ icon "newspaper" }} - {{ text "communities:tab.posts" }} - - - - {{ icon "message-circle-heart" }} - {{ text "communities:tab.questions" }} - -
-{%- endif %} {%- endmacro %} {% macro profile_nav(selected="") -%} -
- - {{ text "auth:label.posts" }} - - - - {{ text "auth:label.replies" }} - - - - {{ text "auth:label.media" }} - -
-{%- endmacro %} diff --git a/crates/app/src/public/html/macros.lisp b/crates/app/src/public/html/macros.lisp new file mode 100644 index 0000000..41f80e8 --- /dev/null +++ b/crates/app/src/public/html/macros.lisp @@ -0,0 +1,216 @@ +(text "{% macro nav(selected=\"\", show_lhs=true, hide_user_menu=false) -%}") +(nav + (div + ("class" "content_container") + (div + ("class" "flex nav_side") + (a + ("href" "/") + ("class" "button desktop title") + (b (text "{{ config.name }}"))) + + (text "{% if show_lhs -%}") + (a + ("href" "{{ home }}") + ("class" "button {% if selected == 'home' -%}active{%- endif %}") + ("title" "Home") + (icon (text "house")) + (span + ("class" "desktop") + (str (text "general:link.home")))) + + (text "{% if user -%}") + (a + ("href" "/communities") + ("class" "button {% if selected == 'communities' -%}active{%- endif %}") + (icon (text "book-heart")) + (span + ("class" "desktop") + (str (text "general:link.communities")))) + + (text "{%- endif %} {%- endif %}")) + + (div + ("class" "flex nav_side") + (text "{% if user -%}") + (a + ("href" "/communities/intents/post") + ("class" "button") + ("title" "Create post") + (icon (text "square-pen"))) + + (a + ("href" "/chats/0/0") + ("class" "button {% if selected == 'chats' -%}active{%- endif %}") + ("title" "Chats") + (icon (text "message-circle"))) + + (a + ("href" "/requests") + ("class" "button {% if selected == 'requests' -%}active{%- endif %}") + ("title" "Chats") + (icon (text "inbox")) + (span + ("class" "notification tr {% if user.request_count <= 0 -%}hidden{%- endif %}") + ("id" "requests_span") + (text "{{ user.request_count }}"))) + + (a + ("href" "/notifs") + ("class" "button {% if selected == 'notifications' -%}active{%- endif %}") + ("title" "Chats") + (icon (text "bell")) + (span + ("class" "notification tr {% if user.notification_count <= 0 -%}hidden{%- endif %}") + ("id" "notifications_span") + (text "{{ user.notification_count }}"))) + + (text "{% if not hide_user_menu -%}") + (div + ("class" "dropdown") + (button + ("class" "flex-row title") + ("onclick" "trigger('atto::hooks::dropdown', [event])") + ("exlude" "dropdown") + ("style" "gap: 0.25rem !important") + (text "{{ components::avatar(username=user.username, size=\"24px\") }}") + (icon_class (text "chevron-down") (text "dropdown-arrow"))) + + (text "{{ components::user_menu() }}")) + (text "{%- endif %} {% else %}") + (div + ("class" "dropdown") + (button + ("class" "title") + ("onclick" "trigger('atto:hooks::dropdown', [evnet])") + ("exclude" "dropdown") + (icon_class (text "chevron-down") (text "dropdown-arrow"))) + + (div + ("class" "inner") + (a + ("href" "/auth/login") + ("class" "button") + (icon (text "log-in")) + (str (text "auth:action.login"))) + + (a + ("href" "/auth/register") + ("class" "button") + (icon (text "user-plus")) + (str (text "auth:action.register"))) + + (div ("class" "title")) + (a + ("href" "https://trisua.com/t/tetratto") + ("class" "button") + (icon (text "code")) + (text "View source"))))) + (text "{%- endif %}"))) +(text "{%- endmacro %}") + +(text "{% macro timelines_nav(selected=\"\") -%}") +(div + ("class" "pillmenu {% if user -%}rows{% endif %} w-full") + (div + ("class" "row") + (text "{% if user -%}") + (a + ("href" "/") + ("class" "{% if selected == 'home' -%}active{%- endif %}") + (icon (text "newspaper")) + (str (text "general:link.home"))) + + (a + ("href" "/stacks") + ("class" "{% if selected == 'stacks' -%}active{%- endif %}") + (icon (text "layers")) + (str (text "stacks:link.stacks"))) + (text "{% else %}") + (a + ("href" "/") + ("class" "{% if selected == 'all' -%}active{%- endif %}") + (icon (text "earch")) + (str (text "general:link.all"))) + (text "{%- endif %}") + + (a + ("href" "/popular") + ("class" "{% if selected == 'popular' -%}active{%- endif %}") + (icon (text "layers")) + (str (text "general:link.popular")))) + + (div + ("class" "row") + (text "{% if user -%}") + (a + ("href" "/following") + ("class" "{% if selected == 'following' -%}active{%- endif %}") + (icon (text "rss")) + (str (text "general:link.following"))) + + (a + ("href" "/search") + ("class" "{% if selected == 'search' -%}active{%- endif %}") + (icon (text "search")) + (str (text "general:link.search"))) + + (a + ("href" "/all") + ("class" "{% if selected == 'all' -%}active{%- endif %}") + (icon (text "earth")) + (str (text "general:link.all"))) + (text "{%- endif %}"))) +(text "{%- endmacro %}") + +(text "{% macro timelines_secondary_nav(posts=\"\", questions=\"\", selected=\"posts\") -%} {% if user -%}") +(div + ("class" "pillmenu w-full") + (a + ("href" "{{ posts }}") + ("class" "{% if selected == 'posts' -%}active{%- endif %}") + (icon (text "newspaper")) + (str (text "communities:label.posts"))) + + (a + ("href" "{{ questions }}") + ("class" "{% if selected == 'questions' -%}active{%- endif %}") + (icon (text "message-circle-heart")) + (str (text "communities:label.questions")))) +(text "{%- endif %} {%- endmacro %}") + +(text "{% macro community_nav(community, selected=\"\") -%} {% if community.context.enable_questions -%}") +(div + ("class" "pillmenu") + (a + ("href" "/community/{{ community.title }}") + ("class" "{% if selected == 'posts' -%}active{%- endif %}") + (icon (text "newspaper")) + (str (text "communities:tab.posts"))) + + (a + ("href" "/community/{{ community.title }}/questions") + ("class" "{% if selected == 'questions' -%}active{%- endif %}") + (icon (text "message-circle-heart")) + (str (text "communities:tab.questions")))) +(text "{%- endif %} {%- endmacro %}") + +(text "{% macro profile_nav(selected=\"\") -%}") +(div + ("class" "pillmenu") + + (a + ("href" "/@{{ profile.username }}") + ("class" "{% if selected == 'posts' -%}active{%- endif %}") + (str (text "auth:label.posts"))) + + (a + ("href" "/@{{ profile.username }}/replies") + ("class" "{% if selected == 'replies' -%}active{%- endif %}") + (str (text "auth:label.replies"))) + + (a + ("href" "/@{{ profile.username }}/media") + ("class" "{% if selected == 'media' -%}active{%- endif %}") + (str (text "auth:label.media")))) +(text "{%- endmacro %}") diff --git a/crates/app/src/public/html/root.lisp b/crates/app/src/public/html/root.lisp index d0bb151..4366dc9 100644 --- a/crates/app/src/public/html/root.lisp +++ b/crates/app/src/public/html/root.lisp @@ -10,7 +10,7 @@ (meta ("http-equiv" "content-security-policy") ("content" "default-src 'self' blob: *.spotify.com musicbrainz.org; img-src * data:; media-src *; font-src *; style-src 'unsafe-inline' 'self' blob: *; script-src 'self' 'unsafe-inline' blob: *; object-src 'self' blob: *; upgrade-insecure-requests; connect-src * localhost; frame-src 'self' blob: data: *")) (link ("rel" "icon") ("href" "/public/favicon.svg")) - (link ("rel" "stylesheet") ("href" "/css/style.css")) + (link ("rel" "stylesheet") ("href" "/css/style.css"))f (text "{% if user -%}