Skip to content

Commit 42edffe

Browse files
authored
Merge pull request #34 from TMCApplications/fix-danger-button-remove-nova-4.28
Fix Nova 4.28.0 removed DangerButton component
2 parents e178ee3 + 05bf17e commit 42edffe

File tree

7 files changed

+58
-10
lines changed

7 files changed

+58
-10
lines changed

dist/js/field.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"@vue/babel-plugin-jsx": "^1.1.1",
1313
"form-backend-validation": "^2.4.0",
1414
"laravel-mix": "^6.0.43",
15+
"laravel-nova-ui": "^0.4.10",
1516
"lodash": "^4.17.21",
1617
"postcss": "^8.4.12",
1718
"resolve-url-loader": "^4.0.0",

resources/js/components/AddButton.vue

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<template>
2+
<Button
3+
state="default"
4+
>
5+
<span class="px-1 font-bold text-xl">+</span>
6+
</Button>
7+
</template>
8+
9+
<script>
10+
import { Button } from 'laravel-nova-ui';
11+
12+
export default {
13+
name: "AddButton",
14+
components: { Button }
15+
}
16+
</script>
17+
18+
19+
<style scoped>
20+
21+
</style>

resources/js/components/ExceptionsTable.vue

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{{ __('Exceptions') }}
77
</table-header>
88
<table-header v-if="editable" class="text-right">
9-
<default-button @click.prevent="$emit('addException')"><span class="px-1">+</span></default-button>
9+
<add-button @click.prevent="$emit('addException')" />
1010
</table-header>
1111
</tr>
1212
</thead>
@@ -39,24 +39,26 @@
3939
<div v-else>{{ __('Closed') }}</div>
4040
</table-column>
4141
<table-column v-if="editable" class="text-right">
42-
<default-button @click.prevent="$emit('addInterval', 'exceptions', exception.date)"><span class="px-1">+</span></default-button>
42+
<add-button @click.prevent="$emit('addInterval', 'exceptions', exception.date)" />
4343
&nbsp;
44-
<danger-button @click.prevent="$emit('removeException', exception.date)"><span class="px-1">-</span></danger-button>
44+
<remove-button @click.prevent="$emit('removeException', exception.date)"/>
4545
</table-column>
4646
</tr>
4747
</tbody>
4848
</table>
4949
</template>
5050

5151
<script>
52+
import AddButton from './AddButton';
53+
import RemoveButton from './RemoveButton';
5254
import IntervalInput from "./IntervalInput";
5355
import DateInput from "./DateInput";
5456
import TableColumn from "./TableColumn";
5557
import TableHeader from "./TableHeader";
5658
import {editableProp, exceptionsProp, useTextInputsProp} from "../src/props";
5759
5860
export default {
59-
components: { IntervalInput, DateInput, TableColumn, TableHeader },
61+
components: { AddButton, RemoveButton, IntervalInput, DateInput, TableColumn, TableHeader },
6062
6163
props: {
6264
...exceptionsProp,

resources/js/components/IntervalInput.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,18 @@
1414
v-model="to"
1515
/>
1616
<span class="ml-2">
17-
<danger-button @click.prevent="$emit('removeInterval')"><span class="px-1">-</span></danger-button>
17+
<remove-button @click.prevent="$emit('removeInterval')" />
1818
</span>
1919
</div>
2020
</template>
2121

2222
<script>
2323
import {useTextInputsProp} from "../src/props";
24+
import RemoveButton from './RemoveButton';
2425
import TimeInput from "./TimeInput";
2526
2627
export default {
27-
components: {TimeInput},
28+
components: { RemoveButton, TimeInput},
2829
2930
props: {
3031
intervalProp: String,
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<template>
2+
<Button
3+
state="danger"
4+
>
5+
<span class="px-1 font-bold text-xl">-</span>
6+
</Button>
7+
</template>
8+
9+
<script>
10+
import { Button } from 'laravel-nova-ui';
11+
12+
export default {
13+
name: "RemoveButton",
14+
components: { Button }
15+
}
16+
</script>
17+
18+
19+
<style scoped>
20+
21+
</style>

resources/js/components/WeekTable.vue

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
</div>
3535
</table-column>
3636
<table-column v-if="editable" class="text-right">
37-
<default-button @click.prevent="$emit('addInterval', 'week', day.day)"><span class="px-1">+</span></default-button>
37+
<add-button @click.prevent="$emit('addInterval', 'week', day.day)" />
3838
<span v-if="Object.values(day.intervals).length" class="ml-2">
39-
<danger-button @click.prevent="$emit('removeAllIntervals', 'week', day.day)"><span class="px-1">-</span></danger-button>
39+
<remove-button @click.prevent="$emit('removeAllIntervals', 'week', day.day)" />
4040
</span>
4141
</table-column>
4242
</tr>
@@ -45,14 +45,16 @@
4545
</template>
4646

4747
<script>
48+
import AddButton from './AddButton';
49+
import RemoveButton from './RemoveButton';
4850
import IntervalInput from "./IntervalInput";
4951
import TableColumn from "./TableColumn";
5052
import TableHeader from "./TableHeader";
5153
import {editableProp, useTextInputsProp, weekProp} from "../src/props";
5254
import {capitalizeFirstLetter} from "../src/func";
5355
5456
export default {
55-
components: { IntervalInput, TableColumn, TableHeader },
57+
components: { AddButton, RemoveButton, IntervalInput, TableColumn, TableHeader },
5658
5759
props: {
5860
...weekProp,

0 commit comments

Comments
 (0)