projects / JavaScriptForFun / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c985f30)
showcase, welcome page without $templateCache
authorGustavo Martin Morcuende <gu.martinm@gmail.com>
Sat, 15 Aug 2015 22:27:23 +0000 (00:27 +0200)
committerGustavo Martin Morcuende <gu.martinm@gmail.com>
Sat, 15 Aug 2015 22:27:23 +0000 (00:27 +0200)
angularjs/showcase/app/app.config.js [new file with mode: 0644] patch | blob
angularjs/showcase/app/app.module.js patch | blob | history
angularjs/showcase/app/index.html patch | blob | history
angularjs/showcase/app/welcome/welcome.html [new file with mode: 0644] patch | blob
angularjs/showcase/bower.json patch | blob | history
angularjs/showcase/server.js patch | blob | history

diff --git a/angularjs/showcase/app/app.config.js b/angularjs/showcase/app/app.config.js
new file mode 100644 (file)
index 0000000..bc41983
--- /dev/null
+++ b/angularjs/showcase/app/app.config.js
@@ -0,0 +1,20 @@
+(function() {
+  'use strict';
+
+  angular
+    .module('app')
+    .config([
+      '$stateProvider',
+      '$urlRouterProvider',
+
+      function($stateProvider, $urlRouterProvider) {
+        var welcome = {
+          url: '/welcome',
+          templateUrl: 'app/welcome/welcome.html'
+        };
+
+        $urlRouterProvider.otherwise('app/welcome');
+        $stateProvider.state('app.welcome', welcome);
+      }
+    ]);
+}());
\ No newline at end of file
diff --git a/angularjs/showcase/app/app.module.js b/angularjs/showcase/app/app.module.js
index 368471b..678ef64 100644 (file)
--- a/angularjs/showcase/app/app.module.js
+++ b/angularjs/showcase/app/app.module.js
@@ -4,18 +4,7 @@
 
   angular.module('app', [
     'ui.router',
-    'ui.grid',
-    'ui.grid.pagination',
-    'ui.grid.expandable',
-    'ui.grid.saveState',
-    'ui.grid.pinning',
-    'ui.grid.selection',
-    'ui.grid.edit',
-    'ui.grid.cellNav',
-    'ui.grid.resizeColumns',
-    'ui.grid.autoResize',
     'ui.bootstrap',
     'ui.bootstrap.modal'
   ]);
-}());
-
+}());
\ No newline at end of file
diff --git a/angularjs/showcase/app/index.html b/angularjs/showcase/app/index.html
index 7e7248f..7a6a354 100644 (file)
--- a/angularjs/showcase/app/index.html
+++ b/angularjs/showcase/app/index.html
@@ -1,83 +1,79 @@
 <!DOCTYPE html>
 <html lang="en">
 
