Skip to content

U
ulakbus-ui
Commit 0bebbad1 authored by Evren Kutar's avatar Evren Kutar
Browse files
Options

add comments to define functions

parent 15543384
Show whitespace changes
Inline Side-by-side
Showing with 67 additions and 45 deletions
app/app.js
View file @ 0bebbad1
...@@ -7,30 +7,54 @@ ...@@ -7,30 +7,54 @@
'use strict'; 'use strict';
// Declare app level module which depends on views, and components
angular.module( angular.module(
'zaerp', [ 'zaerp', [
'oc.lazyLoad',
'ngRoute', 'ngRoute',
'ngSanitize', 'ngSanitize',
'ngAnimate', //'ngAnimate',
'ngQuantum', //'ngQuantum',
'general', //'general',
'formGenerator', //'formGenerator',
'zaerp.dashboard', //'zaerp.dashboard',
'zaerp.login', //'zaerp.login',
'zaerp.version', //'zaerp.version',
'zaerp.test', //'zaerp.test',
'schemaForm' //'schemaForm'
]). ]).
/**
* lazyload modules with oclazyload
* the lines below are config of oclazyload
* turn debug false when production
*/
config(['$ocLazyLoadProvider', function($ocLazyLoadProvider) {
$ocLazyLoadProvider.config({
// todo: turn debug false on prod
debug: true
});
}]).
config(['$routeProvider', function ($routeProvider) { config(['$routeProvider', function ($routeProvider) {
$routeProvider $routeProvider
.when('/login', { .when('/login', {
templateUrl: 'login/login.html', templateUrl: 'login/login.html',
controller: 'LoginCtrl' controller: 'LoginCtrl',
resolve: {
loadMyCtrl: ['$ocLazyLoad', function($ocLazyLoad) {
return $ocLazyLoad.load('login/login.js');
}],
loadMyService: ['$ocLazyLoad', function($ocLazyLoad) {
return $ocLazyLoad.load('login/login_service.js');
}]
}
}) })
.when('/dashboard', { .when('/dashboard', {
templateUrl: 'dashboard/dashboard.html', templateUrl: 'dashboard/dashboard.html',
controller: 'DashCtrl' controller: 'DashCtrl',
resolve: {
loadMyCtrl: ['$ocLazyLoad', function($ocLazyLoad) {
return $ocLazyLoad.load('dashboard/dashboard.js');
}]
}
}) })
.otherwise({redirectTo: '/dashboard'}); .otherwise({redirectTo: '/dashboard'});
}]). }]).
...@@ -38,7 +62,6 @@ angular.module( ...@@ -38,7 +62,6 @@ angular.module(
$rootScope.$on("$routeChangeStart", function (event, next, current) { $rootScope.$on("$routeChangeStart", function (event, next, current) {
if ($rootScope.loggedInUser == null) { if ($rootScope.loggedInUser == null) {
// no logged user, redirect to /login // no logged user, redirect to /login
console.log("test log");
if (next.templateUrl === "login/login.html") { if (next.templateUrl === "login/login.html") {
console.log("test log to login"); console.log("test log to login");
} else { } else {
...@@ -48,13 +71,20 @@ angular.module( ...@@ -48,13 +71,20 @@ angular.module(
} }
}); });
}). }).
/**
* RESTURL is the url of rest api to talk
* Based on the environment it changes from dev to prod
*/
constant("RESTURL", (function(){ constant("RESTURL", (function(){
var dev = "http://127.0.0.1:3000/api/"; var dev = "http://127.0.0.1:3000/api/";
var prod = ""; var prod = "";
var ENV = "dev"; // change to prod in production var ENV = "dev"; // change to prod in production
return ENV =="dev" ? {url:dev} : {url:prod}; return ENV =="dev" ? {url:dev} : {url:prod};
return "http://127.0.0.1:3000/api/"; //return "http://127.0.0.1:3000/api/";
})()). })()).
/**
* USER_ROLES and AUTH_EVENTS are constant for auth functions
*/
constant("USER_ROLES", { constant("USER_ROLES", {
all: "*", all: "*",
admin: "admin", admin: "admin",
......
app/index.html
View file @ 0bebbad1
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css"> <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css">
<link rel="stylesheet" href="bower_components/quantumui/dist/css/addon/effect-light.min.css"> <!--<link rel="stylesheet" href="bower_components/quantumui/dist/css/addon/effect-light.min.css">-->
<link rel="stylesheet" href="bower_components/quantumui/dist/css/quantumui.min.css"> <!--<link rel="stylesheet" href="bower_components/quantumui/dist/css/quantumui.min.css">-->
<link rel="stylesheet" href="app.css"> <link rel="stylesheet" href="app.css">
<!--<script src="bower_components/html5-boilerplate/js/vendor/modernizr-2.6.2.min.js"></script>--> <!--<script src="bower_components/html5-boilerplate/js/vendor/modernizr-2.6.2.min.js"></script>-->
</head> </head>
...@@ -83,24 +83,22 @@ ...@@ -83,24 +83,22 @@
<!-- In production use: <!-- In production use:
<script src="//ajax.googleapis.com/ajax/libs/angularjs/x.x.x/angular.min.js"></script> <script src="//ajax.googleapis.com/ajax/libs/angularjs/x.x.x/angular.min.js"></script>
--> -->
<!--<script src="bower_components/angular/angular.js"></script>--> <script src="bower_components/angular/angular.min.js"></script>
<script src="bower_components/scriptjs/dist/script.min.js"></script> <script src="bower_components/oclazyload/dist/ocLazyLoad.min.js"></script>
<script src="main.js"></script>
<script src="bower_components/angular-route/angular-route.min.js"></script>
<script src="bower_components/angular-resource/angular-resource.min.js"></script>
<!--<script src="bower_components/angular-schema-form/dist/schema-form.js"></script>-->
<!--<script src="bower_components/angular-route/angular-route.js"></script>--> <script type="text/javascript" src="bower_components/angular-sanitize/angular-sanitize.min.js"></script>
<!--<script src="bower_components/angular-resource/angular-resource.js"></script>-->
<!--&lt;!&ndash;<script src="bower_components/angular-schema-form/dist/schema-form.js"></script>&ndash;&gt;-->
<!--<script type="text/javascript" src="bower_components/angular-sanitize/angular-sanitize.min.js"></script>-->
<!--<script type="text/javascript" src="bower_components/angular-animate/angular-animate.min.js"></script>--> <!--<script type="text/javascript" src="bower_components/angular-animate/angular-animate.min.js"></script>-->
<!--<script type="text/javascript" src="bower_components/moment/moment.js"></script>--> <!--<script type="text/javascript" src="bower_components/moment/moment.js"></script>-->
<!--<script type="text/javascript" src="bower_components/tv4/tv4.js"></script>--> <script type="text/javascript" src="bower_components/tv4/tv4.js"></script>
<!--<script type="text/javascript" src="bower_components/objectpath/lib/ObjectPath.js"></script>--> <script type="text/javascript" src="bower_components/objectpath/lib/ObjectPath.js"></script>
<!--<script type="text/javascript" src="bower_components/angular-schema-form/dist/schema-form.min.js"></script>--> <script type="text/javascript" src="bower_components/angular-schema-form/dist/schema-form.min.js"></script>
<!--<script type="text/javascript" src="bower_components/angular-schema-form/dist/bootstrap-decorator.min.js"></script>--> <script type="text/javascript" src="bower_components/angular-schema-form/dist/bootstrap-decorator.min.js"></script>
<!--<script src="app.js"></script>--> <script src="app.js"></script>
<!--<script src="zlib/general.js"></script>--> <!--<script src="zlib/general.js"></script>-->
<!--<script src="forms/form_generator.js"></script>--> <!--<script src="forms/form_generator.js"></script>-->
<!--<script src="test_view_for_generator/testfile.js"></script>--> <!--<script src="test_view_for_generator/testfile.js"></script>-->
......
app/login/login.js
View file @ 0bebbad1
...@@ -12,13 +12,7 @@ ...@@ -12,13 +12,7 @@
// TODO: who field can be removed?? // TODO: who field can be removed??
var login = angular.module('zaerp.login', ['ngRoute', 'schemaForm']); var login = angular.module('zaerp.login', ['ngRoute', 'schemaForm']);
login.config(['$routeProvider', function ($routeProvider) { login.controller('LoginCtrl', function ($scope, $q, $timeout, LoginService) {
//$routeProvider.when('/login', {
// templateUrl: 'login/login.html',
// controller: 'LoginCtrl'
//});
}]);
login.controller('LoginCtrl', function ($scope, $q, $timeout, $http, $location, $rootScope, AUTH_EVENTS, LoginService, FormDiff) {
$scope.schema = $scope.schema =
{ {
title: "Login", title: "Login",
......
bower.json
View file @ 0bebbad1
...@@ -6,12 +6,12 @@ ...@@ -6,12 +6,12 @@
"license": "MIT", "license": "MIT",
"private": true, "private": true,
"dependencies": { "dependencies": {
"angular": "*", "angular": "1.3.x",
"angular-mocks": "1.3.x", "angular-mocks": "1.3.x",
"angular-route": "1.3.x", "angular-route": "1.3.x",
"angular-resource": "1.3.x", "angular-resource": "1.3.x",
"bootstrap": "3.3.4",
"angular-schema-form": "*", "angular-schema-form": "*",
"quantumui": "*", "oclazyload": "*"
"scriptjs": "2.5.x"
} }
} }
karma.conf.js
View file @ 0bebbad1
...@@ -41,7 +41,7 @@ module.exports = function (config) { ...@@ -41,7 +41,7 @@ module.exports = function (config) {
frameworks: ['jasmine'], frameworks: ['jasmine'],
browsers: ['Opera'], browsers: ['Chrome'],
plugins: [ plugins: [
'karma-chrome-launcher', 'karma-chrome-launcher',
......
package.json
View file @ 0bebbad1
{ {
"name": "angular-seed", "name": "zaerp-ui",
"private": true, "private": true,
"version": "0.0.0", "version": "0.0.1",
"description": "A starter project for AngularJS", "description": "",
"repository": "https://github.com/angular/angular-seed", "repository": "https://github.com/zetaops/zaerp-ui",
"license": "MIT", "license": "GPL",
"devDependencies": { "devDependencies": {
"bower": "^1.3.1", "bower": "^1.3.1",
"http-server": "^0.6.1", "http-server": "^0.6.1",
......
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