gburri/recipes
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Calendar is now displayed on home page and recipes can be scheduled without being logged

Browse source
This commit is contained in:
Greg Burri 2025-02-08 22:31:38 +01:00
parent ccb1248da3
commit 37721ac3ea
22 changed files with 538 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

191
frontend/src/calendar.rs
View file

@ -1,20 +1,21 @@
use std::{cell::RefCell, rc::Rc};
use std::{cell::RefCell, default, rc::Rc};
use chrono::{offset::Local, DateTime, Datelike, Days, Months, Weekday};
use chrono::{offset::Local, DateTime, Datelike, Days, Months, NaiveDate, Weekday};
use common::ron_api;
use gloo::{console::log, events::EventListener};
use gloo::{console::log, events::EventListener, utils::document};
use wasm_bindgen::prelude::*;
use wasm_bindgen_futures::spawn_local;
use web_sys::Element;
use crate::{
recipe_scheduler::{self, RecipeScheduler},
request,
utils::{by_id, SelectorExt},
utils::{by_id, selector, selector_all, SelectorExt},
};
struct CalendarStateInternal {
displayed_date: DateTime<Local>,
selected_date: DateTime<Local>,
displayed_date: NaiveDate,
selected_date: NaiveDate,
}
#[derive(Clone)]
@ -24,7 +25,7 @@ pub struct CalendarState {
impl CalendarState {
pub fn new() -> Self {
let current_date = Local::now();
let current_date = Local::now().date_naive();
Self {
internal_state: Rc::new(RefCell::new(CalendarStateInternal {
displayed_date: current_date,
@ -43,33 +44,48 @@ impl CalendarState {
state_borrowed.displayed_date = state_borrowed.displayed_date - Months::new(1);
}
pub fn get_displayed_date(&self) -> DateTime<Local> {
pub fn get_displayed_date(&self) -> NaiveDate {
self.internal_state.borrow().displayed_date
}
pub fn get_selected_date(&self) -> DateTime<Local> {
pub fn get_selected_date(&self) -> NaiveDate {
self.internal_state.borrow().selected_date
}
pub fn set_selected_date(&self, date: DateTime<Local>) {
pub fn set_selected_date(&self, date: NaiveDate) {
self.internal_state.borrow_mut().selected_date = date;
}
}
pub fn setup(calendar: Element) -> CalendarState {
#[derive(Clone, Copy)]
pub struct CalendarOptions {
pub can_select_date: bool,
// pub show_scheduled_recipes: bool,
}
pub fn setup(
calendar: Element,
options: CalendarOptions,
recipe_scheduler: RecipeScheduler,
) -> CalendarState {
let prev: Element = calendar.selector(".prev");
let next: Element = calendar.selector(".next");
let state = CalendarState::new();
display_month(&calendar, state.clone());
display_month(&calendar, state.clone(), options, recipe_scheduler);
// Click on previous month.
let calendar_clone = calendar.clone();
let state_clone = state.clone();
EventListener::new(&prev, "click", move |_event| {
state_clone.displayed_date_previous_month();
display_month(&calendar_clone, state_clone.clone());
display_month(
&calendar_clone,
state_clone.clone(),
options,
recipe_scheduler,
);
})
.forget();
@ -78,33 +94,55 @@ pub fn setup(calendar: Element) -> CalendarState {
let state_clone = state.clone();
EventListener::new(&next, "click", move |_event| {
state_clone.displayed_date_next_month();
display_month(&calendar_clone, state_clone.clone());
display_month(
&calendar_clone,
state_clone.clone(),
options,
recipe_scheduler,
);
})
.forget();
// Click on a day of the current month.
let days: Element = calendar.selector(".days");
let calendar_clone = calendar.clone();
let state_clone = state.clone();
EventListener::new(&days, "click", move |event| {
let target: Element = event.target().unwrap().dyn_into().unwrap();
if target.class_name() == "number" {
let first_day = first_grid_day(state_clone.get_displayed_date());
let day_grid_id = target.parent_element().unwrap().id();
let day_offset = day_grid_id[9..10].parse::<u64>().unwrap() * 7
+ day_grid_id[10..11].parse::<u64>().unwrap();
state_clone.set_selected_date(first_day + Days::new(day_offset));
display_month(&calendar_clone, state_clone.clone());
}
})
.forget();
if options.can_select_date {
let days: Element = calendar.selector(".days");
let calendar_clone = calendar.clone();
let state_clone = state.clone();
EventListener::new(&days, "click", move |event| {
let target: Element = event.target().unwrap().dyn_into().unwrap();
// log!(event);
if target.class_name() == "number" {
let first_day = first_grid_day(state_clone.get_displayed_date());
let day_grid_id = target.parent_element().unwrap().id();
let day_offset = day_grid_id[9..10].parse::<u64>().unwrap() * 7
+ day_grid_id[10..11].parse::<u64>().unwrap();
state_clone.set_selected_date(first_day + Days::new(day_offset));
display_month(
&calendar_clone,
state_clone.clone(),
options,
recipe_scheduler,
);
} else if target.class_name() == "remove-scheduled-recipe" {
log!("REMOVE"); // TODO.
}
})
.forget();
}
state
}
const NB_CALENDAR_ROW: u64 = 5;
fn display_month(calendar: &Element, state: CalendarState) {
fn display_month(
calendar: &Element,
state: CalendarState,
options: CalendarOptions,
recipe_scheduler: RecipeScheduler,
) {
let date = state.get_displayed_date();
calendar
@ -129,6 +167,7 @@ fn display_month(calendar: &Element, state: CalendarState) {
for i in 0..NB_CALENDAR_ROW {
for j in 0..7 {
let day_element: Element = by_id(&format!("day-grid-{}{}", i, j));
let day_content: Element = day_element.selector(".number");
day_content.set_inner_html(&current.day().to_string());
@ -140,13 +179,13 @@ fn display_month(calendar: &Element, state: CalendarState) {
}
class_name += "current-month";
}
if current.date_naive() == Local::now().date_naive() {
if current == Local::now().date_naive() {
if !class_name.is_empty() {
class_name += " ";
}
class_name += "today";
}
if current.date_naive() == state.get_selected_date().date_naive() {
if options.can_select_date && current == state.get_selected_date() {
if !class_name.is_empty() {
class_name += " ";
}
@ -158,30 +197,82 @@ fn display_month(calendar: &Element, state: CalendarState) {
}
}
// Load and display scheduled recipes.
// if options.show_scheduled_recipes {
spawn_local(async move {
let scheduled_recipes: ron_api::ScheduledRecipes = request::get(
"calendar/get_scheduled_recipes",
[
("start_date", first_day.date_naive().to_string()),
(
"end_date",
(first_day + Days::new(NB_CALENDAR_ROW * 7))
.date_naive()
.to_string(),
),
],
)
.await
.unwrap();
// let scheduled_recipes: ron_api::ScheduledRecipes = request::get(
// "calendar/get_scheduled_recipes",
// [
// ("start_date", first_day.date_naive().to_string()),
// (
// "end_date",
// (first_day + Days::new(NB_CALENDAR_ROW * 7))
// .date_naive()
// .to_string(),
// ),
// ],
// )
// .await
// .unwrap();
for recipe in scheduled_recipes.recipes {
// log!(recipe.1);
// TODO
let scheduled_recipes = recipe_scheduler
.get_scheduled_recipes(first_day, first_day + Days::new(NB_CALENDAR_ROW * 7))
.await
.unwrap();
for scheduled_recipe in selector_all::<Element>(".scheduled-recipes") {
scheduled_recipe.set_inner_html("");
}
if !scheduled_recipes.is_empty() {
let recipe_template: Element = selector("#hidden-templates-calendar .scheduled-recipe");
for (date, title, recipe_id) in scheduled_recipes {
let id = format!("scheduled-recipe-{}-{}", recipe_id, date);
if document().get_element_by_id(&id).is_some() {
continue;
}
let delta_from_first_day = (date - first_day).num_days();
let i = delta_from_first_day / 7;
let j = delta_from_first_day % 7;
let scheduled_recipes_element: Element =
selector(&format!("#day-grid-{}{} .scheduled-recipes", i, j));
let recipe_element = recipe_template
.clone_node_with_deep(true)
.unwrap()
.dyn_into::<Element>()
.unwrap();
recipe_element.set_id(&id);
let recipe_link_element: Element = recipe_element.selector("a");
// let recipe_remove_element: Element =
// recipe_element.selector(".remove-scheduled-recipe");
//
// EventListener::new(&recipe_remove_element, "click", move |_event| {
// log!("CLICK REMOVE");
// })
// .forget();
recipe_link_element
.set_attribute("href", &format!("/recipe/view/{}", recipe_id))
.unwrap();
recipe_link_element.set_inner_html(&title);
scheduled_recipes_element
.append_child(&recipe_element)
.unwrap();
// log!(&title);
// TODO
}
}
});
// }
}
fn first_grid_day(mut date: DateTime<Local>) -> DateTime<Local> {
pub fn first_grid_day(mut date: NaiveDate) -> NaiveDate {
while (date - Days::new(1)).month() == date.month() {
date = date - Days::new(1);
}