-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8 from 392-f24/frontend-improvement
Frontend improvement
- Loading branch information
Showing
17 changed files
with
787 additions
and
322 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| { | ||
| /* Visit https://firebase.google.com/docs/database/security to learn more about security rules. */ | ||
| "rules": { | ||
| ".read": false, | ||
| ".write": false | ||
| ".read": true, | ||
| ".write": true | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,194 +1,20 @@ | ||
| import React, { useState, useEffect } from 'react'; | ||
| import './App.css'; | ||
| import { useAuthState, signInWithGoogle, firebaseSignOut } from './utilities/firebase'; | ||
| import { findCafes } from './utilities/findCafes'; | ||
| import MapComponent from "./MapComponent"; | ||
|
|
||
| function App() { | ||
| const [reviews, setReviews] = useState([]); | ||
| const [availability, setAvailability] = useState({}); | ||
| const [newReview, setNewReview] = useState(''); | ||
| const [selectedReview, setSelectedReview] = useState(null); | ||
| const [replyText, setReplyText] = useState(''); | ||
| const [cafeStatus, setCafeStatus] = useState({ seating: '', outlets: '' }); | ||
| const [address, setAddress] = useState(''); | ||
| const [dist, setDist] = useState(''); | ||
| const [cafes, setCafes] = useState([]); | ||
|
|
||
| const [user] = useAuthState(); | ||
|
|
||
| const handleSignIn = async () => { | ||
| try { | ||
| await signInWithGoogle(); | ||
| } catch (error) { | ||
| console.error('Error signing in:', error); | ||
| } | ||
| }; | ||
|
|
||
| const handleLogout = () => firebaseSignOut(); | ||
|
|
||
| useEffect(() => {}, []); | ||
|
|
||
| const findCafesWrapper = () => { | ||
| findCafes(dist, address, setCafes); | ||
| }; | ||
|
|
||
| const handleReviewSubmit = () => { | ||
| if (newReview.trim()) { | ||
| const review = { id: Date.now(), text: newReview, replies: [] }; | ||
| setReviews((prevReviews) => [...prevReviews, review]); | ||
| setNewReview(''); | ||
| } | ||
| }; | ||
|
|
||
| const handleReplySubmit = (reviewId) => { | ||
| if (replyText.trim()) { | ||
| setReviews((prevReviews) => | ||
| prevReviews.map((review) => | ||
| review.id === reviewId | ||
| ? { ...review, replies: [...review.replies, replyText] } | ||
| : review | ||
| ) | ||
| ); | ||
| setReplyText(''); | ||
| setSelectedReview(null); | ||
| } | ||
| }; | ||
|
|
||
| const handleAvailabilityUpdate = (cafeId) => { | ||
| const timestamp = new Date().toLocaleString(); | ||
| const newUpdate = { timestamp, seating: cafeStatus.seating, outlets: cafeStatus.outlets }; | ||
|
|
||
| setAvailability((prevAvailability) => ({ | ||
| ...prevAvailability, | ||
| [cafeId]: { | ||
| history: [...(prevAvailability[cafeId]?.history || []), newUpdate], | ||
| }, | ||
| })); | ||
| setCafeStatus({ seating: '', outlets: '' }); | ||
| }; | ||
|
|
||
| const cafesMap = [ | ||
| { name: "Cafe Blue", lat: 42.046, lng: -87.688 }, | ||
| { name: "Green Bean Cafe", lat: 42.048, lng: -87.684 }, | ||
| { name: "Java Lounge", lat: 42.044, lng: -87.690 }, | ||
| ]; | ||
| import { BrowserRouter as Router, Route, Routes } from "react-router-dom"; | ||
| import LandingPage from './pages/LandingPage'; | ||
| import ReviewPostPage from "./pages/ReviewPostPage"; | ||
| import ReviewsPage from "./pages/ReviewsPage"; | ||
| import CafePage from "./pages/CafePage"; | ||
|
|
||
| const App = () => { | ||
| return ( | ||
| <div className="App"> | ||
| <header className="App-header"> | ||
| <h1>CafeWay</h1> | ||
| {user ? ( | ||
| <> | ||
| <button className="my-post-button" onClick={handleLogout}>Sign Out</button> | ||
| <p>Welcome, {user.email}</p> | ||
| </> | ||
| ) : ( | ||
| <button className="my-post-button" onClick={handleSignIn}>Sign In</button> | ||
| )} | ||
| </header> | ||
|
|
||
| <div className="listings-container"> | ||
| <div className="listings-column"> | ||
| <h2>Share a Review</h2> | ||
| <input | ||
| type="text" | ||
| placeholder="Share a quick review..." | ||
| value={newReview} | ||
| onChange={(e) => setNewReview(e.target.value)} | ||
| /> | ||
| <button onClick={handleReviewSubmit}>Submit</button> | ||
|
|
||
| <ul className="review-list"> | ||
| {reviews.map((review) => ( | ||
| <li key={review.id} className="review-item"> | ||
| <p onClick={() => setSelectedReview(review)}>{review.text}</p> | ||
| <ul className="reply-list"> | ||
| {review.replies.map((reply, index) => ( | ||
| <li key={index} className="reply-item"> | ||
| <span className="reply-label">Reply:</span> {reply} | ||
| </li> | ||
| ))} | ||
| </ul> | ||
| {selectedReview && selectedReview.id === review.id && ( | ||
| <div className="reply-input"> | ||
| <input | ||
| type="text" | ||
| placeholder="Write a reply..." | ||
| value={replyText} | ||
| onChange={(e) => setReplyText(e.target.value)} | ||
| /> | ||
| <button onClick={() => handleReplySubmit(review.id)}>Send</button> | ||
| </div> | ||
| )} | ||
| </li> | ||
| ))} | ||
| </ul> | ||
|
|
||
| <h2>Update Cafe Availability</h2> | ||
| <input | ||
| type="text" | ||
| placeholder="Seating status (e.g., Few seats left)" | ||
| value={cafeStatus.seating} | ||
| onChange={(e) => setCafeStatus({ ...cafeStatus, seating: e.target.value })} | ||
| /> | ||
| <input | ||
| type="text" | ||
| placeholder="Outlet status (e.g., All taken)" | ||
| value={cafeStatus.outlets} | ||
| onChange={(e) => setCafeStatus({ ...cafeStatus, outlets: e.target.value })} | ||
| /> | ||
| <button onClick={() => handleAvailabilityUpdate('cafe-123')}>Update Availability</button> | ||
|
|
||
| <h2>Availability History</h2> | ||
| {availability['cafe-123']?.history?.map((update, index) => ( | ||
| <div key={index} className="availability-item"> | ||
| <p> | ||
| <strong>{update.timestamp}:</strong> Seating: {update.seating}, Outlets: {update.outlets} | ||
| </p> | ||
| </div> | ||
| ))} | ||
| </div> | ||
|
|
||
| <div className="map-column"> | ||
| <h2>Cafes Near Me</h2> | ||
| <input | ||
| type="text" | ||
| placeholder="Enter zip code" | ||
| value={address} | ||
| onChange={(e) => setAddress(e.target.value)} | ||
| /> | ||
| <input | ||
| type="number" | ||
| placeholder="Enter radius (in miles)" | ||
| value={dist} | ||
| onChange={(e) => setDist(e.target.value)} | ||
| /> | ||
| <button onClick={findCafesWrapper}>Search</button> | ||
| <h2>Cafes Near Me</h2> | ||
| <ul> | ||
| {cafes.map((cafe, index) => ( | ||
| <li className="cafe-card" key={index}>{cafe}</li> | ||
| ))} | ||
| </ul> | ||
|
|
||
|
|
||
| <ul className="cafe-list"> | ||
| {cafes.map((cafesMap, index) => ( | ||
| <li key={index} className="cafe-item"> | ||
| {cafe.name} (Lat: {cafe.lat}, Lng: {cafe.lng}) | ||
| </li> | ||
| ))} | ||
| </ul> | ||
|
|
||
| {/* Integrate MapComponent with hardcoded data */} | ||
| <div style={{ height: '400px', width: '100%', marginTop: '20px' }}> | ||
| <MapComponent cafes={cafesMap} /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
| <Router> | ||
| <Routes> | ||
| <Route path="/" element={ <LandingPage/> }/> | ||
| <Route path="/post" element={ <ReviewPostPage/> }/> | ||
| <Route path="/cafes" element={ <ReviewsPage/> }/> | ||
| <Route path="/cafe/:place_id" element={<CafePage/>}/> | ||
| </Routes> | ||
| </Router> | ||
| ) | ||
| } | ||
|
|
||
| export default App; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.