From d7080bcc4bfb4253ece757bd75c9261f13bcd98e Mon Sep 17 00:00:00 2001
From: Rob Watson <rob@netflux.io>
Date: Thu, 17 Sep 2020 06:35:11 +0200
Subject: [PATCH] Prefer frontend/core to frontend-core

---
 Cargo.toml                                                    | 2 +-
 Makefile                                                      | 4 ++--
 {frontend-core => frontend/core}/Cargo.toml                   | 0
 {frontend-core => frontend/core}/src/agents/audio_agent.rs    | 0
 {frontend-core => frontend/core}/src/agents/mod.rs            | 0
 {frontend-core => frontend/core}/src/components/app.rs        | 0
 {frontend-core => frontend/core}/src/components/home.rs       | 0
 {frontend-core => frontend/core}/src/components/mod.rs        | 0
 {frontend-core => frontend/core}/src/components/player.rs     | 0
 .../core}/src/components/waveform/canvas.rs                   | 0
 .../core}/src/components/waveform/container.rs                | 0
 .../core}/src/components/waveform/mod.rs                      | 0
 {frontend-core => frontend/core}/src/lib.rs                   | 0
 {frontend-core => frontend/core}/src/utils.rs                 | 0
 14 files changed, 3 insertions(+), 3 deletions(-)
 rename {frontend-core => frontend/core}/Cargo.toml (100%)
 rename {frontend-core => frontend/core}/src/agents/audio_agent.rs (100%)
 rename {frontend-core => frontend/core}/src/agents/mod.rs (100%)
 rename {frontend-core => frontend/core}/src/components/app.rs (100%)
 rename {frontend-core => frontend/core}/src/components/home.rs (100%)
 rename {frontend-core => frontend/core}/src/components/mod.rs (100%)
 rename {frontend-core => frontend/core}/src/components/player.rs (100%)
 rename {frontend-core => frontend/core}/src/components/waveform/canvas.rs (100%)
 rename {frontend-core => frontend/core}/src/components/waveform/container.rs (100%)
 rename {frontend-core => frontend/core}/src/components/waveform/mod.rs (100%)
 rename {frontend-core => frontend/core}/src/lib.rs (100%)
 rename {frontend-core => frontend/core}/src/utils.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 397f076..5595f26 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 
 [workspace]
 members = [
-    "frontend-core",
+    "frontend/core",
 ]
 
 [profile.release]
diff --git a/Makefile b/Makefile
index de57d80..200ebbd 100644
--- a/Makefile
+++ b/Makefile
@@ -3,14 +3,14 @@
 all: build-frontend
 
 build-frontend:
-	cd frontend-core && \
+	cd frontend/core && \
 		wasm-pack build --dev --target web --out-name wasm --out-dir ./static
 
 build-doc:
 	cargo doc --all --no-deps
 
 run:
-	simple-http-server -i ./frontend-core/static/ -p 3000 --nocache --try-file ./frontend-core/static/index.html
+	simple-http-server -i ./frontend/core/static/ -p 3000 --nocache --try-file ./frontend/core/static/index.html
 
 lint: lint-rustfmt lint-clippy
 
diff --git a/frontend-core/Cargo.toml b/frontend/core/Cargo.toml
similarity index 100%
rename from frontend-core/Cargo.toml
rename to frontend/core/Cargo.toml
diff --git a/frontend-core/src/agents/audio_agent.rs b/frontend/core/src/agents/audio_agent.rs
similarity index 100%
rename from frontend-core/src/agents/audio_agent.rs
rename to frontend/core/src/agents/audio_agent.rs
diff --git a/frontend-core/src/agents/mod.rs b/frontend/core/src/agents/mod.rs
similarity index 100%
rename from frontend-core/src/agents/mod.rs
rename to frontend/core/src/agents/mod.rs
diff --git a/frontend-core/src/components/app.rs b/frontend/core/src/components/app.rs
similarity index 100%
rename from frontend-core/src/components/app.rs
rename to frontend/core/src/components/app.rs
diff --git a/frontend-core/src/components/home.rs b/frontend/core/src/components/home.rs
similarity index 100%
rename from frontend-core/src/components/home.rs
rename to frontend/core/src/components/home.rs
diff --git a/frontend-core/src/components/mod.rs b/frontend/core/src/components/mod.rs
similarity index 100%
rename from frontend-core/src/components/mod.rs
rename to frontend/core/src/components/mod.rs
diff --git a/frontend-core/src/components/player.rs b/frontend/core/src/components/player.rs
similarity index 100%
rename from frontend-core/src/components/player.rs
rename to frontend/core/src/components/player.rs
diff --git a/frontend-core/src/components/waveform/canvas.rs b/frontend/core/src/components/waveform/canvas.rs
similarity index 100%
rename from frontend-core/src/components/waveform/canvas.rs
rename to frontend/core/src/components/waveform/canvas.rs
diff --git a/frontend-core/src/components/waveform/container.rs b/frontend/core/src/components/waveform/container.rs
similarity index 100%
rename from frontend-core/src/components/waveform/container.rs
rename to frontend/core/src/components/waveform/container.rs
diff --git a/frontend-core/src/components/waveform/mod.rs b/frontend/core/src/components/waveform/mod.rs
similarity index 100%
rename from frontend-core/src/components/waveform/mod.rs
rename to frontend/core/src/components/waveform/mod.rs
diff --git a/frontend-core/src/lib.rs b/frontend/core/src/lib.rs
similarity index 100%
rename from frontend-core/src/lib.rs
rename to frontend/core/src/lib.rs
diff --git a/frontend-core/src/utils.rs b/frontend/core/src/utils.rs
similarity index 100%
rename from frontend-core/src/utils.rs
rename to frontend/core/src/utils.rs