Merge pull request #272 from avored/improvements

Improvements
avored · Feb 9, 2025 · 7c1785a · 7c1785a
2 parents 0789ab0 + 44abcd7
commit 7c1785a
Show file tree

Hide file tree

Showing 69 changed files with 288 additions and 4,539 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -3,8 +3,6 @@ name: Rust deploy
 on:
   push:
     branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
 
 env:
   CARGO_TERM_COLOR: always

diff --git a/react-admin/dist/assets/index-D_GtSE4a.js → react-admin/dist/assets/index-B06msKQ0.js b/react-admin/dist/assets/index-D_GtSE4a.js → react-admin/dist/assets/index-B06msKQ0.js
diff --git a/react-admin/dist/assets/index-C48GMntd.css b/react-admin/dist/assets/index-C48GMntd.css
diff --git a/react-admin/dist/assets/index-DDrQdOuq.css b/react-admin/dist/assets/index-DDrQdOuq.css
diff --git a/react-admin/dist/index.html b/react-admin/dist/index.html
@@ -9,8 +9,8 @@
           name="description"
           content="Admin management for AvoRed rust content management system"
   />
-  <script type="module" crossorigin src="/assets/index-D_GtSE4a.js"></script>
-  <link rel="stylesheet" crossorigin href="/assets/index-C48GMntd.css">
+  <script type="module" crossorigin src="/assets/index-B06msKQ0.js"></script>
+  <link rel="stylesheet" crossorigin href="/assets/index-DDrQdOuq.css">
 </head>
 <body class="antialiased">
 <div id="root"></div>

diff --git a/react-admin/src/App.tsx b/react-admin/src/App.tsx
@@ -4,18 +4,13 @@ import Dashboard from './pages/Dashboard'
 import Login from './pages/auth/Login'
 import Home from "./pages/Home";
 import AppLayout from "./layouts/AppLayout";
-import PageTable from "./pages/page/PageTable";
-import PageCreate from "./pages/page/PageCreate";
-import PageEdit from "./pages/page/PageEdit";
 import AdminUserTable from "./pages/admin-user/AdminUserTable";
 import AdminUserCreate from "./pages/admin-user/AdminUserCreate";
 import AdminUserEdit from "./pages/admin-user/AdminUserEdit";
 import RoleTable from "./pages/role/RoleTable";
 import RoleCreate from "./pages/role/RoleCreate";
 import RoleEdit from "./pages/role/RoleEdit";
 import AssetTable from "./pages/asset/AssetTable";
-import {ComponentCreatePage} from "./pages/component/ComponentCreatePage";
-import {ComponentEditPage} from "./pages/component/ComponentEditPage";
 import Setup from "./pages/setup/setup";
 import Logout from "./pages/auth/Logout";
 import ForgotPassword from "./pages/auth/ForgotPassword";
@@ -24,9 +19,6 @@ import AvoRedApiTesting from "./pages/setting/AvoRedApiTesting";
 import SettingPage from "./pages/setting/SettingPage";
 import NotFoundPage from "./pages/NotFoundPage";
 import ChangePassword from './pages/admin-user/ChangePassword';
-import {ModelCreatePage} from "./pages/models/ModelCreatePage";
-import { ModelEditPage } from "./pages/models/ModelEditPage";
-import {ComponentTablePage} from "./pages/component/ComponentTablePage";
 import {CollectionTable} from "./pages/collection/CollectionTable";
 import {CollectionEdit} from "./pages/collection/CollectionEdit";
 import {CollectionCreate} from "./pages/collection/CollectionCreate";
@@ -50,9 +42,6 @@ function App() {
                     <Route path="/admin"   element={<Dashboard />} />
                     <Route path="/admin/logout"   element={<Logout />} />
                     <Route path="/admin/asset/:asset_id?"   element={<AssetTable />} />
-                    {/*<Route path="/admin/component"   element={<ComponentTablePage />} />*/}
-                    {/*<Route path="/admin/component-create"   element={<ComponentCreatePage />} />*/}
-                    {/*<Route path="/admin/component-edit/:component_id"   element={<ComponentEditPage />} />*/}
                     <Route path="/admin/role"   element={<RoleTable />} />
                     <Route path="/admin/role-create"   element={<RoleCreate />} />
                     <Route path="/admin/role-edit/:role_id"   element={<RoleEdit />} />
@@ -61,14 +50,9 @@ function App() {
                     <Route path="/admin/content-create"   element={<ContentCreate />} />
                     <Route path="/admin/content-edit/:content_id"   element={<ContentEdit />} />
 
-                    {/*<Route path="/admin/model-create"   element={<ModelCreatePage />} />*/}
-                    {/*<Route path="/admin/model-edit/:model_id"   element={<ModelEditPage />} />*/}
                     <Route path="/admin/collections"   element={<CollectionTable />} />
                     <Route path="/admin/collection-create"   element={<CollectionCreate />} />
                     <Route path="/admin/collection-edit/:collection_id"   element={<CollectionEdit />} />
-                    {/*<Route path="/admin/page"   element={<PageTable />} />*/}
-                    {/*<Route path="/admin/page-create"   element={<PageCreate />} />*/}
-                    {/*<Route path="/admin/page-edit/:page_id"   element={<PageEdit />} />*/}
                     <Route path="/admin/admin-user"   element={<AdminUserTable />} />
                     <Route path="/admin/admin-user-create"   element={<AdminUserCreate />} />
                     <Route path="/admin/admin-user-edit/:admin_user_id"   element={<AdminUserEdit />} />

diff --git a/...in/src/pages/auth/schemas/login.schema.ts → react-admin/src/hooks/auth/useLoginSchema.ts b/...in/src/pages/auth/schemas/login.schema.ts → react-admin/src/hooks/auth/useLoginSchema.ts
@@ -13,4 +13,4 @@ export const useLoginSchema = (() => {
             'string.empty': t("empty_message", {attribute: t("password")}),
         })
     });
-})
+})
diff --git a/react-admin/src/pages/auth/Login.tsx b/react-admin/src/pages/auth/Login.tsx
@@ -4,12 +4,12 @@ import InputField from "../../components/InputField"
 import {SubmitHandler, useForm} from "react-hook-form"
 import { joiResolver } from "@hookform/resolvers/joi"
 import { useLogin } from "./hooks/useLogin"
-import {useLoginSchema} from "./schemas/login.schema"
 import ErrorMessage from "../../components/ErrorMessage"
 import { useTranslation } from "react-i18next"
 import ILoginPost from "../../types/auth/ILoginPost"
 import {changeLocale} from "../../lib/common"
 import AvoRedButton from "../../components/AvoRedButton";
+import {useLoginSchema} from "../../hooks/auth/useLoginSchema";
 
 function Login() {
     const [t, i18n] = useTranslation("global")
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,4 +13,4 @@ export const useLoginSchema = (() => { @@
                 'string.empty': t("empty_message", {attribute: t("password")}),
             })
         });
-    })
+    })