Skip to content

Commit

Permalink
Making linter happy
Browse files Browse the repository at this point in the history
  • Loading branch information
dartcafe committed Nov 10, 2019
1 parent c9cf2d5 commit c2bd57a
Show file tree
Hide file tree
Showing 23 changed files with 209 additions and 733 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"vue-click-outside": "^1.0.7",
"vue-clipboard2": "^0.3.1",
"vue-router": "^3.1.3",
"vuex": "^3.1.1"
"vuex": "^3.1.2"
},
"browserslist": [
"> 1%",
Expand Down
4 changes: 2 additions & 2 deletions src/js/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<template>
<div id="app-polls">
<navigation/>
<navigation />
<router-view />
</div>
</template>
Expand All @@ -34,7 +34,7 @@ export default {
name: 'App',
components: {
Navigation
},
}
}

</script>
Expand Down
19 changes: 13 additions & 6 deletions src/js/components/PollList/PollListItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,12 @@
<!-- <div v-if="votedBycurrentUser" class="symbol icon-voted" /> -->

<router-link :to="{name: 'vote', params: {id: poll.id}}" class="title">
<div class="name"> {{ poll.event.title }} </div>
<div class="description"> {{ poll.event.description }} </div>
<div class="name">
{{ poll.event.title }}
</div>
<div class="description">
{{ poll.event.description }}
</div>
</router-link>

<!-- <div v-if="countComments" v-tooltip.auto="countCommentsHint" class="app-navigation-entry-utils-counter highlighted">
Expand All @@ -78,8 +82,12 @@
</div>

