Merge pull request #11 from RNViththagan/Develop

Develop

Author: RNViththagan

.github/workflows/auto-merge.yml

@@ -3,7 +3,7 @@ name: Auto Merge Develop to Main
 on:
   push:
     branches:
-      - Develop  # Trigger action on push to Develop (with a capital D)
+      - Develop  # Trigger action on push to Develop
 
 jobs:
   merge:
@@ -12,7 +12,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Get last commit message on develop
+      - name: Get last commit message on Develop
         id: last_commit
         run: |
           LAST_COMMIT_MSG=$(git log -1 --pretty=%B)
@@ -29,14 +29,17 @@ jobs:
           git fetch origin main
           git checkout main
 
-      - name: Merge develop into main (if commit message matches)
+      - name: Merge Develop into main (if commit message matches)
         run: |
           # Convert commit message to lowercase for case-insensitive comparison
           COMMIT_MSG_LOWER=$(echo "${{ steps.last_commit.outputs.commit_message }}" | tr '[:upper:]' '[:lower:]')
           
           if [[ "$COMMIT_MSG_LOWER" == *"ready to deploy"* ]]; then
             echo "Commit message matches, merging Develop into main."
             git merge origin/Develop --no-ff --allow-unrelated-histories -m "Merge Develop into main"
+            # Attempt the merge and capture the result
+            git merge origin/Develop --no-ff -m "Merge Develop into main" || { echo "Merge conflicts detected, skipping push."; exit 1; }
+            
             git push origin main
           else
             echo "Commit message does not match, skipping merge."

src/App.tsx

@@ -2,14 +2,25 @@ import { BrowserRouter as Router, Routes, Route } from "react-router-dom";
 import { Header } from "./components/Header";
 import { Home } from "./pages/Home";
 import { About } from "./pages/About";
+import { useState } from "react";
 
 function App() {
+  const [hasSearched, setHasSearched] = useState(false);
+  // Function to reset the search state
+  const resetSearch = () => {
+    setHasSearched(false); // Reset the state when the logo is clicked
+  };
   return (
     <Router basename="/software-advisor">
       <div className="min-h-screen bg-gray-50">
-        <Header />
+        <Header onLogoClick={resetSearch} />
         <Routes>
-          <Route path="/" element={<Home />} />
+          <Route
+            path="/"
+            element={
+              <Home hasSearched={hasSearched} setHasSearched={setHasSearched} />
+            }
+          />
           <Route path="/about" element={<About />} />
         </Routes>
       </div>

src/components/Header.tsx

@@ -1,15 +1,19 @@
-import React from 'react';
-import { Link } from 'react-router-dom';
-import { AppWindow, Globe, Github, Info } from 'lucide-react';
-
-export function Header() {
+import { Link } from "react-router-dom";
+import { AppWindow, Globe, Github, Info } from "lucide-react";
+interface HeaderProps {
+  onLogoClick: () => void;
+}
+export function Header({ onLogoClick }: HeaderProps) {
   return (
     <header className="bg-white shadow-sm">
       <div className="max-w-7xl mx-auto px-4 py-6">
         <div className="flex items-center justify-between">
-          <Link to="/" className="flex items-center">
+          <Link to="/" className="flex items-center" onClick={onLogoClick}>
+            {" "}
             <AppWindow className="h-8 w-8 text-blue-600" />
-            <h1 className="ml-3 text-2xl font-bold text-gray-900">Software Advisor</h1>
+            <h1 className="ml-3 text-2xl font-bold text-gray-900">
+              Software Advisor
+            </h1>
           </Link>
           <div className="flex items-center space-x-4">
             <Link
@@ -42,4 +46,4 @@ export function Header() {
       </div>
     </header>
   );
-}
+}

src/pages/Home.tsx

@@ -5,7 +5,12 @@ import { SoftwareCard } from "../components/SoftwareCard";
 import { getSuggestions, analyzeSoftwareNeeds } from "../lib/gemini";
 import debounce from "lodash/debounce";
 
-export function Home() {
+interface HomeProps {
+  hasSearched: boolean;
+  setHasSearched: React.Dispatch<React.SetStateAction<boolean>>;
+}
+
+export function Home({ hasSearched, setHasSearched }: HomeProps) {
   const [filters, setFilters] = useState({
     category: "all",
     pricing: "all",
@@ -21,13 +26,19 @@ export function Home() {
   const [showDescriptionSuggestions, setShowDescriptionSuggestions] =
     useState(false);
   const [isLoading, setIsLoading] = useState(false);
-  const [hasSearched, setHasSearched] = useState(false);
   const [aiAnalysis, setAiAnalysis] = useState<any>(null);
   const searchRef = useRef<HTMLDivElement>(null);
   const descriptionRef = useRef<HTMLDivElement>(null);
   const allPlatforms: any[] = ["Android", "iOS"];
   const [software, setSoftware] = useState([]);
 
+  // Reset taskDescription when hasSearched becomes false
+  useEffect(() => {
+    if (!hasSearched) {
+      setTaskDescription(""); // Reset taskDescription to empty
+    }
+  }, [hasSearched]); // Depend on hasSearched, so it runs whenever it changes
+
   const debouncedGetSuggestions = useRef(
     debounce(async (input: string) => {
       const suggestions = await getSuggestions(input);