diff --git a/.gitignore b/.gitignore index e72569b..5e707fe 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,27 @@ target /.idea web/static/index.html web/static/assets +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +pnpm-debug.log* +lerna-debug.log* + +node_modules +dist +dist-ssr +*.local + +# Editor directories and files +.vscode/* +!.vscode/extensions.json +.idea +.DS_Store +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? diff --git a/Cargo.toml b/Cargo.toml index 1fd1f5d..5ff7214 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ serde_repr = "0.1" rmp-serde = "1.1" rand = "0.8" levenshtein = "1.0" -sqlx = { version = "0.7", features = ["runtime-tokio-rustls", "macros", "mysql", "bigdecimal", "chrono", "migrate"]} +sqlx = { version = "0.7", features = ["runtime-tokio-rustls", "macros", "mysql", "bigdecimal", "chrono", "migrate"] } base64 = "0.21" secrecy = "0.8.0" @@ -51,10 +51,11 @@ assets = [ ["conf/Rocket.toml", "etc/reminder-rs/Rocket.toml", "600"], ["web/static/**/*", "lib/reminder-rs/static", "644"], ["reminder-dashboard/dist/static/**/*", "lib/reminder-rs/static", "644"], + ["reminder-dashboard/dist/index.html", "lib/reminder-rs/static/index.html", "644"], ["web/templates/**/*", "lib/reminder-rs/templates", "644"], ["healthcheck", "lib/reminder-rs/healthcheck", "755"], ["cron.d/reminder_health", "etc/cron.d/reminder_health", "644"], -# ["nginx/reminder-rs", "etc/nginx/sites-available/reminder-rs", "755"] + # ["nginx/reminder-rs", "etc/nginx/sites-available/reminder-rs", "755"] ] conf-files = [ "/etc/reminder-rs/config.env", diff --git a/reminder-dashboard b/reminder-dashboard new file mode 160000 index 0000000..5fe558e --- /dev/null +++ b/reminder-dashboard @@ -0,0 +1 @@ +Subproject commit 5fe558ebd177c15c901b5b7205abd665aa2066f6