From a892272cc59104d68c72138f676831b6aecf8b16 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Fri, 12 Jan 2018 16:28:15 +1300
Subject: [PATCH] Shift public resources into public folder (#220)

---
 .gitignore                           |   3 ++-
 .htaccess                            |   2 ++
 composer.json                        |   8 +++++---
 mysite/_config/theme.yml             |   1 +
 {assets => public/assets}/.gitignore |   0
 {assets => public/assets}/.htaccess  |   0
 {assets => public/assets}/web.config |   0
 favicon.ico => public/favicon.ico    | Bin
 8 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 .htaccess
 mode change 100644 => 100755 mysite/_config/theme.yml
 rename {assets => public/assets}/.gitignore (100%)
 rename {assets => public/assets}/.htaccess (100%)
 rename {assets => public/assets}/web.config (100%)
 rename favicon.ico => public/favicon.ico (100%)

diff --git a/.gitignore b/.gitignore
index cd2159b..1dff294 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 /.env
 /vendor/
 /themes/simple/
-/resources/
\ No newline at end of file
+/resources/
+/public/resources/
diff --git a/.htaccess b/.htaccess
new file mode 100644
index 0000000..fdecdd0
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,2 @@
+RewriteEngine On
+RewriteRule .* public/%1
diff --git a/composer.json b/composer.json
index ca7d66e..de3448c 100644
--- a/composer.json
+++ b/composer.json
@@ -13,9 +13,11 @@
     },
     "extra": {
         "project-files": [
-            "assets/*",
             "mysite/_config/*",
-            ".env.example",
+            ".env.example"
+        ],
+        "public-files": [
+            "assets/*",
             "favicon.ico"
         ],
         "branch-alias": {
@@ -28,4 +30,4 @@
     },
     "prefer-stable": true,
     "minimum-stability": "dev"
-}
\ No newline at end of file
+}
diff --git a/mysite/_config/theme.yml b/mysite/_config/theme.yml
old mode 100644
new mode 100755
index ccf866c..e1184e7
--- a/mysite/_config/theme.yml
+++ b/mysite/_config/theme.yml
@@ -3,5 +3,6 @@ Name: mytheme
 ---
 SilverStripe\View\SSViewer:
   themes:
+    - '$public'
     - 'simple'
     - '$default'
diff --git a/assets/.gitignore b/public/assets/.gitignore
similarity index 100%
rename from assets/.gitignore
rename to public/assets/.gitignore
diff --git a/assets/.htaccess b/public/assets/.htaccess
similarity index 100%
rename from assets/.htaccess
rename to public/assets/.htaccess
diff --git a/assets/web.config b/public/assets/web.config
similarity index 100%
rename from assets/web.config
rename to public/assets/web.config
diff --git a/favicon.ico b/public/favicon.ico
similarity index 100%
rename from favicon.ico
rename to public/favicon.ico