Skip to content

Commit 39f7122

Browse files
fixed showprojects onclick to default options
1 parent 29b3563 commit 39f7122

File tree

1 file changed

+20
-14
lines changed

1 file changed

+20
-14
lines changed

src/components/ShowProjects/Showprojects.js

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -99,23 +99,30 @@ function Showprojects()
9999
// "VR"
100100
const [randomProject, setRandomProject] = useState("");
101101

102-
const fetchProjects = async () =>
102+
const fetchProjects = async (queryoption = "") =>
103103
{
104104
setIsLoading(true);
105105

106106
try
107107
{
108108
setRandomProject("");
109109

110-
if (query !== "")
110+
if (queryoption !== "")
111111
{
112-
const results = await server.get(`/getprojects?q=${ query }`);
112+
const results = await server.get(`/getprojects?q=${ queryoption }`);
113113
setIsLoading(false);
114114
setProjects(results.data);
115115
setTotalPages(Math.ceil(results.data.length / itemsPerPage));
116-
} else
116+
117+
} else if( query !== "")
117118
{
118-
toast.error("Please enter a query first");
119+
const results = await server.get(`/getprojects?q=${ query }`);
120+
setIsLoading(false);
121+
setProjects(results.data);
122+
setTotalPages(Math.ceil(results.data.length / itemsPerPage));
123+
124+
} else {
125+
toast.error("Please enter or select a query first");
119126
setIsLoading(false);
120127
}
121128
} catch (error)
@@ -133,8 +140,8 @@ function Showprojects()
133140
query: e.target.innerText,
134141
});
135142

136-
// fetchProjects();
137-
toast.success("Click on search button to search.")
143+
fetchProjects(e.target.innerText);
144+
138145
};
139146

140147
const handleRandomProject = () =>
@@ -174,13 +181,6 @@ function Showprojects()
174181
<div className="mt">
175182
<SearchBox fetchProjects={fetchProjects} />
176183

177-
{isLoading ? (
178-
<div className="loading_indicator">
179-
<Bars stroke={"#6f6ee1"} fill="#6f6ee1" width="60" height="90" />
180-
<p> Fetching {query} projects </p>
181-
</div>
182-
) : null}
183-
184184
<div className=" default_options filtre-div">
185185
<label className="container">
186186
Beginner Level
@@ -313,6 +313,12 @@ function Showprojects()
313313
<h2 className="query"> Enter query to search for projects. </h2>
314314
)}
315315

316+
{isLoading ? (
317+
<div className="loading_indicator">
318+
<Bars stroke={"#6f6ee1"} fill="#6f6ee1" width="60" height="90" />
319+
<p> Fetching {query} projects </p>
320+
</div>
321+
) : null}
316322

317323

318324
<div className="projectsList">

0 commit comments

Comments
 (0)