From 7ac9a6ff73586f40d2896cfdc388a2b90323aa7f Mon Sep 17 00:00:00 2001 From: Nina1o1 Date: Wed, 6 Dec 2023 17:58:16 -0500 Subject: [PATCH 01/10] comment on states --- front-end/src/pages/MainMap/MapLayout.jsx | 26 +++++++++++------------ 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/front-end/src/pages/MainMap/MapLayout.jsx b/front-end/src/pages/MainMap/MapLayout.jsx index f0970f9..d558757 100644 --- a/front-end/src/pages/MainMap/MapLayout.jsx +++ b/front-end/src/pages/MainMap/MapLayout.jsx @@ -4,48 +4,46 @@ import { useEffect, useState } from "react"; import PopupSearch from "./popupSearch"; import TimeRange from '../../components/timeline/TimeRange.jsx'; import { format, setYear, endOfYear } from 'date-fns'; -import InfoCard from "../../components/map/InfoCard.jsx"; //timeline-related const getSpecificYear = (year) => setYear(new Date(), year); const timelineInterval = [getSpecificYear(1000), endOfYear(getSpecificYear(2020))]; - const MapLayout = () => { const location = useLocation() const navigate = useNavigate() const [searchPage, setSearchPage] = useState(false) // display search page or not const [searchData, setSearchData] = useState("") // content that user typed in bar - // subject to changes - // data necessary to search for art object (time & location) - // {location:[lng, lat] (or city), time: num} + // States related to send request to backend + // Data required to search for art object (time & location) + // {location:[lng, lat], timeRange: num} const [foundData, setFoundData] = useState({location:[],timeRange:[1920, 1940]}) - const [refreshPopup, setRefreshPopup] = useState(0) // change counter to refresh popup, 0 to close popup - - //timeline + // Counter to refresh popup page: 0 - close popup, positive increment - refresh popup + const [refreshPopup, setRefreshPopup] = useState(0) + // timeline const [selectedInterval, setSelectedInterval] = useState([getSpecificYear(1920), getSpecificYear(1940)]); const [error, setError] = useState(false); const errorHandler = ({ error }) => setError(error); - + // change timeline upon user interaction const onChangeCallback = (newInterval) => { setSelectedInterval(newInterval); setFoundData(prevData => ({ ...prevData, timeRange: [format(newInterval[0], "yyyy"),format(newInterval[1], "yyyy")] })); + setRefreshPopup(prev => prev+1); }; - + // display search page if user is in search page useEffect(() => { if (location.pathname === "/search") !searchPage && setSearchPage(true) }, []) - // submit search result + // update user input data to searchData state. Display search page if necessary const handleSubmit = (evt) => { evt.stopPropagation() - // send data via react Context to SearchMap if (evt.target.value) { setSearchData(evt.target.value) if (location.pathname === "/") { @@ -60,7 +58,7 @@ const MapLayout = () => { } } - // navigate back to home page + // navigate back to home page upon click back btn const handleClickBack = (evt) => { evt.stopPropagation() evt.preventDefault() @@ -68,7 +66,7 @@ const MapLayout = () => { searchPage && setSearchPage(false) setRefreshPopup(0) } - // navigate to search page + // navigate to search page upon click search btn const handleClickSearch = (evt) => { evt.stopPropagation() evt.preventDefault() From e85db72fd2656069d8b8fc7cc27018254b8bba47 Mon Sep 17 00:00:00 2001 From: Nina1o1 Date: Wed, 6 Dec 2023 18:05:46 -0500 Subject: [PATCH 02/10] slight change on btn style --- front-end/src/components/map/lookupBtn.jsx | 6 +++--- front-end/src/pages/MainMap/MainMap.jsx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/front-end/src/components/map/lookupBtn.jsx b/front-end/src/components/map/lookupBtn.jsx index d19739a..3020af5 100644 --- a/front-end/src/components/map/lookupBtn.jsx +++ b/front-end/src/components/map/lookupBtn.jsx @@ -1,14 +1,14 @@ const LookupBtn = (props) => { //attribute: value, handleClick return ( -
- +
) } diff --git a/front-end/src/pages/MainMap/MainMap.jsx b/front-end/src/pages/MainMap/MainMap.jsx index 71dad46..10f29fa 100644 --- a/front-end/src/pages/MainMap/MainMap.jsx +++ b/front-end/src/pages/MainMap/MainMap.jsx @@ -45,6 +45,7 @@ function LocationMarker(props) { } }) + // update search data upon user click "look up" btn const handleClick = (evt) => { // TODO: center at upper side setFoundData(prev => ({ @@ -58,8 +59,7 @@ function LocationMarker(props) { return( - - + From fc6d33ee82373b071ec54beb1f27326e23da0a0d Mon Sep 17 00:00:00 2001 From: Nina1o1 Date: Wed, 6 Dec 2023 18:21:34 -0500 Subject: [PATCH 03/10] minor changes --- back-end/src/routes/searchRouter.mjs | 51 ++++++++++++----------- front-end/src/pages/MainMap/MapLayout.jsx | 3 +- front-end/src/pages/MainMap/SearchMap.jsx | 8 +--- 3 files changed, 30 insertions(+), 32 deletions(-) diff --git a/back-end/src/routes/searchRouter.mjs b/back-end/src/routes/searchRouter.mjs index 0f21e8e..be4b93a 100644 --- a/back-end/src/routes/searchRouter.mjs +++ b/back-end/src/routes/searchRouter.mjs @@ -1,30 +1,31 @@ import Artwork from '../models/Artwork.mjs'; -export const searchRouter = async (req, res) => { - console.log('Search route accessed'); - const { artinfo, timeRange } = req.query; - const timeRangeArray = timeRange.split(','); - const startYear = parseInt(timeRangeArray[0]); - const endYear = parseInt(timeRangeArray[1]); - console.log(req.query); - console.log(startYear); - console.log(endYear); +const searchRouter = async (req, res) => { + // artinfo, timeRange + const { artinfo, timeRange } = req.query; + const timeRangeArray = timeRange.split(','); + const startYear = parseInt(timeRangeArray[0]); + const endYear = parseInt(timeRangeArray[1]); + console.log(req.query); + console.log(startYear); + console.log(endYear); - try { - console.log('Searching for artworks...'); - const artworks = await Artwork.find({ - Year: { $gte: startYear, $lte: endYear }, - $or: [ - { title: { $regex: `${artinfo}`, $options: 'i' } }, - { artist: { $regex: `${artinfo}`, $options: 'i' } } - ] - }).limit(15); - console.log('Artworks found'); - console.log(artworks); - res.json(artworks); - } catch (err) { - console.error(err); // Log the error for debugging - res.status(500).send('Internal Server Error'); - } + try { + console.log('Searching for artworks...'); + const artworks = await Artwork.find({ + Year: { $gte: startYear, $lte: endYear }, + $or: [ + { title: { $regex: `${artinfo}`, $options: 'i' } }, + { artist: { $regex: `${artinfo}`, $options: 'i' } } + ] + }).limit(15); + console.log('Artworks found'); + console.log(artworks); + return res.json(artworks); + } catch (err) { + console.error(err); // Log the error for debugging + return res.status(500).send('Internal Server Error'); + } }; + export default searchRouter; \ No newline at end of file diff --git a/front-end/src/pages/MainMap/MapLayout.jsx b/front-end/src/pages/MainMap/MapLayout.jsx index d558757..fee7520 100644 --- a/front-end/src/pages/MainMap/MapLayout.jsx +++ b/front-end/src/pages/MainMap/MapLayout.jsx @@ -23,6 +23,8 @@ const MapLayout = () => { // timeline const [selectedInterval, setSelectedInterval] = useState([getSpecificYear(1920), getSpecificYear(1940)]); const [error, setError] = useState(false); + + // timeline error handler const errorHandler = ({ error }) => setError(error); // change timeline upon user interaction @@ -40,7 +42,6 @@ const MapLayout = () => { if (location.pathname === "/search") !searchPage && setSearchPage(true) }, []) - // update user input data to searchData state. Display search page if necessary const handleSubmit = (evt) => { evt.stopPropagation() diff --git a/front-end/src/pages/MainMap/SearchMap.jsx b/front-end/src/pages/MainMap/SearchMap.jsx index 65e7986..76d6e36 100644 --- a/front-end/src/pages/MainMap/SearchMap.jsx +++ b/front-end/src/pages/MainMap/SearchMap.jsx @@ -4,7 +4,6 @@ import axiosProvider from "../../util/api/axios" const SearchMap = () => { const [searchData, ,setFoundData, setRefreshPopup] = useOutletContext(); - const [searchdata, setSearchData] = useState(''); const [suggestions, setSuggestions] = useState([]); useEffect(() => { @@ -17,11 +16,8 @@ const SearchMap = () => { } }; - if (searchdata) { - loadSuggestions(); - } else { - setSuggestions([]); - } + if (searchData) loadSuggestions(); + else setSuggestions([]); // setRefreshPopup(0) }, [searchData]); From 336e0d740f591d5a669789fa82f15afa79bfabeb Mon Sep 17 00:00:00 2001 From: Nina1o1 Date: Wed, 6 Dec 2023 18:31:46 -0500 Subject: [PATCH 04/10] change router name --- back-end/src/app.mjs | 4 ++-- .../src/routes/{searchRouter.mjs => searchArtsRouter.mjs} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename back-end/src/routes/{searchRouter.mjs => searchArtsRouter.mjs} (91%) diff --git a/back-end/src/app.mjs b/back-end/src/app.mjs index 1478771..2750aa5 100644 --- a/back-end/src/app.mjs +++ b/back-end/src/app.mjs @@ -22,7 +22,7 @@ import delaccountRouter from './routes/delaccountRouter.mjs'; import getpieceRouter from './routes/getpieceRouter.mjs'; import resetpasswordRouter from './routes/resetpasswordRouter.mjs'; import resetemailRouter from './routes/resetemailRouter.mjs'; -import searchRouter from './routes/searchRouter.mjs'; +import searchArtsRouter from './routes/searchArtsRouter.mjs'; import {addFavListRouter,favListRouter, getArts} from './routes/modifyFavListRouter.mjs' import { configDotenv } from 'dotenv'; @@ -115,7 +115,7 @@ app.delete("/delaccount", delaccountRouter); //Finished app.post('/addFavorite', addFavListRouter);//finished app.get('/getfavlist', favListRouter); app.post('/getArts', getArts);//finished -app.get('/search', searchRouter); +app.get('/searchArts', searchArtsRouter); // app.post('/favlist/remove',removeFavListRouter); // export the express app we created to make it available to other modules diff --git a/back-end/src/routes/searchRouter.mjs b/back-end/src/routes/searchArtsRouter.mjs similarity index 91% rename from back-end/src/routes/searchRouter.mjs rename to back-end/src/routes/searchArtsRouter.mjs index be4b93a..8ca4dd8 100644 --- a/back-end/src/routes/searchRouter.mjs +++ b/back-end/src/routes/searchArtsRouter.mjs @@ -1,6 +1,6 @@ import Artwork from '../models/Artwork.mjs'; -const searchRouter = async (req, res) => { +const searchArtsRouter = async (req, res) => { // artinfo, timeRange const { artinfo, timeRange } = req.query; const timeRangeArray = timeRange.split(','); @@ -28,4 +28,4 @@ const searchRouter = async (req, res) => { } }; -export default searchRouter; \ No newline at end of file +export default searchArtsRouter; \ No newline at end of file From d3fe63f13d643c7c1a98daa2cba7065e34ee637e Mon Sep 17 00:00:00 2001 From: Nina1o1 Date: Wed, 6 Dec 2023 19:11:34 -0500 Subject: [PATCH 05/10] search route --- back-end/src/routes/modifyFavListRouter.mjs | 2 +- back-end/src/routes/searchArtsRouter.mjs | 14 +++--- front-end/src/pages/MainMap/MainMap.jsx | 2 +- front-end/src/pages/MainMap/MapLayout.jsx | 9 ++-- front-end/src/pages/MainMap/SearchMap.jsx | 44 ++++++++++++++++--- front-end/src/pages/MainMap/popupSearch.jsx | 30 ++++++++++--- .../pages/MainMapGoogle/LocationMarker.jsx | 2 +- 7 files changed, 80 insertions(+), 23 deletions(-) diff --git a/back-end/src/routes/modifyFavListRouter.mjs b/back-end/src/routes/modifyFavListRouter.mjs index 65001a1..c2e85bb 100644 --- a/back-end/src/routes/modifyFavListRouter.mjs +++ b/back-end/src/routes/modifyFavListRouter.mjs @@ -7,7 +7,7 @@ import mongoose from 'mongoose'; export const getArts = async (req, res) => { const { timeRange, location } = req.body; - console.log(location) + console.log(location, timeRange) const startYear = parseInt(timeRange[0]); const endYear = parseInt(timeRange[1]); diff --git a/back-end/src/routes/searchArtsRouter.mjs b/back-end/src/routes/searchArtsRouter.mjs index 8ca4dd8..e3989d0 100644 --- a/back-end/src/routes/searchArtsRouter.mjs +++ b/back-end/src/routes/searchArtsRouter.mjs @@ -2,10 +2,12 @@ import Artwork from '../models/Artwork.mjs'; const searchArtsRouter = async (req, res) => { // artinfo, timeRange - const { artinfo, timeRange } = req.query; - const timeRangeArray = timeRange.split(','); - const startYear = parseInt(timeRangeArray[0]); - const endYear = parseInt(timeRangeArray[1]); + const { artInfo, timeRange } = req.query; + console.log(artInfo, timeRange) + + const startYear = parseInt(timeRange[0]); + const endYear = parseInt(timeRange[1]); + console.log(req.query); console.log(startYear); console.log(endYear); @@ -15,8 +17,8 @@ const searchArtsRouter = async (req, res) => { const artworks = await Artwork.find({ Year: { $gte: startYear, $lte: endYear }, $or: [ - { title: { $regex: `${artinfo}`, $options: 'i' } }, - { artist: { $regex: `${artinfo}`, $options: 'i' } } + { title: { $regex: `${artInfo}`, $options: 'i' } }, + { artist: { $regex: `${artInfo}`, $options: 'i' } } ] }).limit(15); console.log('Artworks found'); diff --git a/front-end/src/pages/MainMap/MainMap.jsx b/front-end/src/pages/MainMap/MainMap.jsx index 10f29fa..3e105d9 100644 --- a/front-end/src/pages/MainMap/MainMap.jsx +++ b/front-end/src/pages/MainMap/MainMap.jsx @@ -52,7 +52,7 @@ function LocationMarker(props) { ...prev, location: position, })) - setRefreshPopup(prev => prev+1) + setRefreshPopup(prev => prev >= 0 ? prev+1 : 1) } diff --git a/front-end/src/pages/MainMap/MapLayout.jsx b/front-end/src/pages/MainMap/MapLayout.jsx index fee7520..ec0fcd7 100644 --- a/front-end/src/pages/MainMap/MapLayout.jsx +++ b/front-end/src/pages/MainMap/MapLayout.jsx @@ -16,14 +16,15 @@ const MapLayout = () => { const [searchData, setSearchData] = useState("") // content that user typed in bar // States related to send request to backend // Data required to search for art object (time & location) - // {location:[lng, lat], timeRange: num} - const [foundData, setFoundData] = useState({location:[],timeRange:[1920, 1940]}) - // Counter to refresh popup page: 0 - close popup, positive increment - refresh popup + // {location:[lng, lat], timeRange: [startYear, endYaer], artInfo: "str"} + const [foundData, setFoundData] = useState({location:[], timeRange:[1920, 1940], artInfo:"str"}) + // Counter to refresh popup page: 0 - close, positive - search by click, positive - search by type const [refreshPopup, setRefreshPopup] = useState(0) // timeline const [selectedInterval, setSelectedInterval] = useState([getSpecificYear(1920), getSpecificYear(1940)]); const [error, setError] = useState(false); + console.log(refreshPopup) // timeline error handler const errorHandler = ({ error }) => setError(error); @@ -34,7 +35,7 @@ const MapLayout = () => { ...prevData, timeRange: [format(newInterval[0], "yyyy"),format(newInterval[1], "yyyy")] })); - setRefreshPopup(prev => prev+1); + setRefreshPopup(prev => prev*2); }; // display search page if user is in search page diff --git a/front-end/src/pages/MainMap/SearchMap.jsx b/front-end/src/pages/MainMap/SearchMap.jsx index 76d6e36..a44ec4b 100644 --- a/front-end/src/pages/MainMap/SearchMap.jsx +++ b/front-end/src/pages/MainMap/SearchMap.jsx @@ -6,10 +6,11 @@ const SearchMap = () => { const [searchData, ,setFoundData, setRefreshPopup] = useOutletContext(); const [suggestions, setSuggestions] = useState([]); + /* useEffect(() => { const loadSuggestions = async () => { try { - const response = await axiosProvider.get(`/search`); + const response = await axiosProvider.get(`/searchArts`); setSuggestions(response.data); } catch (error) { console.error('Error fetching search suggestions', error); @@ -20,18 +21,51 @@ const SearchMap = () => { else setSuggestions([]); // setRefreshPopup(0) }, [searchData]); + */ - console.log(suggestions); + // update suggestions on every user input + useEffect(() => { + // may add another route to get a list of suggestions + if (searchData) setSuggestions(["albert irvin"]) // random author + else setSuggestions([]) + }, [searchData]) - const handleCityClick = (evt, city) => { + // click on suggestion to fetch art data + const handleSuggestionClick = (evt, suggestion) => { evt.stopPropagation() // TODO: find the location of city setFoundData(prev => ({ ...prev, - location: city + artInfo: suggestion })) - setRefreshPopup(prev => prev+1) + setRefreshPopup(prev => prev<=0 ? prev-1 : -1) }; + return( + <> +
+
+
    + + {suggestions.length ? + + suggestions?.map((suggestion, index) => ( +
  • handleSuggestionClick(evt, suggestion)}> +
    + {suggestion} +
    +
    • + )) : + +
  • + No suggestion found, try another one +
    • + } + +
