Skip to content

Commit

Permalink
navigate after edit, delete, refactor and clean up (laurpe#29)
Browse files Browse the repository at this point in the history 
* get all codes back

* add nav border, comment out createEvent in main.js

* change footer

* add free text to card

* change to className in Footer, fetch data for eventShow

* show event image, description, start and end time

* add footer

* make image in EventShow responsive, display flex for top section of eventShow

* eventShow responsive

* working version with axios.get to single event

* get location to work

* change to className in footer.js

* show organizer

* fetch and show location

* delete 2 files

* tried to fix desc paragraph

* fetch data from local api

* uncomment createEvent in Main.js

* add async await to fix fetching issue

* add Link to in Header.js

* create fetchLocalEvent function and call inside useEffect, delete commented out useEffect inside EventShow.js

* import links for fontawesome, bootstrap in base.html.twig

* get social icons to show and show jumbotron bg image

* add import statements and comment them out in app.css

* fail to add time icon to EventShow

* expand jumbotron bg image to full width

* install dayjs

* change date time format

* move dateTimeFormat function to Main.js and pass as props to eventShow and EventList

* eventShow

* Update package.json

* fixed burger icon and social icons

* add datetime, location and share with friends icons

* change jumbotron text to light

* add login state to Login.js

* fetch data in eventShow

* remove fetch helsinki event block from EventList, add search state in main.js

* remove event description from event card

* move state and functions back to EventList

* made search function in EventList

* add trim() to search state in EventList

* move fetchLocalEvents function inside useEffect

* setLoading(true) inside fetchLocalEvents

* redid search function

* filter by price free and all

* remove console.log inside handlePriceFilter

* add filter by category and show location in EventShow

* add filter by category and show more info in EventShow

* got to show today/tomorrow/event date

* move dateTimeFormat function to EventShow

* add filter event today

* fix handleFreeFilter

* add style to eventShow

* render clearIcon based on search.length instead

* add margin top to Footer

* made changes in Main.js

* customzize popup content

* add venue to map popup

* format date and time

* filter out past events

* fix error in Map.js adding ?

* sort events asc

* add go back to hompage button

* finish scroll to top function

* remove go back button from EventShow

* Update EventShow.js

* fixed scroll to top button

* change link in footer

* add defaultValue to Edit.js

* add today + datetime for card in EventList

* delete extra block from Main.js

* delete EventsOnMap

* fetch from backend for login

* update edit.js

* fix date bug

* navigate after edit, delete, changed some styles

Co-authored-by: Laura <[email protected]>
Co-authored-by: Laura <[email protected]>
  • Loading branch information
@Duyen-codes @laurpe
3 people authored Jun 7, 2022
1 parent 2b2903f commit 7a9ee56
Show file tree
Hide file tree
Showing 10 changed files with 1,427 additions and 1,329 deletions.
82 changes: 43 additions & 39 deletions assets/Main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,57 +9,61 @@ import SignUp from "./components/SignUp";
import LogIn from "./components/LogIn";
import CreateEvent from "./components/CreateEvent";
import Edit from "./components/Edit";
import MyEvents from "./components/MyEvents";
import ScrollToTop from "./components/ScrollToTop/ScrollToTop";

const Main = () => {
const [loggedInUser, setLoggedInUser] = useState(null);
const [loggedInUser, setLoggedInUser] = useState(null);

useEffect(() => {
const userFromLocalStorage =
window.localStorage.getItem("loggedInUser");
useEffect(() => {
const userFromLocalStorage = window.localStorage.getItem("loggedInUser");
if (userFromLocalStorage) {
const user = JSON.parse(userFromLocalStorage);
setLoggedInUser({ userId: user.userId });
}
}, []);

if (userFromLocalStorage) {
const user = JSON.parse(userFromLocalStorage);
console.log(user);
setLoggedInUser({ userId: user.userId });
console.log("loggedinUser useEffect", loggedInUser);
}
}, []);

return (
<Router>
<Layout
return (
<Router>
<Layout loggedInUser={loggedInUser} setLoggedInUser={setLoggedInUser}>
<Routes>
<Route index element={<Home />} />
<Route
path="/events/:id"
element={<EventShow loggedInUser={loggedInUser} />}
/>
<Route path="/events/:id/edit" element={<Edit />} />
<Route path="/createEvent" element={<CreateEvent />} />
<Route path="/signup" element={<SignUp />} />
<Route
path="/my_events"
element={<MyEvents loggedInUser={loggedInUser} />}
/>
<Route
path="/my_events/:id"
element={<EventShow loggedInUser={loggedInUser} />}
/>
<Route
path="/login"
element={
<LogIn
loggedInUser={loggedInUser}
setLoggedInUser={setLoggedInUser}
>
<Routes>
<Route index element={<Home />} />
<Route path="/events/:id" element={<EventShow />} />
<Route path="/events/:id" element={<EventShow />} />
<Route path="/events/:id/edit" element={<Edit />} />
<Route path="/createEvent" element={<CreateEvent />} />
<Route path="/signup" element={<SignUp />} />
<Route
path="/login"
element={
<LogIn
loggedInUser={loggedInUser}
setLoggedInUser={setLoggedInUser}
/>
}
/>
</Routes>
</Layout>
</Router>
);
/>
}
/>
</Routes>
</Layout>
</Router>
);
};

const root = ReactDOM.createRoot(document.getElementById("app"));

root.render(
<React.StrictMode>
<Main />
</React.StrictMode>
<React.StrictMode>
<Main />
</React.StrictMode>
);

export default Main;
Loading

0 comments on commit 7a9ee56

Please sign in to comment.