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