From 36fc4bfe982b03589478acb36e5bb6ec5aff9b44 Mon Sep 17 00:00:00 2001
From: Cafe137 <77121044+Cafe137@users.noreply.github.com>
Date: Mon, 20 Jun 2022 12:06:08 +0200
Subject: [PATCH] feat: update logo (#401)
* style: update logo
* feat: use both desktop and dashboard logo
* test: remove App.test
* build: fix depcheck
---
.depcheckrc.json | 1 +
src/App.test.tsx | 23 ---------------------
src/assets/{logo.svg => dashboard-logo.svg} | 0
src/assets/desktop-logo.svg | 11 ++++++++++
src/components/SideBar.tsx | 7 +++++--
5 files changed, 17 insertions(+), 25 deletions(-)
delete mode 100644 src/App.test.tsx
rename src/assets/{logo.svg => dashboard-logo.svg} (100%)
create mode 100644 src/assets/desktop-logo.svg
diff --git a/.depcheckrc.json b/.depcheckrc.json
index 9e2c1cd..2f95884 100644
--- a/.depcheckrc.json
+++ b/.depcheckrc.json
@@ -1,5 +1,6 @@
{
"ignores": [
+ "@testing-library/react",
"@types/*",
"@commitlint/config-conventional",
"@babel/*",
diff --git a/src/App.test.tsx b/src/App.test.tsx
deleted file mode 100644
index 1485fbb..0000000
--- a/src/App.test.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { render } from '@testing-library/react'
-import App from './App'
-
-// Mocks methods that are not implemented in JSDOM
-// see https://jestjs.io/docs/manual-mocks#mocking-methods-which-are-not-implemented-in-jsdom
-Object.defineProperty(window, 'matchMedia', {
- writable: true,
- value: jest.fn().mockImplementation(query => ({
- matches: false,
- media: query,
- onchange: null,
- addListener: jest.fn(), // deprecated
- removeListener: jest.fn(), // deprecated
- addEventListener: jest.fn(),
- removeEventListener: jest.fn(),
- dispatchEvent: jest.fn(),
- })),
-})
-
-// TODO: this is not a good test and should be removed. Keeping it in to make sure the whole app renders (to be used in CI)
-test('should render the app', () => {
- render()
-})
diff --git a/src/assets/logo.svg b/src/assets/dashboard-logo.svg
similarity index 100%
rename from src/assets/logo.svg
rename to src/assets/dashboard-logo.svg
diff --git a/src/assets/desktop-logo.svg b/src/assets/desktop-logo.svg
new file mode 100644
index 0000000..9ac6b05
--- /dev/null
+++ b/src/assets/desktop-logo.svg
@@ -0,0 +1,11 @@
+
+
\ No newline at end of file
diff --git a/src/components/SideBar.tsx b/src/components/SideBar.tsx
index 8268c5e..62c2d84 100644
--- a/src/components/SideBar.tsx
+++ b/src/components/SideBar.tsx
@@ -5,8 +5,10 @@ import { OpenInNewSharp } from '@material-ui/icons'
import { ReactElement, useContext } from 'react'
import { BookOpen, Briefcase, DollarSign, FileText, Home, Settings } from 'react-feather'
import { Link } from 'react-router-dom'
-import Logo from '../assets/logo.svg'
+import DashboardLogo from '../assets/dashboard-logo.svg'
+import DesktopLogo from '../assets/desktop-logo.svg'
import { config } from '../config'
+import { useIsBeeDesktop } from '../hooks/apiHooks'
import { Context } from '../providers/Bee'
import { ROUTES } from '../routes'
import SideBarItem from './SideBarItem'
@@ -96,13 +98,14 @@ const useStyles = makeStyles((theme: Theme) =>
export default function SideBar(): ReactElement {
const classes = useStyles()
const { nodeInfo } = useContext(Context)
+ const { isBeeDesktop } = useIsBeeDesktop()
return (
- 
+ 