diff --git a/frontend/public/images/HomeImage.jpg b/frontend/public/images/HomeImage.jpg new file mode 100644 index 0000000..ee24a43 Binary files /dev/null and b/frontend/public/images/HomeImage.jpg differ diff --git a/frontend/src/components/navigation/UserBar/UserBar.jsx b/frontend/src/components/navigation/UserBar/UserBar.jsx index e3dd5f2..b4b2e0f 100644 --- a/frontend/src/components/navigation/UserBar/UserBar.jsx +++ b/frontend/src/components/navigation/UserBar/UserBar.jsx @@ -23,7 +23,6 @@ const UserBar = () => { const open = Boolean(anchorEl); const dispatch = useDispatch(); - const handleClick = (event) => { setAnchorEl(event.currentTarget); }; @@ -34,16 +33,24 @@ const UserBar = () => { const editUserSettings = () => { dispatch(selectSelf()); setEditUserPopup(true); - } + }; const logoutCommand = useCommand(commands.logout); const username = useSelector((state) => state.user.username); return ( <> - {editUserPopup && {setEditUserPopup(false)}} />} + {editUserPopup && ( + { + setEditUserPopup(false); + }} + /> + )} - + M @@ -89,12 +96,7 @@ const UserBar = () => { {username} - - - - - Add another account - + diff --git a/frontend/src/pages/Home/Home.jsx b/frontend/src/pages/Home/Home.jsx index 6853396..4470e21 100644 --- a/frontend/src/pages/Home/Home.jsx +++ b/frontend/src/pages/Home/Home.jsx @@ -1,14 +1,22 @@ import React from "react"; import { compose } from "react-recompose"; -import RatingCommentCache from "../../components/content/Rating/RatingCommentCache"; import withPageWrapper from "../../hoc/withPageWrapper"; -import DeleteCachePopup from "./../../components/content/CachePopup/DeleteCachePopup/DeleteCachePopup"; +import * as Style from "./style.js"; const Home = () => { return ( - <> -

Home Page Construction

- + + Welcome on Gocache App! + + + + Geocaching is a real-world, outdoor adventure that is happening all + the time, all around the world. To play, participants use the + Geocaching app and/or a GPS device to navigate to cleverly hidden + containers called geocaches. + + + ); }; diff --git a/frontend/src/pages/Home/style.js b/frontend/src/pages/Home/style.js new file mode 100644 index 0000000..4b16206 --- /dev/null +++ b/frontend/src/pages/Home/style.js @@ -0,0 +1,36 @@ +import styled from "styled-components"; + +export const HomeContainer = styled.div` + display: flex; + flex-direction: column; + flex-wrap: nowrap; + row-gap: 45px; + background-color: #15171c; + margin: 0 30px; + box-shadow: 0px 2px 8px rgba(0, 0, 0, 0.32); + padding: 60px; + min-width: 500px; + max-width: 1300px; + color: #e1e9fc; +`; + +export const Header = styled.h2` + font-size: 70px; +`; + +export const HomeContent = styled.div` + display: flex; + column-gap: 45px; + align-items: center; + justify-content: center; +`; + +export const CacheImage = styled.img` + border-radius: 100%; +`; + +export const WelcomeText = styled.p` + font-size: 40px; + text-align: justify; + line-height: 1.4; +`;