diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/index.php | 13 | ||||
| -rw-r--r-- | client/js/app.js | 4 | ||||
| -rw-r--r-- | client/js/controllers/empty | 0 | ||||
| -rw-r--r-- | client/js/controllers/mainApp.js | 10 |
4 files changed, 20 insertions, 7 deletions
diff --git a/client/index.php b/client/index.php index 6ce050c..8c29a9b 100644 --- a/client/index.php +++ b/client/index.php @@ -1,6 +1,6 @@ <!doctype html> -<html lang="en"> +<html lang="en" ng-app="mainApp"> <head> <meta charset="utf-8"> @@ -17,9 +17,9 @@ </head> - <body> + <body ng-controller="mainAppCtrl"> <!-- MAIN GRID --> - <div class="container-lg" ng-app="MainApp"> + <div class="container-lg"> <!-- Status bar --> <div class="row"> <div class="col-lg-12"> @@ -48,7 +48,7 @@ Content test </div> <div class="panel-body"> - Main content test + Main Content </div> </div> </div> @@ -67,9 +67,10 @@ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script> <!-- Include Bootstrap --> <script src="./vendors/bootstrap/js/bootstrap.min.js"></script> - <!-- Include AngularJS --> + <!-- Include AngularJS and dependencies--> <script src="./vendors/angularjs/angular.min.js"></script> - <!-- Include our app --> <script src="./js/app.js"></script> + <script src="./js/controllers/mainApp.js"></script> + </html>
\ No newline at end of file diff --git a/client/js/app.js b/client/js/app.js index e726d8a..63ecfef 100644 --- a/client/js/app.js +++ b/client/js/app.js @@ -1 +1,3 @@ -angular.module("MainApp",[])
\ No newline at end of file + +// Declare main app +var mainApp=angular.module("mainApp",[]);
\ No newline at end of file diff --git a/client/js/controllers/empty b/client/js/controllers/empty deleted file mode 100644 index e69de29..0000000 --- a/client/js/controllers/empty +++ /dev/null diff --git a/client/js/controllers/mainApp.js b/client/js/controllers/mainApp.js new file mode 100644 index 0000000..6ff39a9 --- /dev/null +++ b/client/js/controllers/mainApp.js @@ -0,0 +1,10 @@ +/* + * mainApp Controller + */ + + + +mainApp.controller('mainAppCtrl', function ($scope) +{ + // TODO +});
\ No newline at end of file |