From 1342ed2601da23fea594ecdd1e6e7203d517cff4 Mon Sep 17 00:00:00 2001
From: Sam Lu <samvlu@icloud.com>
Date: Tue, 17 Jul 2018 10:17:28 -0500
Subject: [PATCH] Fix gulpfile.js destinations.

---
 gulpfile.js              | 13 +++++++++----
 src/templates/layout.pug |  9 ++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 5aee47e..450cabe 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -19,6 +19,11 @@ let enabled = {
 	uglify: argv.production
 };
 
+var destination = {
+	css: 'cloud/static/assets/css',
+	pug: 'cloud/templates',
+	js: 'cloud/static/assets/js',
+}
 
 /* CSS */
 gulp.task('styles', function(done) {
@@ -29,7 +34,7 @@ gulp.task('styles', function(done) {
 		.pipe(sass({outputStyle: 'compressed'}))
 		.pipe(autoprefixer("last 3 versions"))
 		//.pipe(gulpif(enabled.maps, sourcemaps.write(".")))
-		.pipe(gulp.dest('dillo/static/css'))
+		.pipe(gulp.dest(destination.css))
 		.pipe(gulpif(argv.livereload, livereload()));
 	done();
 });
@@ -43,7 +48,7 @@ gulp.task('templates', function(done) {
 		.pipe(pug({
 				pretty: enabled.prettyPug
 		}))
-		.pipe(gulp.dest('dillo/templates/'))
+		.pipe(gulp.dest(destination.pug))
 		.pipe(gulpif(argv.livereload, livereload()));
 	done();
 });
@@ -58,7 +63,7 @@ gulp.task('scripts', function(done) {
 		.pipe(gulpif(enabled.uglify, uglify()))
 		.pipe(rename({suffix: '.min'}))
 		//.pipe(gulpif(enabled.maps, sourcemaps.write(".")))
-		.pipe(gulp.dest('dillo/static/js/generated/'))
+		.pipe(gulp.dest(destination.js))
 		.pipe(gulpif(argv.livereload, livereload()));
 	done();
 });
@@ -73,7 +78,7 @@ gulp.task('scripts_tutti', function(done) {
 		.pipe(concat("tutti.min.js"))
 		.pipe(gulpif(enabled.uglify, uglify()))
 		//.pipe(gulpif(enabled.maps, sourcemaps.write(".")))
-		.pipe(gulp.dest('dillo/static/js/generated/'))
+		.pipe(gulp.dest(destination.js))
 		.pipe(gulpif(argv.livereload, livereload()));
 	done();
 });
diff --git a/src/templates/layout.pug b/src/templates/layout.pug
index 5d306ee..8699e9a 100644
--- a/src/templates/layout.pug
+++ b/src/templates/layout.pug
@@ -114,8 +114,8 @@ html(lang="en")
 						li.nav-item
 							a.nav-link(href="{{ url_for('cloud.services') }}",
 									class="{% if category == 'services' %}active{% endif %}") Services
-						//- li.nav-item
-						//- 	i.search-icon.pi-search
+						li.nav-item
+							i.search-icon.pi-search
 						| {% endblock navigation_sections %}
 
 						| {% if current_user.is_anonymous %}
@@ -126,9 +126,8 @@ html(lang="en")
 						| {% endif %}
 
 						| {% block navigation_user %}
-						//- comment out notification and user to make sure navigation links pefect
-						//- | {% include 'menus/notifications.html' %}
-						//- | {% include 'menus/user.html' %}
+						| {% include 'menus/notifications.html' %}
+						| {% include 'menus/user.html' %}
 
 						| {% endblock navigation_user %}