Font customization, Tag selection now goes on top, instead of side.

tmahmood · tmahmood · commit 7bbb4318fad3 · 2025-03-28T07:04:11.000+06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Fri 28, March, 2025
+- [x] Font's can be customized
+- [x] Removed packaged font
+
 ## Tue 04, March, 2025
 
 - [x] BIG UI UPDATE
diff --git a/README.md b/README.md
@@ -117,6 +117,16 @@ By default the "time of the day" widget is not visible, to display it put
 
 in the `.env` file
 
+### Font customization
+
+Previously the app used `Departure Mono` as default font, which was also included in the repo.
+It's now removed.
+And the font can be set using env variable.
+
+Add the following to change default font:
+
+`TWK_USE_FONT='Maple Mono'`
+
 
 # Using the app
 
@@ -179,6 +189,7 @@ there will be errors, as no checks, and there may not be any error messages in c
 
 
 ## Planned
+- [ ] Better configuration
 - [ ] Usability improvements on a long task list
   - [x] Hiding empty columns
   - [ ] Temporary highlight last modified row, if visible
diff --git a/build.rs b/build.rs
@@ -2,32 +2,32 @@ use std::process::Command;
 
 fn main() {
     println!("cargo:rerun-if-changed=frontend/");
-    let css_build_success = match Command::new("tailwindcss")
+    if let Err(_) = Command::new("tailwindcss")
         .args(["-i", "frontend/css/style.css", "-o", "dist/style.css"])
-        .status() {
-        Ok(vv) => {
-            vv.success()
-        }
-        Err(_e) => {
-            false
-        }
-    };
-    if !css_build_success {
+        .status()
+    {
         if let Err(_e) = Command::new("./tailwindcss")
             .args(["-i", "frontend/css/style.css", "-o", "dist/style.css"])
-            .status() {
+            .status()
+        {
             panic!("Failed to process css")
         }
-    };
+    }
     if !Command::new("rollup")
         .args(["-c", "frontend/rollup.config.js"])
-        .status().unwrap().success() {
+        .status()
+        .unwrap()
+        .success()
+    {
         panic!("Failed to process css")
     }
     // adding templates
     if !Command::new("cp")
-        .args(["-r", "frontend/templates",  "frontend/assets", "dist"])
-        .status().unwrap().success() {
+        .args(["-r", "frontend/templates", "dist"])
+        .status()
+        .unwrap()
+        .success()
+    {
         println!("cargo::warning=Failed to copy files");
         panic!("Failed to copy template files")
     }
diff --git a/env.example b/env.example
@@ -1,2 +1,3 @@
 TWK_SERVER_PORT=9080
 DISPLAY_TIME_OF_THE_DAY=1
+TWK_USE_FONT='Maple Mono'
diff --git a/frontend/assets/DepartureMono-Regular.woff b/frontend/assets/DepartureMono-Regular.woff
diff --git a/frontend/css/style.css b/frontend/css/style.css
@@ -45,16 +45,6 @@
 @plugin "@tailwindcss/typography";
 @plugin "@tailwindcss/forms";
 
-
-@font-face {
-    font-family: 'Departure Mono';
-    src: url('assets/DepartureMono-Regular.woff') format('woff');
-}
-
-body {
-    font-family: 'Departure Mono', sans-serif;
-}
-
 .shortcut_key {
     @apply px-1 mx-0.5 space-x-0 opacity-50 text-white bg-base-100 rounded-sm;
 }
diff --git a/frontend/templates/base.html b/frontend/templates/base.html
@@ -2,6 +2,13 @@
 <html lang="en" data-theme="task-warrior">
 <head>
     <link rel="stylesheet" href="/dist/style.css"/>
+    <style>
+        {% if USE_FONT %}
+        body {
+            font-family: '{{ USE_FONT }}', '{{ FALLBACK_FAMILY }}';
+        }
+        {% endif %}
+    </style>
     <script src="/dist/bundle.js" type="module"></script>
     <title>
         Org.Me
diff --git a/frontend/templates/tasks.html b/frontend/templates/tasks.html
@@ -58,9 +58,9 @@
 
         <span hx-get="tasks/active" hx-trigger="load" hx-swap="outerHTML" hx-target="this"></span>
 
-        <div class="flex">
-            <div id="tags_map_drawer" class="shrink pt-4 hidden w-10/12">
-                <div class="flex flex-wrap gap-2 p-4">
+        <div class="grid grid-cols-1">
+            <div id="tags_map_drawer" class="pt-4 hidden bg-green-300 mb-2">
+                <div class="flex flex-wrap gap-2 p-4 bg-accent-content">
                     <div class="join">
                         <button
                                 id="tag-btn-back"
@@ -110,8 +110,7 @@
                     {% endfor %}
                 </div>
             </div>
-
-            <div class="grow">
+            <div>
                 <ul class="list bg-base-100 rounded-box shadow-md text-sm">
                     {% for task in tasks %}
                     <li class="list-row {% if task.start %} bg-green-700 {% endif %} p-2">
@@ -200,10 +199,8 @@
                             {% elif task.urgency > 10 %}
                             <div class="btn btn-xs btn-primary  join-item">{{ task.urgency }}</div>
                             {% else %}
-                            <div class="btn btn-xs btn-neutral  join-item">{{ task.urgency }}</div>
-                            {% endif %}
-                            {% if task.due %}
-                            <div class="btn btn-xs btn-neutral  join-item">{{ task.due }}</div>
+                            <div class="btn btn-xs btn-neutral  join-item">
+                                {{ task.urgency }}</div>
                             {% endif %}
 
                             {% if task.due and task.status != 'completed' %}
diff --git a/src/main.rs b/src/main.rs
@@ -6,6 +6,7 @@ use indexmap::IndexMap;
 use rand::distr::{Alphanumeric, SampleString};
 use std::collections::{HashMap, HashSet};
 use std::env;
+use std::string::ToString;
 use taskwarrior_web::endpoints::tasks::task_query_builder::TaskQuery;
 use taskwarrior_web::endpoints::tasks::{fetch_active_task, get_task_details, list_tasks, mark_task_as_done, run_annotate_command, run_denotate_command, run_modify_command, task_add, task_undo, task_undo_report, toggle_task_active, Task, TaskUUID, TaskViewDataRetType};
 use taskwarrior_web::{
@@ -18,6 +19,7 @@ use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::util::SubscriberInitExt;
 use taskwarrior_web::endpoints::tasks;
 
+
 #[tokio::main]
 async fn main() {
     // initialize tracing
@@ -56,6 +58,17 @@ async fn main() {
     axum::serve(listener, app).await.unwrap();
 }
 
+fn get_default_context() -> Context {
+    let mut ctx = Context::new();
+    let ss = match env::var("TWK_USE_FONT") {
+        Ok(v) => Some(v),
+        Err(_) => None
+    };
+    ctx.insert("USE_FONT", &ss);
+    ctx.insert("FALLBACK_FAMILY", "monospace");
+    ctx
+}
+
 fn init_tracing() {
     tracing_subscriber::registry()
         .with(
@@ -71,14 +84,14 @@ async fn display_task_details(Query(param): Query<HashMap<String, String>>) -> H
     let task = get_task_details(task_id).unwrap();
     let tq = TaskQuery::new(TWGlobalState::default());
     let tasks = list_tasks(&tq).unwrap();
-    let mut ctx = Context::new();
+    let mut ctx = get_default_context();
     ctx.insert("tasks_db", &tasks);
     ctx.insert("task", &task);
     Html(TEMPLATES.render("task_details.html", &ctx).unwrap())
 }
 
 async fn get_active_task() -> Html<String> {
-    let mut ctx = Context::new();
+    let mut ctx = get_default_context();
     if let Ok(v) = fetch_active_task() {
         if let Some(v) = v {
             ctx.insert("active_task", &v);
@@ -88,13 +101,13 @@ async fn get_active_task() -> Html<String> {
 }
 
 async fn get_task_action_bar() -> Html<String> {
-    let ctx = Context::new();
+    let ctx = get_default_context();
     Html(TEMPLATES.render("task_action_bar.html", &ctx).unwrap())
 }
 
 async fn get_bar(Query(param): Query<HashMap<String, String>>) -> Html<String> {
     if let Some(bar) = param.get("bar") {
-        let ctx = Context::new();
+        let ctx = get_default_context();
         if bar == "left_action_bar" {
             Html(TEMPLATES.render("left_action_bar.html", &ctx).unwrap())
         } else {
@@ -106,7 +119,7 @@ async fn get_bar(Query(param): Query<HashMap<String, String>>) -> Html<String> {
 }
 
 async fn get_tag_bar() -> Html<String> {
-    let ctx = Context::new();
+    let ctx = get_default_context();
     Html(TEMPLATES.render("tag_bar.html", &ctx).unwrap())
 }
 
@@ -115,7 +128,7 @@ async fn just_empty() -> Html<String> {
 }
 
 async fn display_flash_message(Query(msg): Query<FlashMsg>) -> Html<String> {
-    let mut ctx = Context::new();
+    let mut ctx = get_default_context();
     ctx.insert("msg", &msg.msg());
     ctx.insert("timeout", &msg.timeout());
     Html(TEMPLATES.render("flash_msg.html", &ctx).unwrap())
@@ -124,7 +137,7 @@ async fn display_flash_message(Query(msg): Query<FlashMsg>) -> Html<String> {
 async fn get_undo_report() -> Html<String> {
     match task_undo_report() {
         Ok(s) => {
-            let mut ctx = Context::new();
+            let mut ctx = get_default_context();
             let lines = s.lines();
             let first_line: String = lines.clone().take(1).collect();
             let mut rest_lines: Vec<String> = lines.skip(1).map(|v| v.to_string()).collect();
@@ -134,7 +147,7 @@ async fn get_undo_report() -> Html<String> {
             Html(TEMPLATES.render("undo_report.html", &ctx).unwrap())
         }
         Err(e) => {
-            let mut ctx = Context::new();
+            let mut ctx = get_default_context();
             ctx.insert("heading", &e.to_string());
             Html(TEMPLATES.render("error.html", &ctx).unwrap())
         }
@@ -154,7 +167,7 @@ async fn display_task_add_window(Query(params): Query<TWGlobalState>) -> Html<St
         })
         .or(Some(TaskQuery::default()))
         .unwrap();
-    let mut ctx = Context::new();
+    let mut ctx = get_default_context();
     ctx.insert("tags", &tq.tags().join(" "));
     ctx.insert("project", tq.project());
     Html(TEMPLATES.render("task_add.html", &ctx).unwrap())
@@ -270,7 +283,7 @@ async fn front_page() -> Html<String> {
         task_list,
         task_shortcut_map,
     } = get_tasks_view_data(tasks, &filters);
-    let mut ctx = Context::new();
+    let mut ctx = get_default_context();
     ctx.insert("tasks_db", &tasks);
     ctx.insert("tasks", &task_list);
     ctx.insert("current_filter", &tq.as_filter_text());
@@ -321,7 +334,7 @@ fn get_tasks_view(tq: TaskQuery, flash_msg: Option<FlashMsg>) -> Html<String> {
         task_list, task_shortcut_map,
     } = get_tasks_view_data(tasks, &filter_ar);
     trace!("{:?}", tag_map);
-    let mut ctx_b = Context::new();
+    let mut ctx_b = get_default_context();
     ctx_b.insert("tasks_db", &tasks);
     ctx_b.insert("tasks", &task_list);
     ctx_b.insert("current_filter", &filter_ar);

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`TWK_SERVER_PORT=9080`
`2`	`2`	`DISPLAY_TIME_OF_THE_DAY=1`
	`3`	`+TWK_USE_FONT='Maple Mono'`