-<head>
-  <meta charset="utf-8" />
-  <title>Showcase</title>
-
-
-  <!-- Using wiredep for filling up index.html file with bower dependencies (no devDependencies) by means of tags: bower:css/bower:js/-->
-  <!-- Using gulp-useref for combining css and js files by means of the found tags in index.html file: build:css/build:js/build:remove -->
-
-
-  <!-- build:css css/combined.css -->
-  <!-- bower:css -->
-  <link rel="stylesheet" href="../bower_components/font-awesome/css/font-awesome.css" />
-  <link rel="stylesheet" href="../bower_components/angular-loading-bar/build/loading-bar.css" />
-  <link rel="stylesheet" href="../bower_components/angular-toggle-switch/angular-toggle-switch.css" />
-  <link rel="stylesheet" href="../bower_components/metisMenu/dist/metisMenu.css" />
-  <link rel="stylesheet" href="../bower_components/angular-chart.js/dist/angular-chart.css" />
-  <!-- endbower -->
-  <!-- endbuild -->
-
-
-  <!-- build:js js/lib.js -->
-  <!-- bower:js -->
-  <script src="../bower_components/angular/angular.js"></script>
-  <script src="../bower_components/angular-translate/angular-translate.js"></script>
-  <script src="../bower_components/angular-ui-router/release/angular-ui-router.js"></script>
-  <script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
-  <script src="../bower_components/jquery/dist/jquery.js"></script>
-  <script src="../bower_components/bootstrap/dist/js/bootstrap.js"></script>
-  <script src="../bower_components/json3/lib/json3.js"></script>
-  <script src="../bower_components/es5-shim/es5-shim.js"></script>
-  <script src="../bower_components/angular-resource/angular-resource.js"></script>
-  <script src="../bower_components/angular-cookies/angular-cookies.js"></script>
-  <script src="../bower_components/angular-sanitize/angular-sanitize.js"></script>
-  <script src="../bower_components/angular-animate/angular-animate.js"></script>
-  <script src="../bower_components/angular-touch/angular-touch.js"></script>
-  <script src="../bower_components/angular-route/angular-route.js"></script>
-  <script src="../bower_components/oclazyload/dist/ocLazyLoad.min.js"></script>
-  <script src="../bower_components/angular-loading-bar/build/loading-bar.js"></script>
-  <script src="../bower_components/angular-toggle-switch/angular-toggle-switch.js"></script>
-  <script src="../bower_components/metisMenu/dist/metisMenu.js"></script>
-  <script src="../bower_components/Chart.js/Chart.js"></script>
-  <script src="../bower_components/angular-chart.js/dist/angular-chart.js"></script>
-  <!-- endbower -->
-  <!-- endbuild -->
-
-
-  <!-- Custom JavaScript -->
-  <!-- build:js js/showcase.js -->
-  <script src="app/app.module.js"></script>
-  <!-- endbuild -->
-
-
-  <script>
-  (function() {
-    'use strict';
-
-    angular
-      .element(document)
-      .ready(function() {
-        angular.bootstrap(document.body, ['app',
-          'showcase'
-        ]);
-      });
-  })();
-  </script>
-
-
-  <!-- build:remove -->
-  <!-- MOCKS -->
-  <!-- MOCKS END -->
-  <!-- endbuild -->
-
-
-</head>
-
-
-<body ng-controller="AppCtrl" >
-</body>
+  <head>
+    <meta charset="utf-8" />
+    <title>Showcase</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
+
+
+    <!-- Using wiredep for filling up index.html file with bower dependencies (no devDependencies) by means of tags: bower:css/bower:js/-->
+    <!-- Using gulp-useref for combining css and js files by means of the found tags in index.html file: build:css/build:js/build:remove -->
+
+
+    <!-- Vendor styles -->
+    <!-- build:css(.) styles/vendor.css -->
+    <!-- bower:css -->
+    <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.css" />
+    <link rel="stylesheet" href="../bower_components/font-awesome/css/font-awesome.css" />
+    <!-- endbower -->
+    <!-- endbuild -->
+
+    <!-- Custom styles -->
+    <!-- build:css(.tmp) styles/main.css -->
+    <!-- endbuild -->
+
+
+
+    <!-- Vendor JavaScript -->
+    <!-- build:js(.) scripts/vendor.js -->
+    <!-- bower:js -->
+    <script src="../bower_components/angular/angular.js"></script>
+    <script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
+    <script src="../bower_components/angular-translate/angular-translate.js"></script>
+    <script src="../bower_components/angular-ui-router/release/angular-ui-router.js"></script>
+    <script src="../bower_components/oclazyload/dist/ocLazyLoad.min.js"></script>
+    <script src="../bower_components/jquery/dist/jquery.js"></script>
+    <script src="../bower_components/bootstrap/dist/js/bootstrap.js"></script>
+    <!-- endbower -->
+    <!-- endbuild -->
+
+
+    <!-- Custom JavaScript -->
+    <!-- build:js({.tmp,app}) scripts/showcase.js -->
+    <script src="app.module.js"></script>
+    <script src="app.config.js"></script>
+    <!-- endbuild -->
+
+
+    <script>
+    (function() {
+      'use strict';
+
+      angular
+        .element(document)
+        .ready(function() {
+          angular.bootstrap(document.body, ['app'
+          ]);
+        });
+    })();
+    </script>
+
+
+    <!-- build:remove -->
+    <!-- MOCKS -->
+    <!-- MOCKS END -->
+    <!-- endbuild -->
+
+  </head>
+
+
+  <body>
+
+    <div ng-app="app">
+      <div ui-view></div>
+    </div>
+
+  </body>
 
 </html>
diff --git a/angularjs/showcase/app/welcome/welcome.html b/angularjs/showcase/app/welcome/welcome.html
new file mode 100644 (file)
index 0000000..ce2c44e
--- /dev/null
+++ b/angularjs/showcase/app/welcome/welcome.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<div class="container" ng-controller="WelcomeController as welcomeController">
+  <div class="row">
+    <div class="col-md-2">
+    </div>
+    <div class="col-md-10">
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/angularjs/showcase/bower.json b/angularjs/showcase/bower.json
index 8ac0813..a48dcbe 100644 (file)
--- a/angularjs/showcase/bower.json
+++ b/angularjs/showcase/bower.json
@@ -16,11 +16,13 @@
     "server.js"
   ],
   "dependencies": {
+    "angular": "~1.4.4",
+    "angular-bootstrap": "~0.13.3",
     "angular-translate": "2.7.2",
-    "angular-ui-router": "0.2.13",
-    "angular-bootstrap": "0.12.1",
-    "bootstrap": "latest",
-    "sb-admin": "latest"
+    "angular-ui-router": "~0.2.15",
+    "oclazyload": "~0.5.2",
+    "bootstrap": "~3.3.4",
+    "font-awesome": "~4.3.0"
   },
   "devDependencies": {
     "angular-mocks": "latest"
@@ -28,5 +30,14 @@
   "resolutions": {
     "angular-bootstrap": "0.12.1",
     "angular": "1.x"
+  },
+  "overrides": {
+    "bootstrap": {
+      "main": [
+        "less/bootstrap.less",
+        "dist/css/bootstrap.css",
+        "dist/js/bootstrap.js"
+      ]
+    }
   }
 }
diff --git a/angularjs/showcase/server.js b/angularjs/showcase/server.js
index 32f6871..86be7b0 100644 (file)
--- a/angularjs/showcase/server.js
+++ b/angularjs/showcase/server.js
@@ -12,6 +12,7 @@ var serverPort = process.env.npm_package_config_backend_port;
 var serverName = process.env.npm_package_config_backend_server_name;
 
 
+app.use('/', express.static(__dirname));
 app.use('/', express.static('app'));
 app.use('/' + moduleName, proxy('http://' + serverName, {
   forwardPath: function(req, res) {
JavaScript for fun