diff --git a/README.md b/README.md index 009d3d3..3176c64 100644 --- a/README.md +++ b/README.md @@ -30,25 +30,26 @@ TODO: more info. # TODO list -- Account system +- ~~Account system~~ - ~~sign up~~ - ~~validate email~~ - ~~login (with cookies)~~ - ~~logout (with cookies)~~ - ~~account deletion~~ - ~~annoying "This site uses cookies" message~~ +- Administration Panel + - ~~Exclusive to admin accounts~~ + - inspect aggregate user data - News blog system (microservice) - ~~build the microservice to provide the news feed~~ - - access an external news feed - - built-in panel for publishing and editing news (admin panel) -- Administration Panel - - Exclusive to admin accounts - - ban/unban accounts - - inspect user data -- Chat system (microservice?) + - ~~access an external news feed~~ + - admin panel for publishing and editing news + - "created at" and "updated at" in the response +- Chat system (microservice) - Based on usernames - Chat logs - Direct Messages & rooms + - admin panel banning/unbanning (currently borked) - Achievements? - Privacy policy & data collection notice diff --git a/client/components/pages/admin.jsx b/client/components/pages/admin.jsx index d108429..e91ef95 100644 --- a/client/components/pages/admin.jsx +++ b/client/components/pages/admin.jsx @@ -2,7 +2,7 @@ import React from 'react'; import { Redirect } from 'react-router-dom'; import { useCookies } from 'react-cookie'; -import BannedEmails from '../panels/banned-emails'; +//import BannedEmails from '../panels/banned-emails'; import NewsPublisher from '../panels/news-publisher'; const Admin = props => { @@ -16,7 +16,6 @@ const Admin = props => { return (

Administration

-
); diff --git a/client/components/pages/homepage.jsx b/client/components/pages/homepage.jsx index 7cfc13d..b8af805 100644 --- a/client/components/pages/homepage.jsx +++ b/client/components/pages/homepage.jsx @@ -1,14 +1,13 @@ import React from 'react'; +import NewsFeed from '../panels/news-feed'; + const HomePage = props => { + //TODO: move the URIs into the config files return (

This is the MERN template homepage.

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

+
); }; diff --git a/client/components/panels/news-feed.jsx b/client/components/panels/news-feed.jsx new file mode 100644 index 0000000..b8d7cce --- /dev/null +++ b/client/components/panels/news-feed.jsx @@ -0,0 +1,38 @@ +import React, { useState } from 'react'; + +//DOCS: props.uri is the address of a live news-server +const NewsFeed = props => { + const [articles, setArticles] = useState(null); + + if (!articles) { + fetch(props.uri, { method: 'GET' }) + .then(a => { + if (!a.ok) { + throw `Network error ${a.status}: ${a.statusText} ${a.url}`; + } + return a.json(); + }) + .then(a => setArticles(a)) + .catch(e => console.error(e)) + ; + } + + return ( +
+

News Feed

+ {(articles || []).map((article, index) => { + return ( +
+
+

{article.title}

+

{article.author}

+ { article.edits > 0 ?

{`${article.edits} edit${article.edits > 1 ? 's': ''}`}

: null } +

{article.body}

+
+ ); + })} +
+ ); +}; + +export default NewsFeed; \ No newline at end of file