YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Move api on a subfolder

Browse source
This commit is contained in:
Kload 2013-11-21 13:49:46 +01:00
parent 788b607e1c
commit 1b8969a322
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
js/app.js
View file

@ -88,7 +88,7 @@ app = Sammy('#main', function (sam) {
$('#popup').modal('hide'); $('#popup').modal('hide');
} }
} }
c.flash('fail', 'An error occured at post-installation.'); c.flash('fail', 'Server error');
} }
store.clear('slide'); store.clear('slide');
c.redirect(store.get('path-1')); c.redirect(store.get('path-1'));
@ -196,11 +196,11 @@ app = Sammy('#main', function (sam) {
// Check if te client is hosted on a yunohost node // Check if te client is hosted on a yunohost node
domain = window.location.hostname domain = window.location.hostname
$.ajax({ $.ajax({
url: 'https://'+ domain +':6767/api', url: 'https://'+ domain +'/ynhapi/api',
timeout: 3000 timeout: 3000
}) })
.success(function() { .success(function() {
$.getJSON('https://'+ domain +':6767/installed', function(data) { $.getJSON('https://'+ domain +'/ynhapi/installed', function(data) {
if (!data.installed) { if (!data.installed) {
c.redirect('#/postinstall'); c.redirect('#/postinstall');
} else { } else {
@ -214,7 +214,7 @@ app = Sammy('#main', function (sam) {
}); });
sam.post('#/login', function (c) { sam.post('#/login', function (c) {
store.set('url', 'https://'+ c.params['domain'] +':6767'); store.set('url', 'https://'+ c.params['domain'] +'/ynhapi');
store.set('user', 'admin'); store.set('user', 'admin');
store.set('password', btoa(c.params['password'])); store.set('password', btoa(c.params['password']));
c.api('/api', function(data) { c.api('/api', function(data) {
@ -267,7 +267,7 @@ app = Sammy('#main', function (sam) {
params['password'] = c.params['password'] params['password'] = c.params['password']
store.set('url', 'https://'+ window.location.hostname +':6767'); store.set('url', 'https://'+ window.location.hostname +'/ynhapi');
store.set('user', 'admin'); store.set('user', 'admin');
store.set('password', btoa('yunohost')); store.set('password', btoa('yunohost'));
c.api('/postinstall', function(data) { // http://api.yunohost.org/#!/tools/tools_postinstall_post_0 c.api('/postinstall', function(data) { // http://api.yunohost.org/#!/tools/tools_postinstall_post_0