Skip to content
This repository has been archived by the owner on Dec 5, 2023. It is now read-only.

Commit

Permalink
Fixed #17, potential conflict with Vue.js not rendering static classe…
Browse files Browse the repository at this point in the history
…s and dynamic class combos, added static classes to dynamic objects with true vals
  • Loading branch information
aschmelyun committed Nov 2, 2018
1 parent bea92b4 commit 4e5b0c2
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
12 changes: 6 additions & 6 deletions src/resources/views/logs/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<div class="row row-cards" id="larametricsLogs">
<div class="col-12">
<div class="btn-list" style="margin-bottom:0.75rem">
<a href="#" class="btn btn-secondary" :class="{'disabled': typeof logsPaginated[page - 1] == 'undefined'}" @click.prevent="page = (page - 1)">Prev</a>
<a href="#" class="btn" v-for="n in pageNumbers" v-text="n + 1" :class="{'disabled': page === (n), 'btn-primary': page === (n), 'btn-secondary': page !== (n)}" @click.prevent="page = (n)"></a>
<a href="#" class="btn btn-secondary" :class="{'disabled': typeof logsPaginated[page + 1] == 'undefined'}" @click.prevent="page = (page + 1)">Next</a>
<a href="#" :class="{'btn': true, 'btn-secondary': true, 'disabled': typeof logsPaginated[page - 1] == 'undefined'}" @click.prevent="page = (page - 1)">Prev</a>
<a href="#" v-for="n in pageNumbers" v-text="n + 1" :class="{'btn': true, 'disabled': page === (n), 'btn-primary': page === (n), 'btn-secondary': page !== (n)}" @click.prevent="page = (n)"></a>
<a href="#" :class="{'btn': true, 'btn-secondary': true, 'disabled': typeof logsPaginated[page + 1] == 'undefined'}" @click.prevent="page = (page + 1)">Next</a>
</div>
<div class="card">
<div class="card-header">
Expand Down Expand Up @@ -35,9 +35,9 @@
</div>
</div>
<div class="btn-list">
<a href="#" class="btn btn-secondary" :class="{'disabled': typeof logsPaginated[page - 1] == 'undefined'}" @click.prevent="page = (page - 1)">Prev</a>
<a href="#" class="btn" v-for="n in pageNumbers" v-text="n + 1" :class="{'disabled': page === (n), 'btn-primary': page === (n), 'btn-secondary': page !== (n)}" @click.prevent="page = (n)"></a>
<a href="#" class="btn btn-secondary" :class="{'disabled': typeof logsPaginated[page + 1] == 'undefined'}" @click.prevent="page = (page + 1)">Next</a>
<a href="#" :class="{'btn': true, 'btn-secondary': true, 'disabled': typeof logsPaginated[page - 1] == 'undefined'}" @click.prevent="page = (page - 1)">Prev</a>
<a href="#" v-for="n in pageNumbers" v-text="n + 1" :class="{'btn': true, 'disabled': page === (n), 'btn-primary': page === (n), 'btn-secondary': page !== (n)}" @click.prevent="page = (n)"></a>
<a href="#" :class="{'btn': true, 'btn-secondary': true, 'disabled': typeof logsPaginated[page + 1] == 'undefined'}" @click.prevent="page = (page + 1)">Next</a>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/resources/views/notifications/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<h3 class="card-title">All Active Notifications</h3>
</div>
<div class="card-body">
<div class="row" v-for="(notification, index) in notifications" :class="{'mt-4': index > 0}">
<div v-for="(notification, index) in notifications" :class="{'row': true, 'mt-4': index > 0}">
<div class="col-sm-4">
<div class="input-group">
<span class="input-group-prepend" id="action-addon">
Expand Down
12 changes: 6 additions & 6 deletions src/resources/views/requests/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<div class="row row-cards" id="larametricsRequests">
<div class="col-12">
<div class="btn-list" style="margin-bottom: 0.75rem;">
<a href="#" class="btn btn-secondary" :class="{'disabled': typeof requestsPaginated[page - 1] == 'undefined'}" @click.prevent="page = (page - 1)">Prev</a>
<a href="#" class="btn" v-for="n in pageNumbers" v-text="n + 1" :class="{'disabled': page === (n), 'btn-primary': page === (n), 'btn-secondary': page !== (n)}" @click.prevent="page = (n)"></a>
<a href="#" class="btn btn-secondary" :class="{'disabled': typeof requestsPaginated[page + 1] == 'undefined'}" @click.prevent="page = (page + 1)">Next</a>
<a href="#" :class="{'btn': true, 'btn-secondary': true, 'disabled': typeof requestsPaginated[page - 1] == 'undefined'}" @click.prevent="page = (page - 1)">Prev</a>
<a href="#" v-for="n in pageNumbers" v-text="n + 1" :class="{'btn': true, 'disabled': page === (n), 'btn-primary': page === (n), 'btn-secondary': page !== (n)}" @click.prevent="page = (n)"></a>
<a href="#" :class="{'btn': true, 'btn-secondary': true, 'disabled': typeof requestsPaginated[page + 1] == 'undefined'}" @click.prevent="page = (page + 1)">Next</a>
</div>
<div class="card">
<div class="card-header">
Expand Down Expand Up @@ -37,9 +37,9 @@
</div>
</div>
<div class="btn-list">
<a href="#" class="btn btn-secondary" :class="{'disabled': typeof requestsPaginated[page - 1] == 'undefined'}" @click.prevent="page = (page - 1)">Prev</a>
<a href="#" class="btn" v-for="n in pageNumbers" v-text="n + 1" :class="{'disabled': page === (n), 'btn-primary': page === (n), 'btn-secondary': page !== (n)}" @click.prevent="page = (n)"></a>
<a href="#" class="btn btn-secondary" :class="{'disabled': typeof requestsPaginated[page + 1] == 'undefined'}" @click.prevent="page = (page + 1)">Next</a>
<a href="#" :class="{'btn': true, 'btn-secondary': true, 'disabled': typeof requestsPaginated[page - 1] == 'undefined'}" @click.prevent="page = (page - 1)">Prev</a>
<a href="#" v-for="n in pageNumbers" v-text="n + 1" :class="{'btn': true, 'disabled': page === (n), 'btn-primary': page === (n), 'btn-secondary': page !== (n)}" @click.prevent="page = (n)"></a>
<a href="#" :class="{'btn': true, 'btn-secondary': true, 'disabled': typeof requestsPaginated[page + 1] == 'undefined'}" @click.prevent="page = (page + 1)">Next</a>
</div>
</div>
</div>
Expand Down

0 comments on commit 4e5b0c2

Please sign in to comment.