From 08bfa2772d81ec4df8a7e1cd03f7136fa0694ed5 Mon Sep 17 00:00:00 2001
From: David Ralph <ohlookitsderpy@protonmail.com>
Date: Sun, 9 May 2021 22:39:45 +0100
Subject: [PATCH] feat: show navbar on hover setting, fix photo information
 toggle hot reload

Co-authored-by: Alex Sparkes <turbomarshmello@gmail.com>
---
 .../main/settings/sections/Appearance.jsx     |  1 +
 .../sections/background/Background.jsx        |  2 +-
 src/components/widgets/navbar/Navbar.jsx      | 51 ++++++++++---------
 src/components/widgets/navbar/scss/index.scss | 21 ++++++++
 src/modules/default_settings.json             |  4 ++
 src/translations/de_DE.json                   |  3 +-
 src/translations/en_GB.json                   |  3 +-
 src/translations/en_US.json                   |  3 +-
 src/translations/es.json                      |  3 +-
 src/translations/fr.json                      |  3 +-
 src/translations/nl.json                      |  3 +-
 src/translations/no.json                      |  3 +-
 src/translations/ru.json                      |  3 +-
 src/translations/zh_CN.json                   |  3 +-
 14 files changed, 72 insertions(+), 34 deletions(-)

diff --git a/src/components/modals/main/settings/sections/Appearance.jsx b/src/components/modals/main/settings/sections/Appearance.jsx
index 10392095..17dcc76a 100644
--- a/src/components/modals/main/settings/sections/Appearance.jsx
+++ b/src/components/modals/main/settings/sections/Appearance.jsx
@@ -34,6 +34,7 @@ export default function AppearanceSettings() {
       <h3>{appearance.navbar.title}</h3>
       <Checkbox name='notesEnabled' text={appearance.navbar.notes} element='.other' />
       <Checkbox name='refresh' text={appearance.navbar.refresh} element='.other' />
+      <Checkbox name='navbarHover' text={appearance.navbar.hover} element='.other' />
 
       <h3>{appearance.font.title}</h3>
       <Text title={appearance.font.custom} name='font' upperCaseFirst={true} category='other' />
diff --git a/src/components/modals/main/settings/sections/background/Background.jsx b/src/components/modals/main/settings/sections/background/Background.jsx
index 2f74399e..1b982517 100644
--- a/src/components/modals/main/settings/sections/background/Background.jsx
+++ b/src/components/modals/main/settings/sections/background/Background.jsx
@@ -149,7 +149,7 @@ export default class BackgroundSettings extends React.PureComponent {
         <Switch name='background' text={this.language.enabled} category='background' />
         <Checkbox name='ddgProxy' text={background.ddg_proxy} />
         <Checkbox name='bgtransition' text={background.transition} />
-        <Checkbox name='photoInformation' text={background.photo_information} category='background' element='.photoInformation' />
+        <Checkbox name='photoInformation' text={background.photo_information} category='background' element='.other' />
 
         <h3>{background.source.title}</h3>
         <Dropdown label={background.type.title} name='backgroundType' onChange={(value) => this.setState({ backgroundType: value })} category='background'>
diff --git a/src/components/widgets/navbar/Navbar.jsx b/src/components/widgets/navbar/Navbar.jsx
index 284a6a32..06033e36 100644
--- a/src/components/widgets/navbar/Navbar.jsx
+++ b/src/components/widgets/navbar/Navbar.jsx
@@ -18,32 +18,35 @@ export default function Navbar(props) {
   const backgroundEnabled = (localStorage.getItem('background') === 'true');
 
   return (
-    <div className='navbar-container'>
-      {(localStorage.getItem('view') === 'true' && backgroundEnabled) ? <Maximise/> :null}
-      {(localStorage.getItem('favouriteEnabled') === 'true' && backgroundEnabled) ? <Favourite/> :null}
+    <>
+      {(localStorage.getItem('navbarHover') === 'true') ? <div className='navbar-hidden'/> :null}
+      <div className='navbar-container'>
+        {(localStorage.getItem('view') === 'true' && backgroundEnabled) ? <Maximise/> :null}
+        {(localStorage.getItem('favouriteEnabled') === 'true' && backgroundEnabled) ? <Favourite/> :null}
   
-      {(localStorage.getItem('notesEnabled') === 'true') ?
-        <div className='notes'>
-          <NotesIcon className='topicons'/>
-          <Notes/>
-        </div>
-      :null}
+        {(localStorage.getItem('notesEnabled') === 'true') ?
+          <div className='notes'>
+            <NotesIcon className='topicons'/>
+            <Notes/>
+          </div>
+        :null}
 
-      {(window.constants.BETA_VERSION === true) ? 
-        <Tooltip title={language.widgets.navbar.tooltips.feedback}>
-          <Report className='topicons' onClick={() => props.openModal('feedbackModal')}/>
+        {(window.constants.BETA_VERSION === true) ? 
+          <Tooltip title={language.widgets.navbar.tooltips.feedback}>
+            <Report className='topicons' onClick={() => props.openModal('feedbackModal')}/>
+          </Tooltip>
+        :null}
+
+        {(localStorage.getItem('refresh') === 'true') ?
+          <Tooltip title={language.widgets.navbar.tooltips.refresh}>
+            <RefreshIcon className='refreshicon topicons' onClick={() => window.location.reload()}/>
+          </Tooltip>
+        :null}
+
+        <Tooltip title={language.modals.main.navbar.settings}>
+          <Gear className='settings-icon topicons' onClick={() => props.openModal('mainModal')}/>
         </Tooltip>
-      :null}
-
-      {(localStorage.getItem('refresh') === 'true') ?
-        <Tooltip title={language.widgets.navbar.tooltips.refresh}>
-          <RefreshIcon className='refreshicon topicons' onClick={() => window.location.reload()}/>
-        </Tooltip>
-      :null}
-
-      <Tooltip title={language.modals.main.navbar.settings}>
-        <Gear className='settings-icon topicons' onClick={() => props.openModal('mainModal')}/>
-      </Tooltip>
-    </div>
+      </div>
+    </>
   );
 }
diff --git a/src/components/widgets/navbar/scss/index.scss b/src/components/widgets/navbar/scss/index.scss
index bd13d697..be17a7e1 100644
--- a/src/components/widgets/navbar/scss/index.scss
+++ b/src/components/widgets/navbar/scss/index.scss
@@ -36,3 +36,24 @@
 .visibilityshow {
   visibility: visible !important;
 }
+
+.navbar-hidden + .navbar-container {
+  display: none;
+}
+
+.navbar-hidden {
+  position: absolute;
+  width: 50vw;
+  right: 0;
+  top: 0;
+  background: none;
+  height: 75px;
+}
+
+.navbar-hidden:hover + .navbar-container {
+  display: block !important;
+}
+
+.navbar-container:hover {
+  display: block;
+}
\ No newline at end of file
diff --git a/src/modules/default_settings.json b/src/modules/default_settings.json
index a27748a6..5d7f41fa 100644
--- a/src/modules/default_settings.json
+++ b/src/modules/default_settings.json
@@ -214,5 +214,9 @@
   {
     "name": "backgroundFilter",
     "value": "grayscale"
+  },
+  {
+    "name": "navbarHover",
+    "value": false
   }
 ]
diff --git a/src/translations/de_DE.json b/src/translations/de_DE.json
index c0a1b697..83375352 100644
--- a/src/translations/de_DE.json
+++ b/src/translations/de_DE.json
@@ -220,7 +220,8 @@
             "navbar": {
               "title": "Navigationsleiste",
               "notes": "Notizen",
-              "refresh": "Aktualisieren"
+              "refresh": "Aktualisieren",
+              "hover": "Display on hover"
             },
             "font": {
               "title": "Schriftart",
diff --git a/src/translations/en_GB.json b/src/translations/en_GB.json
index 0a8517c8..7307ebc0 100644
--- a/src/translations/en_GB.json
+++ b/src/translations/en_GB.json
@@ -220,7 +220,8 @@
             "navbar": {
               "title": "Navbar",
               "notes": "Notes",
-              "refresh": "Refresh button"
+              "refresh": "Refresh button",
+              "hover": "Display on hover"
             },
             "font": {
               "title": "Font",
diff --git a/src/translations/en_US.json b/src/translations/en_US.json
index 4e53d480..c5b35f4b 100644
--- a/src/translations/en_US.json
+++ b/src/translations/en_US.json
@@ -220,7 +220,8 @@
             "navbar": {
               "title": "Navbar",
               "notes": "Notes",
-              "refresh": "Refresh button"
+              "refresh": "Refresh button",
+              "hover": "Display on hover"
             },
             "font": {
               "title": "Font",
diff --git a/src/translations/es.json b/src/translations/es.json
index 30670127..e2197eb0 100644
--- a/src/translations/es.json
+++ b/src/translations/es.json
@@ -220,7 +220,8 @@
             "navbar": {
               "title": "Barra de búsqueda",
               "notes": "Notas",
-              "refresh": "Botón de recargar"
+              "refresh": "Botón de recargar",
+              "hover": "Display on hover"
             },
             "font": {
               "title": "Fuente",
diff --git a/src/translations/fr.json b/src/translations/fr.json
index c3a24614..49f478db 100644
--- a/src/translations/fr.json
+++ b/src/translations/fr.json
@@ -220,7 +220,8 @@
             "navbar": {
               "title": "Navbar",
               "notes": "Notes",
-              "refresh": "Refresh button"
+              "refresh": "Refresh button",
+              "hover": "Display on hover"
             },
             "font": {
               "title": "Font",
diff --git a/src/translations/nl.json b/src/translations/nl.json
index ebc0e9b2..1c1881e9 100644
--- a/src/translations/nl.json
+++ b/src/translations/nl.json
@@ -220,7 +220,8 @@
             "navbar": {
               "title": "Navbar",
               "notes": "Notes",
-              "refresh": "Refresh button"
+              "refresh": "Refresh button",
+              "hover": "Display on hover"
             },
             "font": {
               "title": "Font",
diff --git a/src/translations/no.json b/src/translations/no.json
index 3dbfc52a..1950eb43 100644
--- a/src/translations/no.json
+++ b/src/translations/no.json
@@ -220,7 +220,8 @@
             "navbar": {
               "title": "Navbar",
               "notes": "Notes",
-              "refresh": "Refresh button"
+              "refresh": "Refresh button",
+              "hover": "Display on hover"
             },
             "font": {
               "title": "Font",
diff --git a/src/translations/ru.json b/src/translations/ru.json
index 39b0845e..bc222795 100644
--- a/src/translations/ru.json
+++ b/src/translations/ru.json
@@ -220,7 +220,8 @@
             "navbar": {
               "title": "Navbar",
               "notes": "Notes",
-              "refresh": "Refresh button"
+              "refresh": "Refresh button",
+              "hover": "Display on hover"
             },
             "font": {
               "title": "Font",
diff --git a/src/translations/zh_CN.json b/src/translations/zh_CN.json
index 86ece73d..ae93f158 100644
--- a/src/translations/zh_CN.json
+++ b/src/translations/zh_CN.json
@@ -220,7 +220,8 @@
             "navbar": {
               "title": "Navbar",
               "notes": "Notes",
-              "refresh": "Refresh button"
+              "refresh": "Refresh button",
+              "hover": "Display on hover"
             },
             "font": {
               "title": "Font",