@@ -99,23 +99,30 @@ function Showprojects()
99
99
// "VR"
100
100
const [ randomProject , setRandomProject ] = useState ( "" ) ;
101
101
102
- const fetchProjects = async ( ) =>
102
+ const fetchProjects = async ( queryoption = "" ) =>
103
103
{
104
104
setIsLoading ( true ) ;
105
105
106
106
try
107
107
{
108
108
setRandomProject ( "" ) ;
109
109
110
- if ( query !== "" )
110
+ if ( queryoption !== "" )
111
111
{
112
- const results = await server . get ( `/getprojects?q=${ query } ` ) ;
112
+ const results = await server . get ( `/getprojects?q=${ queryoption } ` ) ;
113
113
setIsLoading ( false ) ;
114
114
setProjects ( results . data ) ;
115
115
setTotalPages ( Math . ceil ( results . data . length / itemsPerPage ) ) ;
116
- } else
116
+
117
+ } else if ( query !== "" )
117
118
{
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" ) ;
119
126
setIsLoading ( false ) ;
120
127
}
121
128
} catch ( error )
@@ -133,8 +140,8 @@ function Showprojects()
133
140
query : e . target . innerText ,
134
141
} ) ;
135
142
136
- // fetchProjects();
137
- toast . success ( "Click on search button to search." )
143
+ fetchProjects ( e . target . innerText ) ;
144
+
138
145
} ;
139
146
140
147
const handleRandomProject = ( ) =>
@@ -174,13 +181,6 @@ function Showprojects()
174
181
< div className = "mt" >
175
182
< SearchBox fetchProjects = { fetchProjects } />
176
183
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
-
184
184
< div className = " default_options filtre-div" >
185
185
< label className = "container" >
186
186
Beginner Level
@@ -313,6 +313,12 @@ function Showprojects()
313
313
< h2 className = "query" > Enter query to search for projects. </ h2 >
314
314
) }
315
315
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 }
316
322
317
323
318
324
< div className = "projectsList" >
0 commit comments