Working on the news feed

This commit is contained in:
2021-02-02 04:17:26 +11:00
parent 969534c0f6
commit 13b83953c3
4 changed files with 52 additions and 15 deletions
+9 -8
View File
@@ -30,25 +30,26 @@ TODO: more info.
# TODO list # TODO list
- Account system - ~~Account system~~
- ~~sign up~~ - ~~sign up~~
- ~~validate email~~ - ~~validate email~~
- ~~login (with cookies)~~ - ~~login (with cookies)~~
- ~~logout (with cookies)~~ - ~~logout (with cookies)~~
- ~~account deletion~~ - ~~account deletion~~
- ~~annoying "This site uses cookies" message~~ - ~~annoying "This site uses cookies" message~~
- Administration Panel
- ~~Exclusive to admin accounts~~
- inspect aggregate user data
- News blog system (microservice) - News blog system (microservice)
- ~~build the microservice to provide the news feed~~ - ~~build the microservice to provide the news feed~~
- access an external news feed - ~~access an external news feed~~
- built-in panel for publishing and editing news (admin panel) - admin panel for publishing and editing news
- Administration Panel - "created at" and "updated at" in the response
- Exclusive to admin accounts - Chat system (microservice)
- ban/unban accounts
- inspect user data
- Chat system (microservice?)
- Based on usernames - Based on usernames
- Chat logs - Chat logs
- Direct Messages & rooms - Direct Messages & rooms
- admin panel banning/unbanning (currently borked)
- Achievements? - Achievements?
- Privacy policy & data collection notice - Privacy policy & data collection notice
+1 -2
View File
@@ -2,7 +2,7 @@ import React from 'react';
import { Redirect } from 'react-router-dom'; import { Redirect } from 'react-router-dom';
import { useCookies } from 'react-cookie'; import { useCookies } from 'react-cookie';
import BannedEmails from '../panels/banned-emails'; //import BannedEmails from '../panels/banned-emails';
import NewsPublisher from '../panels/news-publisher'; import NewsPublisher from '../panels/news-publisher';
const Admin = props => { const Admin = props => {
@@ -16,7 +16,6 @@ const Admin = props => {
return ( return (
<div className='page'> <div className='page'>
<h1 className='centered'>Administration</h1> <h1 className='centered'>Administration</h1>
<BannedEmails />
<NewsPublisher /> <NewsPublisher />
</div> </div>
); );
+4 -5
View File
@@ -1,14 +1,13 @@
import React from 'react'; import React from 'react';
import NewsFeed from '../panels/news-feed';
const HomePage = props => { const HomePage = props => {
//TODO: move the URIs into the config files
return ( return (
<div className='page'> <div className='page'>
<p>This is the MERN template homepage.</p> <p>This is the MERN template homepage.</p>
<p>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.</p> <NewsFeed uri='http://dev-news.eggtrainer.com:3100/news' />
<p>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.</p>
<p>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.</p>
<p>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.</p>
<p>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.</p>
</div> </div>
); );
}; };
+38
View File
@@ -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 (
<div>
<h2 className='centered'>News Feed</h2>
{(articles || []).map((article, index) => {
return (
<div key={index}>
<hr />
<h2>{article.title}</h2>
<h3>{article.author}</h3>
{ article.edits > 0 ? <p><em>{`${article.edits} edit${article.edits > 1 ? 's': ''}`}</em></p> : null }
<p>{article.body}</p>
</div>
);
})}
</div>
);
};
export default NewsFeed;