Merge pull request #194 from opeolluwa/feat-restructure-system

Feat restructure system
opeolluwa · Jun 21, 2024 · 026f942 · 026f942
2 parents 3db19f9 + 8ea8cde
commit 026f942
Show file tree

Hide file tree

Showing 49 changed files with 727 additions and 39 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/uranium.iml b/.idea/uranium.iml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,11 +10,11 @@ version = {workspace = true}
 
 [[bin]] # rename built  binary to uranium
 name = "uranium"
-path = "src/main.rs"
+path = "app/src/main.rs"
 
 [workspace]
 exclude = ["sandbox"]
-members = [".", "app", "entity", "migration", "mailer"]
+members = [".", "app", "entity", "migration", "mailer", "cli"]
 
 [dependencies]
 app = {path = "app"}
@@ -30,7 +30,7 @@ tonic-build = "0.9.2"
 
 [workspace.package]
 authors = ["Adeoye Adefemi <[email protected]>"]
-description = "An Authentication, Authorization and Identity Management system for microservices"
+description = "Free deployable open source central authorization system"
 documentation = "https://opeolluwa.github.io/uranium"
 edition = "2021"
 homepge = "https://opeolluwa.github.io/uranium"
@@ -39,6 +39,7 @@ exclude = ["docs"]
 license-file = "./LICENSE"
 name = "uranium"
 version = "0.1.3"
+
 [workspace.dependencies]
 prost = "0.11.9"
 tokio = {version = "1.20.1", features = ["full"]}

