From 9540002c6e0ddf4b6730e980039bd5198f420889 Mon Sep 17 00:00:00 2001
From: unsettledgames <47360416+unsettledgames@users.noreply.github.com>
Date: Thu, 15 Jul 2021 18:43:59 +0200
Subject: [PATCH] Moved popup windows into a specific folder

---
 build.js                                      |  2 +-
 views/index.hbs                               | 20 +++++++++----------
 views/{about-popup.hbs => popups/about.hbs}   |  0
 .../canvas-resize.hbs}                        |  0
 .../changelog.hbs}                            |  0
 .../{credits-popup.hbs => popups/credits.hbs} |  0
 views/{help-popup.hbs => popups/help.hbs}     |  0
 .../new-pixel.hbs}                            |  0
 .../{palette-popup.hbs => popups/palette.hbs} |  0
 .../settings.hbs}                             |  0
 .../splash-page.hbs}                          |  0
 .../sprite-resize.hbs}                        |  0
 12 files changed, 11 insertions(+), 11 deletions(-)
 rename views/{about-popup.hbs => popups/about.hbs} (100%)
 rename views/{canvas-resize-popup.hbs => popups/canvas-resize.hbs} (100%)
 rename views/{changelog-popup.hbs => popups/changelog.hbs} (100%)
 rename views/{credits-popup.hbs => popups/credits.hbs} (100%)
 rename views/{help-popup.hbs => popups/help.hbs} (100%)
 rename views/{start-pixel-popup.hbs => popups/new-pixel.hbs} (100%)
 rename views/{palette-popup.hbs => popups/palette.hbs} (100%)
 rename views/{settings-popup.hbs => popups/settings.hbs} (100%)
 rename views/{splash-page-popup.hbs => popups/splash-page.hbs} (100%)
 rename views/{sprite-resize-popup.hbs => popups/sprite-resize.hbs} (100%)

diff --git a/build.js b/build.js
index 607a923..5bb5b13 100644
--- a/build.js
+++ b/build.js
@@ -49,7 +49,7 @@ function compile_page(){
 		.pipe(include({includePaths: ['/svg']}))
 
         .pipe(handlebars({encoding: 'utf8', debug: true, bustCache: true})
-            .partials('./views/[!index]*.hbs')
+            .partials('./views/[!index]*.hbs').partials('./views/popups/*.hbs')
             //.helpers({ svg: hb_svg })
             .helpers('./helpers/**/*.js')
             .data({
diff --git a/views/index.hbs b/views/index.hbs
index db5ce38..fab89c4 100644
--- a/views/index.hbs
+++ b/views/index.hbs
@@ -26,16 +26,16 @@
 	{{> holders}}
    
     <div id="pop-up-container">
-		{{> start-pixel-popup}}
-		{{> splash-page-popup}}
-		{{> sprite-resize-popup}}
-		{{> canvas-resize-popup}}
-		{{> palette-popup}}
-		{{> help-popup}}
-		{{> about-popup}}
-		{{> changelog-popup}}
-		{{> credits-popup}}
-		{{> settings-popup}}
+		{{> new-pixel}}
+		{{> splash-page}}
+		{{> sprite-resize}}
+		{{> canvas-resize}}
+		{{> palette}}
+		{{> help}}
+		{{> about}}
+		{{> changelog}}
+		{{> credits}}
+		{{> settings}}
     </div>
 
     <script src="/pixel-editor/pixel-editor.js"></script>
diff --git a/views/about-popup.hbs b/views/popups/about.hbs
similarity index 100%
rename from views/about-popup.hbs
rename to views/popups/about.hbs
diff --git a/views/canvas-resize-popup.hbs b/views/popups/canvas-resize.hbs
similarity index 100%
rename from views/canvas-resize-popup.hbs
rename to views/popups/canvas-resize.hbs
diff --git a/views/changelog-popup.hbs b/views/popups/changelog.hbs
similarity index 100%
rename from views/changelog-popup.hbs
rename to views/popups/changelog.hbs
diff --git a/views/credits-popup.hbs b/views/popups/credits.hbs
similarity index 100%
rename from views/credits-popup.hbs
rename to views/popups/credits.hbs
diff --git a/views/help-popup.hbs b/views/popups/help.hbs
similarity index 100%
rename from views/help-popup.hbs
rename to views/popups/help.hbs
diff --git a/views/start-pixel-popup.hbs b/views/popups/new-pixel.hbs
similarity index 100%
rename from views/start-pixel-popup.hbs
rename to views/popups/new-pixel.hbs
diff --git a/views/palette-popup.hbs b/views/popups/palette.hbs
similarity index 100%
rename from views/palette-popup.hbs
rename to views/popups/palette.hbs
diff --git a/views/settings-popup.hbs b/views/popups/settings.hbs
similarity index 100%
rename from views/settings-popup.hbs
rename to views/popups/settings.hbs
diff --git a/views/splash-page-popup.hbs b/views/popups/splash-page.hbs
similarity index 100%
rename from views/splash-page-popup.hbs
rename to views/popups/splash-page.hbs
diff --git a/views/sprite-resize-popup.hbs b/views/popups/sprite-resize.hbs
similarity index 100%
rename from views/sprite-resize-popup.hbs
rename to views/popups/sprite-resize.hbs