From b488c349e82e812ea1ecfd8e09f148ae602921a1 Mon Sep 17 00:00:00 2001 From: kevgliss Date: Tue, 11 Aug 2015 14:53:28 -0700 Subject: [PATCH 1/5] Look for compiled static files, to see if they need to be created --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6b4282e8..8afa80ed 100644 --- a/setup.py +++ b/setup.py @@ -72,7 +72,7 @@ class SmartInstall(install): `build_static` which is required for JavaScript assets and other things. """ def _needs_static(self): - return not os.path.exists(os.path.join(ROOT, 'lemur-package.json')) + return not os.path.exists(os.path.join(ROOT, 'lemur/static/dist')) def run(self): if self._needs_static(): From bfcbd1b0658e7b050426592acb17c626391d75af Mon Sep 17 00:00:00 2001 From: kevgliss Date: Tue, 11 Aug 2015 15:43:59 -0700 Subject: [PATCH 2/5] Fixes issue where client authentication was not displaying in the UI --- lemur/__init__.py | 2 +- .../app/angular/certificates/certificate/options.tpl.html | 5 +++++ .../app/angular/certificates/certificate/tracking.tpl.html | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lemur/__init__.py b/lemur/__init__.py index 5d91aacf..24cb6ef1 100644 --- a/lemur/__init__.py +++ b/lemur/__init__.py @@ -54,7 +54,7 @@ def configure_hook(app): from lemur.decorators import crossdomain if app.config.get('CORS'): @app.after_request - @crossdomain(origin="http://localhost:3000", methods=['PUT', 'HEAD', 'GET', 'POST', 'OPTIONS', 'DELETE']) + @crossdomain(origin=u"http://localhost:3000", methods=['PUT', 'HEAD', 'GET', 'POST', 'OPTIONS', 'DELETE']) def after(response): return response diff --git a/lemur/static/app/angular/certificates/certificate/options.tpl.html b/lemur/static/app/angular/certificates/certificate/options.tpl.html index 794aaf6e..cef3904a 100644 --- a/lemur/static/app/angular/certificates/certificate/options.tpl.html +++ b/lemur/static/app/angular/certificates/certificate/options.tpl.html @@ -94,6 +94,11 @@ Server Authentication +
+ +
- +

You must enter a common name

From d3ff79d8000882583addd08d6f7cd6b87825f8e9 Mon Sep 17 00:00:00 2001 From: kevgliss Date: Tue, 11 Aug 2015 15:46:54 -0700 Subject: [PATCH 3/5] Getting correct path to readme so that it doesn't matter where setup.py is run from --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8afa80ed..102a9002 100644 --- a/setup.py +++ b/setup.py @@ -113,7 +113,7 @@ setup( version='0.1', author='Kevin Glisson', author_email='kglisson@netflix.com', - long_description=open('README.rst').read(), + long_description=open(os.path.join(ROOT, 'README.rst')).read(), packages=['lemur'], include_package_data=True, zip_safe=False, From 90e49613f96a8f1b792f97a1ec43a8d2a9820e55 Mon Sep 17 00:00:00 2001 From: kevgliss Date: Tue, 11 Aug 2015 16:21:00 -0700 Subject: [PATCH 4/5] develop doesn't need to build the static files, the make develop will do that --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 102a9002..ea7ef326 100644 --- a/setup.py +++ b/setup.py @@ -125,7 +125,6 @@ setup( }, cmdclass={ 'build_static': BuildStatic, - 'develop': DevelopWithBuildStatic, 'sdist': SdistWithBuildStatic, 'install': SmartInstall From 43d4dbbfbdd6cdb4926adb2cf4e738479669325e Mon Sep 17 00:00:00 2001 From: kevgliss Date: Fri, 14 Aug 2015 10:05:30 -0700 Subject: [PATCH 5/5] Fixing the paths related to javascript dependecies --- .bowerrc | 2 +- gulp/build.js | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.bowerrc b/.bowerrc index 6a408552..44491d3d 100644 --- a/.bowerrc +++ b/.bowerrc @@ -1,3 +1,3 @@ { - "directory": "lemur/static/app/vendor/bower_components" + "directory": "bower_components" } diff --git a/gulp/build.js b/gulp/build.js index 54112294..07ad3c5f 100644 --- a/gulp/build.js +++ b/gulp/build.js @@ -48,8 +48,8 @@ gulp.task('test', function (done) { gulp.task('dev:fonts', function () { var fileList = [ - 'lemur/static/app/vendor/bower_components/bootstrap/dist/fonts/*', - 'lemur/static/app/vendor/bower_components/fontawesome/fonts/*' + 'bower_components/bootstrap/dist/fonts/*', + 'bower_components/fontawesome/fonts/*' ]; return gulp.src(fileList) @@ -57,7 +57,7 @@ gulp.task('dev:fonts', function () { }); gulp.task('dev:styles', function () { - var baseContent = '@import "lemur/static/app/vendor/bower_components/bootstrap/less/bootstrap.less";@import "lemur/static/app/vendor/bower_components/bootswatch/$theme$/variables.less";@import "lemur/static/app/vendor/bower_components/bootswatch/$theme$/bootswatch.less";@import "lemur/static/app/vendor/bower_components/bootstrap/less/utilities.less";'; + var baseContent = '@import "bower_components/bootstrap/less/bootstrap.less";@import "bower_components/bootswatch/$theme$/variables.less";@import "bower_components/bootswatch/$theme$/bootswatch.less";@import "bower_components/bootstrap/less/utilities.less";'; var isBootswatchFile = function (file) { var suffix = 'bootswatch.less'; @@ -73,15 +73,15 @@ gulp.task('dev:styles', function () { var fileList = [ 'lemur/static/app/styles/lemur.css', - 'lemur/static/app/vendor/bower_components/bootswatch/sandstone/bootswatch.less', - 'lemur/static/app/vendor/bower_components/fontawesome/css/font-awesome.css', - 'lemur/static/app/vendor/bower_components/angular-spinkit/src/angular-spinkit.css', - 'lemur/static/app/vendor/bower_components/angular-chart.js/dist/angular-chart.css', - 'lemur/static/app/vendor/bower_components/angular-loading-bar/src/loading-bar.css', - 'lemur/static/app/vendor/bower_components/angular-ui-switch/angular-ui-switch.css', - 'lemur/static/app/vendor/bower_components/angular-wizard/dist/angular-wizard.css', - 'lemur/static/app/vendor/bower_components/ng-table/ng-table.css', - 'lemur/static/app/vendor/bower_components/angularjs-toaster/toaster.css' + 'bower_components/bootswatch/sandstone/bootswatch.less', + 'bower_components/fontawesome/css/font-awesome.css', + 'bower_components/angular-spinkit/src/angular-spinkit.css', + 'bower_components/angular-chart.js/dist/angular-chart.css', + 'bower_components/angular-loading-bar/src/loading-bar.css', + 'bower_components/angular-ui-switch/angular-ui-switch.css', + 'bower_components/angular-wizard/dist/angular-wizard.css', + 'bower_components/ng-table/ng-table.css', + 'bower_components/angularjs-toaster/toaster.css' ]; return gulp.src(fileList)