update public & fix form bug & deploy frontend on ic

NeutronStarDAO · Dec 16, 2023 · 9746930 · 9746930
1 parent 4eee957
commit 9746930
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 20 deletions.
diff --git a/canister_ids.json b/canister_ids.json
@@ -19,5 +19,8 @@
     },
     "likeFetch" : {
         "ic" : "leoia-xiaaa-aaaan-qgjyq-cai"
+    },
+    "frontend" : {
+        "ic" : "2f64i-aaaaa-aaaan-qiu4q-cai"
     }
 }
diff --git a/dfx.json b/dfx.json
@@ -62,6 +62,13 @@
             "declarations": {
                 "node_compatibility": true
             }
+        },
+        "frontend": {
+            "frontend": {
+                "entrypoint": "frontend/build/index.html"
+            },
+            "source": ["frontend/build"],
+            "type": "assets"
         }
     },
     "defaults": {

diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico
diff --git a/frontend/public/index.html b/frontend/public/index.html
@@ -2,14 +2,14 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="icon" href="%PUBLIC_URL%/logo.jpg" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
-      content="Web site created using create-react-app"
+      content="Proton"
     />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <!-- <link rel="apple-touch-icon" href="%PUBLIC_URL%/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/
@@ -24,7 +24,7 @@
       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`.
     -->
-    <title>React App</title>
+    <title>Proton</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/frontend/public/logo.jpg b/frontend/public/logo.jpg
diff --git a/frontend/public/logo192.png b/frontend/public/logo192.png
diff --git a/frontend/public/logo512.png b/frontend/public/logo512.png
diff --git a/frontend/public/manifest.json b/frontend/public/manifest.json
@@ -1,21 +1,11 @@
 {
-  "short_name": "React App",
-  "name": "Create React App Sample",
+  "short_name": "Proton",
+  "name": "Proton App",
   "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"
+      "src": "logo.jpg",
+      "type": "image/jpg",
+      "sizes": "400x400"
     }
   ],
   "start_url": ".",

diff --git a/frontend/src/components/Modal/form.tsx b/frontend/src/components/Modal/form.tsx
@@ -50,6 +50,8 @@ export default function ProfileForm(props: ProfileFormProps) {
   const [form] = Form.useForm();
   const [api, contextHolder] = notification.useNotification();
   const {principal} = useAuth()
+  console.log(props.userProfile)
+  console.log(props.userProfile?.feedCanister);
 
   const onFinish = async (values: any) => {
     api.info({
@@ -95,7 +97,7 @@ export default function ProfileForm(props: ProfileFormProps) {
         education: props.userProfile?.education,
         backImgUrl: props.userProfile?.backImgUrl,
         avatarUrl: props.userProfile?.avatarUrl,
-        feedCanister: props.userProfile?.feedCanister[0]?.toString(),
+        feedCanister: (props.userProfile?.feedCanister !== undefined && props.userProfile?.feedCanister.length > 0) ? props.userProfile?.feedCanister[0]?.toString() : "",
         biography: props.userProfile?.biography
       }}
       style={{maxWidth: 600}}