Skip to content

Commit b470ba2

Browse files
committed
chore(app): change baseUrl schema
1 parent bab3921 commit b470ba2

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

src/components/toolbar/toolbar.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ const ToolbarComponent = { bindings: { wide: '=' }, controller, template };
55

66
function controller($document, $mdSidenav, $mdToast, $state, $timeout, $window, WikiService, wikidata) {
77
const vm = this;
8+
const baseUrl = $window.__env.baseUrl;
9+
810
vm.isLoggedIn = false;
911
vm.loading = true;
1012
vm.mobile = {};
@@ -64,11 +66,12 @@ function controller($document, $mdSidenav, $mdToast, $state, $timeout, $window,
6466

6567
function login() {
6668
vm.loading = true;
67-
$window.location.pathname = `${$window.__env.baseUrl}/login`;
69+
const current = $window.location.href;
70+
$window.location.href = `${baseUrl}/login?next=${encodeURIComponent(current)}`;
6871
}
6972

7073
function logout() {
71-
$window.location.pathname = `${$window.__env.baseUrl}/logout`;
74+
$window.location.href = `${baseUrl}/logout`;
7275
}
7376

7477
function openSearch() {

src/index_dev.ejs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
(function (window) {
1616
window.__env = window.__env || {};
1717
window.__env.name = 'dev';
18-
window.__env.baseUrl = '/monumental';
18+
window.__env.baseUrl = '//tools.wmflabs.org/monumental';
1919
}(this));
2020
</script>
2121
</body>

src/index_local.ejs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
(function (window) {
1616
window.__env = window.__env || {};
1717
window.__env.name = 'local';
18-
window.__env.baseUrl = '';
18+
window.__env.baseUrl = '//localhost:5000';
1919
}(this));
2020
</script>
2121
</body>

0 commit comments

Comments
 (0)