Rebrand (#63)

cja/src/cron/registry.rs

@@ -1,7 +1,7 @@
 use std::{collections::HashMap, future::Future, pin::Pin, time::Duration};
 
+use chrono::{OutOfRangeError, Utc};
 use miette::Diagnostic;
-use tokio::time::Instant;
 use tracing::error;
 
 use crate::{app_state::AppState as AS, jobs::Job};
@@ -59,6 +59,7 @@ pub(super) struct CronJob<AppState: AS> {
 pub enum TickError {
     JobError(String),
     SqlxError(sqlx::Error),
+    NegativeDuration(OutOfRangeError),
 }
 
 impl<AppState: AS> CronJob<AppState> {
@@ -73,33 +74,48 @@ impl<AppState: AS> CronJob<AppState> {
     pub(crate) async fn tick(
         &self,
         app_state: AppState,
-        last_enqueue_map: &mut HashMap<&str, Instant>,
+        last_enqueue_map: &HashMap<&str, chrono::DateTime<Utc>>,
     ) -> Result<(), TickError> {
         let last_enqueue = last_enqueue_map.get(self.name);
         let context = format!("Cron@{}", app_state.version());
+        let now = Utc::now();
 
         if let Some(last_enqueue) = last_enqueue {
-            let elapsed = last_enqueue.elapsed();
+            let elapsed = now - last_enqueue;
+            let elapsed = elapsed.to_std().map_err(TickError::NegativeDuration)?;
             if elapsed > self.interval {
                 tracing::info!(
                     task_name = self.name,
                     time_since_last_run =? elapsed,
                     "Enqueuing Task"
                 );
                 (self.func)
-                    .run(app_state, context)
+                    .run(app_state.clone(), context)
                     .await
                     .map_err(TickError::JobError)?;
-                last_enqueue_map.insert(self.name, Instant::now());
             }
         } else {
             tracing::info!(task_name = self.name, "Enqueuing Task for first time");
             (self.func)
-                .run(app_state, context)
+                .run(app_state.clone(), context)
                 .await
                 .map_err(TickError::JobError)?;
-            last_enqueue_map.insert(self.name, Instant::now());
         }
+        sqlx::query!(
+            "INSERT INTO Crons (cron_id, name, last_run_at, created_at, updated_at)
+            VALUES ($1, $2, $3, $4, $5)
+            ON CONFLICT (name)
+            DO UPDATE SET
+            last_run_at = $3",
+            uuid::Uuid::new_v4(),
+            self.name,
+            now,
+            now,
+            now
+        )
+        .execute(app_state.db())
+        .await
+        .map_err(TickError::SqlxError)?;
 
         Ok(())
     }

cja/src/cron/worker.rs

@@ -1,6 +1,6 @@
 use std::{collections::HashMap, time::Duration};
 
-use tokio::time::Instant;
+use chrono::{DateTime, Utc};
 
 use crate::app_state::AppState as AS;
 
@@ -18,11 +18,21 @@ impl<AppState: AS> Worker<AppState> {
 
     pub async fn run(self) -> Result<(), TickError> {
         let worker_id = uuid::Uuid::new_v4();
-        let mut last_enqueue_map: HashMap<&str, Instant> = HashMap::new();
 
         tracing::debug!("Starting cron loop");
         loop {
-            self.tick(&worker_id, &mut last_enqueue_map).await?;
+            let last_runs = sqlx::query!(
+                "SELECT name, max(last_run_at) as last_run_at FROM Crons GROUP BY name"
+            )
+            .fetch_all(self.state.db())
+            .await
+            .map_err(TickError::SqlxError)?;
+
+            let last_run_map: HashMap<&str, DateTime<Utc>> = last_runs
+                .iter()
+                .map(|row| (row.name.as_str(), row.last_run_at.unwrap_or_default()))
+                .collect();
+            self.tick(&worker_id, &last_run_map).await?;
 
             tokio::time::sleep(Duration::from_secs(60)).await;
         }
@@ -32,7 +42,7 @@ impl<AppState: AS> Worker<AppState> {
     async fn tick(
         &self,
         worker_id: &uuid::Uuid,
-        last_enqueue_map: &mut HashMap<&str, Instant>,
+        last_enqueue_map: &HashMap<&str, chrono::DateTime<Utc>>,
     ) -> Result<(), TickError> {
         for job in self.registry.jobs.values() {
             job.tick(self.state.clone(), last_enqueue_map).await?;

db/migrations/20240228040146_AddCrons.down.sql

@@ -0,0 +1,2 @@
+-- Add migration script here
+DROP TABLE Crons;

db/migrations/20240228040146_AddCrons.up.sql

@@ -0,0 +1,17 @@
+-- Add migration script here
+CREATE TABLE
+  Crons (
+    cron_id UUID PRIMARY KEY,
+    name TEXT NOT NULL,
+    last_run_at TIMESTAMP
+    WITH
+      TIME ZONE NOT NULL,
+      created_at TIMESTAMP
+    WITH
+      TIME ZONE NOT NULL,
+      updated_at TIMESTAMP
+    WITH
+      TIME ZONE NOT NULL
+  );
+
+CREATE UNIQUE INDEX idx_crons_name ON Crons (name);

server/src/http_server/pages/blog/md/html.rs

@@ -352,7 +352,7 @@ impl IntoHtml for Code {
         }
 
         Ok(html! {
-          pre class="my-4 py-4 bg-coding_background px-8 overflow-x-auto max-w-vw" { code { (PreEscaped(html_generator.finalize())) } }
+          pre class="my-4 py-4 bg-coding_background px-8 overflow-x-auto max-w-vw text-codeText" { code { (PreEscaped(html_generator.finalize())) } }
         })
     }
 }

server/src/http_server/pages/home.rs

@@ -44,10 +44,10 @@ pub(crate) async fn home_page(
     Ok(base(
         html! {
             (constrained_width(html! {
-                ."md:bg-header-background bg-cover bg-left bg-no-repeat mb-24" {
+                ."flex bg-right-bottom bg-no-repeat mb-24 justify-between" {
                     ."md:w-[60%]" {
                         h1 class="text-2xl sm:text-4xl font-medium leading-tight pt-8 md:pt-16 pb-4" {
-                            "Educational & entertaining content for developers of all skill levels"
+                            "Learn, Code, Develop"
                         }
 
                         h3 class="text-lg sm:text-2xl text-subtitle leading-tight mb-8" {
@@ -58,6 +58,10 @@ pub(crate) async fn home_page(
                             (LinkButton::primary(html!("View Posts"), "/posts"))
                         }
                     }
+
+                    div class="hidden md:w-[35%] md:flex" {
+                        img src="/static/headshot-bg-removed.webp" alt="Corey's Headshot" class="mt-auto" {}
+                    }
                 }
 
                 div class="flex flex-col md:flex-row md:space-x-8" {

server/src/http_server/pages/projects.rs

@@ -104,7 +104,7 @@ impl StatusTag {
 impl Render for StatusTag {
     fn render(&self) -> Markup {
         html! {
-          span class="inline-flex items-center gap-x-1.5 rounded-md px-2 py-1 text-xs font-medium text-white ring-1 ring-inset ring-grey-800" {
+          span class="inline-flex items-center gap-x-1.5 rounded-md px-2 py-1 text-xs font-medium text-text ring-1 ring-inset ring-grey-800" {
             svg class=(format!("h-1.5 w-1.5 {}", self.color_class())) viewBox="0 0 6 6" aria-hidden="true" {
               circle cx="3" cy="3" r="3";
             }

server/src/http_server/pages/videos.rs

@@ -100,7 +100,6 @@ pub(crate) async fn video_get(
     Ok(base_constrained(
         html! {
           @if let Some(video) = video {
-            (video.title)
             h1 class="text-2xl" { (video.title) }
             @if let Some(published_at) = video.published_at {
               subtitle class="block text-lg text-subtitle mb-8 " { (published_at.format("%Y-%m-%d")) }

server/src/http_server/templates/buttons.rs

@@ -39,7 +39,7 @@ pub enum ButtonType {
 impl ButtonType {
     fn classes(&self) -> &str {
         match &self {
-            ButtonType::Primary => "bg-secondary-400",
+            ButtonType::Primary => "bg-berryBlue text-almostBackground",
             ButtonType::Secondary => "bg-background border",
         }
     }
@@ -48,7 +48,6 @@ impl ButtonType {
 impl Render for LinkButton {
     fn render(&self) -> Markup {
         let mut classes = vec![
-            "text-text",
             "px-8",
             "py-4",
             "rounded",

server/src/http_server/templates/footer.rs

@@ -1,6 +1,6 @@
 use maud::{html, Markup, PreEscaped};
 
-use crate::http_server::templates::{LOGO_MONOCHROME_SVG, MAX_WIDTH_CONTAINER_CLASSES};
+use crate::http_server::templates::{LOGO_FLAT_SVG, MAX_WIDTH_CONTAINER_CLASSES};
 
 pub fn newsletter_signup_footer() -> Markup {
     html! {
@@ -28,7 +28,7 @@ pub fn newsletter_signup_footer() -> Markup {
             input
               type="submit"
               value="Subscribe"
-              class="bg-secondary-400 rounded-lg px-8 py-2"
+              class="bg-berryBlue rounded-lg px-8 py-2"
               ;
         }
       }
@@ -39,11 +39,11 @@ pub fn footer() -> Markup {
     html! {
       div class="flex-grow mb-24" {}
       (newsletter_signup_footer())
-      div ."min-h-[100px] bg-subtitle" {
+      div ."min-h-[100px] bg-footer" {
         div ."flex ".(MAX_WIDTH_CONTAINER_CLASSES) {
           div class="max-w-[10rem] sm:max-w-[15rem] min-w-[100px] py-8 flex-grow" {
             a href="/" {
-              (PreEscaped(LOGO_MONOCHROME_SVG))
+              (PreEscaped(LOGO_FLAT_SVG))
             }
           }
 

server/src/http_server/templates/header.rs

@@ -2,7 +2,7 @@ use std::borrow::Borrow;
 
 use maud::{html, Markup, PreEscaped, Render};
 
-use crate::http_server::templates::LOGO_SVG;
+use crate::http_server::templates::LOGO_DARK_FLAT_SVG;
 
 pub struct OpenGraph {
     pub title: String,
@@ -62,12 +62,23 @@ pub fn head(og: impl Borrow<OpenGraph>) -> Markup {
 
         link rel="preconnect" href="https://fonts.googleapis.com" {}
         link rel="preconnect" href="https://fonts.gstatic.com" crossorigin {}
-        link href="https://fonts.googleapis.com/css2?family=Quicksand:wght@300;400;500;600;700&&display=swap" rel="stylesheet" {}
+        link href="https://fonts.googleapis.com/css2?family=Quicksand:wght@300;400;500;600;700&&display=block" rel="stylesheet" {}
 
         link rel="stylesheet" href="https://kit.fontawesome.com/d4a1ffb2a0.css" crossorigin="anonymous";
 
         meta name="viewport" content="width=device-width, initial-scale=1";
 
+        link rel="apple-touch-icon" sizes="180x180" href="/static/icons/apple-touch-icon.png";
+        link rel="icon" type="image/png" sizes="32x32" href="/static/icons/favicon-32x32.png";
+        link rel="icon" type="image/png" sizes="16x16" href="/static/icons/favicon-16x16.png";
+        link rel="manifest" href="/static/icons/site.webmanifest";
+        link rel="mask-icon" href="/static/icons/safari-pinned-tab.svg" color="#401f74";
+        link rel="shortcut icon" href="/static/icons/favicon.ico";
+        meta name="msapplication-TileColor" content="#603cba";
+        meta name="msapplication-config" content="/static/icons/browserconfig.xml";
+        meta name="theme-color" content="#401f74";
+
+
         (og.borrow())
 
         script type="text/javascript" {
@@ -98,13 +109,13 @@ pub fn header() -> Markup {
         div class="flex flex-grow justify-center" {
           div class="max-w-sm min-w-[200px] py-8 lg:py-12 flex-grow" {
             a href="/" {
-              (PreEscaped(LOGO_SVG))
+              (PreEscaped(LOGO_DARK_FLAT_SVG))
             }
           }
         }
 
         nav class="flex flex-grow w-full pb-4 sm:pb-8" {
-          ul class="flex flex-col sm:flex-row justify-center sm:items-center flex-grow space-y-4 sm:space-y-0" {
+          ul class="text-lg flex flex-col sm:flex-row justify-center sm:items-center flex-grow space-y-4 sm:space-y-0" {
             (HeaderLink { href: "/", text: "Home" })
             (HeaderLink { href: "/posts", text: "Posts" })
             (HeaderLink { href: "/til", text: "TILs" })

server/src/http_server/templates/mod.rs

@@ -6,8 +6,9 @@ mod footer;
 
 pub use footer::footer;
 
-const LOGO_SVG: &str = include_str!("../../../static/logo.svg");
-const LOGO_MONOCHROME_SVG: &str = include_str!("../../../static/logo-monochrome.svg");
+const LOGO_FLAT_SVG: &str = include_str!("../../../static/logo-flat.svg");
+const LOGO_DARK_SVG: &str = include_str!("../../../static/logo-dark.svg");
+const LOGO_DARK_FLAT_SVG: &str = include_str!("../../../static/logo-dark-flat.svg");
 
 const MAX_WIDTH_CONTAINER_CLASSES: &str = "max-w-5xl m-auto px-4";
 
@@ -30,6 +31,7 @@ pub fn base(inner: impl Borrow<Markup>, og: header::OpenGraph) -> Markup {
         body class="
         bg-background
         text-text
+        font-medium
         font-sans
         min-h-screen
         flex

server/static/icons/browserconfig.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/static/mstile-150x150.png"/>
+            <TileColor>#603cba</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>