Merge branch 'develop' into feature/pinner

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 ECEntrics
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { Menu } from 'semantic-ui-react';
+import { Dropdown, Menu } from 'semantic-ui-react';
 import { useTranslation } from 'react-i18next';
 import { useHistory } from 'react-router';
 import { useSelector } from 'react-redux';
@@ -39,14 +39,6 @@ const MainLayoutMenu = () => {
                   >
                       <img src={appLogo} alt="app_logo" />
                   </Menu.Item>
-                  <Menu.Item
-                    link
-                    name="clear-databases"
-                    key="clear-databases"
-                    onClick={handleClearDatabasesClick}
-                  >
-                      {t('topbar.button.clear.databases')}
-                  </Menu.Item>
                   <Menu.Menu position="right">
                       {hasSignedUp && history.location.pathname === '/home' && (
                           <Menu.Item
@@ -81,6 +73,18 @@ const MainLayoutMenu = () => {
                             </Menu.Item>
                         )}
                   </Menu.Menu>
+                  <Dropdown key="overflow" item direction="left">
+                      <Dropdown.Menu>
+                          <Dropdown.Item
+                            link
+                            name="clear-databases"
+                            key="clear-databases"
+                            onClick={handleClearDatabasesClick}
+                          >
+                              {t('topbar.button.clear.databases')}
+                          </Dropdown.Item>
+                      </Dropdown.Menu>
+                  </Dropdown>
 
                   <ClearDatabasesModal
                     open={isClearDatabasesOpen}