Skip to content

Commit

Permalink
Merge branch '10.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
crynobone committed Jul 3, 2024
2 parents fe6ed78 + af213bd commit d02cf7d
Show file tree
Hide file tree
Showing 8 changed files with 2,727 additions and 4,191 deletions.
932 changes: 492 additions & 440 deletions nova-components/CustomField/package-lock.json

Large diffs are not rendered by default.

647 changes: 326 additions & 321 deletions nova-components/IconsViewer/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion nova-components/RememberTokenCopier/dist/js/asset.js

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

898 changes: 469 additions & 429 deletions nova-components/RememberTokenCopier/package-lock.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<ModalHeader v-text="data.title" />

<div class="p-4">
<span v-if="data.token !== null">{{ data.token }}</span>
<span v-if="(data?.token ?? null)">{{ data.token }}</span>
<span v-else>&mdash;</span>
</div>
Expand All @@ -24,6 +24,7 @@
<script setup>
import { Button } from 'laravel-nova-ui'
const emit = defineEmits(['close'])
const props = defineProps({
Expand Down
14 changes: 1 addition & 13 deletions nova-components/RememberTokenCopier/src/AssetServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,11 @@ class AssetServiceProvider extends ServiceProvider
{
/**
* Bootstrap any application services.
*
* @return void
*/
public function boot()
public function boot(): void
{
Nova::serving(function (ServingNova $event) {
Nova::script('remember-token-copier', __DIR__.'/../dist/js/asset.js');
});
}

/**
* Register any application services.
*
* @return void
*/
public function register()
{
//
}
}
Loading

0 comments on commit d02cf7d

Please sign in to comment.