From 91e897ccd916aec4b1214beb03437d781ea58327 Mon Sep 17 00:00:00 2001 From: NGPixel Date: Sat, 18 Jan 2020 15:18:41 -0500 Subject: [PATCH] fix: admin contribute list + source permission --- client/components/admin/admin-contribute.vue | 103 +- package.json | 90 +- server/controllers/common.js | 4 +- server/graph/resolvers/contribute.js | 35 +- server/graph/schemas/contribute.graphql | 16 +- yarn.lock | 1524 +++++++++++++----- 6 files changed, 1221 insertions(+), 551 deletions(-) diff --git a/client/components/admin/admin-contribute.vue b/client/components/admin/admin-contribute.vue index 2d7e1b63..8976f448 100644 --- a/client/components/admin/admin-contribute.vue +++ b/client/components/admin/admin-contribute.vue @@ -64,16 +64,16 @@ input(type='image', src='/img/donate_paypal.png', border='0', name='submit', title='PayPal - The safer, easier way to pay online!', alt='Donate with PayPal button') img(alt='', border='0', src='https://www.paypal.com/en_CA/i/scr/pixel.gif', width='1', height='1') v-tab-item(:transition='false', :reverse-transition='false') - .body-1.pa-3 {{ $t('admin:contribute.ethereum') }} + .body-2.pa-3 {{ $t('admin:contribute.ethereum') }} .ml-3 .admin-contribute-ethaddress strong Ethereum Address span 0xE1d55C19aE86f6Bcbfb17e7f06aCe96BdBb22Cb5 div: img(src='/img/donate_eth_qr.png') v-tab-item(:transition='false', :reverse-transition='false') - .body-1.pa-3 {{ $t('admin:contribute.tshirts') }} + .body-2.pa-3 {{ $t('admin:contribute.tshirts') }} v-card-actions.ml-2 - v-btn(outlined, :color='darkMode ? `blue lighten-1` : `primary`', href='https://wikijs.threadless.com', large) + v-btn(outlined, :color='$vuetify.theme.dark ? `blue lighten-1` : `primary`', href='https://wikijs.threadless.com', large) v-icon(left) mdi-tshirt-crew span {{ $t('admin:contribute.shop') }} v-divider.mt-3 @@ -93,48 +93,27 @@ li {{ $t('admin:contribute.talkToFriends') }} i18next(path='admin:contribute.followUsOnTwitter', tag='li') a(href='https://twitter.com/requarks', target='_blank') Twitter - v-toolbar(color='teal', dense, dark) - .subtitle-1 Sponsors - v-spacer - v-btn(outlined, small, href='https://opencollective.com/wikijs/order/1273') Become a Sponsor - v-list(two-line) - template(v-for='(sponsor, idx) in sponsors') - v-list-item(:key='sponsor.id') - v-list-item-avatar - img(v-if='sponsor.image', :src='sponsor.image') - v-avatar(v-else, color='teal', size='40') - span.white--text.subtitle-1 {{sponsor.name[0].toUpperCase()}} - v-list-item-content - v-list-item-title {{sponsor.name}} - v-list-item-subtitle {{sponsor.description}} - v-list-item-action(v-if='sponsor.twitter') - v-btn(icon, :href='sponsor.twitter', target='_blank') - v-icon mdi-twitter - v-list-item-action(v-if='sponsor.website') - v-btn(icon, :href='sponsor.website', target='_blank') - v-icon(color='grey') mdi-earth - v-divider(v-if='idx < sponsors.length - 1') - v-toolbar(color='blue-grey', dense, dark) - .subtitle-1 Backers - v-spacer - v-btn(outlined, small, href='https://opencollective.com/wikijs/order/1272') Become a Backer - v-list(two-line, dense) - template(v-for='(backer, idx) in backers') - v-list-item(:key='backer.id') - v-list-item-avatar - img(v-if='backer.image', :src='backer.image') - v-avatar(v-else, color='blue-grey', size='40') - span.white--text.subtitle-1 {{backer.name[0].toUpperCase()}} - v-list-item-content - v-list-item-title {{backer.name}} - v-list-item-subtitle {{backer.description}} - v-list-item-action(v-if='backer.twitter') - v-btn(icon, :href='backer.twitter', target='_blank') - v-icon mdi-twitter - v-list-item-action(v-if='backer.website') - v-btn(icon, :href='backer.website', target='_blank') - v-icon(color='grey') mdi-earth - v-divider(v-if='idx < backers.length - 1') + v-toolbar(color='indigo', dense, dark) + .subtitle-1 Sponsors & Backers + v-container.pa-5.grey(fluid, :class='$vuetify.theme.dark ? `darken-3` : `lighten-4`') + v-progress-circular(indeterminate, color='indigo', size='24', width='2', v-if='backers.length < 1') + v-row(dense) + v-col(cols='12', lg='6', xl='4', v-for='(backer, idx) in backers', :key='backer.id') + v-card.grey(flat, :class='$vuetify.theme.dark ? `darken-4` : `lighten-2`') + v-list-item + v-list-item-avatar + img(v-if='backer.avatar', :src='backer.avatar') + v-avatar(v-else, color='blue-grey', size='40') + span.white--text.subtitle-1 {{backer.name[0].toUpperCase()}} + v-list-item-content + v-list-item-title {{backer.name}} + v-list-item-subtitle: .caption Since {{backer.joined | moment('MMMM DD, YYYY')}} on {{backer.source}} + v-list-item-action(v-if='backer.twitter') + v-btn(icon, :href='backer.twitter', target='_blank') + v-icon(color='grey') mdi-twitter + v-list-item-action(v-if='backer.website') + v-btn(icon, :href='backer.website', target='_blank') + v-icon(color='grey') mdi-earth v-toolbar(color='primary', dense, dark) .subtitle-1 Special Thanks v-list(two-line) @@ -211,29 +190,31 @@