Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Search mapbox feature #135

Open
wants to merge 31 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
663dd0e
Implemented search feature and added filters
lavnimusha Jan 13, 2023
f7d03ba
fix mapbox popups and popup styling
nicoledicochea Mar 3, 2023
042cd40
add directions to map popup box button
nicoledicochea Mar 18, 2023
5954d41
update home page, local arts and featured art
nicoledicochea May 4, 2023
fbe0af7
Implemented SearchBar feature
May 15, 2023
222b6fa
Implemented Searchbar feature
May 16, 2023
20c7c26
minor changes
May 16, 2023
113cc48
add gradient to search grid images and update backend spreadsheet
nicoledicochea May 18, 2023
b81e4f6
update mobile home search bar input width and fix typo on search page…
nicoledicochea May 18, 2023
6ff6933
alignment changes in Contact us page and typecase fixfor searchbar
May 21, 2023
9270a50
Added context Api for Features and Search
May 29, 2023
20c06e5
stick the footer to the bottom of the page, fix footer link colors
nicoledicochea Jun 10, 2023
c3a6e28
update contact page with message success
nicoledicochea Jul 6, 2023
d0b7d41
removed overlay
Aug 2, 2023
c86b321
removed overlay
Aug 2, 2023
2ef7411
removed overlay in local arts
Aug 2, 2023
3d9cb5b
Merge branch 'develop' of github.com:codeforsanjose/heartofthevalley …
JMStudiosJoe Feb 27, 2024
8eca82a
more cleanup
JMStudiosJoe Feb 27, 2024
0056910
moar cleanup of files
JMStudiosJoe Feb 27, 2024
7df899c
moved contexts into separate folder
nickkats Feb 27, 2024
0f9e2be
more organizing and cleanup
JMStudiosJoe Feb 27, 2024
5af3815
Merge branch 'search_mapbox_feature' of github.com:codeforsanjose/hea…
JMStudiosJoe Feb 27, 2024
66b9bba
closer but still not building
JMStudiosJoe Feb 27, 2024
0257116
push fixes
JMStudiosJoe Feb 29, 2024
c692baf
need these too
JMStudiosJoe Feb 29, 2024
23ec27c
add back in script for start in backend
JMStudiosJoe Feb 29, 2024
9428799
fix dem urls demokrats broke
JMStudiosJoe Feb 29, 2024
2ae8731
fix noob mistake
JMStudiosJoe Feb 29, 2024
39330b0
add that other token
JMStudiosJoe Feb 29, 2024
152f1e0
update naviation use
JMStudiosJoe Feb 29, 2024
29ece5a
change the map height
JMStudiosJoe Feb 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 11 additions & 6 deletions app/client/package.json
Expand Up @@ -6,17 +6,21 @@
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^11.2.7",
"@testing-library/user-event": "^12.8.3",
"axios": "^0.21.1",
"axios": "^0.21.4",
"bootstrap": "^5.0.2",
"formik": "^2.2.9",
"jquery": "^3.6.0",
"load-json-file": "^7.0.1",
"react": "^17.0.2",
"react-bootstrap": "^1.6.1",
"react-dom": "^17.0.2",
"react-icons": "^4.3.1",
"react-map-gl": "^6.1.17",
"react-router-dom": "^5.3.0",
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.3",
"web-vitals": "^1.1.2"
"request": "^2.79.0",
"web-vitals": "^1.1.2",
"yup": "^0.32.11"
},
"scripts": {
"start": "react-scripts start",
Expand All @@ -37,13 +41,14 @@
"react-app/jest"
]
},
"proxy": "http://localhost:3000",
"proxy": "http://127.0.0.1:3000",
"devDependencies": {
"eslint-config-airbnb": "^18.2.1",
"eslint-plugin-react-hooks": "^4.2.0",
"json-loader": "^0.5.7",
"npm-run-all": "^4.1.5",
"npm-watch": "^0.11.0",
"prettier": "^2.4.1",
"npm-run-all": "^4.1.5"
"prettier": "^2.4.1"
},
"browserslist": {
"production": [
Expand Down
2 changes: 1 addition & 1 deletion app/client/public/index.html
Expand Up @@ -10,7 +10,7 @@
integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk"
crossorigin="anonymous"
/>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/@emailjs/browser@3/dist/email.min.js"></script>
<title>Heart of Valley</title>
</head>
<body>
Expand Down
62 changes: 40 additions & 22 deletions app/client/src/App.js
Expand Up @@ -2,34 +2,52 @@ import React from 'react'
import './assets/stylesheets/App.css'
import Header from './components/Header'
import Footer from './components/Footer'
import { Route, Switch } from 'react-router-dom'
import { BrowserRouter as Router, Switch, Route } from "react-router-dom"
import Home from './pages/Home'
import About from './pages/About'
import Contact from './pages/Contact'
import Search from './pages/Search'
import ArtDetails from './components/ArtDetails'
import { createContext, useState } from 'react'

const App = () => (
<div>
<Header />
export const FeatureContext = createContext()
export const SearchContext = createContext()

<Switch>
<Route path="/about">
<About />
</Route>

<Route path="/contact">
<Contact />
</Route>
<Route path="/search">
<Search />
</Route>
<Route path="/">
<Home />
</Route>
</Switch>

<Footer />
const App = () => {
const [searchText, setSearchText] = useState('')
const [filterType, setFilterType] = useState('All')
return(
<FeatureContext.Provider value={[filterType, setFilterType]}>
<SearchContext.Provider value={[searchText,setSearchText]}>

<div id="appRoot">
<div className="appContent">
<Header />

<Switch>
<Route path="/about">
<About />
</Route>

<Route path="/contact">
<Contact />
</Route>
<Route path="/search">
<Search />
</Route>
<Route path="/artDetails">
<ArtDetails/>
</Route>
<Route path="/">
<Home />
</Route>
</Switch>

<Footer />
</div>
</div>
)
</SearchContext.Provider>
</FeatureContext.Provider>
)}

export default App
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.