Merge pull request #161 from avored/153-component-field-support-needed

153 component field support needed
avored · Jun 6, 2024 · d63694f · d63694f
2 parents 30a382f + 5451eed
commit d63694f
Show file tree

Hide file tree

Showing 29 changed files with 1,818 additions and 476 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,7 +16,7 @@ dotenvy = "0.15.7"
 axum-extra = { version = "0.9.3", features = ["cookie", "cookie-signed"] }
 futures = "0.3.30"
 tower = "0.4.13"
-argon2 = "0.5.2"
+argon2 = "0.5.3"
 rand = "0.8.5"
 urlencoding = "2.1.3"
 serde_json = "1.0.117"

diff --git a/react-admin-ts/src/pages/asset/AssetTable.tsx b/react-admin-ts/src/pages/asset/AssetTable.tsx
@@ -43,8 +43,6 @@ const AssetTable: React.FC = () => {
     }
   };
 
-  console.log(t("asset.asset_table"));
-
   return (
     <div className="flex-1 bg-white">
       <div className="pl-64">

diff --git a/react-admin/.env.example b/react-admin/.env.example
@@ -1,2 +1,2 @@
-REACT_APP_AVORED_FRONTEND_BASE_URL=http://localhost:3000
-REACT_APP_AVORED_BACKEND_BASE_URL=http://localhost:8080
+VITE_AVORED_FRONTEND_BASE_URL=http://localhost:3000
+VITE_AVORED_BACKEND_BASE_URL=http://localhost:8080
diff --git a/react-admin/.gitignore b/react-admin/.gitignore
@@ -9,7 +9,7 @@
 /coverage
 
 # production
-/build
+/dist
 
 # misc
 .DS_Store

diff --git a/react-admin/public/index.html → react-admin/index.html b/react-admin/public/index.html → react-admin/index.html
@@ -2,25 +2,25 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="icon" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
       content="Admin management for AvoRed rust content management system"
     />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <link rel="apple-touch-icon" href="/logo192.png" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <link rel="manifest" href="/manifest.json" />
     <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
+      Notice the use of ring-gray-300 in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
       Only files inside the `public` folder can be referenced from the HTML.
 
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      Unlike "/favicon.ico" or "favicon.ico", "ring-gray-300/favicon.ico" will
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
@@ -39,5 +39,6 @@
       To begin the development, run `npm start` or `yarn start`.
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
+    <script type="module" src="/src/index.tsx"></script>
   </body>
 </html>
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ @@
     /coverage
     # production
-    /build
+    /dist
     # misc
     .DS_Store
@@ Expand Down @@