merged
This commit is contained in:
commit
3be449ec22
12 changed files with 1978 additions and 1555 deletions
17
src/App.js
Normal file
17
src/App.js
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
import React from 'react';
|
||||||
|
import { BrowserRouter as Router, Route } from 'react-router-dom';
|
||||||
|
import Home from './components/Home';
|
||||||
|
import Header from './components/Header';
|
||||||
|
|
||||||
|
const App = () => {
|
||||||
|
return (
|
||||||
|
<div className='App'>
|
||||||
|
<Header />
|
||||||
|
<Router>
|
||||||
|
<Route exact path='/' component={Home} />
|
||||||
|
</Router>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default App;
|
30
src/components/Channel/ChannelEntry.js
Normal file
30
src/components/Channel/ChannelEntry.js
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
import React from 'react';
|
||||||
|
import ChannelList from './ChannelList';
|
||||||
|
|
||||||
|
const ChannelEntry = props => {
|
||||||
|
const { clients, channel } = props;
|
||||||
|
const joined = [];
|
||||||
|
if (channel.totalClients > 0) {
|
||||||
|
clients.forEach(client => {
|
||||||
|
if (client.channelId === channel.id) joined.push(client);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{channel.name}
|
||||||
|
{joined.length > 0 && (
|
||||||
|
<ul>
|
||||||
|
{joined.map(e => (
|
||||||
|
<li key={e.databaseId}>{e.nickname}</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
)}
|
||||||
|
{channel.subchannels !== undefined && (
|
||||||
|
<ChannelList channels={channel.subchannels} clients={clients} />
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default ChannelEntry;
|
19
src/components/Channel/ChannelList.js
Normal file
19
src/components/Channel/ChannelList.js
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
import React from 'react';
|
||||||
|
|
||||||
|
import ChannelEntry from './ChannelEntry';
|
||||||
|
|
||||||
|
const ChannelList = ({ channels, clients }) => {
|
||||||
|
return (
|
||||||
|
<ul className='channelList'>
|
||||||
|
{channels.map(channel => {
|
||||||
|
return (
|
||||||
|
<li key={channel.id}>
|
||||||
|
<ChannelEntry channel={channel} clients={clients} />
|
||||||
|
</li>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</ul>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default ChannelList;
|
28
src/components/Channel/ChannelView.js
Normal file
28
src/components/Channel/ChannelView.js
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
import React from 'react';
|
||||||
|
|
||||||
|
const ChannelView = ({ channel }) => {
|
||||||
|
return (
|
||||||
|
<div className='channel-view'>
|
||||||
|
<h2>{channel.name}</h2>
|
||||||
|
<ul>
|
||||||
|
<li>
|
||||||
|
<span>{`# ${channel.id}`}</span>
|
||||||
|
{channel.name}
|
||||||
|
</li>
|
||||||
|
{channel.totalClients >= 0 && (
|
||||||
|
<li>
|
||||||
|
<span>Users online</span>
|
||||||
|
{channel.totalClients}
|
||||||
|
</li>
|
||||||
|
)}
|
||||||
|
{channel.subchannels.length > 0 && (
|
||||||
|
<li>
|
||||||
|
<span>Subchannels:</span>
|
||||||
|
</li>
|
||||||
|
)}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default ChannelView;
|
32
src/components/Channel/Channels.js
Normal file
32
src/components/Channel/Channels.js
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
import React, { Component } from 'react';
|
||||||
|
import ApiService from '../../services/ApiService';
|
||||||
|
import ChannelList from './ChannelList';
|
||||||
|
|
||||||
|
class Channels extends Component {
|
||||||
|
constructor(props) {
|
||||||
|
super(props);
|
||||||
|
this.state = {
|
||||||
|
loaded: false,
|
||||||
|
channels: [],
|
||||||
|
clients: [],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
componentDidMount() {
|
||||||
|
ApiService.fetchAllChannels().then(data => {
|
||||||
|
this.setState({
|
||||||
|
channels: data.channelJson,
|
||||||
|
clients: data.clientJson,
|
||||||
|
loaded: true,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
const { loaded, channels, clients } = this.state;
|
||||||
|
if (!loaded) return <div className='loading'>Loading...</div>;
|
||||||
|
return <ChannelList channels={channels} clients={clients} />;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default Channels;
|
7
src/components/Header.js
Normal file
7
src/components/Header.js
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
import React from 'react';
|
||||||
|
|
||||||
|
const Header = () => {
|
||||||
|
return <div className='app-header'>Cliffbreak.de</div>;
|
||||||
|
};
|
||||||
|
|
||||||
|
export default Header;
|
12
src/components/Home.js
Normal file
12
src/components/Home.js
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
import React, { Component } from 'react';
|
||||||
|
import Channels from './Channel/Channels';
|
||||||
|
|
||||||
|
export default class Home extends Component {
|
||||||
|
render() {
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<Channels />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
12
src/index.js
Normal file
12
src/index.js
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
import React from 'react';
|
||||||
|
import ReactDOM from 'react-dom';
|
||||||
|
import App from './App';
|
||||||
|
import './index.scss';
|
||||||
|
import * as serviceWorker from './serviceWorker';
|
||||||
|
|
||||||
|
ReactDOM.render(<App />, document.getElementById('root'));
|
||||||
|
|
||||||
|
// If you want your app to work offline and load faster, you can change
|
||||||
|
// unregister() to register() below. Note this comes with some pitfalls.
|
||||||
|
// Learn more about service workers: http://bit.ly/CRA-PWA
|
||||||
|
serviceWorker.unregister();
|
40
src/index.scss
Normal file
40
src/index.scss
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
body {
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
|
||||||
|
"Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
|
||||||
|
sans-serif;
|
||||||
|
-webkit-font-smoothing: antialiased;
|
||||||
|
-moz-osx-font-smoothing: grayscale;
|
||||||
|
background-color: #4a4a4a;
|
||||||
|
font-size: 160%;
|
||||||
|
color: #fff
|
||||||
|
}
|
||||||
|
|
||||||
|
code {
|
||||||
|
font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New",
|
||||||
|
monospace;
|
||||||
|
}
|
||||||
|
|
||||||
|
.app-header {
|
||||||
|
text-align: center;
|
||||||
|
background-color: #282c34;
|
||||||
|
font-size: 1.6em;
|
||||||
|
padding: 0.5em 0;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.channelList {
|
||||||
|
list-style: none
|
||||||
|
}
|
||||||
|
|
||||||
|
.channel-view {
|
||||||
|
background-color: green;
|
||||||
|
width: 20%;
|
||||||
|
height: auto;
|
||||||
|
margin: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.channel-view ul {
|
||||||
|
text-align: left
|
||||||
|
}
|
135
src/serviceWorker.js
Normal file
135
src/serviceWorker.js
Normal file
|
@ -0,0 +1,135 @@
|
||||||
|
// This optional code is used to register a service worker.
|
||||||
|
// register() is not called by default.
|
||||||
|
|
||||||
|
// This lets the app load faster on subsequent visits in production, and gives
|
||||||
|
// it offline capabilities. However, it also means that developers (and users)
|
||||||
|
// will only see deployed updates on subsequent visits to a page, after all the
|
||||||
|
// existing tabs open on the page have been closed, since previously cached
|
||||||
|
// resources are updated in the background.
|
||||||
|
|
||||||
|
// To learn more about the benefits of this model and instructions on how to
|
||||||
|
// opt-in, read https://bit.ly/CRA-PWA
|
||||||
|
|
||||||
|
const isLocalhost = Boolean(
|
||||||
|
window.location.hostname === 'localhost' ||
|
||||||
|
// [::1] is the IPv6 localhost address.
|
||||||
|
window.location.hostname === '[::1]' ||
|
||||||
|
// 127.0.0.1/8 is considered localhost for IPv4.
|
||||||
|
window.location.hostname.match(
|
||||||
|
/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
export function register(config) {
|
||||||
|
if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
|
||||||
|
// The URL constructor is available in all browsers that support SW.
|
||||||
|
const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
|
||||||
|
if (publicUrl.origin !== window.location.origin) {
|
||||||
|
// Our service worker won't work if PUBLIC_URL is on a different origin
|
||||||
|
// from what our page is served on. This might happen if a CDN is used to
|
||||||
|
// serve assets; see https://github.com/facebook/create-react-app/issues/2374
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
window.addEventListener('load', () => {
|
||||||
|
const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
|
||||||
|
|
||||||
|
if (isLocalhost) {
|
||||||
|
// This is running on localhost. Let's check if a service worker still exists or not.
|
||||||
|
checkValidServiceWorker(swUrl, config);
|
||||||
|
|
||||||
|
// Add some additional logging to localhost, pointing developers to the
|
||||||
|
// service worker/PWA documentation.
|
||||||
|
navigator.serviceWorker.ready.then(() => {
|
||||||
|
console.log(
|
||||||
|
'This web app is being served cache-first by a service ' +
|
||||||
|
'worker. To learn more, visit https://bit.ly/CRA-PWA'
|
||||||
|
);
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
// Is not localhost. Just register service worker
|
||||||
|
registerValidSW(swUrl, config);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function registerValidSW(swUrl, config) {
|
||||||
|
navigator.serviceWorker
|
||||||
|
.register(swUrl)
|
||||||
|
.then(registration => {
|
||||||
|
registration.onupdatefound = () => {
|
||||||
|
const installingWorker = registration.installing;
|
||||||
|
if (installingWorker == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
installingWorker.onstatechange = () => {
|
||||||
|
if (installingWorker.state === 'installed') {
|
||||||
|
if (navigator.serviceWorker.controller) {
|
||||||
|
// At this point, the updated precached content has been fetched,
|
||||||
|
// but the previous service worker will still serve the older
|
||||||
|
// content until all client tabs are closed.
|
||||||
|
console.log(
|
||||||
|
'New content is available and will be used when all ' +
|
||||||
|
'tabs for this page are closed. See https://bit.ly/CRA-PWA.'
|
||||||
|
);
|
||||||
|
|
||||||
|
// Execute callback
|
||||||
|
if (config && config.onUpdate) {
|
||||||
|
config.onUpdate(registration);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// At this point, everything has been precached.
|
||||||
|
// It's the perfect time to display a
|
||||||
|
// "Content is cached for offline use." message.
|
||||||
|
console.log('Content is cached for offline use.');
|
||||||
|
|
||||||
|
// Execute callback
|
||||||
|
if (config && config.onSuccess) {
|
||||||
|
config.onSuccess(registration);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
};
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
console.error('Error during service worker registration:', error);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function checkValidServiceWorker(swUrl, config) {
|
||||||
|
// Check if the service worker can be found. If it can't reload the page.
|
||||||
|
fetch(swUrl)
|
||||||
|
.then(response => {
|
||||||
|
// Ensure service worker exists, and that we really are getting a JS file.
|
||||||
|
const contentType = response.headers.get('content-type');
|
||||||
|
if (
|
||||||
|
response.status === 404 ||
|
||||||
|
(contentType != null && contentType.indexOf('javascript') === -1)
|
||||||
|
) {
|
||||||
|
// No service worker found. Probably a different app. Reload the page.
|
||||||
|
navigator.serviceWorker.ready.then(registration => {
|
||||||
|
registration.unregister().then(() => {
|
||||||
|
window.location.reload();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
// Service worker found. Proceed as normal.
|
||||||
|
registerValidSW(swUrl, config);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
console.log(
|
||||||
|
'No internet connection found. App is running in offline mode.'
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function unregister() {
|
||||||
|
if ('serviceWorker' in navigator) {
|
||||||
|
navigator.serviceWorker.ready.then(registration => {
|
||||||
|
registration.unregister();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
12
src/services/ApiService.js
Normal file
12
src/services/ApiService.js
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
const API_URL = 'https://ts.cliffbreak.de/v1/';
|
||||||
|
|
||||||
|
class ApiService {
|
||||||
|
static async fetchAllChannels() {
|
||||||
|
const channelRes = await fetch(`${API_URL}channels`);
|
||||||
|
const clientRes = await fetch(`${API_URL}clients`);
|
||||||
|
const channelJson = await channelRes.json();
|
||||||
|
const clientJson = await clientRes.json();
|
||||||
|
return { channelJson, clientJson };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export default ApiService;
|
Loading…
Reference in a new issue