Merge branch 'master' into simple_pagination

src/components/NotificationDialog.vue

@@ -55,7 +55,7 @@
                                     <p style="margin-top: 8px;">
 
                                         <template v-if="notification.telegramBotToken">
-                                            <a :href="telegramGetUpdatesURL" target="_blank">{{ telegramGetUpdatesURL }}</a>
+                                            <a :href="telegramGetUpdatesURL" target="_blank" style="word-break: break-word;">{{ telegramGetUpdatesURL }}</a>
                                         </template>
 
                                         <template v-else>

src/mixins/socket.js

@@ -35,7 +35,8 @@ export default {
         window.addEventListener('resize', this.onResize);
 
         let wsHost;
-        if (localStorage.dev === "dev") {
+        const env = process.env.NODE_ENV || "production";
+        if (env === "development" || localStorage.dev === "dev") {
             wsHost = ":3001"
         } else {
             wsHost = ""
@@ -45,6 +46,10 @@ export default {
             transports: ['websocket']
         });
 
+        socket.on("connect_error", (err) => {
+            console.error(`Failed to connect to the backend. Socket.io connect_error: ${err.message}`);
+        });
+
         socket.on('info', (info) => {
             this.info = info;
         });
@@ -158,7 +163,7 @@ export default {
         },
 
         getSocket() {
-          return socket;
+            return socket;
         },
 
         toastRes(res) {