Skip to content

Commit

Permalink
Merge pull request #152 from likecoin/greenkeeper/initial
Browse files Browse the repository at this point in the history
Update dependencies to enable Greenkeeper 🌴
  • Loading branch information
williamchong committed Sep 5, 2018
2 parents c930470 + 6d99b02 commit 0b3b2f5
Show file tree
Hide file tree
Showing 14 changed files with 988 additions and 477 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# puttyimages [![CircleCI](https://circleci.com/gh/likecoin/puttyimages-web.svg?style=svg)](https://circleci.com/gh/likecoin/puttyimages-web) [![codecov](https://codecov.io/gh/likecoin/puttyimages-web/branch/master/graph/badge.svg)](https://codecov.io/gh/likecoin/puttyimages-web)
# puttyimages [![CircleCI](https://circleci.com/gh/likecoin/puttyimages-web.svg?style=svg)](https://circleci.com/gh/likecoin/puttyimages-web) [![codecov](https://codecov.io/gh/likecoin/puttyimages-web/branch/master/graph/badge.svg)](https://codecov.io/gh/likecoin/puttyimages-web) [![Greenkeeper badge](https://badges.greenkeeper.io/likecoin/puttyimages-web.svg)](https://greenkeeper.io/)

Puttyimegs is an open stock image DApp that live within the
[LikeCoin](https://like.co/) ecosystem.
Expand Down
1 change: 1 addition & 0 deletions __mocks__/ipfs-api.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ class IPFSApi {
Promise.resolve(dagNode, options)
),
};

swarm = {
localAddrs: jest
.fn()
Expand Down
3 changes: 3 additions & 0 deletions components/ImageDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,13 @@
rel="noopener noreferrer"
target="_blank"
>{{ $t(`ImageDetails.label.${image.license}`) }}</a>
<!-- TODO: figure out a good way to avoid v-html -->
<!-- eslint-disable vue/no-v-html -->
<p
class="mt-4"
v-html="$t(`ImageDetails.label.${image.license}-details`)"
/>
<!-- eslint-enable vue/no-v-html -->
<a
class="text--underline text--size-12 text--color-gray-9b"
@click="reportImage"
Expand Down
4 changes: 2 additions & 2 deletions components/MasonryImagesGrid.vue
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<script>
import { mapActions } from 'vuex';
import LikeButton from '~/components/LikeButton';
// import LikeButton from '~/components/LikeButton';
import UserBadge from '~/components/UserBadge';
import { getImageSourceFromUrl } from '~/util/index';
Expand All @@ -86,7 +86,7 @@ function sortImagesByHeight(images, colCount) {
export default {
name: 'masonry-images-grid',
components: {
LikeButton,
// LikeButton,
UserBadge,
},
props: {
Expand Down
2 changes: 1 addition & 1 deletion components/ReportImageDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
</v-flex>

<v-text-field
v-model="comments"
:disabled="isSubmitting"
:label="$t('ReportImageDialog.label.comments')"
v-model="comments"
class="mt-16"
/>

Expand Down
4 changes: 2 additions & 2 deletions components/TheImageUploadForm.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<v-form
ref="form"
v-model="formValid"
ref="form"
class="the-upload-image-form mx-auto"
lazy-validation
>
Expand All @@ -27,8 +27,8 @@
@input="onTagChange"
>
<template
slot="selection"
slot-scope="data"
slot="selection"
>
<v-chip
:selected="data.selected"
Expand Down
2 changes: 1 addition & 1 deletion components/TheOverlayComponent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<div v-else>
<!-- Chrome Dialog start (ask when user use browser like Safari) -->
<v-dialog
v-if="shouldShowChromeDialog"
v-model="isDialogOpen"
v-if="shouldShowChromeDialog"
max-width="290"
@keydown.esc="isDialogOpen = false"
>
Expand Down
4 changes: 2 additions & 2 deletions components/dialogs/BaseDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@


<script>
import EarthIcon from '@/assets/icons/earth.svg';
// import EarthIcon from '@/assets/icons/earth.svg';
import LanguageSwitch from '@/components/LanguageSwitch';
export default {
name: 'base-dialog',
components: {
EarthIcon,
// EarthIcon,
LanguageSwitch,
},
props: {
Expand Down
Loading

0 comments on commit 0b3b2f5

Please sign in to comment.