Skip to content
This repository was archived by the owner on Aug 30, 2021. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/views/layout.server.view.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@
<meta property="og:title" content="{{title}}">
<meta property="og:description" content="{{description}}">
<meta property="og:url" content="{{url}}">
<meta property="og:image" content="/img/brand/logo.png">
<meta property="og:image" content="{{logo}}">
<meta property="og:type" content="website">

<!-- Twitter META -->
<meta name="twitter:title" content="{{title}}">
<meta name="twitter:description" content="{{description}}">
<meta name="twitter:url" content="{{url}}">
<meta name="twitter:image" content="/img/brand/logo.png">
<meta name="twitter:image" content="{{logo}}">

<!-- Fav Icon -->
<link href="/modules/core/img/brand/favicon.ico" rel="shortcut icon" type="image/x-icon">
<link href="{{favicon}}" rel="shortcut icon" type="image/x-icon">

<!--Application CSS Files-->
{% for cssFile in cssFiles %}
Expand Down Expand Up @@ -63,7 +63,7 @@
<script type="text/javascript" src="{{jsFile}}"></script>
{% endfor %}

{% if process.env.NODE_ENV === 'development' %}
{% if livereload %}
<!--Livereload script rendered -->
<script type="text/javascript" src="http://{{request.hostname}}:35729/livereload.js"></script>
{% endif %}
Expand Down
7 changes: 7 additions & 0 deletions config/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,10 @@ module.exports.getCSSAssets = function() {
var output = this.getGlobbedFiles(this.assets.lib.css.concat(this.assets.css), 'public/');
return output;
};

/**
* Get the routing js files
*/
module.exports.getRoutingFiles = function() {
return this.getGlobbedFiles(this.routings);
};
6 changes: 5 additions & 1 deletion config/env/all.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ module.exports = {
stream: 'access.log'
}
},
// routing glob pattern(s)
routings: './app/routes/**/*.js',
assets: {
lib: {
css: [
Expand Down Expand Up @@ -68,5 +70,7 @@ module.exports = {
'public/lib/angular-mocks/angular-mocks.js',
'public/modules/*/tests/*.js'
]
}
},
logo: '/modules/core/img/brand/logo.png',
favicon: '/modules/core/img/brand/favicon.ico'
};
3 changes: 2 additions & 1 deletion config/env/development.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,6 @@ module.exports = {
pass: process.env.MAILER_PASSWORD || 'MAILER_PASSWORD'
}
}
}
},
livereload: true
};
5 changes: 4 additions & 1 deletion config/express.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ module.exports = function(db) {
app.locals.facebookAppId = config.facebook.clientID;
app.locals.jsFiles = config.getJavaScriptAssets();
app.locals.cssFiles = config.getCSSAssets();
app.locals.logo = config.logo;
app.locals.favicon = config.favicon;
app.locals.livereload = config.livereload;

// Passing the request url to environment locals
app.use(function(req, res, next) {
Expand Down Expand Up @@ -119,7 +122,7 @@ module.exports = function(db) {
app.use(flash());

// Globbing routing files
config.getGlobbedFiles('./app/routes/**/*.js').forEach(function(routePath) {
config.getRoutingFiles().forEach(function(routePath) {
require(path.resolve(routePath))(app);
});

Expand Down
12 changes: 5 additions & 7 deletions public/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,20 @@

// Init the application configuration module for AngularJS application
var ApplicationConfiguration = (function() {
// Init module configuration options
var applicationModuleName = 'mean';
var applicationModuleVendorDependencies = ['ngResource', 'ngAnimate', 'ui.router', 'ui.bootstrap', 'ui.utils'];

// Add a new vertical module
var registerModule = function(moduleName, dependencies) {
// Create angular module
angular.module(moduleName, dependencies || []);

// Add the module to the AngularJS configuration file
angular.module(applicationModuleName).requires.push(moduleName);
angular.module(this.applicationModuleName).requires.push(moduleName);
};

return {
applicationModuleName: applicationModuleName,
applicationModuleVendorDependencies: applicationModuleVendorDependencies,
applicationModuleName: 'mean',
applicationName: 'MEAN.JS',
applicationModuleVendorDependencies: ['ngResource', 'ngAnimate', 'ui.router', 'ui.bootstrap', 'ui.utils'],
registerModule: registerModule
};
})();
})();
3 changes: 2 additions & 1 deletion public/modules/core/controllers/header.client.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ angular.module('core').controller('HeaderController', ['$scope', 'Authentication
$scope.authentication = Authentication;
$scope.isCollapsed = false;
$scope.menu = Menus.getMenu('topbar');
$scope.headerTitle = ApplicationConfiguration.applicationName;

$scope.toggleCollapsibleMenu = function() {
$scope.isCollapsed = !$scope.isCollapsed;
Expand All @@ -15,4 +16,4 @@ angular.module('core').controller('HeaderController', ['$scope', 'Authentication
$scope.isCollapsed = false;
});
}
]);
]);
4 changes: 2 additions & 2 deletions public/modules/core/views/header.client.view.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a href="/#!/" class="navbar-brand">MEAN.JS</a>
<a href="/#!/" class="navbar-brand">{{headerTitle}}</a>
</div>
<nav class="collapse navbar-collapse" collapse="!isCollapsed" role="navigation">
<ul class="nav navbar-nav" data-ng-if="menu.shouldRender(authentication.user);">
Expand Down Expand Up @@ -55,4 +55,4 @@
</li>
</ul>
</nav>
</div>
</div>