Merge branch 'develop' of https://github.com/Mi-Tech-Consulting/front…

…end-web-ad into develop
Mi-Tech-Consulting · Jun 1, 2024 · b7f2152 · b7f2152
2 parents 9648e4c + 19de64b
commit b7f2152
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -28,6 +28,7 @@ Here is the procedure on how to work with the GitHub repo, when you want to star
 3. When your code is ready to merge, pls create a PULL REQUEST from your repo to the origin repo
 4. Before merging, pls make sure you have run the following commands:
    ```console
+   git submodule update --init
    npm install
    npm run build
    ```

diff --git a/components/ui/ad-details.tsx b/components/ui/ad-details.tsx
@@ -12,7 +12,7 @@ export default function Form({ channels, ad }: { channels: ChannelField[], ad:Ad
       </div>
       <div className="flex justify-end gap-4">
           <Link
-            href="/manage"
+            href="/ad/manage"
             className="flex h-10 items-center rounded-lg bg-gray-100 px-4 text-sm font-medium text-gray-600 transition-colors hover:bg-gray-200"
           >
             Back
@@ -143,7 +143,7 @@ export default function Form({ channels, ad }: { channels: ChannelField[], ad:Ad
                 <div className="md:w-3/4">
                   {ad.headline5}
                 </div>
-              </div>):null}
+              </div>): null}
             <div className="md:flex md:items-center mb-6">
               <div className="md:w-1/4">
                 <label className="block text-gray-500 font-bold mb-1 md:mb-0 pr-4" htmlFor="adTargetAudience">
@@ -156,17 +156,22 @@ export default function Form({ channels, ad }: { channels: ChannelField[], ad:Ad
                 </div>
               </div>
             </div>
-            <hr /><br />
-            <div className="md:flex md:items-center mb-6">
-              <div className="md:w-1/4">
-                <label className="block text-gray-500 font-bold mb-1 md:mb-0 pr-4" htmlFor="image-upload">
-                  Images:
-                </label>
-              </div>
-              <div className="md:w-1/4 inline-flex">
-                <img src={ad.image_url} />
-              </div>
-            </div>
+
+            {ad.image_url? (
+              <div>
+                <hr /><br />
+                <div className="md:flex md:items-center mb-6">
+                  <div className="md:w-1/4">
+                    <label className="block text-gray-500 font-bold mb-1 md:mb-0 pr-4" htmlFor="image-upload">
+                      Images:
+                    </label>
+                  </div>
+                  <div className="md:w-1/4 inline-flex">
+                    <img src={ad.image_url} />
+                  </div>
+                </div>
+              </div>): null}
+
             <hr /><br />
             <div className="md:flex md:items-center mb-6">
               <div className="md:w-1/4">

diff --git a/components/ui/button.tsx b/components/ui/button.tsx
@@ -27,7 +27,7 @@ export function UpdateAd({ id }: { id: string }) {
   return (
     <Tooltip content={"Edit"} offset={-4}>
     <Button onClick={handleRedirect}
-    className="rounded-md border p-2 bg-zinc-300 hover:bg-gray-100">
+    className="rounded-md border p-2 hover:bg-gray-100 min-w-0">
       <PencilIcon className="w-5" />
     </Button>
     </Tooltip>
@@ -42,7 +42,7 @@ export function AdDetails({ id }: { id: string }) {
   return (
     <Tooltip content={"Details"} offset={-4}>
     <Button onClick={handleRedirect}
-    className="rounded-md border p-2 bg-zinc-300 hover:bg-gray-100">
+    className="rounded-md border p-2 hover:bg-gray-100 min-w-0">
       <EyeIcon className="w-5" />
     </Button>
     </Tooltip>

diff --git a/lib/actions.ts b/lib/actions.ts
@@ -6,7 +6,6 @@ import { z } from 'zod';
 import { revalidatePath } from 'next/cache';
 import { redirect } from 'next/navigation';
 //import { signIn } from '@/auth';
-import { AuthError } from 'next-auth';
 
 const FormSchema = z.object({
     id: z.string(),