Commit 29f5334e authored by Evren Kutar's avatar Evren Kutar

define dev url for rest api

use it system-wide
parent 29785656
......@@ -15,9 +15,11 @@ angular.module(
'ngAnimate',
'ngQuantum',
'general',
'formGenerator',
'zaerp.dashboard',
'zaerp.login',
'zaerp.version',
'zaerp.test',
'schemaForm'
]).
config(['$routeProvider', function ($routeProvider) {
......@@ -46,6 +48,13 @@ angular.module(
}
});
}).
constant("RESTURL", (function(){
var dev = "http://127.0.0.1:3000/api/";
var prod = "";
var ENV = "dev"; // change to prod in production
return ENV =="dev" ? {url:dev} : {url:prod};
return "http://127.0.0.1:3000/api/";
})()).
constant("USER_ROLES", {
all: "*",
admin: "admin",
......
......@@ -5,15 +5,24 @@
* (GPLv3). See LICENSE.txt for details.
*/
var form_generator = angular.module('FormGenerator', []);
var form_generator = angular.module('formGenerator', []);
form_generator.factory('Generator', function(){
var generator ={};
generator.generate = function(modelObject){
form_generator.factory('Generator', function ($http, RESTURL) {
var generator = {};
generator.generate = function (modelObject) {
return generator.group(modelObject);
};
generator.group = function(form_items){
generator.group = function (form_items) {
return form_items;
};
generator.get_form = function (url, getParams) {
return $http
.get(RESTURL.url + url + getParams)
.then(function (res) {
if (res.data) {
return res.data;
}
});
};
return generator;
});
\ No newline at end of file
......@@ -98,6 +98,8 @@
<script src="app.js"></script>
<script src="zlib/general.js"></script>
<script src="forms/form_generator.js"></script>
<script src="test_view_for_generator/testfile.js"></script>
<!-- login js -->
......
......@@ -9,7 +9,7 @@
// TODO: login url change with correct one
login.factory('LoginService', function ($http, $rootScope, $location, Session) {
login.factory('LoginService', function ($http, $rootScope, $location, Session, RESTURL) {
var loginService = {};
loginService.login = function (credentials) {
......@@ -19,7 +19,7 @@ login.factory('LoginService', function ($http, $rootScope, $location, Session) {
getParams += k+"="+credentials[k]+"&";
}
return $http
.get('http://127.0.0.1:8000/login' + getParams)
.get(RESTURL.url + 'login' + getParams)
.then(function (res) {
if (res.data.success){
$rootScope.loggedInUser = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment