Ivan - Table Component - Remove /app path [skip ci]

client/gulp/tasks/browserify.js

@@ -21,7 +21,7 @@ var util = require('gulp-util');
 function buildScript(file, watch) {
 
   var bundler = browserify({
-    entries: [config.sourceDir + 'app/' + file],
+    entries: [config.sourceDir + '/' + file],
     debug: !global.isProd,
     insertGlobalVars: {
       noFixtures: function() {

client/src/app/App.js

@@ -28,8 +28,8 @@ class App extends React.Component {
     redirectIfPathIsNotValid(props) {
         const validations = {
             languageChanged: props.config.language !== this.props.config.language,
-            loggedIn: !_.includes(props.location.pathname, '/app/dashboard') && props.session.logged,
-            loggedOut: _.includes(props.location.pathname, '/app/dashboard') && !props.session.logged
+            loggedIn: !_.includes(props.location.pathname, '/dashboard') && props.session.logged,
+            loggedOut: _.includes(props.location.pathname, '/dashboard') && !props.session.logged
         };
 
         if (validations.languageChanged) {
@@ -37,11 +37,11 @@ class App extends React.Component {
         }
 
         if (validations.loggedOut) {
-            browserHistory.push('/app');
+            browserHistory.push('/');
         }
 
         if (validations.loggedIn) {
-            browserHistory.push('/app/dashboard');
+            browserHistory.push('/dashboard');
         }
     }
 }

client/src/app/Routes.js

@@ -27,8 +27,8 @@ const history = syncHistoryWithStore(browserHistory, store);
 
 export default (
     <Router history={history}>
-        <Route component={App} path='/'>
-            <Route path='/app' component={MainLayout}>
+        <Route component={App}>
+            <Route path='/' component={MainLayout}>
                 <IndexRoute component={MainHomePage} />
                 <Route path='signup' component={MainSignUpPage}/>
                 <Route path='recover-password' component={MainRecoverPasswordPage}/>
@@ -40,7 +40,7 @@ export default (
                     <Route path='edit-profile' component={DashboardEditProfilePage}/>
 
                     <Route path='article' component={DashboardArticlePage}/>
-                    <Route path='ticket' component={DashboardTicketPage}/>
+                    <Route path='ticket/:ticketNumber' component={DashboardTicketPage}/>
                 </Route>
             </Route>
 

client/src/app/main/dashboard/dashboard-list-tickets/dashboard-list-tickets-page.js

@@ -130,7 +130,11 @@ class DashboardListTicketsPage extends React.Component {
 
         return {
             number: '#' + ticket.ticketNumber,
-            title: <Button type="clean" route={{to: '/app/dashboard/view-ticket/' + ticket.ticketNumber}}>{titleText}</Button>,
+            title: (
+                <Button className="dashboard-ticket-list__title-link" type="clean" route={{to: '/dashboard/ticket/' + ticket.ticketNumber}}>
+                    {titleText}
+                </Button>
+            ),
             department: ticket.department,
             date: ticket.date,
             highlighted: ticket.unread

client/src/app/main/dashboard/dashboard-list-tickets/dashboard-list-tickets-page.scss

@@ -23,4 +23,10 @@
     &__date {
         text-align: right;
     }
+
+    &__title-link:hover,
+    &__title-link:focus {
+        outline: none;
+        text-decoration: underline;
+    }
 }

client/src/app/main/dashboard/dashboard-menu.js

@@ -4,10 +4,10 @@ import _ from 'lodash';
 import Menu from 'core-components/menu';
 
 let dashboardRoutes = [
-    { path: '/app/dashboard', text: 'Ticket List', icon: 'file-text-o' },
-    { path: '/app/dashboard/create-ticket', text: 'Create Ticket', icon: 'plus' },
-    { path: '/app/dashboard/articles', text: 'View Articles', icon: 'book' },
-    { path: '/app/dashboard/edit-profile', text: 'Edit Profile', icon: 'pencil' }
+    { path: '/dashboard', text: 'Ticket List', icon: 'file-text-o' },
+    { path: '/dashboard/create-ticket', text: 'Create Ticket', icon: 'plus' },
+    { path: '/dashboard/articles', text: 'View Articles', icon: 'book' },
+    { path: '/dashboard/edit-profile', text: 'Edit Profile', icon: 'pencil' }
 ];
 
 class DashboardMenu extends React.Component {

client/src/app/main/main-layout-header.js

@@ -42,8 +42,8 @@ class MainLayoutHeader extends React.Component {
         } else {
             result = (
                 <div className="main-layout-header--login-links">
-                    <Button type="clean" route={{to:'/app'}}>{i18n('LOG_IN')}</Button>
-                    <Button type="clean" route={{to:'/app/signup'}}>Sign up</Button>
+                    <Button type="clean" route={{to:'/'}}>{i18n('LOG_IN')}</Button>
+                    <Button type="clean" route={{to:'/signup'}}>Sign up</Button>
                 </div>
             );
         }