Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(deps): update to buefy 0.9 #2259

Merged
merged 8 commits into from
Dec 7, 2024
Merged

fix(deps): update to buefy 0.9 #2259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
60b19d8
fix(deps): update to buefy 0.9
WikiRik Aug 16, 2023
da6a538
chore(deps): update package.json
WikiRik Aug 16, 2023
81262c8
Merge remote-tracking branch 'origin/stable' into WikiRik/buefy
WikiRik Dec 7, 2024
aebc56b
chore: fix BoardView
WikiRik Dec 7, 2024
5291fbc
style: fix lint
WikiRik Dec 7, 2024
38b34b7
Merge branch 'stable' into WikiRik/buefy
WikiRik Dec 7, 2024
219cc2d
chore: migrate new tables
WikiRik Dec 7, 2024
16f28a1
chore: fix BoardListing
WikiRik Dec 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@vue/eslint-config-airbnb": "^7.0.0",
"animate.css": "^4.1.1",
"axios": "^1.6.5",
"buefy": "^0.8.20",
"buefy": "^0.9.23",
"chart.js": "^2.9.4",
"compression-webpack-plugin": "^6.1.1",
"css-loader": "^5.2.7",
Expand Down
58 changes: 28 additions & 30 deletions src/views/core/bodies/BulkImport.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,36 +15,34 @@
</div>

<b-table :data="members">
<template slot-scope="props">
<b-table-column field="first_name" label="First name">
{{ props.row.first_name }}
</b-table-column>

<b-table-column field="last_name" label="Last name">
{{ props.row.last_name }}
</b-table-column>

<b-table-column field="email" label="Email">
{{ props.row.email }}
</b-table-column>

<b-table-column field="username" label="Username">
{{ props.row.username }}
</b-table-column>

<b-table-column label="Delete user">
<a v-if="!props.row.status" @click="members.splice(props.index, 1)" class="button is-danger is-small">
<span class="icon"><font-awesome-icon icon="minus" /></span>
<span>Delete user</span>
</a>
</b-table-column>

<b-table-column label="Status">
<span v-if="props.row.status === 'saving'">Saving...</span>
<span class="has-text-success" v-if="props.row.status === 'success'">Successfully saved.</span>
<span class="has-text-danger" v-if="props.row.status === 'error'">Error while saving: {{ props.row.errors }}</span>
</b-table-column>
</template>
<b-table-column field="first_name" label="First name" v-slot="props">
{{ props.row.first_name }}
</b-table-column>

<b-table-column field="last_name" label="Last name" v-slot="props">
{{ props.row.last_name }}
</b-table-column>

<b-table-column field="email" label="Email" v-slot="props">
{{ props.row.email }}
</b-table-column>

<b-table-column field="username" label="Username" v-slot="props">
{{ props.row.username }}
</b-table-column>

<b-table-column label="Delete user" v-slot="props">
<a v-if="!props.row.status" @click="members.splice(props.index, 1)" class="button is-danger is-small">
<span class="icon"><font-awesome-icon icon="minus" /></span>
<span>Delete user</span>
</a>
</b-table-column>

<b-table-column label="Status" v-slot="props">
<span v-if="props.row.status === 'saving'">Saving...</span>
<span class="has-text-success" v-if="props.row.status === 'success'">Successfully saved.</span>
<span class="has-text-danger" v-if="props.row.status === 'error'">Error while saving: {{ props.row.errors }}</span>
</b-table-column>

<template slot="empty">
<section class="section">
Expand Down
24 changes: 11 additions & 13 deletions src/views/core/bodies/CampaignsList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,19 @@
</div>

<b-table :data="campaigns">
<template slot-scope="props">
<b-table-column field="name" label="Campaign name">
<router-link :to="{ name: 'oms.bodies.campaigns.view', params: { body_id: $route.params.id, id: props.row.id } }">
{{ props.row.name }}
</router-link>
</b-table-column>
<b-table-column field="name" label="Campaign name" v-slot="props">
<router-link :to="{ name: 'oms.bodies.campaigns.view', params: { body_id: $route.params.id, id: props.row.id } }">
{{ props.row.name }}
</router-link>
</b-table-column>

