Skip to content

Commit

Permalink
(refactor) moved the event module into rocksalt_shared
Browse files Browse the repository at this point in the history
  • Loading branch information
mbuscemi committed Apr 19, 2020
1 parent 17262a8 commit 7d92dd2
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 18 deletions.
10 changes: 4 additions & 6 deletions frontend/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,19 @@ extern crate serde;
extern crate serde_json;
extern crate serde_derive;

mod event;
mod file;
mod message;
pub mod model;
mod view;

use yew::{html, Component, ComponentLink, Html, ShouldRender};

use event::{
use rocksalt_shared::event::{
Event,
set_file::SetFile,
set_project_path::SetProjectPath,
};
use rocksalt_shared::event::message::Message;
use yew::{html, Component, ComponentLink, Html, ShouldRender};

use file::File;
use message::Message;
use model::Model;

impl Component for Model {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/model.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use rocksalt_shared::file_system::disk_entry::DiskEntry;
use rocksalt_shared::event::Event;
use yew::ComponentLink;

use crate::event::Event;
use crate::file::File;

pub struct Model {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/view.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use rocksalt_shared::file_system::disk_entry::DiskEntry;
use rocksalt_shared::event::message::Message;
use yew::{html, Html};

use crate::message::Message;
use crate::model::Model;

impl Model {
Expand Down
1 change: 1 addition & 0 deletions shared/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ edition = "2018"

[dependencies]
yew = { version = "0.14.3", features = ["std_web"] }
stdweb = "0.4.20"
serde = "1.0.106"
serde_json = "1.0.51"
serde_derive = "1.0.106"
2 changes: 1 addition & 1 deletion frontend/src/message.rs → shared/src/event/message.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use rocksalt_shared::file_system::disk_entry::DiskEntry;
use crate::file_system::disk_entry::DiskEntry;

pub enum Message {
OpenFile,
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/event/mod.rs → shared/src/event/mod.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
pub mod message;
pub mod set_file;
pub mod set_project_path;

use message::Message;
use serde::de::Deserialize;
use stdweb::{ serde::Serde, unstable::TryInto, Value };
use yew::{ Component, ComponentLink };

use crate::message::Message;

pub trait Detail {
const NAME: &'static str;
fn transform(&self) -> Message;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use serde::Deserialize;

use crate::event::Detail;
use crate::message::Message;
use super::Detail;
use super::message::Message;

#[derive(Deserialize, Debug)]
pub struct SetFile {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use rocksalt_shared::file_system::disk_entry::DiskEntry;
use serde::Deserialize;

use crate::event::Detail;
use crate::message::Message;
use super::Detail;
use crate::file_system::disk_entry::DiskEntry;
use super::message::Message;

#[derive(Deserialize, Debug)]
pub struct SetProjectPath {
Expand Down
2 changes: 1 addition & 1 deletion shared/src/file_system/disk_entry.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use serde::Deserialize;
use serde::{ Serialize, Deserialize };

use super::file_type::FileType;

Expand Down
2 changes: 1 addition & 1 deletion shared/src/file_system/file_type.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use serde::Deserialize;
use serde::{ Serialize, Deserialize };
use std::fs::metadata;

#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
Expand Down
4 changes: 4 additions & 0 deletions shared/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#[macro_use]
extern crate stdweb;
extern crate serde;
extern crate serde_json;
extern crate serde_derive;

pub mod event;
pub mod file_system;
Binary file modified static/rocksalt_frontend.wasm
Binary file not shown.

0 comments on commit 7d92dd2

Please sign in to comment.