diff --git a/.gitignore b/.gitignore index 1aa7499..37f26ff 100644 --- a/.gitignore +++ b/.gitignore @@ -254,13 +254,3 @@ paket-files/ # Ionide VSCode extension .ionide - -# Compiled files / application -src/MyPrayerJournal/Api/*.db -src/MyPrayerJournal/Api/wwwroot/favicon.ico -src/MyPrayerJournal/Api/wwwroot/index.html -src/MyPrayerJournal/Api/wwwroot/*.js -src/MyPrayerJournal/Api/wwwroot/*.js.map -src/MyPrayerJournal/Api/wwwroot/css -src/MyPrayerJournal/Api/wwwroot/js -src/MyPrayerJournal/Api/appsettings.Development.json diff --git a/src/MyPrayerJournal/App/package.json b/src/MyPrayerJournal/App/package.json index 585cd23..ea9c7d1 100644 --- a/src/MyPrayerJournal/App/package.json +++ b/src/MyPrayerJournal/App/package.json @@ -8,9 +8,9 @@ "serve": "vue-cli-service serve", "build": "vue-cli-service build", "lint": "vue-cli-service lint", - "apistart": "cd ../Api && dotnet run", - "publish": "vue-cli-service build --modern && cd ../Api && dotnet publish -c Release -r linux-x64 --self-contained false", - "vue": "vue-cli-service build --development && cd ../Api && dotnet run" + "apistart": "cd ../Server && dotnet run", + "publish": "vue-cli-service build --modern && cd ../Server && dotnet publish -c Release -r linux-x64 -p:PublishSingleFile=true --self-contained false", + "vue": "vue-cli-service build --development && cd ../Server && dotnet run" }, "dependencies": { "@vueuse/core": "^6.4.1", diff --git a/src/MyPrayerJournal/App/vue.config.js b/src/MyPrayerJournal/App/vue.config.js index 2635591..3cd0966 100644 --- a/src/MyPrayerJournal/App/vue.config.js +++ b/src/MyPrayerJournal/App/vue.config.js @@ -1,6 +1,6 @@ module.exports = { lintOnSave: false, - outputDir: "../Api/wwwroot", + outputDir: "../Server/wwwroot", configureWebpack: { module: { rules: [{ diff --git a/src/MyPrayerJournal/Server/.gitignore b/src/MyPrayerJournal/Server/.gitignore new file mode 100644 index 0000000..35a495a --- /dev/null +++ b/src/MyPrayerJournal/Server/.gitignore @@ -0,0 +1,13 @@ +## LiteDB database file +*.db + +## 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/Api/Data.fs b/src/MyPrayerJournal/Server/Data.fs similarity index 100% rename from src/MyPrayerJournal/Api/Data.fs rename to src/MyPrayerJournal/Server/Data.fs diff --git a/src/MyPrayerJournal/Api/Domain.fs b/src/MyPrayerJournal/Server/Domain.fs similarity index 100% rename from src/MyPrayerJournal/Api/Domain.fs rename to src/MyPrayerJournal/Server/Domain.fs diff --git a/src/MyPrayerJournal/Api/Handlers.fs b/src/MyPrayerJournal/Server/Handlers.fs similarity index 100% rename from src/MyPrayerJournal/Api/Handlers.fs rename to src/MyPrayerJournal/Server/Handlers.fs diff --git a/src/MyPrayerJournal/Api/MyPrayerJournal.Api.fsproj b/src/MyPrayerJournal/Server/MyPrayerJournal.Server.fsproj similarity index 100% rename from src/MyPrayerJournal/Api/MyPrayerJournal.Api.fsproj rename to src/MyPrayerJournal/Server/MyPrayerJournal.Server.fsproj diff --git a/src/MyPrayerJournal/Api/Program.fs b/src/MyPrayerJournal/Server/Program.fs similarity index 100% rename from src/MyPrayerJournal/Api/Program.fs rename to src/MyPrayerJournal/Server/Program.fs diff --git a/src/MyPrayerJournal/Api/Properties/launchSettings.json b/src/MyPrayerJournal/Server/Properties/launchSettings.json similarity index 100% rename from src/MyPrayerJournal/Api/Properties/launchSettings.json rename to src/MyPrayerJournal/Server/Properties/launchSettings.json diff --git a/src/MyPrayerJournal/Api/appsettings.json b/src/MyPrayerJournal/Server/appsettings.json similarity index 100% rename from src/MyPrayerJournal/Api/appsettings.json rename to src/MyPrayerJournal/Server/appsettings.json