Skip to content

Commit

Permalink
Merge branch 'master' into prepare-phpstan
Browse files Browse the repository at this point in the history
  • Loading branch information
szepeviktor authored Nov 29, 2023
2 parents fffb555 + a907307 commit c64d345
Show file tree
Hide file tree
Showing 78 changed files with 1,065 additions and 443 deletions.
32 changes: 16 additions & 16 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions public/build/assets/app-8666ab41.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion public/build/assets/app-bc3780fe.js

This file was deleted.

1 change: 1 addition & 0 deletions public/build/assets/dropdown-180e6571.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion public/build/assets/dropdown-613489dc.js

This file was deleted.

1 change: 1 addition & 0 deletions public/build/assets/editor-180e6571.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion public/build/assets/editor-613489dc.js

This file was deleted.

1 change: 1 addition & 0 deletions public/build/assets/media-manager-180e6571.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion public/build/assets/media-manager-613489dc.js

This file was deleted.

1 change: 1 addition & 0 deletions public/build/assets/repeater-180e6571.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion public/build/assets/repeater-613489dc.js

This file was deleted.

1 change: 1 addition & 0 deletions public/build/assets/table-180e6571.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 14 additions & 6 deletions public/build/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,44 +7,52 @@
"css": [
"assets/app-d00ef1bd.css"
],
"file": "assets/app-455c4098.js",
"file": "assets/app-33c235a1.js",
"isEntry": true,
"src": "resources/js/app.js"
},
"resources/js/dropdown.js": {
"file": "assets/dropdown-613489dc.js",
"file": "assets/dropdown-180e6571.js",
"imports": [
"resources/js/app.js"
],
"isEntry": true,
"src": "resources/js/dropdown.js"
},
"resources/js/editor.js": {
"file": "assets/editor-613489dc.js",
"file": "assets/editor-180e6571.js",
"imports": [
"resources/js/app.js"
],
"isEntry": true,
"src": "resources/js/editor.js"
},
"resources/js/media-manager.js": {
"file": "assets/media-manager-613489dc.js",
"file": "assets/media-manager-180e6571.js",
"imports": [
"resources/js/app.js"
],
"isEntry": true,
"src": "resources/js/media-manager.js"
},
"resources/js/repeater.js": {
"file": "assets/repeater-613489dc.js",
"file": "assets/repeater-180e6571.js",
"imports": [
"resources/js/app.js"
],
"isEntry": true,
"src": "resources/js/repeater.js"
},
"resources/js/table.js": {
"file": "assets/table-180e6571.js",
"imports": [
"resources/js/app.js"
],
"isEntry": true,
"src": "resources/js/table.js"
},
"resources/sass/app.scss": {
"file": "assets/app-bc3780fe.js",
"file": "assets/app-8666ab41.js",
"imports": [
"resources/js/app.js"
],
Expand Down
3 changes: 3 additions & 0 deletions resources/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ import './notifications';
import './theme';
import * as Turbo from '@hotwired/turbo';

// Turbo
window.Turbo = Turbo;

// Alpine
Alpine.plugin(focus);
window.Alpine = Alpine;
Expand Down
17 changes: 17 additions & 0 deletions resources/js/table.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
document.addEventListener('alpine:init', () => {
window.Alpine.data('table', (config) => {
return {
models: config.models,
selection: [],
selectedAllMatchingQuery: false,
selectedAllModels: false,
init() {
this.$watch('selection', () => {
this.$refs.selectCheckbox.indeterminate = this.selection.length > 0 && this.selection.length < this.models.length;

this.selectedAllModels = this.selection.length > 0 && this.selection.length === this.models.length;
});
},
};
});
});
32 changes: 16 additions & 16 deletions resources/sass/config/_font.scss
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
@use 'sprucecss/scss/spruce' as *;

@include font-face(
'Manrope',
'/vendor/root/fonts/manrope-v14-latin-regular.woff2'
'Manrope',
'/vendor/root/fonts/manrope-v14-latin-regular.woff2'
);

@include font-face(
'Manrope',
'/vendor/root/fonts/manrope-v14-latin-500.woff2',
500
'Manrope',
'/vendor/root/fonts/manrope-v14-latin-500.woff2',
500
);

@include font-face(
'Manrope',
'/vendor/root/fonts/manrope-v14-latin-600.woff2',
600
'Manrope',
'/vendor/root/fonts/manrope-v14-latin-600.woff2',
600
);

@include font-face(
'Manrope',
'/vendor/root/fonts/manrope-v14-latin-800.woff2',
700
'Manrope',
'/vendor/root/fonts/manrope-v14-latin-800.woff2',
700
);

@include font-face(
'Open Sans',
'/vendor/root/fonts/open-sans-v35-latin-regular.woff2'
'Open Sans',
'/vendor/root/fonts/open-sans-v35-latin-regular.woff2'
);

@include font-face(
'Open Sans',
'/vendor/root/fonts/open-sans-v35-latin-700.woff2',
700
'Open Sans',
'/vendor/root/fonts/open-sans-v35-latin-700.woff2',
700
);
5 changes: 4 additions & 1 deletion resources/views/actions/action.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@
@include($field['template'], $field)
@endforeach
</div>
<template x-for="selected in selection">
<input type="hidden" name="models[]" x-bind:value="selected">
</template>
<input type="hidden" name="all" x-bind:value="selectedAllMatchingQuery">
</form>

<x-slot:footer>
<button form="{{ $key }}" type="submit" class="btn btn--primary">
{{ __('Run') }}
Expand Down
1 change: 1 addition & 0 deletions resources/views/app.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<meta name="csrf-token" content="{{ csrf_token() }}">

{{-- Styles --}}
<link rel="icon" href="{{ URL::asset('vendor/root/favicon.png') }}" sizes="32x32">
Expand Down
15 changes: 9 additions & 6 deletions resources/views/components/layout/breadcrumbs.blade.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<ol class="breadcrumb-list app-header__breadcrumb">
<li>
<a href="/">Dashboard</a>
</li>
<li>
<span aria-current="page">Products</span>
</li>
@foreach($breadcrumbs as $item)
<li>
@if($loop->last)
<span aria-current="page">{{ $item['label'] }}</span>
@else
<a href="{{ $item['uri'] }}">{{ $item['label'] }}</a>
@endif
</li>
@endforeach
</ol>
2 changes: 1 addition & 1 deletion resources/views/components/layout/header.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ class="btn btn--outline-dark btn--sm btn--icon display--none:md"
{{-- <button class="btn btn--outline-dark btn--sm btn--icon display--none:md" aria-label="Open search">
<x-root::icon name="search" class="btn__icon" />
</button> --}}
<x-root::layout.breadcrumbs />
</div>
{{-- <x-root::layout.breadcrumbs /> --}}
</div>
<div class="app-header__actions">
<x-root::layout.notifications />
Expand Down
55 changes: 55 additions & 0 deletions resources/views/fields/morph-to.blade.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<div class="form-group--row">
<label class="form-label" for="{{ $attrs->get('id') }}">
{{ $label }}
@if($attrs->get('required'))
<span class="required-marker">*</span>
@endif
</label>
<div class="form-row--mixed">
<select
class="form-control"
x-on:change="(function (event) {
Turbo.visit('{{ $url }}?{{ $morphTypeName }}='+event.target.value, { frame: '{{ $attrs->get('id') }}-select' })
})"
>
<option value="" @disabled(! $nullable)>{{ __('Choose Type') }}</option>
@foreach($types as $type => $name)
<option value="{{ $type }}" @selected($type === $morphType)>{{ $name }}</option>
@endforeach
</select>
<turbo-frame id="{{ $attrs->get('id') }}-select">
<div>
<div class="form-group--stacked">
@if($prefix)
<div class="form-group-label">{!! $prefix !!}</div>
@endif
<select {{ $attrs }}>
@if($nullable)
<option value="">--- {{ $label }} ---</option>
@endif
@foreach($options as $option)
@if(isset($option['options']))
<optgroup label="{{ $option['label'] }}">
@foreach($option['options'] as $o)
<option {{ $o['attrs'] }}>{{ $o['label'] }}</option>
@endforeach
</optgroup>
@else
<option {{ $option['attrs'] }}>{{ $option['label'] }}</option>
@endif
@endforeach
</select>
@if($suffix)
<div class="form-group-label">{!! $suffix !!}</div>
@endif
</div>
@if($invalid)
<span class="field-feedback field-feedback--invalid">{!! $error !!}</span>
@endif
@if($help)
<span class="form-description">{!! $help !!}</span>
@endif
</div>
</turbo-frame>
</div>
</div>
Loading

0 comments on commit c64d345

Please sign in to comment.