Update deps
This commit is contained in:
@ -6,7 +6,7 @@ use lighter_lib::{BulbId, BulbMode};
|
||||
use seed::prelude::*;
|
||||
use seed::{attrs, button, div, input, C};
|
||||
use seed_router::Page;
|
||||
use std::collections::{BTreeMap, HashSet, HashMap};
|
||||
use std::collections::{BTreeMap, HashMap, HashSet};
|
||||
use std::fmt::Write;
|
||||
|
||||
/// /lights page
|
||||
@ -23,7 +23,6 @@ pub struct Model {
|
||||
groups_interacted: bool,
|
||||
|
||||
color_picker: ColorPicker,
|
||||
|
||||
}
|
||||
|
||||
#[derive(Default, Clone)]
|
||||
@ -56,7 +55,11 @@ impl Page for Model {
|
||||
fn update(&mut self, msg: Self::Msg, orders: &mut impl Orders<Self::Msg>) {
|
||||
match msg {
|
||||
Msg::ServerMessage(msg) => match msg {
|
||||
ServerMessage::BulbState { id, mode: new_mode, wake_schedule } => {
|
||||
ServerMessage::BulbState {
|
||||
id,
|
||||
mode: new_mode,
|
||||
wake_schedule,
|
||||
} => {
|
||||
*self.bulb_states.entry(id).or_default() = BulbState {
|
||||
mode: new_mode,
|
||||
wake_schedule,
|
||||
@ -131,8 +134,7 @@ impl Page for Model {
|
||||
};
|
||||
orders.notify(message);
|
||||
});
|
||||
}
|
||||
else if let Ok(time) = NaiveTime::parse_from_str(&time, "%H:%M") {
|
||||
} else if let Ok(time) = NaiveTime::parse_from_str(&time, "%H:%M") {
|
||||
self.for_selected_bulbs(|id, _| {
|
||||
let message = ClientMessage::SetBulbWakeTime {
|
||||
id: id.clone(),
|
||||
@ -146,146 +148,150 @@ impl Page for Model {
|
||||
}
|
||||
}
|
||||
|
||||
fn view(&self) -> Node<Self::Msg> {
|
||||
//let view_bulb = |(id, (mode, color_picker)): (&BulbId, &(BulbMode, ColorPicker))| {
|
||||
// div![
|
||||
// C![C.bulb_box],
|
||||
// h1![id],
|
||||
// div![
|
||||
// C![C.bulb_controls],
|
||||
// {
|
||||
// let id = id.clone();
|
||||
// color_picker.view().map_msg(|msg| Msg::ColorPicker(id, msg))
|
||||
// },
|
||||
// button![
|
||||
// if mode.power {
|
||||
// C![C.bulb_power_button, C.bulb_power_button_on]
|
||||
// } else {
|
||||
// C![C.bulb_power_button]
|
||||
// },
|
||||
// {
|
||||
// let id = id.clone();
|
||||
// let power = !mode.power;
|
||||
// ev(Ev::Click, move |_| Msg::SetBulbPower(id, power))
|
||||
// },
|
||||
// ],
|
||||
// ],
|
||||
// ]
|
||||
//};
|
||||
|
||||
fn view(&self) -> Node<Self::Msg> {
|
||||
//let view_bulb = |(id, (mode, color_picker)): (&BulbId, &(BulbMode, ColorPicker))| {
|
||||
// div![
|
||||
// C![C.bulb_box],
|
||||
// h1![id],
|
||||
// div![
|
||||
// C![C.bulb_controls],
|
||||
// {
|
||||
// let id = id.clone();
|
||||
// color_picker.view().map_msg(|msg| Msg::ColorPicker(id, msg))
|
||||
// },
|
||||
// button![
|
||||
// if mode.power {
|
||||
// C![C.bulb_power_button, C.bulb_power_button_on]
|
||||
// } else {
|
||||
// C![C.bulb_power_button]
|
||||
// },
|
||||
// {
|
||||
// let id = id.clone();
|
||||
// let power = !mode.power;
|
||||
// ev(Ev::Click, move |_| Msg::SetBulbPower(id, power))
|
||||
// },
|
||||
// ],
|
||||
// ],
|
||||
// ]
|
||||
//};
|
||||
let bulb_map_width = self
|
||||
.bulb_map
|
||||
.groups
|
||||
.iter()
|
||||
.map(|group| group.x + group.shape.width())
|
||||
.max()
|
||||
.unwrap_or(0);
|
||||
|
||||
let bulb_map_width = self
|
||||
.bulb_map
|
||||
.groups
|
||||
.iter()
|
||||
.map(|group| group.x + group.shape.width())
|
||||
.max()
|
||||
.unwrap_or(0);
|
||||
let bulb_map_height = self
|
||||
.bulb_map
|
||||
.groups
|
||||
.iter()
|
||||
.map(|group| group.y + group.shape.height())
|
||||
.max()
|
||||
.unwrap_or(0);
|
||||
|
||||
let bulb_map_height = self
|
||||
.bulb_map
|
||||
.groups
|
||||
.iter()
|
||||
.map(|group| group.y + group.shape.height())
|
||||
.max()
|
||||
.unwrap_or(0);
|
||||
let view_bulb_group = |(i, group): (usize, &BulbGroup)| {
|
||||
let (w, h) = (group.shape.width(), group.shape.height());
|
||||
let mut style = String::new();
|
||||
write!(
|
||||
&mut style,
|
||||
"margin-left: {}rem; margin-top: {}rem; width: {}rem; height: {}rem;",
|
||||
group.x, group.y, w, h
|
||||
)
|
||||
.ok();
|
||||
|
||||
let view_bulb_group = |(i, group): (usize, &BulbGroup)| {
|
||||
let (w, h) = (group.shape.width(), group.shape.height());
|
||||
let mut style = String::new();
|
||||
write!(
|
||||
&mut style,
|
||||
"margin-left: {}rem; margin-top: {}rem; width: {}rem; height: {}rem;",
|
||||
group.x, group.y, w, h
|
||||
)
|
||||
.ok();
|
||||
if let BulbGroupShape::Circle { r } = group.shape {
|
||||
write!(&mut style, " border-radius: {r}rem;").ok();
|
||||
}
|
||||
|
||||
if let BulbGroupShape::Circle { r } = group.shape {
|
||||
write!(&mut style, " border-radius: {r}rem;").ok();
|
||||
}
|
||||
|
||||
div![
|
||||
&group.name[..1],
|
||||
if self.selected_groups.contains(&i) {
|
||||
C![C.bulb_group, C.bulb_group_selected]
|
||||
} else {
|
||||
C![C.bulb_group]
|
||||
},
|
||||
attrs! {
|
||||
At::Style => style,
|
||||
},
|
||||
ev(Ev::Click, move |event| {
|
||||
event.stop_propagation();
|
||||
Msg::SelectGroup(i)
|
||||
}),
|
||||
]
|
||||
};
|
||||
|
||||
let selected_bulb = self
|
||||
.selected_groups
|
||||
.iter()
|
||||
.next()
|
||||
.and_then(|&index| self.bulb_map.groups.get(index))
|
||||
.and_then(|group| group.bulbs.first())
|
||||
.and_then(|id| self.bulb_states.get(id))
|
||||
.cloned() // TODO: remove clone
|
||||
.unwrap_or_default();
|
||||
|
||||
let calendar_day = |day: Weekday| {
|
||||
let time = selected_bulb.wake_schedule.get(&day).map(|t| t.to_string()).unwrap_or_default();
|
||||
div![
|
||||
C![C.calendar_day],
|
||||
day.to_string(),
|
||||
input![
|
||||
C![C.calendar_time_input],
|
||||
attrs! {At::Placeholder => time},
|
||||
input_ev(Ev::Input, move |input| Msg::LightTime(input, day))
|
||||
],
|
||||
]
|
||||
};
|
||||
|
||||
|
||||
div![
|
||||
C![C.bulb_box],
|
||||
div![
|
||||
C![C.bulb_map],
|
||||
attrs! {
|
||||
At::Style => format!("width: {}rem; height: {}rem;", bulb_map_width, bulb_map_height),
|
||||
},
|
||||
ev(Ev::Click, |_| Msg::DeselectGroups),
|
||||
self.bulb_map.groups.iter().enumerate().map(view_bulb_group),
|
||||
],
|
||||
div![
|
||||
C![C.bulb_controls],
|
||||
self.color_picker
|
||||
.view()
|
||||
.map_msg(|msg| Msg::ColorPicker(msg)),
|
||||
button![
|
||||
if selected_bulb.mode.power {
|
||||
C![C.bulb_power_button, C.bulb_power_button_on]
|
||||
div![
|
||||
&group.name[..1],
|
||||
if self.selected_groups.contains(&i) {
|
||||
C![C.bulb_group, C.bulb_group_selected]
|
||||
} else {
|
||||
C![C.bulb_power_button]
|
||||
C![C.bulb_group]
|
||||
},
|
||||
ev(Ev::Click, move |_| Msg::SetBulbPower(!selected_bulb.mode.power)),
|
||||
div![attrs! { At::Id => "switch_socket" }],
|
||||
div![attrs! { At::Id => "off_label" }, "Off"],
|
||||
div![attrs! { At::Id => "on_label" }, "On"],
|
||||
div![attrs! { At::Id => "lever_stem" }],
|
||||
div![attrs! { At::Id => "lever_face" }],
|
||||
],
|
||||
],
|
||||
attrs! {
|
||||
At::Style => style,
|
||||
},
|
||||
ev(Ev::Click, move |event| {
|
||||
event.stop_propagation();
|
||||
Msg::SelectGroup(i)
|
||||
}),
|
||||
]
|
||||
};
|
||||
|
||||
let selected_bulb = self
|
||||
.selected_groups
|
||||
.iter()
|
||||
.next()
|
||||
.and_then(|&index| self.bulb_map.groups.get(index))
|
||||
.and_then(|group| group.bulbs.first())
|
||||
.and_then(|id| self.bulb_states.get(id))
|
||||
.cloned() // TODO: remove clone
|
||||
.unwrap_or_default();
|
||||
|
||||
let calendar_day = |day: Weekday| {
|
||||
let time = selected_bulb
|
||||
.wake_schedule
|
||||
.get(&day)
|
||||
.map(|t| t.to_string())
|
||||
.unwrap_or_default();
|
||||
div![
|
||||
C![C.calendar_day],
|
||||
day.to_string(),
|
||||
input![
|
||||
C![C.calendar_time_input],
|
||||
attrs! {At::Placeholder => time},
|
||||
input_ev(Ev::Input, move |input| Msg::LightTime(input, day))
|
||||
],
|
||||
]
|
||||
};
|
||||
|
||||
div![
|
||||
C![C.calendar_box],
|
||||
calendar_day(Weekday::Mon),
|
||||
calendar_day(Weekday::Tue),
|
||||
calendar_day(Weekday::Wed),
|
||||
calendar_day(Weekday::Thu),
|
||||
calendar_day(Weekday::Fri),
|
||||
calendar_day(Weekday::Sat),
|
||||
calendar_day(Weekday::Sun),
|
||||
],
|
||||
]
|
||||
}
|
||||
C![C.bulb_box],
|
||||
div![
|
||||
C![C.bulb_map],
|
||||
attrs! {
|
||||
At::Style => format!("width: {}rem; height: {}rem;", bulb_map_width, bulb_map_height),
|
||||
},
|
||||
ev(Ev::Click, |_| Msg::DeselectGroups),
|
||||
self.bulb_map.groups.iter().enumerate().map(view_bulb_group),
|
||||
],
|
||||
div![
|
||||
C![C.bulb_controls],
|
||||
self.color_picker
|
||||
.view()
|
||||
.map_msg(|msg| Msg::ColorPicker(msg)),
|
||||
button![
|
||||
if selected_bulb.mode.power {
|
||||
C![C.bulb_power_button, C.bulb_power_button_on]
|
||||
} else {
|
||||
C![C.bulb_power_button]
|
||||
},
|
||||
ev(Ev::Click, move |_| Msg::SetBulbPower(
|
||||
!selected_bulb.mode.power
|
||||
)),
|
||||
div![attrs! { At::Id => "switch_socket" }],
|
||||
div![attrs! { At::Id => "off_label" }, "Off"],
|
||||
div![attrs! { At::Id => "on_label" }, "On"],
|
||||
div![attrs! { At::Id => "lever_stem" }],
|
||||
div![attrs! { At::Id => "lever_face" }],
|
||||
],
|
||||
],
|
||||
div![
|
||||
C![C.calendar_box],
|
||||
calendar_day(Weekday::Mon),
|
||||
calendar_day(Weekday::Tue),
|
||||
calendar_day(Weekday::Wed),
|
||||
calendar_day(Weekday::Thu),
|
||||
calendar_day(Weekday::Fri),
|
||||
calendar_day(Weekday::Sat),
|
||||
calendar_day(Weekday::Sun),
|
||||
],
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
impl Model {
|
||||
|
||||
Reference in New Issue
Block a user