Merge pull request #27 from verder-helpen/reorganisation

Reorganise package, fix attribute view
verder-helpen · Dec 12, 2023 · 11323b9 · 11323b9
2 parents 015110b + 43d9902
commit 11323b9
Show file tree

Hide file tree

Showing 40 changed files with 509 additions and 503 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,37 @@
-[workspace]
+[package]
+name = "verder-helpen-comm-isolate"
+version = "0.1.0"
+edition = "2021"
 
-members = [
-    "comm-common",
-    "comm-plugin",
-]
+[features]
+default = ["auth_during_comm", "platform_token", "session_db"]
+auth_during_comm = ["platform_token"]
+platform_token = []
+sentry = ["dep:verder-helpen-sentry"]
+session_db = ["platform_token"]
+
+[dependencies]
+verder-helpen-jwt = { git = "https://github.com/verder-helpen/verder-helpen-jwt.git" }
+verder-helpen-proto = { git = "https://github.com/verder-helpen/verder-helpen-proto.git" }
+verder-helpen-sentry = { git = "https://github.com/verder-helpen/verder-helpen-sentry.git", optional = true }
+accept-language = "2.0.0"
+josekit = "0.8.2"
+lazy_static = "1.4.0"
+rand = "0.8.5"
+reqwest = { version = "0.11.16", features = ["json"] }
+rocket = { version = "0.5.0-rc.3", features = ["json"] }
+rocket_oauth2 = { git = "https://github.com/arjentz/rocket_oauth2.git", rev = "214efa99b0bd95c0df4d3f3d4c6235ae25610e37" }
+rocket_sync_db_pools = { version = "0.1.0-rc.3", features = ["postgres_pool"] }
+serde = "1.0.159"
+serde_json = "1.0.95"
+serde_yaml = "0.9.19"
+strum = "0.24.1"
+strum_macros = "0.24.3"
+tera = "1.18.1"
+thiserror = "1.0.40"
+unic-langid = "0.9.1"
+
+[dev-dependencies]
+figment = { version = "0.10.8", features = ["env", "toml", "json"] }
+serial_test = "2.0.0"
+tokio-test = "0.4.2"
diff --git a/comm-common/.gitignore b/comm-common/.gitignore
diff --git a/comm-common/Cargo.toml b/comm-common/Cargo.toml
diff --git a/comm-common/LICENSE b/comm-common/LICENSE
diff --git a/comm-common/README.md b/comm-common/README.md
diff --git a/comm-common/config.toml b/comm-common/config.toml
diff --git a/comm-common/schema.sql b/comm-common/schema.sql
diff --git a/comm-common/src/templates/base.html b/comm-common/src/templates/base.html
diff --git a/comm-common/src/templates/credentials.html b/comm-common/src/templates/credentials.html
diff --git a/comm-common/src/templates/expired.html b/comm-common/src/templates/expired.html
diff --git a/comm-common/src/templates/login.html b/comm-common/src/templates/login.html
diff --git a/comm-common/src/templates/not_found.html b/comm-common/src/templates/not_found.html
diff --git a/comm-plugin/.gitignore b/comm-plugin/.gitignore
diff --git a/comm-plugin/Cargo.toml b/comm-plugin/Cargo.toml
diff --git a/comm-plugin/LICENSE b/comm-plugin/LICENSE
diff --git a/comm-plugin/attribute-ui/attribute.js b/comm-plugin/attribute-ui/attribute.js
diff --git a/comm-plugin/attribute-ui/index.html b/comm-plugin/attribute-ui/index.html
diff --git a/config.sample.toml b/config.sample.toml
@@ -1,5 +1,5 @@
 [global]
-## NOTE: Don't (!) use this key! Generate your own!
+## NOTE: DON'T USE THIS KEY! GENERATE YOUR OWN!
 secret_key = "2P7d9MsOAZWyPu8HZn2AyMvOeN9MhkFEb4C9IzkLvno="
 
 internal_url = "http://comm-isolate:8000/internal"
@@ -149,7 +149,6 @@ Bs6neR/sZuHzNm8y/xtxj2ZAEw==
 session = { url = "postgres://tg@comm-isolate-psql:5432/tg" }
 
 [global.translations.en]
-title = "Information"
 unknown_error = "Unknown error"
 loading = "Loading..."
 purpose = "Subject"
@@ -168,9 +167,9 @@ login_successful = "Login successfull. You can close this window."
 logout_successful = "Logout successfull. You can close this window."
 insufficient_permission = "You do not have sufficient permissions to access this resource."
 no_credentials_found = "There are no authenticated guests (yet)"
+secured_by = "secured by"
 
 [global.translations.nl]
-title = "Verder Helpen gegevens"
 unknown_error = "Onbekende fout"
 loading = "Laden..."
 purpose = "Onderwerp"
@@ -189,3 +188,4 @@ login_successful = "U bent ingelogd. U kan dit venster nu sluiten"
 logout_successful = "U bent uitgelogd. U kan dit venster nu sluiten"
 insufficient_permission = "Uw account heeft niet voldoende rechten, probeer met een ander account in te loggen"
 no_credentials_found = "Er zijn (nog) geen geïdentificeerde gasten"
+secured_by = "beveiligd door"