From 28edbbf577aee6ff3134d64be12870c8c5d11062 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Fri, 16 Aug 2019 22:02:17 -0400 Subject: [PATCH 1/8] Add maxUploadFileSize Signed-off-by: Andrew Welch --- config/general.php | 1 + 1 file changed, 1 insertion(+) diff --git a/config/general.php b/config/general.php index 82d67b4..6512804 100644 --- a/config/general.php +++ b/config/general.php @@ -36,6 +36,7 @@ 'errorTemplatePrefix' => 'errors/', 'generateTransformsBeforePageLoad' => true, 'maxCachedCloudImageSize' => 3000, + 'maxUploadFileSize' => '100M', 'omitScriptNameInUrls' => true, 'useEmailAsUsername' => true, 'usePathInfo' => true, From 2fbbaafe831bb616d6459ddab957b8cb9fbf1046 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Fri, 16 Aug 2019 22:03:19 -0400 Subject: [PATCH 2/8] Version 2.0.2 Signed-off-by: Andrew Welch --- CHANGELOG.md | 4 ++++ composer.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fba2694..9e85c5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # nystudio107/craft Change Log +## 2.0.2 - 2018.08.20 +### +* Added `maxUploadFileSize` to `general.php` + ## 2.0.1 - 2018.08.15 ### Changed * Numerous template changes to get the base build working diff --git a/composer.json b/composer.json index 66e472f..92b26bb 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "craftcms/craft", "description": "nystudio107 Craft 3.2 CMS scaffolding project", - "version": "2.0.1", + "version": "2.0.2", "keywords": [ "craft", "cms", From af1e9ce959fe2c891dfecfd2263e853b2f2f87d1 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Sat, 17 Aug 2019 14:14:28 -0400 Subject: [PATCH 3/8] Move errors to a channel Signed-off-by: Andrew Welch --- templates/errors/404.twig | 2 +- templates/errors/503.twig | 2 +- templates/errors/error.twig | 2 +- templates/errors/offline.twig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/errors/404.twig b/templates/errors/404.twig index 2846593..98c1450 100755 --- a/templates/errors/404.twig +++ b/templates/errors/404.twig @@ -1,3 +1,3 @@ -{% set entry = craft.entries.section("notFound").limit(1).one() %} +{% set entry = craft.entries.section('errors').slug('error404').one() %} {% extends "_layouts/error-page-layout.twig" %} diff --git a/templates/errors/503.twig b/templates/errors/503.twig index 0cfcec1..8bff3ae 100755 --- a/templates/errors/503.twig +++ b/templates/errors/503.twig @@ -1,3 +1,3 @@ -{% set entry = craft.entries.section("serviceUnavailable").limit(1).one() %} +{% set entry = craft.entries.section('errors').slug('error503').one() %} {% extends "_layouts/error-page-layout.twig" %} diff --git a/templates/errors/error.twig b/templates/errors/error.twig index 0e4b6cc..e3a547f 100755 --- a/templates/errors/error.twig +++ b/templates/errors/error.twig @@ -1,3 +1,3 @@ -{% set entry = craft.entries.section("genericError").limit(1).one() %} +{% set entry = craft.entries.section('errors').slug('errorError').one() %} {% extends "_layouts/error-page-layout.twig" %} diff --git a/templates/errors/offline.twig b/templates/errors/offline.twig index 59b2f74..66fe18f 100755 --- a/templates/errors/offline.twig +++ b/templates/errors/offline.twig @@ -1,3 +1,3 @@ -{% set entry = craft.entries.section("siteOffline").limit(1).one() %} +{% set entry = craft.entries.section('errors').slug('errorOffline').one() %} {% extends "_layouts/error-page-layout.twig" %} From 3e95c6172886e6cf5d17776ca9fa0801e7b28ed9 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Sat, 17 Aug 2019 14:24:03 -0400 Subject: [PATCH 4/8] Generic fallbacks Signed-off-by: Andrew Welch --- templates/_layouts/error-page-layout.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/_layouts/error-page-layout.twig b/templates/_layouts/error-page-layout.twig index d6fa270..ca420e2 100644 --- a/templates/_layouts/error-page-layout.twig +++ b/templates/_layouts/error-page-layout.twig @@ -27,10 +27,10 @@

- {{ entry.errorHeadline }} + {{ entry.errorHeadline ?? 'Error' }}

- {{ entry.errorText |nl2br }} + {{ (entry.errorText ?? 'An error has occurred.') |nl2br }}

From 6b0bd9df9583303a0c93f540ee90b33c181c2355 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Sat, 17 Aug 2019 14:46:01 -0400 Subject: [PATCH 5/8] Add login image background Signed-off-by: Andrew Welch --- web/img/.gitignore | 2 - web/img/site/login-background-image.svg | 63 +++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 2 deletions(-) delete mode 100644 web/img/.gitignore create mode 100644 web/img/site/login-background-image.svg diff --git a/web/img/.gitignore b/web/img/.gitignore deleted file mode 100644 index d6b7ef3..0000000 --- a/web/img/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/web/img/site/login-background-image.svg b/web/img/site/login-background-image.svg new file mode 100644 index 0000000..4bd1d23 --- /dev/null +++ b/web/img/site/login-background-image.svg @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 45403479e4f8c6eeee3834ddbfd4c35e3c6d77bd Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Sat, 17 Aug 2019 15:01:47 -0400 Subject: [PATCH 6/8] Add `/web/dist/*` Signed-off-by: Andrew Welch --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7ce8602..08778c9 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ # ASSETS /web/assets/* /web/cpresources/* +/web/dist/* # BUILD FILES /bower_components/* From 3fd30cb7caa0479d9ecc512c3e529e0656bddb1d Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Sat, 17 Aug 2019 15:07:50 -0400 Subject: [PATCH 7/8] Background image cover Signed-off-by: Andrew Welch --- .../src/assetbundles/sitemodule/dist/css/SiteModule.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/sitemodule/src/assetbundles/sitemodule/dist/css/SiteModule.css b/modules/sitemodule/src/assetbundles/sitemodule/dist/css/SiteModule.css index f8573ef..e082c9f 100755 --- a/modules/sitemodule/src/assetbundles/sitemodule/dist/css/SiteModule.css +++ b/modules/sitemodule/src/assetbundles/sitemodule/dist/css/SiteModule.css @@ -11,8 +11,8 @@ */ body.login { - background-size: 600px; - background-repeat: repeat; + background-size: cover; + background-repeat: no-repeat; background-image: url('/img/site/login-background-image.svg'); } From cfc00feaeeb98dce5c8a5803949ae28e8300198e Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Sat, 17 Aug 2019 15:15:08 -0400 Subject: [PATCH 8/8] Version 2.0.2 Signed-off-by: Andrew Welch --- CHANGELOG.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e85c5e..1a605e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,11 @@ # nystudio107/craft Change Log -## 2.0.2 - 2018.08.20 -### +## 2.0.2 - 2018.08.17 +### Changed * Added `maxUploadFileSize` to `general.php` +* Added `/web/dist/*` to `.gitignore` +* Refactored the error pages out to a single channel +* Added generic login image background ## 2.0.1 - 2018.08.15 ### Changed