Merge pull request #62 from NishantGupt786/master

pr
CodeChefVIT · Mar 17, 2024 · df45555 · df45555
2 parents 0d2786e + d4c7938
commit df45555
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/...24-portal-fe/src/app/submit-idea/page.tsx → ...4-portal-fe/src/app/_submit-idea/page.tsx b/...24-portal-fe/src/app/submit-idea/page.tsx → ...4-portal-fe/src/app/_submit-idea/page.tsx
diff --git a/.../src/app/submit-idea/submit-idea-form.tsx → ...src/app/_submit-idea/submit-idea-form.tsx b/.../src/app/submit-idea/submit-idea-form.tsx → ...src/app/_submit-idea/submit-idea-form.tsx
diff --git a/devsoc24-portal-fe/src/app/home/page.tsx b/devsoc24-portal-fe/src/app/home/page.tsx
@@ -146,7 +146,7 @@ export default function HomePage() {
       );
       if (response.data.status === "success") {
         // setShowBanner(response.data.data!.is_selected);
-        // setShowNotice(response.data.data!.is_selected);
+        setShowNotice(true);
         SetIdea("idea found");
       }
     } catch (e) {
@@ -253,10 +253,9 @@ export default function HomePage() {
   ];
   const ideaCard = [
     {
-      text: "Submit An Idea",
-      showModal: getIdea !== "idea found" && getIdea !== "",
+      text: "Submit an Idea",
+      showModal: true,
       modalType: "Choice",
-      routeTo: "/submit-idea",
     },
   ];
 
@@ -418,16 +417,16 @@ export default function HomePage() {
               title="Idea Submission"
               cardImage="ideaSubmissionImg"
               cardContent={
-                getIdea === "idea found" ? "Idea Submitted" : "No Idea Yet"
+                getIdea === "idea found" ? "Idea Submitted" : "Idea submission closed"
               }
               cardDesc={
                 getIdea === "idea found"
                   ? isLeader
                     ? "Edit or View Idea"
                     : "View Idea"
-                  : isLeader
-                    ? "Submit an Idea"
-                    : "View Idea"
+                  : "closed"
+
+
               }
               buttonDetails={
                 getIdea === "idea found" && !team

diff --git a/devsoc24-portal-fe/src/components/team/Option.tsx b/devsoc24-portal-fe/src/components/team/Option.tsx
@@ -1,14 +1,10 @@
-import {
-  DialogContent,
-  DialogTitle,
-} from "@/components/ui/dialog";
-
+import { DialogContent, DialogTitle } from "@/components/ui/dialog";
 
 function Choice() {
   return (
     <>
-      <DialogContent className="min-h-[100px] sm:max-w-[425px] flex flex-col justify-center items-center">
-        <DialogTitle>You must join or create a team first.</DialogTitle>
+      <DialogContent className="flex min-h-[100px] flex-col items-center justify-center sm:max-w-[425px]">
+        <DialogTitle>Idea submission Closed.</DialogTitle>
 
         {/* <div className="flex justify-evenly w-full ">
             <Button type="submit" className="bg-[#458B71] w-[30%]">