feat: GUI logo added

olzzon · Nov 4, 2021 · 24dabad · 24dabad
1 parent ae66ec3
commit 24dabad
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -33,11 +33,11 @@
     "gypfile": true,
     "dependencies": {
         "bindings": "^1.5.0",
+        "electron-is-dev": "^2.0.0",
         "express": "^4.17.1",
         "node-emberplus": "^2.5.10",
         "socket.io": "^4.1.3",
         "socket.io-client": "^4.1.3",
-        "electron-is-dev": "^2.0.0",
         "winston": "^3.3.3"
     },
     "bin": {
@@ -64,6 +64,7 @@
         "css-loader": "^6.2.0",
         "electron": "^15.3.0",
         "electron-builder": "^22.13.1",
+        "file-loader": "^6.2.0",
         "jest": "^27.0.6",
         "jest-haste-map": "^24.5.0",
         "jest-resolve": "^24.5.0",

diff --git a/src/client/components/mainPage.tsx b/src/client/components/mainPage.tsx
@@ -1,5 +1,7 @@
 import '../styles/MainPage.css'
 import * as IO from '../../models/SOCKET_IO_CONTANTS'
+//@ts-ignore
+import logo from '../assets/logo.png'
 
 import React, { useEffect, useState } from 'react'
 import io from 'socket.io-client'
@@ -50,7 +52,10 @@ const MainPage = () => {
 
     return (
         <div className={'container'}>
-            <div className={'header'}>NDI CONTROLLER</div>
+            <div className={'header'}>
+            <img className={"logo"} src={logo} width="70" height="60"/>
+                NDI CONTROLLER
+                </div>
             {!showSettings ? (
                 <React.Fragment>
                     <Matrix sources={sources} targets={targets} />

diff --git a/src/client/styles/MainPage.css b/src/client/styles/MainPage.css
@@ -73,3 +73,8 @@ body {
     transform: translateY(2px);
 }
 
+.logo {
+    position: absolute;
+    top: 0px;
+    right: 5px;
+}
diff --git a/webpack.config.js b/webpack.config.js
@@ -12,6 +12,10 @@ module.exports = {
                 use: ['style-loader', 'css-loader'],
                 exclude: /\.module\.css$/,
             },
+            {
+                test: /\.(png|jpe?g|svg)$/,
+                loader: 'file-loader'
+            }
         ],
     },
     resolve: {

diff --git a/yarn.lock b/yarn.lock
@@ -1634,6 +1634,11 @@ base@^0.11.1:
     mixin-deep "^1.2.0"
     pascalcase "^0.1.1"
 
+big.js@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
+
 bindings@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
@@ -2951,6 +2956,11 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
+emojis-list@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
+  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
+
 [email protected]:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2"
@@ -3374,6 +3384,14 @@ figures@^3.1.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
+file-loader@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"
+  integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==
+  dependencies:
+    loader-utils "^2.0.0"
+    schema-utils "^3.0.0"
+
 [email protected]:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
@@ -5155,6 +5173,15 @@ loader-runner@^4.2.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384"
   integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
 
+loader-utils@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.1.tgz#3b8d4386f42378d6434d32d7bc08e7a52d39575e"
+  integrity sha512-g4miPa9uUrZz4iElkaVJgDFwKJGh8aQGM7pUL4ejXl6cu7kSb30seQOVGNMP6sW8j7DW77X68hJZ+GM7UGhXeQ==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^2.1.2"
+
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"