diff --git a/Cargo.lock b/Cargo.lock index 53aabea..79940c0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1106,23 +1106,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "golgi" -version = "0.1.1" -dependencies = [ - "async-std", - "async-stream 0.3.2", - "base64 0.13.0", - "futures 0.3.21", - "hex", - "kuska-handshake", - "kuska-sodiumoxide", - "kuska-ssb", - "serde 1.0.136", - "serde_json", - "sha2", -] - [[package]] name = "golgi" version = "0.1.1" @@ -2442,7 +2425,7 @@ dependencies = [ "chrono", "dirs 4.0.0", "fslock", - "golgi 0.1.1", + "golgi", "jsonrpc-client-core", "jsonrpc-client-http", "jsonrpc-core 8.0.1", @@ -2527,20 +2510,19 @@ dependencies = [ [[package]] name = "peach-web" -version = "0.5.0" +version = "0.6.0" dependencies = [ "async-std", "base64 0.13.0", + "chrono", "dirs 4.0.0", "env_logger 0.8.4", "futures 0.3.21", - "golgi 0.1.1 (git+https://git.coopcloud.tech/golgi-ssb/golgi.git)", + "golgi", "lazy_static", "log 0.4.14", "maud", "peach-lib", - "peach-network", - "peach-stats", "rouille", "temporary", "xdg", diff --git a/peach-web/Cargo.toml b/peach-web/Cargo.toml index 5902770..0b4f9a7 100644 --- a/peach-web/Cargo.toml +++ b/peach-web/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "peach-web" -version = "0.5.0" +version = "0.6.0" authors = ["Andrew Reid "] edition = "2018" description = "peach-web is a web application which provides a web interface for monitoring and interacting with the PeachCloud device. This allows administration of the single-board computer (ie. Raspberry Pi) running PeachCloud, as well as the ssb-server and related plugins." @@ -21,8 +21,6 @@ maintainer-scripts="debian" systemd-units = { unit-name = "peach-web" } assets = [ ["target/release/peach-web", "/usr/bin/", "755"], - ["Rocket.toml", "/usr/share/peach-web/Rocket.toml", "644"], - ["templates/**/*", "/usr/share/peach-web/templates/", "644"], ["static/*", "/usr/share/peach-web/static/", "644"], ["static/css/*", "/usr/share/peach-web/static/css/", "644"], ["static/icons/*", "/usr/share/peach-web/static/icons/", "644"], @@ -37,6 +35,7 @@ maintenance = { status = "actively-developed" } [dependencies] async-std = "1.10" base64 = "0.13" +chrono = "0.4" dirs = "4.0" env_logger = "0.8" futures = "0.3" @@ -45,8 +44,9 @@ lazy_static = "1.4" log = "0.4" maud = "0.23" peach-lib = { path = "../peach-lib" } -peach-network = { path = "../peach-network" } -peach-stats = { path = "../peach-stats" } +# these will be reintroduced when the full peachcloud mode is added +#peach-network = { path = "../peach-network" } +#peach-stats = { path = "../peach-stats" } rouille = { version = "3.5", default-features = false } temporary = "0.6" xdg = "2.2"