From c1975a4c92be744572a72daa8be00209e3831397 Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers" <daniel@bitbadger.solutions>
Date: Tue, 26 Oct 2021 11:31:40 -0400
Subject: [PATCH] Repo reorg

---
 .../Migrate.fsproj                               |  2 +-
 .../Program.fs                                   |  0
 src/MyPrayerJournal/.gitignore                   |  5 +++++
 src/MyPrayerJournal/{Server => }/Data.fs         |  0
 src/MyPrayerJournal/{Server => }/Dates.fs        |  0
 src/MyPrayerJournal/{Server => }/Domain.fs       |  0
 src/MyPrayerJournal/{Server => }/Handlers.fs     |  0
 ...rnal.Server.fsproj => MyPrayerJournal.fsproj} |  4 ++--
 src/MyPrayerJournal/{Server => }/Program.fs      |  0
 .../{Server => }/Properties/launchSettings.json  |  0
 src/MyPrayerJournal/Server/.gitignore            | 16 ----------------
 .../{Server => }/Views/Helpers.fs                |  0
 .../{Server => }/Views/Journal.fs                |  0
 src/MyPrayerJournal/{Server => }/Views/Layout.fs |  0
 src/MyPrayerJournal/{Server => }/Views/Legal.fs  |  0
 .../{Server => }/Views/Request.fs                |  0
 .../{Server => }/appsettings.json                |  0
 .../wwwroot/script/bootstrap.bundle.min.js       |  0
 .../wwwroot/script/htmx-1.5.0.min.js             |  0
 .../{Server => }/wwwroot/script/mpj.js           |  0
 .../{Server => }/wwwroot/style/bootstrap.min.css |  0
 .../{Server => }/wwwroot/style/style.css         |  0
 22 files changed, 8 insertions(+), 19 deletions(-)
 rename src/{MyPrayerJournal/Migrate => MyPrayerJournal.Migrate}/Migrate.fsproj (82%)
 rename src/{MyPrayerJournal/Migrate => MyPrayerJournal.Migrate}/Program.fs (100%)
 create mode 100644 src/MyPrayerJournal/.gitignore
 rename src/MyPrayerJournal/{Server => }/Data.fs (100%)
 rename src/MyPrayerJournal/{Server => }/Dates.fs (100%)
 rename src/MyPrayerJournal/{Server => }/Domain.fs (100%)
 rename src/MyPrayerJournal/{Server => }/Handlers.fs (100%)
 rename src/MyPrayerJournal/{Server/MyPrayerJournal.Server.fsproj => MyPrayerJournal.fsproj} (84%)
 rename src/MyPrayerJournal/{Server => }/Program.fs (100%)
 rename src/MyPrayerJournal/{Server => }/Properties/launchSettings.json (100%)
 delete mode 100644 src/MyPrayerJournal/Server/.gitignore
 rename src/MyPrayerJournal/{Server => }/Views/Helpers.fs (100%)
 rename src/MyPrayerJournal/{Server => }/Views/Journal.fs (100%)
 rename src/MyPrayerJournal/{Server => }/Views/Layout.fs (100%)
 rename src/MyPrayerJournal/{Server => }/Views/Legal.fs (100%)
 rename src/MyPrayerJournal/{Server => }/Views/Request.fs (100%)
 rename src/MyPrayerJournal/{Server => }/appsettings.json (100%)
 rename src/MyPrayerJournal/{Server => }/wwwroot/script/bootstrap.bundle.min.js (100%)
 rename src/MyPrayerJournal/{Server => }/wwwroot/script/htmx-1.5.0.min.js (100%)
 rename src/MyPrayerJournal/{Server => }/wwwroot/script/mpj.js (100%)
 rename src/MyPrayerJournal/{Server => }/wwwroot/style/bootstrap.min.css (100%)
 rename src/MyPrayerJournal/{Server => }/wwwroot/style/style.css (100%)

