Implement Scene widget

src/lib.rs

@@ -13,6 +13,7 @@ use futures::compat::Compat;
 use futures::{join, TryFutureExt};
 use settings::Settings;
 use std::thread;
+pub use protocol as dsl;
 
 pub fn main() -> Result<Control, Error> {
  let settings = Settings::parse()?;

ui/src/lib.rs

@@ -22,7 +22,7 @@ impl Component for Model {
 impl Renderable<Self> for Model {
  fn view(&self) -> Html<Self> {
  html! {
- <widgets::Spinner: />
+ <widgets::Scene: />
  }
  }
 }

ui/src/widgets/container.rs

@@ -30,24 +30,9 @@ impl Widget for Model {
  }
 
  fn main_view(&self) -> View<Self> {
- match self.container {
- Container::Blank => {
- html! {
- <p>{ "Blank" }</p>
- }
- }
- Container::Tabs(_) => {
- html! {
- <p>{ "Tabs" }</p>
- }
- }
- Container::Panel(ref panel) => {
- html! {
- <div class="container",>
- <widgets::Panel: panel=panel.clone(), />
- </div>
- }
- }
+ html! {
+ <div class="container">
+ </div>
  }
  }
 }

ui/src/widgets/mod.rs

@@ -10,9 +10,6 @@ pub use blank::BlankWidget as Blank;
 mod button;
 pub use button::ButtonWidget as Button;
 
-mod container;
-pub use container::ContainerWidget as Container;
-
 mod control;
 pub use control::ControlWidget as Control;
 
@@ -37,13 +34,16 @@ pub use page::PageWidget as Page;
 mod panel;
 pub use panel::PanelWidget as Panel;
 
-mod scene;
-pub use scene::SceneWidget as Scene;
-
 mod welcome;
 pub use welcome::WelcomeWidget as Welcome;
 */
 
+mod container;
+pub use container::ContainerWidget as Container;
+
+mod scene;
+pub use scene::SceneWidget as Scene;
+
 mod spinner;
 pub use spinner::SpinnerWidget as Spinner;
 

ui/src/widgets/scene.rs

@@ -1,6 +1,6 @@
 use crate::live::{Requirement, ResponseEvt};
 use crate::widgets::{self, Reqs, View, Widget, WidgetModel};
-use protocol::{Reaction, Scene};
+use protocol::{Container, Reaction, Scene};
 use yew::{html, Properties, ShouldRender};
 
 pub type SceneWidget = WidgetModel<Model>;
@@ -45,16 +45,15 @@ impl Widget for Model {
  <widgets::Spinner: />
  }
  }
- Scene::FullScreen(ref layout) => {
+ Scene::App => {
  html! {
- <div class="scene-fullscreen",>
- <widgets::Layout: layout=layout.clone(), />
+ <div class="app">
  </div>
  }
  }
- Scene::Dashboard(ref dashboard) => {
+ Scene::Container(ref container) => {
  html! {
- <widgets::Dashboard: dashboard=dashboard.clone(), />
+ <widgets::Container: container=container.clone() />
  }
  }
  }