Skip to content

Commit

Permalink
Merge pull request #15 from JayBox325/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
JayBox325 authored Sep 20, 2020
2 parents 405a582 + 2580956 commit 98af738
Show file tree
Hide file tree
Showing 32 changed files with 825 additions and 64 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).

## 1.0.12
### Added
- Basic footer markup
- Multiple asset directories
- Audio file component
- Core fields
- External URL macro
- Menu list field

## 1.0.11
### Added
- SVG Symbol markup example
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "jaybox325/jaycraft",
"description": "Craft boilerplate to work with JayBox325/JayPack",
"version": "1.0.11",
"version": "1.0.12",
"type": "project",
"require": {
"adigital/cookie-consent-banner": "^1.1",
Expand Down
4 changes: 2 additions & 2 deletions config/matrixmate.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
'groups' => [
[
'label' => 'Content',
'types' => ['accordions', 'body', 'testimonial'],
'types' => ['body', 'accordions', 'testimonial'],
],
[
'label' => 'Media',
'types' => ['images', 'video', 'externalVideo'],
'types' => ['images', 'video', 'externalVideo', 'audio'],
]
]
]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,73 @@
fieldLayouts:
d6c92853-2151-43f6-bde4-c6d430617786:
tabs:
-
elements:
-
autocapitalize: true
autocomplete: false
autocorrect: true
class: null
disabled: false
id: null
instructions: null
label: null
max: null
min: null
name: null
orientation: null
placeholder: null
readonly: false
requirable: false
size: null
step: null
tip: null
title: null
type: craft\fieldlayoutelements\EntryTitleField
warning: null
width: 100
-
fieldUid: 989f6b5c-82cf-4a15-aa85-fe9b821cee4b
instructions: ''
label: ''
required: '1'
tip: null
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
name: Content
sortOrder: 1
-
elements:
-
fieldUid: 65332953-fec0-4f58-b96d-8297c3994640
instructions: null
label: null
required: false
tip: null
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
name: Options
sortOrder: 2
-
elements:
-
fieldUid: 7fdd5aee-0781-486e-810f-9af57a6cd8ce
instructions: null
label: null
required: false
tip: null
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
name: SEO
sortOrder: 3
handle: news
hasTitleField: true
name: News
section: b6dcff48-9906-46af-add1-70d94f8fa406
sortOrder: 1
titleFormat: null
titleLabel: Title
titleTranslationKeyFormat: null
titleTranslationMethod: site
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ fieldLayouts:
width: 100
-
fieldUid: 989f6b5c-82cf-4a15-aa85-fe9b821cee4b
instructions: null
label: null
required: false
instructions: ''
label: ''
required: '1'
tip: null
type: craft\fieldlayoutelements\CustomField
warning: null
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
contentColumnType: string
fieldGroup: 9d0976d6-6ff8-4790-9e75-5bb37d331d19
handle: contactEmail
instructions: ''
name: 'Contact email'
searchable: true
settings:
placeholder: ''
translationKeyFormat: null
translationMethod: none
type: craft\fields\Email
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
contentColumnType: text
fieldGroup: 9d0976d6-6ff8-4790-9e75-5bb37d331d19
handle: contactPhone
instructions: ''
name: 'Contact phone'
searchable: true
settings:
byteLimit: null
charLimit: null
code: ''
columnType: null
initialRows: '4'
multiline: ''
placeholder: ''
uiMode: normal
translationKeyFormat: null
translationMethod: none
type: craft\fields\PlainText
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
contentColumnType: string
fieldGroup: 9d0976d6-6ff8-4790-9e75-5bb37d331d19
handle: mainMenu
instructions: 'List of pages to show in the main site navigation. Maximum of seven for user experience purposes. If a menu is not set, the pages from "Site" will display.'
name: 'Main menu'
searchable: false
settings:
allowSelfRelations: false
limit: '7'
localizeRelations: false
selectionLabel: ''
showSiteMenu: true
source: null
sources:
- 'section:3a95c5ae-691b-45a9-af63-804ec4f32d8f'
targetSiteId: null
validateRelatedElements: false
viewMode: null
translationKeyFormat: null
translationMethod: site
type: craft\fields\Entries
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ fieldGroup: be866704-e9e5-489a-94b0-c7763eec7317
handle: pageDescription
instructions: ''
name: 'Page description'
searchable: false
searchable: true
settings:
availableTransforms: '*'
availableVolumes: '*'
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
contentColumnType: text
fieldGroup: 9d0976d6-6ff8-4790-9e75-5bb37d331d19
handle: tags
instructions: 'Hashtags included in any Twitter, Facebook or LinkedIn share features.'
name: Tags
searchable: false
settings:
byteLimit: null
charLimit: null
code: ''
columnType: null
initialRows: '4'
multiline: ''
placeholder: ''
uiMode: normal
translationKeyFormat: null
translationMethod: none
type: craft\fields\PlainText
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
contentColumnType: string
fieldGroup: 9d0976d6-6ff8-4790-9e75-5bb37d331d19
handle: utilityMenu
instructions: 'List of pages to show in the footer, such as legal pages.'
name: 'Utility menu'
searchable: false
settings:
allowSelfRelations: false
limit: '6'
localizeRelations: false
selectionLabel: ''
showSiteMenu: true
source: null
sources:
- 'section:b6dcff48-9906-46af-add1-70d94f8fa406'
- 'section:3a95c5ae-691b-45a9-af63-804ec4f32d8f'
targetSiteId: null
validateRelatedElements: false
viewMode: null
translationKeyFormat: null
translationMethod: site
type: craft\fields\Entries
Original file line number Diff line number Diff line change
@@ -1,6 +1,50 @@
fieldLayouts:
8762c3d1-6cfc-4a3a-9590-3e15f33414e7:
tabs:
-
elements:
-
fieldUid: 37791995-fc9d-4977-9057-ad800dd1b735
instructions: null
label: null
required: false
tip: null
type: craft\fieldlayoutelements\CustomField
warning: null
width: 50
-
fieldUid: 639079df-d2e2-40b6-b2a2-2b528a89ec4e
instructions: null
label: null
required: false
tip: null
type: craft\fieldlayoutelements\CustomField
warning: null
width: 50
name: Menus
sortOrder: 1
-
elements:
-
fieldUid: 4a8ef1e9-0d62-4ea2-b094-f78aa2d8b906
instructions: null
label: null
required: false
tip: null
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
-
fieldUid: fb3be2e2-4f29-4954-867d-c4ab5dc55a9c
instructions: null
label: null
required: false
tip: null
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
name: 'Business details'
sortOrder: 2
-
elements:
-
Expand All @@ -12,7 +56,16 @@ fieldLayouts:
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
name: Social
sortOrder: 1
-
fieldUid: 4caee081-e90b-4ece-8d4a-8d67ab5b2928
instructions: null
label: null
required: false
tip: null
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
name: 'Social media'
sortOrder: 3
handle: siteDetails
name: 'Site details'
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
field: 989f6b5c-82cf-4a15-aa85-fe9b821cee4b
fieldLayouts:
24d10f0a-7220-46c7-98d2-4c0818d07dbe:
tabs:
-
elements:
-
fieldUid: a8d65c69-c832-4301-902e-712b8221762f
instructions: null
label: null
required: true
tip: null
type: craft\fieldlayoutelements\CustomField
warning: null
width: 100
name: Content
sortOrder: 1
fields:
a8d65c69-c832-4301-902e-712b8221762f:
contentColumnType: string
fieldGroup: null
handle: audio
instructions: 'Upload an audio file.'
name: Audio
searchable: false
settings:
allowSelfRelations: false
allowedKinds:
- audio
defaultUploadLocationSource: 'volume:d9c51571-b4e8-40c9-abaf-dab181ce75bf'
defaultUploadLocationSubpath: ''
limit: '1'
localizeRelations: false
previewMode: full
restrictFiles: '1'
selectionLabel: 'Add an audio file'
showSiteMenu: true
showUnpermittedFiles: false
showUnpermittedVolumes: false
singleUploadLocationSource: 'volume:696a96fe-981a-49b3-8947-b85b4ec0dc06'
singleUploadLocationSubpath: ''
source: null
sources:
- 'volume:d9c51571-b4e8-40c9-abaf-dab181ce75bf'
targetSiteId: null
useSingleFolder: false
validateRelatedElements: false
viewMode: list
translationKeyFormat: null
translationMethod: site
type: craft\fields\Assets
handle: audio
name: Audio
sortOrder: 7
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ fields:
allowedKinds:
- json
- video
defaultUploadLocationSource: 'volume:25e8c49e-de76-4f02-b0f2-4412c37bdad4'
defaultUploadLocationSource: 'volume:81307dab-347a-4fb8-b528-45b18ed7d0e0'
defaultUploadLocationSubpath: ''
limit: '1'
localizeRelations: false
Expand All @@ -38,12 +38,13 @@ fields:
showSiteMenu: true
showUnpermittedFiles: false
showUnpermittedVolumes: false
singleUploadLocationSource: 'volume:25e8c49e-de76-4f02-b0f2-4412c37bdad4'
singleUploadLocationSubpath: /embedded
singleUploadLocationSource: 'volume:81307dab-347a-4fb8-b528-45b18ed7d0e0'
singleUploadLocationSubpath: ''
source: null
sources: '*'
sources:
- 'volume:81307dab-347a-4fb8-b528-45b18ed7d0e0'
targetSiteId: null
useSingleFolder: true
useSingleFolder: false
validateRelatedElements: false
viewMode: list
translationKeyFormat: null
Expand Down
Loading

0 comments on commit 98af738

Please sign in to comment.