<b-table-column field="description_long" label="Description">
<span class="description" v-html="$options.filters.markdown(props.row.description_long)" />
</b-table-column>
<b-table-column field="description_long" label="Description" v-slot="props">
<span class="description" v-html="$options.filters.markdown(props.row.description_long)" />
</b-table-column>

<b-table-column label="Link">
{{ '/signup/' + props.row.url }}
</b-table-column>
</template>
<b-table-column label="Link" v-slot="props">
{{ '/signup/' + props.row.url }}
</b-table-column>

<template slot="empty">
<empty-table-stub />
Expand Down
50 changes: 24 additions & 26 deletions src/views/core/bodies/List.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,32 +47,30 @@
</div>

<b-table :data="bodies" :loading="isLoading" narrowed>
<template slot-scope="props">
<b-table-column field="code" label="Body code" sortable>
{{ props.row.code }}
</b-table-column>

<b-table-column field="name" label="Body name" sortable>
<router-link :to="{ name: 'oms.bodies.view', params: { id: props.row.id } }">{{ props.row.name}}</router-link>
</b-table-column>

<b-table-column field="type" label="Type" sortable>
{{ props.row.type | capitalize }}
</b-table-column>

<b-table-column field="description" label="Description">
<span class="body-description" v-html="$options.filters.markdown(props.row.description)" />
</b-table-column>

<b-table-column field="founded_at" label="Foundation date" sortable>
{{ props.row.founded_at }}
</b-table-column>

<b-table-column field="status" label="Status" :visible="includeDeleted">
<span class="tag is-small is-info" v-if="props.row.status === 'active'">Active</span>
<span class="tag is-small is-danger" v-if="props.row.status === 'deleted'">Deleted</span>
</b-table-column>
</template>
<b-table-column field="code" label="Body code" v-slot="props" sortable>
{{ props.row.code }}
</b-table-column>

<b-table-column field="name" label="Body name" v-slot="props" sortable>
<router-link :to="{ name: 'oms.bodies.view', params: { id: props.row.id } }">{{ props.row.name}}</router-link>
</b-table-column>

<b-table-column field="type" label="Type" v-slot="props" sortable>
{{ props.row.type | capitalize }}
</b-table-column>

<b-table-column field="description" label="Description" v-slot="props">
<span class="body-description" v-html="$options.filters.markdown(props.row.description)" />
</b-table-column>

<b-table-column field="founded_at" label="Foundation date" v-slot="props" sortable>
{{ props.row.founded_at }}
</b-table-column>

<b-table-column field="status" label="Status" :visible="includeDeleted" v-slot="props">
<span class="tag is-small is-info" v-if="props.row.status === 'active'">Active</span>
<span class="tag is-small is-danger" v-if="props.row.status === 'deleted'">Deleted</span>
</b-table-column>

<template slot="empty">
<empty-table-stub />
Expand Down
56 changes: 27 additions & 29 deletions src/views/core/bodies/ListFeePaymentsModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,42 +6,40 @@
</header>
<section class="modal-card-body">
<b-table :data="member.payments" v-if="member.payments.length > 0">
<template slot-scope="props">
<b-table-column field="id" label="#" numeric sortable>
{{ props.row.id }}
</b-table-column>
<b-table-column field="id" label="#" numeric sortable v-slot="props">
{{ props.row.id }}
</b-table-column>

<b-table-column field="inserted_at" label="Starts at">
{{ props.row.starts }}
</b-table-column>
<b-table-column field="inserted_at" label="Starts at" v-slot="props">
{{ props.row.starts }}
</b-table-column>

<b-table-column field="expires" label="Expires on">
{{ props.row.expires }}
</b-table-column>
<b-table-column field="expires" label="Expires on" v-slot="props">
{{ props.row.expires }}
</b-table-column>

<b-table-column field="amount" label="Amount">
{{ props.row.amount }}
</b-table-column>
<b-table-column field="amount" label="Amount" v-slot="props">
{{ props.row.amount }}
</b-table-column>

