fix url construction to eliminate #

mvillis · Mar 31, 2016 · ff01af5 · ff01af5
1 parent 81a7a38
commit ff01af5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/client/js/components/assessment/assessmentList.js b/client/js/components/assessment/assessmentList.js
@@ -32,11 +32,11 @@ var AssessmentList = React.createClass({
             return (
               <LinkContainer key={assessment.id} to={{pathname: assessmentUrl}}>
                 <tr className='clickable' >
-                  <td><a href={'#' + assessmentUrl}>{assessment.id}</a></td>
+                  <td><a href={assessmentUrl}>{assessment.id}</a></td>
                   <td>{prettyCreated} <small>({relativeCreated})</small></td>
                   <td>{assessment.template.name}</td>
                   <td className={this.props.showTeams ? '' : 'hidden'}>
-                    <a href={'#/team/' + assessment.team.id + '/'}>{assessment.team.name}</a>
+                    <a href={'/team/' + assessment.team.id + '/'}>{assessment.team.name}</a>
                   </td>
                 </tr>
               </LinkContainer>

diff --git a/client/js/components/home/assessmentCreationForm.js b/client/js/components/home/assessmentCreationForm.js
@@ -53,7 +53,7 @@ var AssessmentCreationForm = React.createClass({
       type: 'POST',
       cache: true,
       success: function (output) {
-        window.location = '/#/assessment/' + output.id + '/'
+        window.location = '/assessment/' + output.id + '/'
       },
       error: function (xhr, status, err) {
         var message = 'Launch failed due to unknown reason. Try again later.'

diff --git a/client/js/components/home/teamCreationForm.js b/client/js/components/home/teamCreationForm.js
@@ -132,7 +132,7 @@ var TeamCreationForm = React.createClass({
       cache: true,
       success: function (newTeam) {
         console.log('created team ' + JSON.stringify(newTeam))
-        window.location = '/#/team/' + newTeam.id + '/'
+        window.location = '/team/' + newTeam.id + '/'
       },
       error: function (xhr, status, err) {
         var message = 'Team creation failed due to unknown reason. Try again later.'

diff --git a/client/js/components/team/teamList.js b/client/js/components/team/teamList.js
@@ -34,7 +34,7 @@ var TeamList = React.createClass({
               <LinkContainer key={team.id} to={{pathname: teamUrl}}>
                 <tr className='clickable'>
                   <td>
-                    <a href={'#' + teamUrl}>{team.id}</a>
+                    <a href={teamUrl}>{team.id}</a>
                   </td>
                   <td>{team.name}</td>
                   <td className='wrap'><TagList tags={team.tags}/></td>