From 66cc59c48e137597a41f58154de9f80973e94d83 Mon Sep 17 00:00:00 2001
From: unknown <pawel999@icloud.com>
Date: Fri, 11 Jun 2021 00:09:25 +0200
Subject: [PATCH] Fixed bug related to websocket protocol which was making app
 unusable with reverse proxy and https

---
 README.md                                     |  6 ++-
 Socket.js                                     |  2 +-
 client/README.md                              | 46 -------------------
 .../Widgets/WeatherWidget/WeatherWidget.tsx   |  8 ++--
 4 files changed, 9 insertions(+), 53 deletions(-)
 delete mode 100644 client/README.md

diff --git a/README.md b/README.md
index 58517bf72f6da873398de544afcef214becc67d3..3b2ed3d9af01381cbe15da7a24ed76b7e643f293 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,9 @@
 # Flame
 
+[![JS Badge](https://img.shields.io/badge/JavaScript-F7DF1E?style=for-the-badge&logo=javascript&logoColor=black)](https://shields.io/)
+[![TS Badge](https://img.shields.io/badge/TypeScript-007ACC?style=for-the-badge&logo=typescript&logoColor=white)](https://shields.io/)
+[![React Badge](https://img.shields.io/badge/React-20232A?style=for-the-badge&logo=react&logoColor=61DAFB)](https://shields.io/)
+
 ![Homescreen screenshot](./github/_home.png)
 
 ## Description
@@ -10,7 +14,7 @@ Flame is self-hosted startpage for your server. It's inspired (heavily) by [SUI]
   - Node.js + Express
   - Sequelize ORM + SQLite
 - Frontend
-  - React
+  - React 
   - Redux
   - TypeScript
 - Deployment
diff --git a/Socket.js b/Socket.js
index af9249ae4b6c9de809f56ecf9c4c465b52d43e49..0ae1f563e53a8013d58a61a924abf334738cced9 100644
--- a/Socket.js
+++ b/Socket.js
@@ -9,7 +9,7 @@ class Socket {
     })
 
     this.webSocketServer.on('connection', (webSocketClient) => {
-      console.log('Socket: new connection');
+      // console.log('Socket: new connection');
     })
   }
 
diff --git a/client/README.md b/client/README.md
deleted file mode 100644
index b87cb00449efa5b6131f56b7e45cc63eddf37373..0000000000000000000000000000000000000000
--- a/client/README.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# Getting Started with Create React App
-
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
-
-## Available Scripts
-
-In the project directory, you can run:
-
-### `npm start`
-
-Runs the app in the development mode.\
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-
-The page will reload if you make edits.\
-You will also see any lint errors in the console.
-
-### `npm test`
-
-Launches the test runner in the interactive watch mode.\
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
-
-### `npm run build`
-
-Builds the app for production to the `build` folder.\
-It correctly bundles React in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.\
-Your app is ready to be deployed!
-
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-
-### `npm run eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
-
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
-
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
-
-## Learn More
-
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
-
-To learn React, check out the [React documentation](https://reactjs.org/).
diff --git a/client/src/components/Widgets/WeatherWidget/WeatherWidget.tsx b/client/src/components/Widgets/WeatherWidget/WeatherWidget.tsx
index b28ef0a427c5870bfee03adc06d520002cd69844..ab758d51287e98d2d39ebfe29a07197b5885276f 100644
--- a/client/src/components/Widgets/WeatherWidget/WeatherWidget.tsx
+++ b/client/src/components/Widgets/WeatherWidget/WeatherWidget.tsx
@@ -50,11 +50,9 @@ const WeatherWidget = (): JSX.Element => {
 
   // Open socket for data updates
   useEffect(() => {
-    const webSocketClient = new WebSocket(`ws://${window.location.host}/socket`);
-
-    webSocketClient.onopen = () => {
-      console.log('Socket: listen')
-    }
+    const socketProtocol = document.location.protocol === 'http:' ? 'ws:' : 'wss:';
+    const socketAddress = `${socketProtocol}//${window.location.host}/socket`;
+    const webSocketClient = new WebSocket(socketAddress);
 
     webSocketClient.onmessage = (e) => {
       const data = JSON.parse(e.data);