diff --git a/src/MyPrayerJournal/Migrate/Migrate.fsproj b/src/MyPrayerJournal.Migrate/Migrate.fsproj
similarity index 82%
rename from src/MyPrayerJournal/Migrate/Migrate.fsproj
rename to src/MyPrayerJournal.Migrate/Migrate.fsproj
index 095f9e1..d228dd8 100644
--- a/src/MyPrayerJournal/Migrate/Migrate.fsproj
+++ b/src/MyPrayerJournal.Migrate/Migrate.fsproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Server\MyPrayerJournal.Server.fsproj" />
+    <ProjectReference Include="..\MyPrayerJournal\MyPrayerJournal.fsproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/MyPrayerJournal/Migrate/Program.fs b/src/MyPrayerJournal.Migrate/Program.fs
similarity index 100%
rename from src/MyPrayerJournal/Migrate/Program.fs
rename to src/MyPrayerJournal.Migrate/Program.fs
diff --git a/src/MyPrayerJournal/.gitignore b/src/MyPrayerJournal/.gitignore
new file mode 100644
index 0000000..ee14a3f
--- /dev/null
+++ b/src/MyPrayerJournal/.gitignore
@@ -0,0 +1,5 @@
+## LiteDB database file
+*.db
+
+## Development settings
+appsettings.Development.json
diff --git a/src/MyPrayerJournal/Server/Data.fs b/src/MyPrayerJournal/Data.fs
similarity index 100%
rename from src/MyPrayerJournal/Server/Data.fs
rename to src/MyPrayerJournal/Data.fs
diff --git a/src/MyPrayerJournal/Server/Dates.fs b/src/MyPrayerJournal/Dates.fs
similarity index 100%
rename from src/MyPrayerJournal/Server/Dates.fs
rename to src/MyPrayerJournal/Dates.fs
diff --git a/src/MyPrayerJournal/Server/Domain.fs b/src/MyPrayerJournal/Domain.fs
similarity index 100%
rename from src/MyPrayerJournal/Server/Domain.fs
rename to src/MyPrayerJournal/Domain.fs
diff --git a/src/MyPrayerJournal/Server/Handlers.fs b/src/MyPrayerJournal/Handlers.fs
similarity index 100%
rename from src/MyPrayerJournal/Server/Handlers.fs
rename to src/MyPrayerJournal/Handlers.fs
diff --git a/src/MyPrayerJournal/Server/MyPrayerJournal.Server.fsproj b/src/MyPrayerJournal/MyPrayerJournal.fsproj
similarity index 84%
rename from src/MyPrayerJournal/Server/MyPrayerJournal.Server.fsproj
rename to src/MyPrayerJournal/MyPrayerJournal.fsproj
index 820ee94..c71a4d3 100644
--- a/src/MyPrayerJournal/Server/MyPrayerJournal.Server.fsproj
+++ b/src/MyPrayerJournal/MyPrayerJournal.fsproj
@@ -24,8 +24,8 @@
     <PackageReference Include="NodaTime" Version="3.0.9" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../../../../Giraffe.Htmx/src/Htmx/Giraffe.Htmx.fsproj" />
