Skip to content

Commit

Permalink
Merge pull request #166 from datasci4health/revert-165-revert-164-dev…
Browse files Browse the repository at this point in the history
…elopment

Revert "Revert "More fixes urls to the cloud""
  • Loading branch information
marcosfmmota authored Aug 12, 2020
2 parents c1e9021 + c58268a commit aad2046
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/adonisjs/app/Controllers/Http/AuthController.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ class AuthController {
//const data = { user : 'hello world' }
response.cookie('token', user.token)
//yield response.sendView('index', data)
//return view.render('index', { user: user.toJSON() })
return response.redirect('/')
return view.render('index', { user: user.toJSON() })
// return response.redirect('/space')
})
.catch(function (error) {
console.log(error);
Expand Down
2 changes: 1 addition & 1 deletion src/adonisjs/public/author/js/author.js
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ class AuthorManager {
break;
case "control/leave/drafts": await this.caseSave();
//window.location.href = 'draft.html';
window.location.href = '/drafts';
window.location.href = 'drafts';
break;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/adonisjs/resources/views/author/author.edge
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<script src="{{ assetsUrl('dccs/components/dcc-expression.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-block.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-trigger.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-character.js') }})"></script>
<script src="{{ assetsUrl('dccs/components/dcc-character.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-lively-dialog.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-notice-input.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-context-menu.js') }}"></script>
Expand Down

1 comment on commit aad2046

@marcosfmmota
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mess up in this pull request the first revert wasn't need.

Please sign in to comment.