Skip to content
This repository has been archived by the owner on Oct 6, 2022. It is now read-only.

Making the logo configurable #188

Open
wants to merge 5 commits into
base: 3.0
Choose a base branch
from
Open
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
35 changes: 32 additions & 3 deletions client/configuration/config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,34 @@
angular.module('config', [])

.constant('ENV', {RequiresAuth:false,etcdHost:'127.0.0.1',etcdPort:'4001',hobknobHost:'localhost',hobknobPort:'3006',categories:[{id:0,name:'Simple Features',description:'Use when you want your feature to be either on or off'},{id:1,name:'Domain Features',description:'Use when you want your features to be toggled separately for different domains (e.g. com, couk, fr, ...)',values:['com','couk','de','fr']},{id:2,name:'Locale Features',description:'Use when you want your features to be toggled separately for different locales (e.g. en-GB, en-US, fr-FR, ...)',values:['en-GB','en-US','fr-FR','de-DE']}],plugin:{path:'../server/examplePlugin.js'},hooks:['server/exampleHook.js']})

;
.constant('ENV', {
RequiresAuth: false,
dataSource: 'etcd',
etcdHost: '127.0.0.1',
etcdPort: '4001',
hobknobHost: 'localhost',
hobknobPort: '3006',
loadBalancerFile: '/etc/lbstatus/hobknob',
categories: [{
id: 0,
name: 'Simple Features',
description: 'Use when you want your feature to be either on or off'
}, {
id: 1,
name: 'Domain Features',
description: 'Use when you want your features to be toggled separately for different domains (e.g. com, couk, fr, ...)',
values: ['com', 'couk', 'de', 'fr']
}, {
id: 2,
name: 'Locale Features',
description: 'Use when you want your features to be toggled separately for different locales (e.g. en-GB, en-US, fr-FR, ...)',
values: ['en-GB', 'en-US', 'fr-FR', 'de-DE']
}],
plugin: {
path: '../server/examplePlugin.js'
},
hooks: ['server/exampleHook.js'],
customization: {
logo: '/img/opentable-hr-mono.png',
title: 'Opentable Feature Toggles'
}
});
5 changes: 4 additions & 1 deletion client/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ featureToggleFrontend.config(function ($routeProvider, $locationProvider, $httpP
$httpProvider.defaults.headers.post = {'Content-Type': 'application/json'};
});

featureToggleFrontend.run(function (editableOptions) {
featureToggleFrontend.run(function ($rootScope, editableOptions, ENV) {
editableOptions.theme = 'bs3';
$rootScope.$on('$routeChangeSuccess', function (event, current, previous) {
$rootScope.title = current.$$route.title || ENV.customization.title;
});
});
2 changes: 2 additions & 0 deletions client/js/controllers/loginController.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
'use strict';

featureToggleFrontend.controller('LoginController', ['$scope', '$window', 'ENV', function ($scope, $window, ENV) {
$scope.logo = ENV.customization.logo;

if (ENV.RequiresAuth) {
var authProvider = Object.keys(ENV.AuthProviders)[0];

Expand Down
3 changes: 2 additions & 1 deletion client/js/controllers/sideBarController.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
'use strict';

featureToggleFrontend.controller('SideBarController', ['$scope', 'applicationService', 'authorisationService', '$location', 'focus', 'CurrentUser', function ($scope, applicationService, authorisationService, $location, focus, CurrentUser) {
featureToggleFrontend.controller('SideBarController', ['$scope', 'applicationService', 'authorisationService', '$location', 'focus', 'CurrentUser', 'ENV', function ($scope, applicationService, authorisationService, $location, focus, CurrentUser, ENV) {
$scope.applications = [];
$scope.newApplicationName = '';
$scope.adding = false;
$scope.CurrentUser = CurrentUser;
$scope.logo = ENV.customization.logo;

var loadApplications = function () {
applicationService.getApplications(
Expand Down
8 changes: 4 additions & 4 deletions client/views/login.pug
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
doctype html
html(lang='en')
html(lang='en' ng-app='featureToggleFrontend' ng-cloak)
head
meta(name='viewport', content='width=device-width, initial-scale=1')
title Hobknob Dashboard
title(ng-bind="$root.title")
link(href='/bower_components/bootstrap/dist/css/bootstrap.min.css', media='all', rel='stylesheet')
link(href='/css/dashboard.css', media='all', rel='stylesheet')
link(href='/css/toggleswitch.css', media='all', rel='stylesheet')
link(href='/bower_components/bootstrap-social/bootstrap-social.css', media='all', rel='stylesheet')
link(href='/bower_components/font-awesome/css/font-awesome.css', media='all', rel='stylesheet')
script(src='/bower_components/jquery/dist/jquery.min.js')
body(ng-app='featureToggleFrontend' ng-cloak)
body
#wrapper
#sidebar-wrapper
ul.sidebar-nav(ng-controller="LoginController")
li.sidebar-brand
a.navbar-brand.logo(href='/')
img(src='/img/opentable-hr-mono.png')
img(ng-src='{{logo}}')
a(href='/auth/google',ng-if="authProvider == 'GoogleAuth'", id="loginwithgoogle").btn.btn-block.btn-social.btn-google-plus.sign-in
i.fa.fa-google-plus
| Sign in with Google
Expand Down
6 changes: 3 additions & 3 deletions client/views/main.pug
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
doctype html
html(lang='en')
html(lang='en' ng-app='featureToggleFrontend')
head
meta(name='viewport', content='width=device-width, initial-scale=1')
title Hobknob Dashboard
title(ng-bind="$root.title")
link(href='/bower_components/bootstrap/dist/css/bootstrap.min.css', media='all', rel='stylesheet')
link(href='/css/dashboard.css', media='all', rel='stylesheet')
link(href='/bower_components/angular-xeditable/dist/css/xeditable.css' rel='stylesheet')
Expand All @@ -11,7 +11,7 @@ html(lang='en')
script(src='/bower_components/jquery/dist/jquery.min.js')
script(type="text/javascript").
window.user = !{JSON.stringify(user || {}, null, 2)};
body(ng-app='featureToggleFrontend')
body
#wrapper
include ./sidebar.pug
#page-content-wrapper
Expand Down
2 changes: 1 addition & 1 deletion client/views/sidebar.pug
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
ul.sidebar-nav
li.sidebar-brand
a.navbar-brand.logo(href='/')
img(src='/img/opentable-hr-mono.png')
img(ng-src='{{logo}}')
li
.profile
img.media-object.img-circle(ng-src='{{CurrentUser.getPicture()}}', alt='avatar')
Expand Down
8 changes: 6 additions & 2 deletions config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"RequiresAuth": false,
"dataSource": "etcd",
"etcdHost": "127.0.0.1",
"etcdPort": "4001",
"etcdPort": "2379",
"hobknobHost": "localhost",
"hobknobPort": "3006",
"loadBalancerFile": "/etc/lbstatus/hobknob",
Expand Down Expand Up @@ -40,5 +40,9 @@
},
"hooks": [
"server/exampleHook.js"
]
],
"customization": {
"logo": "/img/opentable-hr-mono.png",
"title": "Hobknob Dashboard"
}
}