From 3de24253d50915c8646e14e5f96f3c3ca31389b2 Mon Sep 17 00:00:00 2001 From: Gustavo Martin Morcuende Date: Sun, 16 Aug 2015 00:27:23 +0200 Subject: [PATCH] showcase, welcome page without $templateCache --- angularjs/showcase/app/app.config.js | 20 ++++ angularjs/showcase/app/app.module.js | 13 +-- angularjs/showcase/app/index.html | 152 ++++++++++++++-------------- angularjs/showcase/app/welcome/welcome.html | 9 ++ angularjs/showcase/bower.json | 19 +++- angularjs/showcase/server.js | 1 + 6 files changed, 120 insertions(+), 94 deletions(-) create mode 100644 angularjs/showcase/app/app.config.js create mode 100644 angularjs/showcase/app/welcome/welcome.html diff --git a/angularjs/showcase/app/app.config.js b/angularjs/showcase/app/app.config.js new file mode 100644 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 --- 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 --- a/angularjs/showcase/app/index.html +++ b/angularjs/showcase/app/index.html @@ -1,83 +1,79 @@ - - - Showcase - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + Showcase + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + diff --git a/angularjs/showcase/app/welcome/welcome.html b/angularjs/showcase/app/welcome/welcome.html new file mode 100644 index 0000000..ce2c44e --- /dev/null +++ b/angularjs/showcase/app/welcome/welcome.html @@ -0,0 +1,9 @@ + +
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/angularjs/showcase/bower.json b/angularjs/showcase/bower.json index 8ac0813..a48dcbe 100644 --- 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 --- 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) { -- 2.1.4