-    <ProjectReference Include="../../../../Giraffe.Htmx/src/ViewEngine.Htmx/Giraffe.ViewEngine.Htmx.fsproj" />
+    <ProjectReference Include="../../../Giraffe.Htmx/src/Htmx/Giraffe.Htmx.fsproj" />
+    <ProjectReference Include="../../../Giraffe.Htmx/src/ViewEngine.Htmx/Giraffe.ViewEngine.Htmx.fsproj" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="wwwroot\" />
diff --git a/src/MyPrayerJournal/Server/Program.fs b/src/MyPrayerJournal/Program.fs
similarity index 100%
rename from src/MyPrayerJournal/Server/Program.fs
rename to src/MyPrayerJournal/Program.fs
diff --git a/src/MyPrayerJournal/Server/Properties/launchSettings.json b/src/MyPrayerJournal/Properties/launchSettings.json
similarity index 100%
rename from src/MyPrayerJournal/Server/Properties/launchSettings.json
rename to src/MyPrayerJournal/Properties/launchSettings.json
diff --git a/src/MyPrayerJournal/Server/.gitignore b/src/MyPrayerJournal/Server/.gitignore
deleted file mode 100644
index 22673b1..0000000
--- a/src/MyPrayerJournal/Server/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-## LiteDB database file
-*.db
-
-## Auth0 settings
-wwwroot/auth-config.json
-
-## Web application compile output
-wwwroot/favicon.ico
-wwwroot/index.html
-wwwroot/*.js
-wwwroot/*.js.map
-wwwroot/css
-wwwroot/js
-
-## Development settings
-appsettings.Development.json
diff --git a/src/MyPrayerJournal/Server/Views/Helpers.fs b/src/MyPrayerJournal/Views/Helpers.fs
similarity index 100%
rename from src/MyPrayerJournal/Server/Views/Helpers.fs
rename to src/MyPrayerJournal/Views/Helpers.fs
diff --git a/src/MyPrayerJournal/Server/Views/Journal.fs b/src/MyPrayerJournal/Views/Journal.fs
similarity index 100%
rename from src/MyPrayerJournal/Server/Views/Journal.fs
rename to src/MyPrayerJournal/Views/Journal.fs
diff --git a/src/MyPrayerJournal/Server/Views/Layout.fs b/src/MyPrayerJournal/Views/Layout.fs
similarity index 100%
rename from src/MyPrayerJournal/Server/Views/Layout.fs
rename to src/MyPrayerJournal/Views/Layout.fs
diff --git a/src/MyPrayerJournal/Server/Views/Legal.fs b/src/MyPrayerJournal/Views/Legal.fs
similarity index 100%
rename from src/MyPrayerJournal/Server/Views/Legal.fs
rename to src/MyPrayerJournal/Views/Legal.fs
diff --git a/src/MyPrayerJournal/Server/Views/Request.fs b/src/MyPrayerJournal/Views/Request.fs
similarity index 100%
rename from src/MyPrayerJournal/Server/Views/Request.fs
rename to src/MyPrayerJournal/Views/Request.fs
diff --git a/src/MyPrayerJournal/Server/appsettings.json b/src/MyPrayerJournal/appsettings.json
similarity index 100%
rename from src/MyPrayerJournal/Server/appsettings.json
rename to src/MyPrayerJournal/appsettings.json
diff --git a/src/MyPrayerJournal/Server/wwwroot/script/bootstrap.bundle.min.js b/src/MyPrayerJournal/wwwroot/script/bootstrap.bundle.min.js
similarity index 100%
rename from src/MyPrayerJournal/Server/wwwroot/script/bootstrap.bundle.min.js
rename to src/MyPrayerJournal/wwwroot/script/bootstrap.bundle.min.js
diff --git a/src/MyPrayerJournal/Server/wwwroot/script/htmx-1.5.0.min.js b/src/MyPrayerJournal/wwwroot/script/htmx-1.5.0.min.js
similarity index 100%
rename from src/MyPrayerJournal/Server/wwwroot/script/htmx-1.5.0.min.js
rename to src/MyPrayerJournal/wwwroot/script/htmx-1.5.0.min.js
diff --git a/src/MyPrayerJournal/Server/wwwroot/script/mpj.js b/src/MyPrayerJournal/wwwroot/script/mpj.js
similarity index 100%
rename from src/MyPrayerJournal/Server/wwwroot/script/mpj.js
rename to src/MyPrayerJournal/wwwroot/script/mpj.js
diff --git a/src/MyPrayerJournal/Server/wwwroot/style/bootstrap.min.css b/src/MyPrayerJournal/wwwroot/style/bootstrap.min.css
similarity index 100%
rename from src/MyPrayerJournal/Server/wwwroot/style/bootstrap.min.css
rename to src/MyPrayerJournal/wwwroot/style/bootstrap.min.css
diff --git a/src/MyPrayerJournal/Server/wwwroot/style/style.css b/src/MyPrayerJournal/wwwroot/style/style.css
similarity index 100%
rename from src/MyPrayerJournal/Server/wwwroot/style/style.css
rename to src/MyPrayerJournal/wwwroot/style/style.css