Skip to content

Commit

Permalink
Merge pull request #270 from avored/improvements
Browse files Browse the repository at this point in the history
more minor changes
  • Loading branch information
indpurvesh authored Jan 24, 2025
2 parents 5cf33be + fa116b7 commit 3d81686
Show file tree
Hide file tree
Showing 13 changed files with 609 additions and 29 deletions.
1 change: 1 addition & 0 deletions react-admin/dist/assets/index-C48GMntd.css

Large diffs are not rendered by default.

531 changes: 531 additions & 0 deletions react-admin/dist/assets/index-D_GtSE4a.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions react-admin/dist/assets/logo_only-BiO0haTV.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added react-admin/dist/favicon.ico
Binary file not shown.
19 changes: 19 additions & 0 deletions react-admin/dist/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/avored.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Avored rust content management (CMS)</title>
<meta
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">
</head>
<body class="antialiased">
<div id="root"></div>
</body>
</html>

Binary file added react-admin/dist/logo192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added react-admin/dist/logo512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions react-admin/dist/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"short_name": "React App",
"name": "Create React App Sample",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
},
{
"src": "logo192.png",
"type": "image/png",
"sizes": "192x192"
},
{
"src": "logo512.png",
"type": "image/png",
"sizes": "512x512"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
}
3 changes: 3 additions & 0 deletions react-admin/dist/robots.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# https://www.robotstxt.org/robotstxt.html
User-agent: *
Disallow:
16 changes: 8 additions & 8 deletions react-admin/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ 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/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 />} />
Expand All @@ -61,14 +61,14 @@ 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/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/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 />} />
Expand Down
36 changes: 18 additions & 18 deletions react-admin/src/layouts/partials/AppSidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ function AppSidebar() {
</div>

<li className="text-sm text-gray-500 ">
<Link
className="flex items-center w-full py-1 px-2 rounded relative hover:text-white hover:bg-gray-700"
to={`/admin/page`}
>
<div className="pr-2">
<RocketLaunchIcon className="h-6 w-6"/>
</div>
<div className="ml-2">{t("sidebar.page")}</div>
</Link>
{/*<Link*/}
{/* className="flex items-center w-full py-1 px-2 rounded relative hover:text-white hover:bg-gray-700"*/}
{/* to={`/admin/page`}*/}
{/*>*/}
{/* <div className="pr-2">*/}
{/* <RocketLaunchIcon className="h-6 w-6"/>*/}
{/* </div>*/}
{/* <div className="ml-2">{t("sidebar.page")}</div>*/}
{/*</Link>*/}
<Link
className="flex items-center w-full py-1 px-2 mt-3 rounded relative hover:text-white hover:bg-gray-700"
to={`/admin/collections`}
Expand All @@ -58,15 +58,15 @@ function AppSidebar() {
<div className="ml-2">{t("collections")}</div>
</Link>

<Link
to={`admin/component`}
className="flex items-center w-full py-1 px-2 mt-3 rounded relative hover:text-white hover:bg-gray-700 "
>
<div className="pr-2">
<CpuChipIcon className="h-6 w-6"/>
</div>
<div className="ml-2">{t("components")}</div>
</Link>
{/*<Link*/}
{/* to={`admin/component`}*/}
{/* className="flex items-center w-full py-1 px-2 mt-3 rounded relative hover:text-white hover:bg-gray-700 "*/}
{/*>*/}
{/* <div className="pr-2">*/}
{/* <CpuChipIcon className="h-6 w-6"/>*/}
{/* </div>*/}
{/* <div className="ml-2">{t("components")}</div>*/}
{/*</Link>*/}
<Link
to={`/admin/asset`}
className="flex items-center w-full py-1 px-2 mt-3 rounded relative hover:text-white hover:bg-gray-700"
Expand Down
4 changes: 2 additions & 2 deletions react-admin/src/pages/collection/CollectionCreate.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ export const CollectionCreate = () => {
});

const submitHandler = ((data: SavableCollectionType) => {
console.log(data)
// mutate(data)
// console.log(data)
mutate(data)
})

const onNameChange = (e: React.KeyboardEvent<HTMLInputElement>) => {
Expand Down
2 changes: 1 addition & 1 deletion react-admin/src/pages/page/SingleImageModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export const SingleImageModal = (({
) : (
<>
<img
src={`${backend_url}${asset.path}`}
src={`${backend_url}${asset.new_path}`}
className="h-40"
alt={asset.name}
/>
Expand Down

0 comments on commit 3d81686

Please sign in to comment.