clarified side bar by moving usefull links + clarified followed assoc…

…iations in career
simde-utc · Mar 3, 2020 · 89b0545 · 89b0545
1 parent 02e137c
commit 89b0545
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 30 deletions.
diff --git a/resources/assets/react/components/Sidebar.js b/resources/assets/react/components/Sidebar.js
@@ -94,6 +94,34 @@ class Sidebar extends React.Component {
 							</NavLink>
 						</div>
 
+						<div className="sidebar-group">
+							<h6 className="sidebar-header d-hover-zone">
+								RACCOURCIS{' '}
+								<NavLink
+									className="float-right d-hover fas fa-cog"
+									style={{ display: 'none' }}
+									to="/settings/sidebar/shortcuts"
+								/>
+							</h6>
+							{isAuthenticated && user.types.contributorBde && (
+								<NavLink className="sidebar-link" to="/bookings">
+									<FontAwesomeIcon icon="person-booth" /> Réservations
+								</NavLink>
+							)}
+							<NavLink className="sidebar-link" to="/services">
+								<FontAwesomeIcon icon="concierge-bell" /> Services
+							</NavLink>
+							<NavLink className="sidebar-link" to="/assos">
+								<FontAwesomeIcon icon="hands-helping" /> Associations
+							</NavLink>
+							<NavLink className="sidebar-link" to="/partners">
+								<FontAwesomeIcon icon="handshake" /> Partenaires
+							</NavLink>
+							<NavLink className="sidebar-link" to="/groupes" style={{ display: 'none' }}>
+								<FontAwesomeIcon icon="users" /> Groupes
+							</NavLink>
+						</div>
+
 						<div className="sidebar-group">
 							<h6 className="sidebar-header d-hover-zone">
 								LIENS UTILES{' '}
@@ -154,34 +182,6 @@ class Sidebar extends React.Component {
 							</a>
 						</div>
 
-						<div className="sidebar-group">
-							<h6 className="sidebar-header d-hover-zone">
-								RACCOURCIS{' '}
-								<NavLink
-									className="float-right d-hover fas fa-cog"
-									style={{ display: 'none' }}
-									to="/settings/sidebar/shortcuts"
-								/>
-							</h6>
-							{isAuthenticated && user.types.contributorBde && (
-								<NavLink className="sidebar-link" to="/bookings">
-									<FontAwesomeIcon icon="person-booth" /> Réservations
-								</NavLink>
-							)}
-							<NavLink className="sidebar-link" to="/services">
-								<FontAwesomeIcon icon="concierge-bell" /> Services
-							</NavLink>
-							<NavLink className="sidebar-link" to="/assos">
-								<FontAwesomeIcon icon="hands-helping" /> Associations
-							</NavLink>
-							<NavLink className="sidebar-link" to="/partners">
-								<FontAwesomeIcon icon="handshake" /> Partenaires
-							</NavLink>
-							<NavLink className="sidebar-link" to="/groupes" style={{ display: 'none' }}>
-								<FontAwesomeIcon icon="users" /> Groupes
-							</NavLink>
-						</div>
-
 						{isAuthenticated && services.length > 0 && (
 							<div className="sidebar-group">
 								<h6 className="sidebar-header d-hover-zone">

diff --git a/resources/assets/react/screens/Profile/AssociativeCareer.js b/resources/assets/react/screens/Profile/AssociativeCareer.js
@@ -43,7 +43,7 @@ class AssociativeCareerScreen extends React.Component {
 		semesters.forEach(semester => {
 			if (associativeSemesters[semester.id] === undefined) {
 				actions.user.assos
-					.all({ cemetery: true, semester: semester.id, only: 'joined' })
+					.all({ cemetery: true, semester: semester.id, only: 'joined,followed' })
 					.payload.then(({ data }) => {
 						if (data.length > 0) {
 							this.addNewAssociativeSemester(semester.id, data);
@@ -87,7 +87,7 @@ class AssociativeCareerScreen extends React.Component {
 											key={asso.id + semester.id}
 											name={asso.name}
 											shortname={asso.shortname}
-											additionalInfo={role ? role.name : ''}
+											additionalInfo={role ? role.name : 'Association suivie'}
 											image={asso.image}
 											login={asso.parent ? asso.parent.login : asso.login}
 											deleted={asso.in_cemetery_at != null}