Skip to content
Open

v6 #130

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,11 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest]
php: [8.2, 8.3, 8.4]
php: [8.3, 8.4]
laravel: [11.*, 12.*]
stability: [prefer-lowest, prefer-stable]
os: [ubuntu-latest]
dependency-version: [prefer-stable]
exclude:
- php: 8.1
laravel: 11.*
- php: 8.1
laravel: 12.*
- php: 8.4
laravel: 10.*
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ubuntu-latest
steps:
- name: Checkout code
Expand All @@ -39,8 +33,7 @@ jobs:
coverage: none

- name: Install dependencies
run: |
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
run: composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest

- name: Execute tests
run: vendor/bin/phpunit -c phpunit.xml
run: vendor/bin/pest
65 changes: 31 additions & 34 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,32 @@
{
"name": "transformstudios/events",
"type": "statamic-addon",
"license": "proprietary",
"description": "Statamic addon to create & manage events",
"license": "proprietary",
"type": "statamic-addon",
"authors": [
{
"name": "Erin Dalzell",
"email": "erin@transformstudios.com",
"homepage": "https://transformstudios.com"
}
],
"require": {
"php": "^8.3",
"rlanvin/php-rrule": "^2.3.1",
"spatie/calendar-links": "^1.0",
"spatie/icalendar-generator": "^2.3.3",
"statamic/cms": "^6.0.0-alpha.14"
},
"require-dev": {
"orchestra/testbench": "^9.2 || ^10.0",
"pestphp/pest": "^4.0",
"spatie/laravel-ray": "^1.35",
"spatie/test-time": "^1.2"
},
"autoload": {
"psr-4": {
"TransformStudios\\Events\\": "src"
"TransformStudios\\Events\\": "src",
"TransformStudios\\Events\\Tests\\": "tests"
},
"files": [
"src/helpers.php"
Expand All @@ -23,41 +37,24 @@
"TransformStudios\\Events\\Tests\\": "tests"
}
},
"extra": {
"statamic": {
"name": "Events",
"description": "Statamic addon to create & manage events"
"config": {
"allow-plugins": {
"pestphp/pest-plugin": true,
"pixelfear/composer-dist-plugin": true
},
"optimize-autoloader": true,
"preferred-install": "dist",
"sort-packages": true
},
"extra": {
"laravel": {
"providers": [
"TransformStudios\\Events\\ServiceProvider"
]
},
"statamic": {
"description": "Statamic addon to create & manage events",
"name": "Events"
}
},
"require": {
"php": "^8.2",
"edalzell/forma": "^2.0 || ^3.0",
"nesbot/carbon": "^2.0 || ^3.0",
"rlanvin/php-rrule": "^2.3.1",
"spatie/calendar-links": "^1.0",
"spatie/icalendar-generator": "^2.3.3",
"statamic/cms": "^4.5 || ^5.0"
},
"require-dev": {
"mockery/mockery": "^1.3.1",
"nunomaduro/collision": "^6.0 || ^7.0 || ^8.0",
"phpunit/phpunit": "^9.0 || ^10.0 || ^11.0",
"orchestra/testbench": "^7.0 || ^8.0 || ^9.0",
"spatie/laravel-ray": "^1.35",
"spatie/test-time": "^1.2"
},
"config": {
"optimize-autoloader": true,
"preferred-install": "dist",
"sort-packages": true,
"allow-plugins": {
"pixelfear/composer-dist-plugin": true
}
},
"repositories": []
}
}
18 changes: 0 additions & 18 deletions resources/blueprints/config.yaml

This file was deleted.

43 changes: 43 additions & 0 deletions resources/blueprints/settings.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
tabs:
main:
display: Main
sections:
-
fields:
-
handle: collections
field:
type: grid
display: Collections
sortable: false
add_row: 'Add Collection'
full_width_setting: true
fields:
-
handle: collection
field:
type: collections
display: Collection
width: 50
mode: select
max_items: 1
-
handle: location_field
field:
type: text
display: 'Location Field'
width: 50
default: location
default:
-
collection: events
location_field: location
-
handle: timezone
field:
mode: select
max_items: 1
type: timezones
display: Timezone
full_width_setting: true
default: 'UTC'
11 changes: 3 additions & 8 deletions resources/fieldsets/event.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,11 @@ fields:
-
handle: timezone
field:
dictionary: timezones
max_items: 1
clearable: false
searchable: true
taggable: false
push_tags: false
cast_booleans: false
default: UTC
type: dictionary
display: Timezone
type: timezones
mode: typeahead
width: 33
-
handle: all_day
field:
Expand Down
Loading