From fc6e437b7ea03e7385ee15ba815fd2e65924bff8 Mon Sep 17 00:00:00 2001
From: Brad Nelson <flagxor@gmail.com>
Date: Fri, 12 Feb 2021 21:49:19 -0800
Subject: [PATCH] Fixed up layout.

---
 ueforth/Makefile                                     | 12 ++++++------
 ueforth/site/ESP32forth.html                         |  2 +-
 ueforth/site/app.yaml                                |  4 ++++
 ueforth/site/classic.html                            |  2 +-
 .../site/{static => downloads}/ESP32forth-6.3.0.ino  |  0
 ueforth/site/linux.html                              |  2 +-
 ueforth/site/windows.html                            |  4 ++--
 7 files changed, 15 insertions(+), 11 deletions(-)
 rename ueforth/site/{static => downloads}/ESP32forth-6.3.0.ino (100%)

diff --git a/ueforth/Makefile b/ueforth/Makefile
index 5ad9147..a488b9c 100644
--- a/ueforth/Makefile
+++ b/ueforth/Makefile
@@ -274,13 +274,13 @@ $(DEPLOY)/app.yaml: $(ARDUINO)/ESP32forth.zip \
                     site/app.yaml \
                     site/eforth.go \
                     $(TARGETS) | $(DEPLOY)
-	mkdir -p $(DEPLOY)/static
-	cp -r $(ARDUINO)/ESP32forth.zip $(DEPLOY)/static
-	cp -r $(POSIX)/ueforth $(DEPLOY)/static/ueforth.linux
-	cp -r $(WINDOWS)/uEf32.exe $(DEPLOY)/static/uEf32.exe
-	cp -r $(WINDOWS)/uEf64.exe $(DEPLOY)/static/uEf64.exe
-	cp -r $(RES)/eforth.ico $(DEPLOY)/static/favicon.ico
 	cp -r site/* $(DEPLOY)/
+	mkdir -p $(DEPLOY)/downloads
+	cp -r $(ARDUINO)/ESP32forth.zip $(DEPLOY)/downloads
+	cp -r $(POSIX)/ueforth $(DEPLOY)/downloads/ueforth.linux
+	cp -r $(WINDOWS)/uEf32.exe $(DEPLOY)/downloads/uEf32.exe
+	cp -r $(WINDOWS)/uEf64.exe $(DEPLOY)/downloads/uEf64.exe
+	cp -r $(RES)/eforth.ico $(DEPLOY)/downloads/favicon.ico
 	cp site/.gcloudignore $(DEPLOY)
 
 deploy: clean all
diff --git a/ueforth/site/ESP32forth.html b/ueforth/site/ESP32forth.html
index c29db98..fedd776 100644
--- a/ueforth/site/ESP32forth.html
+++ b/ueforth/site/ESP32forth.html
@@ -19,7 +19,7 @@
 <h2>Download</h2>
 
 <p>
-<a href="static/ESP32forth.zip">ESP32forth.zip</a>
+<a href="downloads/ESP32forth.zip">ESP32forth.zip</a>
   - Single .ino file ready for installation
 </p>
 
diff --git a/ueforth/site/app.yaml b/ueforth/site/app.yaml
index afed362..1623d4b 100644
--- a/ueforth/site/app.yaml
+++ b/ueforth/site/app.yaml
@@ -27,6 +27,10 @@ handlers:
   static_dir: static
   secure: always
 
+- url: /downloads
+  static_dir: downloads
+  secure: always
+
 - url: /.*
   script: auto
   secure: always
diff --git a/ueforth/site/classic.html b/ueforth/site/classic.html
index 9e20a1d..e67240f 100644
--- a/ueforth/site/classic.html
+++ b/ueforth/site/classic.html
@@ -26,7 +26,7 @@ ESP32forth - Version 6.3 for NodeMCU ESP32S - Tweaked for the Web
 </p>
 
 <p>
-<a href="static/ESP32forth-6.3.0.ino">ESP32forth-6.3.0.ino</a>
+<a href="downloads/ESP32forth-6.3.0.ino">ESP32forth-6.3.0.ino</a>
   - This has Dr. Ting's v6.3 version with WebUI added in
 </p>
 
diff --git a/ueforth/site/static/ESP32forth-6.3.0.ino b/ueforth/site/downloads/ESP32forth-6.3.0.ino
similarity index 100%
rename from ueforth/site/static/ESP32forth-6.3.0.ino
rename to ueforth/site/downloads/ESP32forth-6.3.0.ino
diff --git a/ueforth/site/linux.html b/ueforth/site/linux.html
index e47af8d..382755e 100644
--- a/ueforth/site/linux.html
+++ b/ueforth/site/linux.html
@@ -18,7 +18,7 @@
 <h2>Download</h2>
 
 <p>
-<a href="static/ueforth.linux">ueforth.linux</a>
+<a href="downloads/ueforth.linux">ueforth.linux</a>
   - Linux 64-bit Executable µEforth
 </p>
 
diff --git a/ueforth/site/windows.html b/ueforth/site/windows.html
index 2c610a7..499eb56 100644
--- a/ueforth/site/windows.html
+++ b/ueforth/site/windows.html
@@ -18,12 +18,12 @@
 <h2>Download</h2>
 
 <p>
-<a href="static/uEf32.exe">uEf32.exe</a>
+<a href="downloads/uEf32.exe">uEf32.exe</a>
    - Window 32-bit EXE µEforth
 </p>
 
 <p>
-<a href="static/uEf64.exe">uEf64.exe</a>
+<a href="downloads/uEf64.exe">uEf64.exe</a>
    - Window 64-bit EXE µEforth
 </p>