Merge branch 'master' into SWIK-1500-fixUserMenu

slidewiki · Feb 28, 2018 · 5fb4bf1 · 5fb4bf1
2 parents 83f9598 + b301100
commit 5fb4bf1
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 38 deletions.
diff --git a/components/Header/Header.js b/components/Header/Header.js
@@ -1,15 +1,10 @@
 import React from 'react';
 import { NavLink } from 'fluxible-router';
 import SearchBox  from '../Search/AutocompleteComponents/HeaderSearchBox';
-<<<<<<< HEAD
 //import UserNotificationsBadge from '../User/UserNotificationsPanel/UserNotificationsBadge';
 import LoginModal from '../Login/LoginModal';
 import HeaderDropdown from '../Login/HeaderDropdown';
 import UserMenuDropdown from '../Login/UserMenuDropdown';
-=======
-import LoginModal from '../Login/LoginModal.js';
-import HeaderDropdown from '../Login/HeaderDropdown.js';
->>>>>>> master
 import {connectToStores} from 'fluxible-addons-react';
 import UserProfileStore from '../../stores/UserProfileStore';
 import userSignOut from '../../actions/user/userSignOut';

diff --git a/components/Login/HeaderDropdown.js b/components/Login/HeaderDropdown.js
@@ -96,15 +96,10 @@ class HeaderDropdown extends React.Component {
         const alarmClassName = (this.props.UserNotificationsStore.newNotificationsCount > 0) ? 'alarm red icon' : 'alarm outline icon';
         const alarmIcon = (this.props.UserNotificationsStore.newNotificationsCount > 0) ? (<i className="ui small outline alarm icon" />) : '';
         return(
-<<<<<<< HEAD
             <div>
 
               <div id="userButtonMenu" role="button" className="ui top right dropdown larger blue button" ref={(drop) => {this.userDropDown=drop;}}  aria-haspopup="true" aria-controls="userHeaderMenu" aria-label="User management" aria-expanded={this.state.userMenuButtonExpanded}>
                 {/*<div className="text">*/}
-=======
-            <div className="ui top right dropdown larger blue button" ref="userDropDown" role="button" aria-haspopup="true" aria-label={this.context.intl.formatMessage(header_messages.usermanagement)}>
-                <div className="text">
->>>>>>> master
                     <UserPicture picture={ pic } username={ this.props.UserProfileStore.username } avatar={ true } width= { 30 } />
                 {/*</div>*/}
 
@@ -114,7 +109,6 @@ class HeaderDropdown extends React.Component {
                     {/*
                     <li className="header" role="separator" tabIndex="-1">
                         {this.props.UserProfileStore.username}
-<<<<<<< HEAD
                     </li>
                     <li className="divider"  role="separator" tabIndex="-1" ></li>
                      */}
@@ -137,26 +131,6 @@ class HeaderDropdown extends React.Component {
                 </ul>
               </div>
                 {alarmIcon} {/*Placed here to avoid sr problems*/}
-=======
-                    </div>
-                    <div className="divider"></div>
-                    <div className="item" data-value={'/user/' + this.props.UserProfileStore.username} role="menuitem" aria-label={this.context.intl.formatMessage(header_messages.mydecks)} tabIndex="0" >
-                        <i className="user icon link"  /> {this.context.intl.formatMessage(header_messages.mydecks)}
-                    </div>
-                    <div className="item" data-value={'/user/' + this.props.UserProfileStore.username + '/groups/overview'} role="menuitem" aria-label={this.context.intl.formatMessage(header_messages.mygroups)} tabIndex="0" >
-                        <i className="icon users" /> {this.context.intl.formatMessage(header_messages.mygroups)}
-                    </div>
-                    <div className="item" data-value={'/user/' + this.props.UserProfileStore.username + '/settings/profile' } role="menuitem" aria-label={this.context.intl.formatMessage(header_messages.mysettings)} tabIndex="0" >
-                        <i className="setting icon" /> {this.context.intl.formatMessage(header_messages.mysettings)}
-                    </div>
-                    <div className="item" data-value={'/notifications'} role="menuitem" aria-label={this.context.intl.formatMessage(header_messages.mynotifications)} tabIndex="0" >
-                        <i className={alarmClassName} />{this.context.intl.formatMessage(header_messages.mynotifications)}
-                    </div>
-                    <div className="item" data-value={'logout'} role="menuitem" aria-label={this.context.intl.formatMessage(header_messages.signout)} tabIndex="0" >
-                        <i className="sign out icon"/> {this.context.intl.formatMessage(header_messages.signout)}
-                    </div>
-                </div>
->>>>>>> master
             </div>
 
         );

diff --git a/package.json b/package.json
@@ -72,11 +72,8 @@
     "compression": "^1.6.2",
     "cookie": "^0.3.1",
     "cookie-parser": "^1.4.3",
-<<<<<<< Updated upstream
     "crypt": "^0.0.2",
-=======
     "css-loader": "^0.28.7",
->>>>>>> Stashed changes
     "css-modules-require-hook": "^4.0.6",
     "csurf": "^1.9.0",
     "debug": "^3.1.0",
@@ -120,12 +117,8 @@
     "napa": "^2.3.0",
     "pre-commit": "^1.2.2",
     "react": "^15.4.2",
-<<<<<<< Updated upstream
     "react-aria-menubutton": "^5.1.1",
     "react-async-script": "^0.7.0",
-=======
-    "react-async-script": "~0.7.0",
->>>>>>> Stashed changes
     "react-cookie": "1.0.4",
     "react-cookie-banner": "^0.0.18",
     "react-custom-scrollbars": "^4.0.2",