<b-table-column field="currency" label="Currency">
{{ props.row.currency }}
</b-table-column>
<b-table-column field="currency" label="Currency" v-slot="props">
{{ props.row.currency }}
</b-table-column>

<b-table-column field="invoice_address" label="Invoice address">
{{ props.row.invoice_address }}
</b-table-column>
<b-table-column field="invoice_address" label="Invoice address" v-slot="props">
{{ props.row.invoice_address }}
</b-table-column>

<b-table-column field="invoice_name" label="Invoice name">
{{ props.row.invoice_name }}
</b-table-column>
<b-table-column field="invoice_name" label="Invoice name" v-slot="props">
{{ props.row.invoice_name }}
</b-table-column>

<b-table-column label="Delete" centered :visible="canDelete">
<a class="button is-small is-danger" @click="askDeleteMemberPaymentFee(props.row, false)">
<span class="icon"><font-awesome-icon icon="minus" /></span>
<span>Delete</span>
</a>
</b-table-column>
</template>
<b-table-column label="Delete" centered :visible="canDelete" v-slot="props">
<a class="button is-small is-danger" @click="askDeleteMemberPaymentFee(props.row, false)">
<span class="icon"><font-awesome-icon icon="minus" /></span>
<span>Delete</span>
</a>
</b-table-column>

<template slot="empty">
<empty-table-stub />
Expand Down
60 changes: 29 additions & 31 deletions src/views/core/bodies/ViewJoinRequests.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,43 +18,41 @@
</div>

<b-table :data="members" :loading="isLoading" narrowed>
<template slot-scope="props">
<b-table-column field="user.first_name" label="Name and surname" sortable>
<router-link :to="{ name: 'oms.members.view', params: { id: props.row.user_id } }">
{{ props.row.user.first_name }} {{ props.row.user.last_name }}
</router-link>
</b-table-column>
<b-table-column field="user.first_name" label="Name and surname" sortable v-slot="props">
<router-link :to="{ name: 'oms.members.view', params: { id: props.row.user_id } }">
{{ props.row.user.first_name }} {{ props.row.user.last_name }}
</router-link>
</b-table-column>

<b-table-column field="motivation" label="Motivation">
{{ props.row.motivation }}
</b-table-column>
<b-table-column field="motivation" label="Motivation" v-slot="props">
{{ props.row.motivation }}
</b-table-column>

<b-table-column field="created_at" label="Date" sortable>
{{ props.row.created_at | datetime }}
</b-table-column>
<b-table-column field="created_at" label="Date" sortable v-slot="props">
{{ props.row.created_at | datetime }}
</b-table-column>

<b-table-column label="Approve">
<div class="field" v-if="props.row.status === 'pending'">
<div class="control">
<a class="button is-small is-info" @click="askSetMemberApproved(props.row, true)">
<span class="icon"><font-awesome-icon icon="plus" /></span>
<span>Approve</span>
</a>
</div>
<b-table-column label="Approve" v-slot="props">
<div class="field" v-if="props.row.status === 'pending'">
<div class="control">
<a class="button is-small is-info" @click="askSetMemberApproved(props.row, true)">
<span class="icon"><font-awesome-icon icon="plus" /></span>
<span>Approve</span>
</a>
</div>
</b-table-column>
</div>
</b-table-column>

<b-table-column label="Reject">
<div class="field" v-if="props.row.status === 'pending'">
<div class="control">
<a class="button is-small is-danger" @click="askSetMemberApproved(props.row, false)">
<span class="icon"><font-awesome-icon icon="minus" /></span>
<span>Reject</span>
</a>
</div>
<b-table-column label="Reject" v-slot="props">
<div class="field" v-if="props.row.status === 'pending'">
<div class="control">
<a class="button is-small is-danger" @click="askSetMemberApproved(props.row, false)">
<span class="icon"><font-awesome-icon icon="minus" /></span>
<span>Reject</span>
</a>
</div>
</b-table-column>
</template>
</div>
</b-table-column>

<template slot="empty">
<empty-table-stub />
Expand Down
Loading
Loading