diff --git a/frontend/public/images/background.jpg b/frontend/public/images/background.jpg new file mode 100644 index 0000000..e08a94a Binary files /dev/null and b/frontend/public/images/background.jpg differ diff --git a/frontend/public/images/browse.png b/frontend/public/images/browse.png new file mode 100644 index 0000000..d5bf591 Binary files /dev/null and b/frontend/public/images/browse.png differ diff --git a/frontend/public/images/logo.ico b/frontend/public/images/logo.ico new file mode 100644 index 0000000..a1a02f2 Binary files /dev/null and b/frontend/public/images/logo.ico differ diff --git a/frontend/public/images/logo.png b/frontend/public/images/logo.png new file mode 100644 index 0000000..18db70f Binary files /dev/null and b/frontend/public/images/logo.png differ diff --git a/frontend/public/images/portfolio.png b/frontend/public/images/portfolio.png new file mode 100644 index 0000000..710c547 Binary files /dev/null and b/frontend/public/images/portfolio.png differ diff --git a/frontend/src/App.js b/frontend/src/App.js index 287c2b5..561bf0e 100644 --- a/frontend/src/App.js +++ b/frontend/src/App.js @@ -10,7 +10,7 @@ import Events from "./components/Events"; import Profile from "./components/Profile"; import CreateEvent from "./components/CreateEvent"; import CreatePost from "./components/CreatePost"; - +import Main from "./components/Main"; import "bootstrap/dist/css/bootstrap.min.css"; import $ from "jquery"; import Popper from "popper.js"; @@ -25,6 +25,7 @@ function App() { + diff --git a/frontend/src/components/CreateEvent.js b/frontend/src/components/CreateEvent.js index 1d5a080..c5285b6 100644 --- a/frontend/src/components/CreateEvent.js +++ b/frontend/src/components/CreateEvent.js @@ -18,56 +18,60 @@ const CreateEvent = (props) => { }); }; return ( -
-
-

Create Event

-
- +
+
+ +

+ Create Event +

+
+ + +
+
+ + +
+
+ + +
-
-
- - -
-
- - -
- -
- + className="btn btn-success text-left" + type="submit" + value="Submit" + /> +
+ +
); }; diff --git a/frontend/src/components/CreatePost.js b/frontend/src/components/CreatePost.js index 5a54f4c..5a0afbe 100644 --- a/frontend/src/components/CreatePost.js +++ b/frontend/src/components/CreatePost.js @@ -19,43 +19,50 @@ const CreatePost = (props) => { }; return (
-
-
-

Create Post

- +
+ +
+

+ Create Post +

+ + +
+
+ + +
-
-
- - -
- -
- + className="btn btn-success text-left" + type="submit" + value="Submit" + /> +
+ +
); }; diff --git a/frontend/src/components/Event.js b/frontend/src/components/Event.js index 4f8508f..b6c1b1e 100644 --- a/frontend/src/components/Event.js +++ b/frontend/src/components/Event.js @@ -65,68 +65,73 @@ const Event = (props) => { }); }; return ( -
-

Hello {state.user.username}!

-

+
+

Event {props.match.params.id}

+
+

Hello {state.user.username}!

-
-

Event: {state.event_title}

- - Website - -

{state.event_text}

+
+

Event: {state.event_title}

+ + Website + +

{state.event_text}

-

Topics:

-
- {state.topics.map((topic) => { +

Topics:

+
+ {state.topics.map((topic) => { + return ( +
+

{topic}

+
+ ); + })} +
+
+
+ +
+
+
+
+

+ {state.upvotes} Likes +

+
+
+
+
+