diff --git a/.env.dist b/.env.dist index edb071cba..0a6e9a6cd 100644 --- a/.env.dist +++ b/.env.dist @@ -6,6 +6,8 @@ APP_ENV=dev APP_DEBUG=1 APP_SECRET=67d829bf61dc5f87a73fd814e2c9f629 +#TRUSTED_PROXIES=127.0.0.1,127.0.0.2 +#TRUSTED_HOSTS='^localhost|example\.com$' ###< symfony/framework-bundle ### ###> doctrine/doctrine-bundle ### diff --git a/composer.lock b/composer.lock index 7edaef77a..8982cf68b 100644 --- a/composer.lock +++ b/composer.lock @@ -202,16 +202,16 @@ }, { "name": "bolt/assets", - "version": "4.0.0-rc.1", + "version": "4.0.0-rc.2", "source": { "type": "git", "url": "https://github.com/bolt/assets.git", - "reference": "7d263fe46102c329eeceff8025da04295c3f54ce" + "reference": "7a114af482d195e8248b6a5970a9e70705221823" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bolt/assets/zipball/7d263fe46102c329eeceff8025da04295c3f54ce", - "reference": "7d263fe46102c329eeceff8025da04295c3f54ce", + "url": "https://api.github.com/repos/bolt/assets/zipball/7a114af482d195e8248b6a5970a9e70705221823", + "reference": "7a114af482d195e8248b6a5970a9e70705221823", "shasum": "" }, "require-dev": { @@ -229,20 +229,20 @@ } ], "description": "🛠 Assets used in Bolt's backend. Do not use directly.", - "time": "2020-02-02T13:21:02+00:00" + "time": "2020-02-09T11:44:32+00:00" }, { "name": "bolt/common", - "version": "2.1.3", + "version": "2.1.4", "source": { "type": "git", "url": "https://github.com/bolt/common.git", - "reference": "2b75c4aba56b2cce2cefe926adcbf16dff7696ae" + "reference": "1d02950552a744a6e30d6aa189215267c581d5f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bolt/common/zipball/2b75c4aba56b2cce2cefe926adcbf16dff7696ae", - "reference": "2b75c4aba56b2cce2cefe926adcbf16dff7696ae", + "url": "https://api.github.com/repos/bolt/common/zipball/1d02950552a744a6e30d6aa189215267c581d5f8", + "reference": "1d02950552a744a6e30d6aa189215267c581d5f8", "shasum": "" }, "require": { @@ -281,20 +281,20 @@ } ], "description": "🧰 Common utilities for all Bolt libraries", - "time": "2019-12-30T13:05:27+00:00" + "time": "2020-02-02T14:16:10+00:00" }, { "name": "bolt/core", - "version": "4.0.0-rc.1", + "version": "4.0.0-rc.2", "source": { "type": "git", "url": "https://github.com/bolt/core.git", - "reference": "c3cb8e8a8bb299d38974c7cf1ae545765de7a7f1" + "reference": "79ee67e41ee3fbdae099e33eb1f3a97911acf11c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bolt/core/zipball/c3cb8e8a8bb299d38974c7cf1ae545765de7a7f1", - "reference": "c3cb8e8a8bb299d38974c7cf1ae545765de7a7f1", + "url": "https://api.github.com/repos/bolt/core/zipball/79ee67e41ee3fbdae099e33eb1f3a97911acf11c", + "reference": "79ee67e41ee3fbdae099e33eb1f3a97911acf11c", "shasum": "" }, "require": { @@ -415,7 +415,7 @@ "MIT" ], "description": "🧿 Bolt 4 Core", - "time": "2020-02-02T13:12:44+00:00" + "time": "2020-02-09T11:39:43+00:00" }, { "name": "bolt/newswidget", @@ -631,16 +631,16 @@ }, { "name": "composer/composer", - "version": "1.9.2", + "version": "1.9.3", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "7a04aa0201ddaa0b3cf64d41022bd8cdcd7fafeb" + "reference": "1291a16ce3f48bfdeca39d64fca4875098af4d7b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/7a04aa0201ddaa0b3cf64d41022bd8cdcd7fafeb", - "reference": "7a04aa0201ddaa0b3cf64d41022bd8cdcd7fafeb", + "url": "https://api.github.com/repos/composer/composer/zipball/1291a16ce3f48bfdeca39d64fca4875098af4d7b", + "reference": "1291a16ce3f48bfdeca39d64fca4875098af4d7b", "shasum": "" }, "require": { @@ -707,7 +707,7 @@ "dependency", "package" ], - "time": "2020-01-14T15:30:32+00:00" + "time": "2020-02-04T11:58:49+00:00" }, { "name": "composer/semver", @@ -2920,16 +2920,16 @@ }, { "name": "league/flysystem", - "version": "1.0.63", + "version": "1.0.64", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "8132daec326565036bc8e8d1876f77ec183a7bd6" + "reference": "d13c43dbd4b791f815215959105a008515d1a2e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/8132daec326565036bc8e8d1876f77ec183a7bd6", - "reference": "8132daec326565036bc8e8d1876f77ec183a7bd6", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/d13c43dbd4b791f815215959105a008515d1a2e0", + "reference": "d13c43dbd4b791f815215959105a008515d1a2e0", "shasum": "" }, "require": { @@ -2941,7 +2941,7 @@ }, "require-dev": { "phpspec/phpspec": "^3.4", - "phpunit/phpunit": "^5.7.10" + "phpunit/phpunit": "^5.7.26" }, "suggest": { "ext-fileinfo": "Required for MimeType", @@ -3000,7 +3000,7 @@ "sftp", "storage" ], - "time": "2020-01-04T16:30:31+00:00" + "time": "2020-02-05T18:14:17+00:00" }, { "name": "league/glide", @@ -4550,16 +4550,16 @@ }, { "name": "scienta/doctrine-json-functions", - "version": "4.1.1", + "version": "4.1.2", "source": { "type": "git", "url": "https://github.com/ScientaNL/DoctrineJsonFunctions.git", - "reference": "34502880cef2eb06f62e381e71cc1e1f245dc2c9" + "reference": "6cab3f93a7415dbc889da15336c7605efbfe7bd4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ScientaNL/DoctrineJsonFunctions/zipball/34502880cef2eb06f62e381e71cc1e1f245dc2c9", - "reference": "34502880cef2eb06f62e381e71cc1e1f245dc2c9", + "url": "https://api.github.com/repos/ScientaNL/DoctrineJsonFunctions/zipball/6cab3f93a7415dbc889da15336c7605efbfe7bd4", + "reference": "6cab3f93a7415dbc889da15336c7605efbfe7bd4", "shasum": "" }, "require": { @@ -4608,7 +4608,7 @@ "postgresql", "sqlite" ], - "time": "2019-12-13T10:04:29+00:00" + "time": "2020-02-07T11:05:21+00:00" }, { "name": "seld/jsonlint", @@ -9334,7 +9334,7 @@ }, { "name": "tightenco/collect", - "version": "v6.13.0", + "version": "v6.14.0", "source": { "type": "git", "url": "https://github.com/tightenco/collect.git", @@ -9446,16 +9446,16 @@ }, { "name": "ua-parser/uap-php", - "version": "v3.9.4", + "version": "v3.9.5", "source": { "type": "git", "url": "https://github.com/ua-parser/uap-php.git", - "reference": "8c1e3c6c7698d197368bfaa0d16734c947d94e99" + "reference": "67f8f61bc7fc36fcd23dd6526f6ed5e7a32625c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ua-parser/uap-php/zipball/8c1e3c6c7698d197368bfaa0d16734c947d94e99", - "reference": "8c1e3c6c7698d197368bfaa0d16734c947d94e99", + "url": "https://api.github.com/repos/ua-parser/uap-php/zipball/67f8f61bc7fc36fcd23dd6526f6ed5e7a32625c7", + "reference": "67f8f61bc7fc36fcd23dd6526f6ed5e7a32625c7", "shasum": "" }, "require": { @@ -9499,7 +9499,7 @@ } ], "description": "A multi-language port of Browserscope's user agent parser.", - "time": "2020-01-21T09:54:19+00:00" + "time": "2020-02-03T09:54:22+00:00" }, { "name": "webmozart/assert", diff --git a/config/bolt/config.yaml b/config/bolt/config.yaml index 2dfba338a..77c83aa4e 100644 --- a/config/bolt/config.yaml +++ b/config/bolt/config.yaml @@ -31,10 +31,6 @@ locale: en # Set maintenance mode on or off. # -# While in maintenance mode, only users of level editor or higher can access the -# site. All other visitors are presented with a notice that the site is -# currently offline. -# # The default for the Maintenance mode (503) page. Can be an (array of) template # names or identifiers for records, which will be tried until a match is found. maintenance_mode: false diff --git a/config/bolt/contenttypes.yaml b/config/bolt/contenttypes.yaml index fc060e96e..e96269872 100644 --- a/config/bolt/contenttypes.yaml +++ b/config/bolt/contenttypes.yaml @@ -21,7 +21,6 @@ homepage: in the webbrowser, edit sitename: in the configuration file. image: type: image - placeholder: https://source.unsplash.com/1920x640/?cityscape,landscape,nature/__random__ teaser: type: html localize: true @@ -71,7 +70,6 @@ pages: image: type: image label: "Eén plaatje" - placeholder: https://source.unsplash.com/1280x768/?business,workplace/__random__ teaser: type: html height: 150px @@ -91,7 +89,7 @@ pages: type: templateselect filter: '*.twig' taxonomy: [ groups ] - recordsperpage: 5 + records_per_page: 5 # Entries can be used for things like 'news' or 'blogpostings'. They have a @@ -177,20 +175,20 @@ blocks: # text - varchar(256) - input type text. # integer - integer - Input field for integer numbers. # float - double - Input field for floating numbers, stored as 'Double'. -# geolocation - text (65kb) - Input field for geolocation. Enter an address, and the location is geocoded to latitude/longitude coordinates -# imagelist - text (65kb) - Input type for imagelists. Add multiple images with a description. Useful for image sliders, galleries, etcetera. +# imagelist - text (65kb) - Input type for imagelists. Add multiple images. Useful for image sliders, galleries, etcetera. # image - varchar(256) - image select/upload widget, stored as filename. # file - varchar(256) - file select/upload widget, stored as filename. # filelist - text (65kb) - Input type for a list of files. Including a description. # video - varchar(256) - Video embed widget, stored as filename. # html - text (65kb) - wysiwyg element. # textarea - varchar(32768) - Simple, plain < textarea > field. -# markdown - varchar(32768) - Simple, plain < textarea > field, which is parsed as Markdown text. -# datetime - datetime - date and time selector widget. +# markdown - varchar(32768) - wysiwyg element, which is parsed as Markdown text. # date - datetime - date selector widget. # select - varchar(256) - select with predefined values # templateselect - varchar(256) - select with template filenames # checkbox - integer - checkbox-field which is 1 (checked) or 0 (unchecked) +# set - text (65kb) - Input type for sests. Group fields semantically into a combined set field. +# collection - text (65kb) - Input type for collections. Add multiple fields of different types. Useful for lists. # Using YAML repeated nodes # @@ -220,8 +218,9 @@ blocks: # Then, as an example, you could create a ContentType with default fields, with # an additional 'image' field. # -#contenttype_abc: +#contenttypeabc: # name: ContentType Abc +# slug: contenttypeabc # fields: # <<: *field_defaults # image: @@ -235,8 +234,9 @@ blocks: # Alternatively, or additionally, you then can then create a ContentType with # default fields, and a 'select' field, and a different 'templateselect' option. # -#contenttype_xyz: +#contenttypexyz: # name: ContentType Xyz +# slug: contenttypexyz # fields: # <<: *field_defaults # selectfield: diff --git a/config/routes.yaml b/config/routes.yaml index e34f2eaf7..ce5b5a798 100644 --- a/config/routes.yaml +++ b/config/routes.yaml @@ -33,10 +33,20 @@ project: #contentlisting: # path: /{contenttypeslug} # defaults: -# _controller: Bolt\Controller\Frontend\Controller::contentListing +# _controller: Bolt\Controller\Frontend\ListingController::listing # requirements: # contenttypeslug: '%bolt.requirement.pluralcontenttypes%' +# Use this route to display a record, based on the value of a field. for example, +# URLs like `/number/12`, where the intent is to display the record from the +# "entry" ContentType, where the "title" Field is equal to "12". +entrybynumber: + path: /number/{value} + defaults: + _controller: Bolt\Controller\Frontend\DetailController::contentByFieldValue + contentTypeSlug: 'entries' + field: 'title' + # ------------------------------------------------------------------------------ # last of all, try to find content only by slug (SEO routes) before throwing 404 content_seo: