From 173f8819c30199bf28e820871dfbcf14110e3150 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 9 Nov 2018 18:30:20 +0100 Subject: [PATCH 1/3] Reports icons --- client/src/views/layout/header/imports.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/views/layout/header/imports.js b/client/src/views/layout/header/imports.js index 269e2ada2..8f7a971ed 100644 --- a/client/src/views/layout/header/imports.js +++ b/client/src/views/layout/header/imports.js @@ -29,7 +29,7 @@ const teamsMenus = { { title: 'Your teams', to: '/teams/manage-teams', icon: GamepadRounded }, { title: 'Team members', to: '/teams/team-members', icon: GamepadRounded }, { title: 'Financial beings', to: '/teams/financial-beings', icon: GamepadRounded }, - { title: 'Report', to: 'https://github.com/AdvancedAlgos/TeamsModule/issues/new', icon: LibraryAdd, externalLink: true } + { title: 'Report', to: 'https://github.com/AdvancedAlgos/TeamsModule/issues/new', icon: BugReport, externalLink: true } ] } @@ -41,7 +41,7 @@ const eventsMenus = { { title: 'Your events', to: '/events/my', icon: GamepadRounded }, { title: 'Your hosted events', to: '/events/host', icon: AccessibilityNew }, { title: 'Host an event', to: '/events/create', icon: LibraryAdd }, - { title: 'Report', to: 'https://github.com/AdvancedAlgos/UsersModule/issues/new', icon: LibraryAdd, externalLink: true } + { title: 'Report', to: 'https://github.com/AdvancedAlgos/UsersModule/issues/new', icon: BugReport, externalLink: true } ] } @@ -51,7 +51,7 @@ const keyvaultMenus = { submenus: [ { title: 'Manage keys', to: '/key-vault/browse', icon: Search }, { title: 'Add key', to: '/key-vault/addKey', icon: GamepadRounded }, - { title: 'Report', to: 'https://github.com/AdvancedAlgos/KeyVaultModule/issues/new', icon: LibraryAdd, externalLink: true } + { title: 'Report', to: 'https://github.com/AdvancedAlgos/KeyVaultModule/issues/new', icon: BugReport, externalLink: true } ] } From 8bcb09870007c9e4827c185a89ce6108620381ec Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 9 Nov 2018 18:34:16 +0100 Subject: [PATCH 2/3] Resolving Conflics --- client/src/views/layout/header/imports.js | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/client/src/views/layout/header/imports.js b/client/src/views/layout/header/imports.js index fdadfa04a..c89518eab 100644 --- a/client/src/views/layout/header/imports.js +++ b/client/src/views/layout/header/imports.js @@ -24,17 +24,10 @@ const teamsMenus = { to: '/teams', submenus: [ { title: 'All teams', to: '/teams', icon: Search }, -<<<<<<< HEAD - { title: 'Your teams', to: '/teams/manage-teams', icon: GamepadRounded }, - { title: 'Team members', to: '/teams/team-members', icon: GamepadRounded }, - { title: 'Financial beings', to: '/teams/financial-beings', icon: GamepadRounded }, - { title: 'Report', to: 'https://github.com/AdvancedAlgos/TeamsModule/issues/new', icon: BugReport, externalLink: true } -======= { title: 'Your teams', to: '/teams/manage-teams', icon: GamepadRounded, authenticated: true }, { title: 'Team members', to: '/teams/team-members', icon: GamepadRounded, authenticated: true }, { title: 'Financial beings', to: '/teams/financial-beings', icon: GamepadRounded, authenticated: true }, - { title: 'Report', to: 'https://github.com/AdvancedAlgos/TeamsModule/issues/new', icon: LibraryAdd, externalLink: true } ->>>>>>> bb03bc2e61cf91e6f78adf00f500855414664268 + { title: 'Report', to: 'https://github.com/AdvancedAlgos/TeamsModule/issues/new', icon: BugReport, externalLink: true } ] } @@ -43,17 +36,10 @@ const eventsMenus = { to: '/events', submenus: [ { title: 'All events', to: '/events', icon: Search }, -<<<<<<< HEAD - { title: 'Your events', to: '/events/my', icon: GamepadRounded }, - { title: 'Your hosted events', to: '/events/host', icon: AccessibilityNew }, - { title: 'Host an event', to: '/events/create', icon: LibraryAdd }, - { title: 'Report', to: 'https://github.com/AdvancedAlgos/UsersModule/issues/new', icon: BugReport, externalLink: true } -======= { title: 'Your events', to: '/events/my', icon: GamepadRounded, authenticated: true }, { title: 'Your hosted events', to: '/events/host', icon: AccessibilityNew, authenticated: true }, { title: 'Host an event', to: '/events/create', icon: LibraryAdd, authenticated: true }, - { title: 'Report', to: 'https://github.com/AdvancedAlgos/UsersModule/issues/new', icon: LibraryAdd, externalLink: true } ->>>>>>> bb03bc2e61cf91e6f78adf00f500855414664268 + { title: 'Report', to: 'https://github.com/AdvancedAlgos/UsersModule/issues/new', icon: BugReport, externalLink: true } ] } From a42bf39ed97fdaa587bd463ff53a242e1df5250c Mon Sep 17 00:00:00 2001 From: Barry Low Date: Fri, 9 Nov 2018 09:39:22 -0800 Subject: [PATCH 3/3] Update Main Menu Teams icons --- client/src/views/layout/header/imports.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/client/src/views/layout/header/imports.js b/client/src/views/layout/header/imports.js index c89518eab..0ff73cedc 100644 --- a/client/src/views/layout/header/imports.js +++ b/client/src/views/layout/header/imports.js @@ -5,7 +5,9 @@ import { LibraryAdd, ImportContacts, BugReport, - People + People, + Group, + Adb } from '@material-ui/icons' const usersMenus = { @@ -24,9 +26,9 @@ const teamsMenus = { to: '/teams', submenus: [ { title: 'All teams', to: '/teams', icon: Search }, - { title: 'Your teams', to: '/teams/manage-teams', icon: GamepadRounded, authenticated: true }, - { title: 'Team members', to: '/teams/team-members', icon: GamepadRounded, authenticated: true }, - { title: 'Financial beings', to: '/teams/financial-beings', icon: GamepadRounded, authenticated: true }, + { title: 'Your teams', to: '/teams/manage-teams', icon: Group, authenticated: true }, + { title: 'Team members', to: '/teams/team-members', icon: People, authenticated: true }, + { title: 'Financial beings', to: '/teams/financial-beings', icon: Adb, authenticated: true }, { title: 'Report', to: 'https://github.com/AdvancedAlgos/TeamsModule/issues/new', icon: BugReport, externalLink: true } ] }