<div class="dates">
<div class="created "> {{ timeSpanCreated }} </div>
<div class="expiry" :class="{ expired : poll.event.expired }"> {{ timeSpanExpiration }} </div>
<div class="created ">
{{ timeSpanCreated }}
</div>
<div class="expiry" :class="{ expired : poll.event.expired }">
{{ timeSpanExpiration }}
</div>
</div>
</div>
</template>
Expand Down Expand Up @@ -118,7 +126,7 @@ export default {
return this.poll.event.access
} else if (this.poll.event.access === 'hidden') {
return this.poll.event.access
} else {
} else {
return 'select'
}
},
Expand Down Expand Up @@ -364,7 +372,6 @@ export default {
flex-wrap: wrap;
align-items: center;


.created, .expiry {
width: 100px;
flex: 1 1;
Expand Down
2 changes: 1 addition & 1 deletion src/js/components/base/controls.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</div>
</div>
<div class="after">
<slot name="after"/>
<slot name="after" />
</div>
</div>
</template>
Expand Down
2 changes: 1 addition & 1 deletion src/js/components/base/userDiv.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<div v-if="description" class="description">
{{ description }}
</div>
<Avatar :disable-menu="true" :user="userId" :display-name="computedDisplayName"
<avatar :disable-menu="true" :user="userId" :display-name="computedDisplayName"
:is-no-user="isNoUser" />
<div v-if="!hideNames" class="user-name">
{{ computedDisplayName }}
Expand Down
12 changes: 6 additions & 6 deletions src/js/components/create/createDlg.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@
-->

<template lang="html">
<div class="createDlg" class="create-dialog">
<div class="create-dialog">
<h2>{{ t('polls', 'Create new poll') }}</h2>
<input id="pollTitle" v-model="event.title" type="text" :placeholder="t('polls', 'Enter Title')">
<input id="pollTitle" v-model="event.title" type="text"
:placeholder="t('polls', 'Enter Title')">

<div class="configBox">
<label class="title icon-checkmark">
Expand All @@ -45,22 +46,21 @@
<button class="button" @click="cancel">
{{ t('polls', 'Cancel') }}
</button>
<button :disabled="titleEmpty" class="button primary" @click="confirm" >
<button :disabled="titleEmpty" class="button primary" @click="confirm">
{{ t('polls', 'Publish') }}
</button>
</div>

</div>
</template>

<script>
export default {
name: 'createDlg',
name: 'CreateDlg',

data() {
return {
event: {
title: '' ,
title: '',
description: '',
type: 'datePoll',
allowMaybe: false,
Expand Down
98 changes: 0 additions & 98 deletions src/js/components/create/datesShift.vue

This file was deleted.

63 changes: 27 additions & 36 deletions src/js/components/navigation/navigation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,91 +21,83 @@
-->

<template lang="html">
<AppNavigation>
<AppNavigationNew :text="t('polls', 'Add new Poll')" @click="toggleCreateDlg" />
<CreateDlg v-show="createDlg" @closeCreate="closeCreate()"/>
<app-navigation>
<app-navigation-new :text="t('polls', 'Add new Poll')" @click="toggleCreateDlg" />
<create-dlg v-show="createDlg" @closeCreate="closeCreate()" />
<ul>
<AppNavigationItem title="All polls"
<app-navigation-item title="All polls"
:allow-collapse="true"
icon="icon-folder"
:open="true">
<ul>
<AppNavigationItem
<app-navigation-item
v-for="(poll) in pollList"
:key="poll.id"
:title="poll.event.title"
:icon="eventIcon(poll.event.type)"
:key="poll.id"
:to="{name: 'vote', params: {id: poll.id}}">
</AppNavigationItem>
:to="{name: 'vote', params: {id: poll.id}}" />
</ul>
</AppNavigationItem>

</app-navigation-item>
</ul>
<ul>
<AppNavigationItem title="My polls"
<app-navigation-item title="My polls"
:allow-collapse="true"
icon="icon-folder"
:open="false">
<ul>
<AppNavigationItem
<app-navigation-item
v-for="(poll) in myPolls"
:key="poll.id"
:title="poll.event.title"
:icon="eventIcon(poll.event.type)"
:key="poll.id"
:to="{name: 'vote', params: {id: poll.id}}">
</AppNavigationItem>
:to="{name: 'vote', params: {id: poll.id}}" />
</ul>
</AppNavigationItem>

</app-navigation-item>
</ul>

<ul>
<AppNavigationItem title="Public polls"
<app-navigation-item title="Public polls"
:allow-collapse="true"
icon="icon-folder"
:open="false">
<ul>
<AppNavigationItem
<app-navigation-item
v-for="(poll) in publicPolls"
:key="poll.id"
:title="poll.event.title"
:icon="eventIcon(poll.event.type)"
:key="poll.id"
:to="{name: 'vote', params: {id: poll.id}}">
</AppNavigationItem>
:to="{name: 'vote', params: {id: poll.id}}" />
</ul>
</AppNavigationItem>

</app-navigation-item>
</ul>

<ul>
<AppNavigationItem title="Hidden polls"
<app-navigation-item title="Hidden polls"
:allow-collapse="true"
icon="icon-folder"
:open="false">
<ul>
<AppNavigationItem
<app-navigation-item
v-for="(poll) in hiddenPolls"
:key="poll.id"
:title="poll.event.title"
:icon="eventIcon(poll.event.type)"
:key="poll.id"
:to="{name: 'vote', params: {id: poll.id}}">
</AppNavigationItem>
:to="{name: 'vote', params: {id: poll.id}}" />
</ul>
</AppNavigationItem>

</app-navigation-item>
</ul>

<AppNavigation-settings>
<app-navigation-settings>
<router-link :to="{ name: 'list'}">
List
</router-link>
</AppNavigation-settings>
</AppNavigation>
</app-navigation-settings>
</app-navigation>
</template>

<script>

import { AppNavigation, AppNavigationNew, AppNavigationItem, AppNavigationSettings, ActionButton } from '@nextcloud/vue'
import { AppNavigation, AppNavigationNew, AppNavigationItem, AppNavigationSettings } from '@nextcloud/vue'
import { mapGetters } from 'vuex'
import CreateDlg from '../create/createDlg'

Expand All @@ -116,7 +108,6 @@ export default {
AppNavigationNew,
AppNavigationItem,
AppNavigationSettings,
ActionButton,
CreateDlg
},

Expand Down
4 changes: 2 additions & 2 deletions src/js/components/share/shareDiv.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<div>
<h2> {{ t('polls', 'Share with') }}</h2>

<Multiselect id="ajax"
<multiselect id="ajax"
v-model="shares"
:options="users"
:multiple="true"
Expand All @@ -47,7 +47,7 @@
{{ values.length }} users selected
</span>
</template>
</Multiselect>
</multiselect>

<TransitionGroup :css="false" tag="ul" class="shared-list">
<li v-for="(item, index) in sortedShares" :key="item.displayName" :data-index="index">
Expand Down
2 changes: 1 addition & 1 deletion src/js/components/sidebar/SideBarTabComments.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<template>
<div>
<CommentAdd />
<comment-add />
<transition-group v-if="countComments" name="fade" class="comments"
tag="ul">
<li v-for="(comment) in sortedComments" :key="comment.id">
Expand Down
Loading

0 comments on commit c2bd57a

Please sign in to comment.