-
-
-
-
- Dashboard content goes here
-
-
+
+
+ Dashboard outlet content goes here
-
-
)
}
diff --git a/react-admin/src/pages/auth/Login.jsx b/react-admin/src/pages/auth/Login.jsx
index 0b9a5f98..d3ba2398 100644
--- a/react-admin/src/pages/auth/Login.jsx
+++ b/react-admin/src/pages/auth/Login.jsx
@@ -28,6 +28,7 @@ function Login() {
body: JSON.stringify({email: email, password: password})
}))
const login_response = await response.json()
+ console.log(login_response)
if (login_response.status) {
localStorage.setItem("AUTH_TOKEN", login_response.data)
return redirect("/admin");
diff --git a/react-admin/src/pages/page/PageCreate.jsx b/react-admin/src/pages/page/PageCreate.jsx
new file mode 100644
index 00000000..1fd9b5e1
--- /dev/null
+++ b/react-admin/src/pages/page/PageCreate.jsx
@@ -0,0 +1,18 @@
+import {useEffect, useState} from "react";
+import {Link} from "react-router-dom";
+
+function PageCreate() {
+
+
+ return (
+
+
+
+ Page Create Form goes here
+
+
+
+ )
+}
+
+export default PageCreate
\ No newline at end of file
diff --git a/react-admin/src/pages/page/PageTable.jsx b/react-admin/src/pages/page/PageTable.jsx
new file mode 100644
index 00000000..ec0d2ddc
--- /dev/null
+++ b/react-admin/src/pages/page/PageTable.jsx
@@ -0,0 +1,93 @@
+import {useEffect, useState} from "react";
+import {Link} from "react-router-dom";
+
+function PageTable() {
+ const [pages, setPages] = useState([]);
+
+ const getFormattedDate = ((date) => {
+ var date = new Date(date);
+
+ return `${date.getFullYear()}-${date.getMonth()}-${date.getDate()}`;
+ })
+
+ useEffect(() => {
+ const mounted = (async () => {
+ const response = await fetch('http://localhost:8080/api/page', {
+ method: 'get',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'Authorization': 'Bearer ' + localStorage.getItem("AUTH_TOKEN"),
+ }
+ })
+ return await response.json()
+ })
+
+ mounted().then((res) => {
+ console.log(res.data)
+ setPages(res.data)
+ })
+
+ }, [])
+
+ return (
+
+
+
+
+ Pages
+
+
+ Create
+
+
+
+
+
+
+
+
+ | ID |
+ Name |
+ Identifier |
+ Created at |
+ Updated at |
+ Created by |
+ Updated by |
+ Action |
+
+
+
+ {pages.map((page) => {
+ return (
+
+ | {page.id} |
+ {page.name} |
+ {page.identifier} |
+
+ {getFormattedDate(page.created_at)}
+ |
+
+ {getFormattedDate(page.updated_at)}
+ |
+ {page.created_by} |
+ {page.updated_by} |
+
+
+ Edit
+
+
+ |
+
+ )
+ })}
+
+
+
+
+
+ )
+}
+
+export default PageTable
\ No newline at end of file
diff --git a/src/api/rest_api/handlers/mod.rs b/src/api/rest_api/handlers/mod.rs
index 81751079..5baa5b5b 100644
--- a/src/api/rest_api/handlers/mod.rs
+++ b/src/api/rest_api/handlers/mod.rs
@@ -1,3 +1,5 @@
pub mod health_check_api_handler;
pub mod component_all_api_handler;
pub mod admin_user;
+pub mod page;
+
diff --git a/src/api/rest_api/handlers/page/mod.rs b/src/api/rest_api/handlers/page/mod.rs
new file mode 100644
index 00000000..f8a96c30
--- /dev/null
+++ b/src/api/rest_api/handlers/page/mod.rs
@@ -0,0 +1,2 @@
+pub mod page_table_api_handler;
+pub mod request;
\ No newline at end of file
diff --git a/src/api/rest_api/handlers/page/page_table_api_handler.rs b/src/api/rest_api/handlers/page/page_table_api_handler.rs
new file mode 100644
index 00000000..3da5d9a9
--- /dev/null
+++ b/src/api/rest_api/handlers/page/page_table_api_handler.rs
@@ -0,0 +1,19 @@
+use std::sync::Arc;
+use axum::extract::{Query, State};
+use axum::Json;
+use crate::api::rest_api::handlers::page::request::page_table_request::PageTableRequest;
+use crate::avored_state::AvoRedState;
+use crate::error::Result;
+use crate::models::page_model::PagePagination;
+
+pub async fn page_table_api_handler(
+ state: State
>,
+ Query(query_param): Query,
+) -> Result> {
+ println!("->> {:<12} - page_table_api_handler", "HANDLER");
+
+ let current_page = query_param.page.unwrap_or(1);
+ let page_pagination = state.page_service.paginate(&state.db, current_page).await?;
+
+ Ok(Json(page_pagination))
+}
diff --git a/src/api/rest_api/handlers/page/request/mod.rs b/src/api/rest_api/handlers/page/request/mod.rs
new file mode 100644
index 00000000..c89747a8
--- /dev/null
+++ b/src/api/rest_api/handlers/page/request/mod.rs
@@ -0,0 +1 @@
+pub mod page_table_request;
\ No newline at end of file
diff --git a/src/api/rest_api/handlers/page/request/page_table_request.rs b/src/api/rest_api/handlers/page/request/page_table_request.rs
new file mode 100644
index 00000000..8be1a0f6
--- /dev/null
+++ b/src/api/rest_api/handlers/page/request/page_table_request.rs
@@ -0,0 +1,6 @@
+use serde::Deserialize;
+
+#[derive(Deserialize, Debug)]
+pub struct PageTableRequest {
+ pub page: Option,
+}
diff --git a/src/api/rest_api/rest_api_routes.rs b/src/api/rest_api/rest_api_routes.rs
index 12b96d64..a73a2557 100644
--- a/src/api/rest_api/rest_api_routes.rs
+++ b/src/api/rest_api/rest_api_routes.rs
@@ -4,12 +4,15 @@ use axum::{routing::get, Router, middleware};
use axum::routing::post;
use axum::http::header::{AUTHORIZATION, CONTENT_TYPE};
use axum::http::header::HeaderValue;
-use crate::api::rest_api::handlers::component_all_api_handler::component_all_api_handler;
-use crate::api::rest_api::handlers::health_check_api_handler::health_check_api_handler;
-use crate::api::rest_api::handlers::admin_user::admin_user_login_api_handler::admin_user_login_api_handler;
use crate::avored_state::AvoRedState;
use crate::middleware::require_jwt_authentication::require_jwt_authentication;
use tower_http::cors::CorsLayer;
+use crate::api::rest_api::handlers::{
+ page::page_table_api_handler::page_table_api_handler,
+ admin_user::admin_user_login_api_handler::admin_user_login_api_handler,
+ component_all_api_handler::component_all_api_handler,
+ health_check_api_handler::health_check_api_handler
+};
pub fn rest_api_routes(state: Arc) -> Router {
@@ -29,6 +32,7 @@ pub fn rest_api_routes(state: Arc) -> Router {
]);
Router::new()
+ .route("/api/page", get(page_table_api_handler))
.route("/api/component-all", get(component_all_api_handler))
.route_layer(middleware::from_fn_with_state(
state.clone(),
+