diff --git a/app-old/Cargo.toml b/app-old/Cargo.toml
@@ -0,0 +1,36 @@
+[package]
+edition = "2021"
+name = "app"
+version = "0.1.0"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+async-trait = "0.1.73"
+axum = {version = "0.6.20", features = ["json"]}
+bcrypt = "0.15.0"
+chrono = "0.4.26"
+dotenv = "0.15.0"
+dotenvy = "0.15.7"
+entity = {path = "../entity"}
+error = "0.1.9"
+fake = "2.6.1"
+futures = "0.3.28"
+http-body = "0.4.5"
+jsonwebtoken = "8.3.0"
+log = "0.4.19"
+migration = {path = "../migration"}
+sea-orm = {version = "0.12.2", features = ["macros", "debug-print", "with-uuid", "sqlx-postgres", "runtime-tokio-rustls"]}
+serde = "1.0.181"
+serde_json = "1.0.104"
+simple_logger = "4.2.0"
+this = "0.3.0"
+thiserror = "1.0.44"
+tokio = {version = "1.29.1", features = ["full"]}
+tower-http = {version = "0.4.3", features = ["cors", "trace"]}
+tracing = "0.1.37"
+tracing-subscriber = {version = "0.3.17", features = ["env-filter"]}
+uuid = "1.4.1"
+validator = {version = "0.16.1", features = ["derive"]}
+prost = {workspace = true}
+tonic = {workspace = true}
diff --git a/app/README.md → app-old/README.md b/app/README.md → app-old/README.md
diff --git a/app/src/common/mod.rs → app-old/src/common/mod.rs b/app/src/common/mod.rs → app-old/src/common/mod.rs
diff --git a/app/src/common/uranium.rs → app-old/src/common/uranium.rs b/app/src/common/uranium.rs → app-old/src/common/uranium.rs
diff --git a/app/src/config/app_state.rs → app-old/src/config/app_state.rs b/app/src/config/app_state.rs → app-old/src/config/app_state.rs
diff --git a/app/src/config/database.rs → app-old/src/config/database.rs b/app/src/config/database.rs → app-old/src/config/database.rs
diff --git a/app/src/config/mod.rs → app-old/src/config/mod.rs b/app/src/config/mod.rs → app-old/src/config/mod.rs
diff --git a/app/src/extractors/auth.rs → app-old/src/extractors/auth.rs b/app/src/extractors/auth.rs → app-old/src/extractors/auth.rs
diff --git a/app/src/extractors/mod.rs → app-old/src/extractors/mod.rs b/app/src/extractors/mod.rs → app-old/src/extractors/mod.rs
diff --git a/app/src/extractors/user.rs → app-old/src/extractors/user.rs b/app/src/extractors/user.rs → app-old/src/extractors/user.rs
diff --git a/app/src/handlers/auth.rs → app-old/src/handlers/auth.rs b/app/src/handlers/auth.rs → app-old/src/handlers/auth.rs
diff --git a/app/src/handlers/mod.rs → app-old/src/handlers/mod.rs b/app/src/handlers/mod.rs → app-old/src/handlers/mod.rs
diff --git a/app/src/handlers/users.rs → app-old/src/handlers/users.rs b/app/src/handlers/users.rs → app-old/src/handlers/users.rs
diff --git a/app/src/lib.rs → app-old/src/lib.rs b/app/src/lib.rs → app-old/src/lib.rs
diff --git a/app/src/router/auth.rs → app-old/src/router/auth.rs b/app/src/router/auth.rs → app-old/src/router/auth.rs
diff --git a/app/src/router/mod.rs → app-old/src/router/mod.rs b/app/src/router/mod.rs → app-old/src/router/mod.rs
diff --git a/app/src/router/users.rs → app-old/src/router/users.rs b/app/src/router/users.rs → app-old/src/router/users.rs
diff --git a/app/src/utils/api_response.rs → app-old/src/utils/api_response.rs b/app/src/utils/api_response.rs → app-old/src/utils/api_response.rs
diff --git a/app/src/utils/jwt.rs → app-old/src/utils/jwt.rs b/app/src/utils/jwt.rs → app-old/src/utils/jwt.rs
diff --git a/app/src/utils/message_queue.rs → app-old/src/utils/message_queue.rs b/app/src/utils/message_queue.rs → app-old/src/utils/message_queue.rs
diff --git a/app/src/utils/mod.rs → app-old/src/utils/mod.rs b/app/src/utils/mod.rs → app-old/src/utils/mod.rs
diff --git a/app/src/utils/otp_handler.rs → app-old/src/utils/otp_handler.rs b/app/src/utils/otp_handler.rs → app-old/src/utils/otp_handler.rs
diff --git a/app/src/utils/sql_query_builder.rs → app-old/src/utils/sql_query_builder.rs b/app/src/utils/sql_query_builder.rs → app-old/src/utils/sql_query_builder.rs
diff --git a/app/.gitignore b/app/.gitignore
@@ -0,0 +1,14 @@
+# Generated by Cargo
+# will have compiled files and executables
+debug/
+target/
+
+# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
+# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
+Cargo.lock
+
+# These are backup files generated by rustfmt
+**/*.rs.bk
+
+# MSVC Windows builds of rustc generate these, which store debugging information
+*.pdb
diff --git a/app/Cargo.toml b/app/Cargo.toml
@@ -1,36 +1,15 @@
 [package]
-edition = "2021"
-name = "app"
-version = "0.1.0"
+authors.workspace = true
+description.workspace = true
+documentation.workspace = true
+edition.workspace = true
+homepge.workspace = true
+keywords.workspace = true
+exclude.workspace = true
+license-file.workspace = true
+version.workspace = true
+name = "uranium"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-async-trait = "0.1.73"
-axum = {version = "0.6.20", features = ["json"]}
-bcrypt = "0.15.0"
-chrono = "0.4.26"
-dotenv = "0.15.0"
-dotenvy = "0.15.7"
-entity = {path = "../entity"}
-error = "0.1.9"
-fake = "2.6.1"
-futures = "0.3.28"
-http-body = "0.4.5"
-jsonwebtoken = "8.3.0"
-log = "0.4.19"
-migration = {path = "../migration"}
-sea-orm = {version = "0.12.2", features = ["macros", "debug-print", "with-uuid", "sqlx-postgres", "runtime-tokio-rustls"]}
-serde = "1.0.181"
-serde_json = "1.0.104"
-simple_logger = "4.2.0"
-this = "0.3.0"
-thiserror = "1.0.44"
-tokio = {version = "1.29.1", features = ["full"]}
-tower-http = {version = "0.4.3", features = ["cors", "trace"]}
-tracing = "0.1.37"
-tracing-subscriber = {version = "0.3.17", features = ["env-filter"]}
-uuid = "1.4.1"
-validator = {version = "0.16.1", features = ["derive"]}
-prost = {workspace = true}
-tonic = {workspace = true}
diff --git a/app/src/main.rs b/app/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+authors.workspace = true
+description.workspace = true
+documentation.workspace = true
+edition.workspace = true
+homepge.workspace = true
+keywords.workspace = true
+exclude.workspace = true
+license-file.workspace = true
+version.workspace = true
+name="uranium-cli"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}
diff --git a/dashboard/app.vue b/dashboard/app.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
     <NuxtRouteAnnouncer />
-    <NuxtWelcome />
+    <NuxtPage />
   </div>
 </template>
diff --git a/dashboard/assets/css/main.css b/dashboard/assets/css/main.css
@@ -0,0 +1,3 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
diff --git a/dashboard/nuxt.config.ts b/dashboard/nuxt.config.ts
@@ -1,4 +1,12 @@
 // https://nuxt.com/docs/api/configuration/nuxt-config
 export default defineNuxtConfig({
-  devtools: { enabled: true }
-})
+  devtools: { enabled: true },
+  css: ["~/assets/css/main.css"],
+  modules: ["nuxt-icon"],
+  postcss: {
+    plugins: {
+      tailwindcss: {},
+      autoprefixer: {},
+    },
+  },
+});