diff --git a/src/App.css b/src/App.css index 20d9800..795b920 100644 --- a/src/App.css +++ b/src/App.css @@ -19,15 +19,17 @@ .App { display: flex; flex-direction: column; - background-color: #d1aabc; + background-color: #6b4477; align-items: center; margin: 0; padding: 0; + overflow-y: hidden; } .loading-message { - color:rgb(111, 30, 151); + color:white; font-family: 'Indie Flower', sans-serif; + font-size: 2.5rem; height: 100vh; } @@ -45,14 +47,14 @@ align-items: center; width: 100%; height: 5rem; - background-color: rgb(111, 30, 151); + background-color: rgb(0, 0, 0); border-bottom: 1px solid black; z-index: 9; } .nav-title-desktop { display: inline-flex; - color: orchid; + color: rgb(190, 113, 188); padding-left: 1.5rem; font-family: 'Open Sans', sans-serif; } @@ -76,7 +78,7 @@ .sidebar-button { border: transparent; - background-color: orchid; + background-color: rgb(190, 113, 188); box-shadow: 1px 1px rgb(111, 30, 151); text-align: center; height: 3.5rem; @@ -138,22 +140,26 @@ width: 90vw; } +/* Page handling */ + .page-handling { display: inline-flex; flex-direction: row; align-items: center; justify-content: space-between; padding: 2rem; - background-color: orchid; + background-color: rgb(190, 113, 188); border-radius: 15px; width: 50%; height: 3rem; } .page-handling button { - background-color: rgb(218, 171, 216); + background-color: rgb(0, 0, 0); + color: rgb(190, 113, 188); border: transparent; border-radius: 50%; + font-size: 2rem; height: 3.5rem; width: 3.5rem; box-shadow:2rem rgb(111, 30, 151); @@ -173,9 +179,7 @@ } #bottom-page-handling { - margin-top: 5rem; - position: relative; - bottom: 6rem; + margin-bottom: 10rem; } /* Media queries (tablet) */ @@ -225,6 +229,7 @@ .page-handling button { height: 2rem; width: 2rem; + font-size: 1.4rem; margin: 0 0.4rem; } } @@ -273,5 +278,6 @@ .page-handling button { height: 1.5rem; width: 1.5rem; + font-size: 1rem; } } \ No newline at end of file diff --git a/src/features/discussion/Discussion.js b/src/features/discussion/Discussion.js index b2dc6e2..89502c2 100644 --- a/src/features/discussion/Discussion.js +++ b/src/features/discussion/Discussion.js @@ -55,13 +55,14 @@ export default function Discussion({permalink, isVisible}) { console.log(comment.data.replies.data.children[0].data.author) return ( - <> -

THIS IS A REPLY:

-

Nested {comment.data.replies.data.children[0].data.depth} layers deep

-

{comment.data.replies.data.children[0].data.is_submitter ? 'OP posted' : ''}

-

u/{comment.data.replies.data.children[0].data.author}

-

{comment.data.replies.data.children[0].data.body}

- +
+

+ u/{comment.data.replies.data.children[0].data.author} + {comment.data.replies.data.children[0].data.is_submitter ? ' (OP)' : ''} + {comment.data.replies.data.children ? ' replied:' : ''} +

+

{comment.data.replies.data.children[0].data.body}

+
) } else { return; @@ -72,11 +73,13 @@ export default function Discussion({permalink, isVisible}) { setThread(comments.map((comment) => { return ( + <>

u/{comment.data.author}

{comment.data.body}

- {getReplies(comment)}
+ {getReplies(comment)} + ) })) } diff --git a/src/features/navbar/Navbar.js b/src/features/navbar/Navbar.js index d53dc72..bbc1004 100644 --- a/src/features/navbar/Navbar.js +++ b/src/features/navbar/Navbar.js @@ -1,5 +1,5 @@ import React, { useState } from "react"; -import SearchBar from "../searchBar/searchBar"; +// import SearchBar from "../searchBar/searchBar"; import Sidebar from "../sidebar/Sidebar"; export default function Navbar() { @@ -14,7 +14,6 @@ export default function Navbar() {

Reddit, but it's all cats

Cat Reddit

-
diff --git a/src/features/posts/Feed.js b/src/features/posts/Feed.js index 951823b..1852296 100644 --- a/src/features/posts/Feed.js +++ b/src/features/posts/Feed.js @@ -82,6 +82,8 @@ export default function Feed() { let sortedPosts = extractedPosts.sort(comparePosts); // implements sorting function + console.log(sortedPosts); + let newFeed = sortedPosts.map((post) => { return ( - -

Crosspost from {data.crosspost_parent_list[0].subreddit_name_prefixed}

+ +

Crosspost from {data.crosspost_parent_list[0].subreddit_name_prefixed}

); + } else if (data.crosspost_parent_list[0].url && !data.url) { + return ( + <> + {title} +

Crosspost from {data.crosspost_parent_list[0].subreddit_name_prefixed}

+ + ) } else { return; } @@ -90,18 +101,20 @@ export default function Post({data, key}) { {media ? {title} : ''} {data.crosspost_parent_list ? handleCrosspost() : ''} - {data.crosspost_parent_list ? - (data.crosspost_parent_list[0].is_video ? - - : null) - : null} {data.gallery_data ?

View the gallery of photos corresponding to this post here.

: null} {video ? - + : ''} {body ?