migrated to javascript

serviceWorker.js

@@ -8,7 +8,7 @@
 // resources are updated in the background.
 
 // To learn more about the benefits of this model and instructions on how to
-// opt-in, read http://bit.ly/CRA-PWA
+// opt-in, read https://bit.ly/CRA-PWA
 
 const isLocalhost = Boolean(
   window.location.hostname === 'localhost' ||
@@ -20,18 +20,10 @@ const isLocalhost = Boolean(
     )
 );
 
-type Config = {
+export function register(config) {
-  onSuccess?: (registration: ServiceWorkerRegistration) => void;
-  onUpdate?: (registration: ServiceWorkerRegistration) => void;
-};
-
-export function register(config?: 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(
+    const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
-      (process as { env: { [key: string]: string } }).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
@@ -51,7 +43,7 @@ export function register(config?: Config) {
         navigator.serviceWorker.ready.then(() => {
           console.log(
             'This web app is being served cache-first by a service ' +
-              'worker. To learn more, visit http://bit.ly/CRA-PWA'
+              'worker. To learn more, visit https://bit.ly/CRA-PWA'
           );
         });
       } else {
@@ -62,7 +54,7 @@ export function register(config?: Config) {
   }
 }
 
-function registerValidSW(swUrl: string, config?: Config) {
+function registerValidSW(swUrl, config) {
   navigator.serviceWorker
     .register(swUrl)
     .then(registration => {
@@ -79,7 +71,7 @@ function registerValidSW(swUrl: string, config?: Config) {
               // 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 http://bit.ly/CRA-PWA.'
+                  'tabs for this page are closed. See https://bit.ly/CRA-PWA.'
               );
 
               // Execute callback
@@ -106,7 +98,7 @@ function registerValidSW(swUrl: string, config?: Config) {
     });
 }
 
-function checkValidServiceWorker(swUrl: string, config?: Config) {
+function checkValidServiceWorker(swUrl, config) {
   // Check if the service worker can be found. If it can't reload the page.
   fetch(swUrl)
     .then(response => {

src/App.js

@@ -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;

src/App.scss

@@ -1,5 +0,0 @@
-body {
-  background-color: #4a4a4a;
-  font-size: 160%;
-  color: #fff
-}

src/App.tsx

@@ -1,22 +0,0 @@
-import React, { Component } from 'react';
-import { BrowserRouter as Router, Route } from 'react-router-dom';
-
-import Header from './components/Header/Header';
-
-import './App.scss';
-import Home from './components/Home';
-
-class App extends Component {
-  public render() {
-    return (
-      <div className='App'>
-        <Header />
-        <Router>
-          <Route exact path='/' component={Home} />
-        </Router>
-      </div>
-    );
-  }
-}
-
-export default App;

src/components/Channel/ChannelEntry.js

@@ -1,9 +1,9 @@
-import React, { Component } from 'react';
+import React from 'react';
 import ChannelList from './ChannelList';
 
-const ChannelEntry = (props: ChannelEntryProps) => {
+const ChannelEntry = props => {
   const { clients, channel } = props;
-  const joined: Client[] = [];
+  const joined = [];
   if (channel.totalClients > 0) {
     clients.forEach(client => {
       if (client.channelId === channel.id) joined.push(client);

src/components/Channel/ChannelList.js

@@ -1,10 +1,8 @@
-import React, { Component } from 'react';
+import React from 'react';
-import ApiService from '../../services/ApiService';
+
 import ChannelEntry from './ChannelEntry';
 
-import './ChannelList.scss';
+const ChannelList = ({ channels, clients }) => {
-
-const ChannelList = ({ channels, clients }: ChannelListProps) => {
   return (
     <ul className='channelList'>
       {channels.map(channel => {

src/components/Channel/ChannelList.scss

@@ -1,3 +0,0 @@
-.channelList {
-  list-style: none
-}

src/components/Channel/ChannelView.js

@@ -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;

src/components/Channel/ChannelView.scss

@@ -1,10 +0,0 @@
-.channel-view {
-  background-color: green;
-  width: 20%;
-  height: auto;
-  margin: auto;
-}
-
-.channel-view ul {
-  text-align: left
-}

src/components/Channel/ChannelView.tsx

@@ -1,29 +0,0 @@
-import React, { Component } from 'react';
-import './ChannelView.scss';
-
-export default class ChannelView extends Component<ChannelViewProps> {
-  render() {
-    const { channel } = this.props;
-    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>
-    );
-  }
-}

src/components/Channel/Channels.js

@@ -2,8 +2,8 @@ import React, { Component } from 'react';
 import ApiService from '../../services/ApiService';
 import ChannelList from './ChannelList';
 
-class Channels extends Component<{}, ChannelState> {
+class Channels extends Component {
-  constructor(props: any) {
+  constructor(props) {
     super(props);
     this.state = {
       loaded: false,
@@ -13,23 +13,20 @@ class Channels extends Component<{}, ChannelState> {
   }
 
   componentDidMount() {
-    ApiService.fetchAllChannels()
+    ApiService.fetchAllChannels().then(data => {
-      .then(data => {
       this.setState({
         channels: data.channelJson,
         clients: data.clientJson,
         loaded: true,
       });
-      })
+    });
-      .catch(e => console.error(e));
   }
+
   render() {
     const { loaded, channels, clients } = this.state;
     if (!loaded) return <div className='loading'>Loading...</div>;
-    else {
     return <ChannelList channels={channels} clients={clients} />;
   }
 }
-}
 
 export default Channels;

src/components/Header.js

@@ -0,0 +1,7 @@
+import React from 'react';
+
+const Header = () => {
+  return <div className='app-header'>Cliffbreak.de</div>;
+};
+
+export default Header;

src/components/Header/Header.scss

@@ -1,7 +0,0 @@
-.App-header {
-  text-align: center;
-  background-color: #282c34;
-  font-size: 1.6em;
-  padding: 0.5em 0;
-  color: white;
-}

src/components/Header/Header.tsx

@@ -1,9 +0,0 @@
-import React, { Component } from 'react';
-import './Header.scss';
-class Header extends Component {
-  public render() {
-    return <div className='App-header'>Cliffbreak.de</div>;
-  }
-}
-
-export default Header;

src/index.css

@@ -1,14 +0,0 @@
-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;
-}
-
-code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
-    monospace;
-}

src/index.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import App from './App';
-import './index.css';
+import './index.scss';
 import * as serviceWorker from './serviceWorker';
 
 ReactDOM.render(<App />, document.getElementById('root'));

src/index.scss

@@ -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
+}

src/react-app-env.d.ts

@@ -1 +0,0 @@
-/// <reference types="react-scripts" />

src/serviceWorker.js

@@ -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();
+    });
+  }
+}

src/services/ApiService.js

@@ -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;

src/services/ApiService.ts

@@ -1,11 +0,0 @@
-const API_URL = 'https://ts.cliffbreak.de/v1/';
-
-export default class ApiService {
-  public 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 };
-  }
-}

src/types.d.ts

@@ -1,35 +0,0 @@
-interface Channel {
-  id: number;
-  name: string;
-  totalClients: number;
-  neededSubscribePower: number;
-  subchannels: Channel[];
-}
-
-interface Client {
-  databaseId: number;
-  channelId: number;
-  nickname: string;
-  type: number;
-  away: boolean;
-  awayMessage: string;
-}
-
-interface ChannelState {
-  loaded: boolean;
-  channels: Channel[];
-  clients: Client[];
-}
-
-interface ChannelListProps {
-  channels: Channel[];
-  clients: Client[];
-}
-
-interface ChannelEntryProps {
-  channel: Channel;
-  clients: Client[];
-}
-interface ChannelViewProps {
-  channel: Channel;
-}