Skip to content

Commit 18db305

Browse files
authored
fix : use asset helper to load images, modify execute and status vue components to receive route urls from blade (codestudiohq#23)
1 parent 0804ce8 commit 18db305

File tree

7 files changed

+38
-19
lines changed

7 files changed

+38
-19
lines changed

public/css/app.css.map

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

public/js/app.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resources/assets/js/tasks/components/ExecuteButton.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
},
1919
props: {
2020
dataTask: {},
21+
url: {
22+
type: String,
23+
required: true
24+
},
2125
iconName: {
2226
type: String,
2327
default: null
@@ -42,7 +46,7 @@
4246
execute() {
4347
this.running = true
4448
45-
axios.get('/totem/tasks/' + this.task.id + '/execute')
49+
axios.get(this.url)
4650
.takeAtLeast(500)
4751
.then(response => {
4852
this.task = response.data

resources/assets/js/tasks/components/StatusButton.vue

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,24 @@
1717
components: {
1818
'icon':Icon
1919
},
20-
props: [
21-
'dataTask',
22-
'dataExists'
23-
],
20+
props: {
21+
dataTask: {
22+
type: Object,
23+
default: null
24+
},
25+
dataExists : {
26+
type: Boolean,
27+
required: false
28+
},
29+
activateUrl : {
30+
type: String,
31+
required: true
32+
},
33+
deactivateUrl : {
34+
type: String,
35+
required: true
36+
}
37+
},
2438
data() {
2539
return {
2640
hovering: false,
@@ -44,8 +58,9 @@
4458
activate() {
4559
this.working = true
4660
47-
axios.post('/totem/tasks/status', { task_id: this.task.id })
48-
.takeAtLeast(500)
61+
axios.post(this.activateUrl, {
62+
task_id: this.dataTask.id
63+
}).takeAtLeast(500)
4964
.then(response => {
5065
this.task = response.data
5166
this.working = false
@@ -55,7 +70,7 @@
5570
deactivate() {
5671
this.working = true
5772
58-
axios.delete(`/totem/tasks/status/${this.task.id}`)
73+
axios.delete(this.deactivateUrl)
5974
.takeAtLeast(500)
6075
.then(response => {
6176
this.task = response.data

resources/views/partials/sidebar.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<aside class="uk-width-1-6@l uk-margin-bottom">
22
<div class="uk-text-center">
3-
<img src="/vendor/totem/img/mask.svg" class="uk-svg">
3+
<img src="{{asset('vendor/totem/img/mask.svg')}}" class="uk-svg">
44
<div class="uk-text-large">Totem</div>
55
</div>
66
<hr>

resources/views/tasks/index.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@
5555
<span class="uk-float-right uk-hidden@s uk-text-muted">Next Run</span>
5656
</td>
5757
<td class="uk-text-center@m">
58-
<execute-button :data-task="{{$task}}" icon-name="cog" button-class="uk-button-link"></execute-button>
58+
<execute-button :data-task="{{$task}}" url="{{route('totem.task.execute', $task)}}" icon-name="cog" button-class="uk-button-link"></execute-button>
5959
</td>
6060
</tr>
6161
@empty
6262
<tr>
6363
<td class="uk-text-center" colspan="5">
64-
<img class="uk-svg" width="50" height="50" src="/vendor/totem/img/funnel.svg">
64+
<img class="uk-svg" width="50" height="50" src="{{asset('/vendor/totem/img/funnel.svg')}}">
6565
<p>No Tasks Found.</p>
6666
</td>
6767
</tr>

resources/views/tasks/view.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@section('title')
77
<div class="uk-flex uk-flex-between uk-flex-middle">
88
<h5 class="uk-card-title uk-margin-remove">Task Details</h5>
9-
<status-button :data-task="{{ $task }}" :data-exists="{{ $task->exists ? 1 : 0 }}"></status-button>
9+
<status-button :data-task="{{ $task }}" :data-exists="{{ $task->exists ? 'true' : 'false' }}" activate-url="{{route('totem.task.activate')}}" deactivate-url="{{route('totem.task.deactivate', $task)}}"></status-button>
1010
</div>
1111
@stop
1212
@section('main-panel-content')
@@ -84,7 +84,7 @@
8484
<button type="submit" class="uk-button uk-button-danger uk-button-small">Delete</button>
8585
</form>
8686
</span>
87-
<execute-button :data-task="{{ $task }}" button-class="uk-button-small uk-button-primary"></execute-button>
87+
<execute-button :data-task="{{ $task }}" url="{{route('totem.task.execute', $task)}}" button-class="uk-button-small uk-button-primary"></execute-button>
8888
</div>
8989
@stop
9090
@section('additional-panels')

0 commit comments

Comments
 (0)