+
+
+ + ) } export default SearchMap \ No newline at end of file diff --git a/front-end/src/pages/MainMap/popupSearch.jsx b/front-end/src/pages/MainMap/popupSearch.jsx index 299e5f3..21ad3f1 100644 --- a/front-end/src/pages/MainMap/popupSearch.jsx +++ b/front-end/src/pages/MainMap/popupSearch.jsx @@ -13,7 +13,26 @@ const PopupSearch = (props) => { const location = useLocation() useEffect(() => { - async function getData() { + // request to "searchArts" route + async function searchArtsData() { + const getData = { + artInfo: props.foundData.artInfo, + timeRange: props.foundData.timeRange + } + console.log(getData) + try { + const res = await axiosProvider.get( + "/searchArts", + { params: getData} + ) + setArts(res.data); + } catch (error) { + console.error(err); + } + } + + // request to "/getArts" route + async function getArtsData() { const postData = { location: props.foundData.location, timeRange: props.foundData.timeRange @@ -29,14 +48,15 @@ const PopupSearch = (props) => { JSON.stringify(postData), postOptions ); - const retData = res.data; - setArts(retData); + setArts(res.data); } catch (err) { console.error(err); } } - if (props.refreshPopup) getData(); - }, [props.refreshPopup, props.foundData]); + if (props.refreshPopup > 0) getArtsData() + else if (props.refreshPopup < 0) searchArtsData() + }, [props.refreshPopup]); + const handleArtItemClick = (art) => { // Navigate to the art information page diff --git a/front-end/src/pages/MainMapGoogle/LocationMarker.jsx b/front-end/src/pages/MainMapGoogle/LocationMarker.jsx index 8006428..b5b2729 100644 --- a/front-end/src/pages/MainMapGoogle/LocationMarker.jsx +++ b/front-end/src/pages/MainMapGoogle/LocationMarker.jsx @@ -17,7 +17,7 @@ const LocationMarker = ({ map }) => { ...prev, location: { lat: position.lat(), lng: position.lng() } })); - setRefreshPopup(prev => prev + 1); + setRefreshPopup(prev => prev<=0 ? prev-1 : -1) }; useEffect(() => { From 1c7c352c454cf34625f12261cf21420b8f341f40 Mon Sep 17 00:00:00 2001 From: Nina1o1 Date: Wed, 6 Dec 2023 19:13:48 -0500 Subject: [PATCH 06/10] change getArt to get route --- back-end/src/app.mjs | 2 +- back-end/src/routes/modifyFavListRouter.mjs | 2 +- front-end/src/pages/MainMap/popupSearch.jsx | 14 ++++---------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/back-end/src/app.mjs b/back-end/src/app.mjs index 2750aa5..19e266f 100644 --- a/back-end/src/app.mjs +++ b/back-end/src/app.mjs @@ -114,7 +114,7 @@ app.delete("/delaccount", delaccountRouter); //Finished // Favorites list routes app.post('/addFavorite', addFavListRouter);//finished app.get('/getfavlist', favListRouter); -app.post('/getArts', getArts);//finished +app.get('/getArts', getArts);//finished app.get('/searchArts', searchArtsRouter); // app.post('/favlist/remove',removeFavListRouter); diff --git a/back-end/src/routes/modifyFavListRouter.mjs b/back-end/src/routes/modifyFavListRouter.mjs index c2e85bb..d4d4028 100644 --- a/back-end/src/routes/modifyFavListRouter.mjs +++ b/back-end/src/routes/modifyFavListRouter.mjs @@ -6,7 +6,7 @@ import mongoose from 'mongoose'; export const getArts = async (req, res) => { - const { timeRange, location } = req.body; + const { timeRange, location } = req.query; console.log(location, timeRange) const startYear = parseInt(timeRange[0]); diff --git a/front-end/src/pages/MainMap/popupSearch.jsx b/front-end/src/pages/MainMap/popupSearch.jsx index 21ad3f1..1696b56 100644 --- a/front-end/src/pages/MainMap/popupSearch.jsx +++ b/front-end/src/pages/MainMap/popupSearch.jsx @@ -23,7 +23,7 @@ const PopupSearch = (props) => { try { const res = await axiosProvider.get( "/searchArts", - { params: getData} + { params: getData } ) setArts(res.data); } catch (error) { @@ -33,20 +33,14 @@ const PopupSearch = (props) => { // request to "/getArts" route async function getArtsData() { - const postData = { + const getData = { location: props.foundData.location, timeRange: props.foundData.timeRange }; - const postOptions = { - headers: { - 'Content-Type': 'application/json' - } - }; try { - const res = await axiosProvider.post( + const res = await axiosProvider.get( "/getArts", - JSON.stringify(postData), - postOptions + { params: getData } ); setArts(res.data); } catch (err) { From cc63c52bdb3bccfb9c9c9148727bbf2e86a3599b Mon Sep 17 00:00:00 2001 From: Nina1o1 Date: Wed, 6 Dec 2023 19:31:07 -0500 Subject: [PATCH 07/10] minor change on refreshpopup --- front-end/src/pages/MainMap/MapLayout.jsx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/front-end/src/pages/MainMap/MapLayout.jsx b/front-end/src/pages/MainMap/MapLayout.jsx index ec0fcd7..63e8b32 100644 --- a/front-end/src/pages/MainMap/MapLayout.jsx +++ b/front-end/src/pages/MainMap/MapLayout.jsx @@ -24,10 +24,9 @@ const MapLayout = () => { const [selectedInterval, setSelectedInterval] = useState([getSpecificYear(1920), getSpecificYear(1940)]); const [error, setError] = useState(false); - console.log(refreshPopup) // timeline error handler const errorHandler = ({ error }) => setError(error); - + // change timeline upon user interaction const onChangeCallback = (newInterval) => { setSelectedInterval(newInterval); @@ -35,9 +34,13 @@ const MapLayout = () => { ...prevData, timeRange: [format(newInterval[0], "yyyy"),format(newInterval[1], "yyyy")] })); - setRefreshPopup(prev => prev*2); + setRefreshPopup(prev => prev > 0 ? prev+1 : (prev < 0 ? prev-1 : prev)); }; - + + useEffect(() => { + console.log(refreshPopup) + }, [refreshPopup]) + // display search page if user is in search page useEffect(() => { if (location.pathname === "/search") !searchPage && setSearchPage(true) From 66c2b58028294bd6b661e1747d93395f0783ddf0 Mon Sep 17 00:00:00 2001 From: Nina1o1 Date: Wed, 6 Dec 2023 19:32:49 -0500 Subject: [PATCH 08/10] remove print --- front-end/src/pages/MainMap/MapLayout.jsx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/front-end/src/pages/MainMap/MapLayout.jsx b/front-end/src/pages/MainMap/MapLayout.jsx index 63e8b32..c32642b 100644 --- a/front-end/src/pages/MainMap/MapLayout.jsx +++ b/front-end/src/pages/MainMap/MapLayout.jsx @@ -37,10 +37,6 @@ const MapLayout = () => { setRefreshPopup(prev => prev > 0 ? prev+1 : (prev < 0 ? prev-1 : prev)); }; - useEffect(() => { - console.log(refreshPopup) - }, [refreshPopup]) - // display search page if user is in search page useEffect(() => { if (location.pathname === "/search") !searchPage && setSearchPage(true) From fb73d7dc869e58636d9455ae414215d03dfe7eb5 Mon Sep 17 00:00:00 2001 From: Nina1o1 Date: Wed, 6 Dec 2023 19:33:34 -0500 Subject: [PATCH 09/10] remove print --- front-end/src/pages/MainMap/MapLayout.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front-end/src/pages/MainMap/MapLayout.jsx b/front-end/src/pages/MainMap/MapLayout.jsx index c32642b..882fe72 100644 --- a/front-end/src/pages/MainMap/MapLayout.jsx +++ b/front-end/src/pages/MainMap/MapLayout.jsx @@ -17,7 +17,7 @@ const MapLayout = () => { // States related to send request to backend // Data required to search for art object (time & location) // {location:[lng, lat], timeRange: [startYear, endYaer], artInfo: "str"} - const [foundData, setFoundData] = useState({location:[], timeRange:[1920, 1940], artInfo:"str"}) + const [foundData, setFoundData] = useState({location:[], timeRange:[1920, 1940], artInfo:""}) // Counter to refresh popup page: 0 - close, positive - search by click, positive - search by type const [refreshPopup, setRefreshPopup] = useState(0) // timeline From 7b2f8c920a63e217bef1abd46597431edffb0828 Mon Sep 17 00:00:00 2001 From: Nina1o1 Date: Wed, 6 Dec 2023 19:53:39 -0500 Subject: [PATCH 10/10] minor update --- front-end/src/pages/Account/Account.jsx | 3 ++- front-end/src/pages/FavoriteList/FavoriteList.jsx | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/front-end/src/pages/Account/Account.jsx b/front-end/src/pages/Account/Account.jsx index 8b05f32..bd822ad 100644 --- a/front-end/src/pages/Account/Account.jsx +++ b/front-end/src/pages/Account/Account.jsx @@ -224,7 +224,8 @@ const AccountEdit = (props) => { setCurrentActionData(null) } - console.log("Component render, current username:", username); + // console.log("Component render, current username:", username); + //Return the AccountEdit component return ( <> diff --git a/front-end/src/pages/FavoriteList/FavoriteList.jsx b/front-end/src/pages/FavoriteList/FavoriteList.jsx index fbc2e62..ee26ab9 100644 --- a/front-end/src/pages/FavoriteList/FavoriteList.jsx +++ b/front-end/src/pages/FavoriteList/FavoriteList.jsx @@ -42,8 +42,7 @@ const FavoriteList = () => { return ( <> -
- +

My Favorite Arts