fix(reactions): lint
continuous-integration/drone/pr Build is passing Details

This commit is contained in:
kolaente 2024-03-12 17:34:09 +01:00
parent a65776ad56
commit 2ffaec15f1
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
8 changed files with 24 additions and 18 deletions

View File

@ -133,9 +133,13 @@ async function toggleReaction(value: string) {
</script>
<template>
<div class="reactions" ref="reactionContainerRef">
<div
ref="reactionContainerRef"
class="reactions"
>
<BaseButton
v-for="(users, value) in (model as IReactionPerEntity)"
:key="'button' + value"
v-tooltip="getReactionTooltip(users, value)"
class="reaction-button"
:class="{'current-user-has-reacted': hasCurrentUserReactedWithEmoji(value)}"
@ -144,22 +148,22 @@ async function toggleReaction(value: string) {
{{ value }} {{ users.length }}
</BaseButton>
<BaseButton
ref="emojiPickerButtonRef"
v-tooltip="$t('reaction.add')"
class="reaction-button"
@click.stop="toggleEmojiPicker"
v-tooltip="$t('reaction.add')"
ref="emojiPickerButtonRef"
>
<icon :icon="['far', 'face-laugh']"/>
<icon :icon="['far', 'face-laugh']" />
</BaseButton>
<CustomTransition name="fade">
<VuemojiPicker
v-if="showEmojiPicker"
ref="emojiPickerRef"
class="emoji-picker"
:style="{left: emojiPickerPosition?.left + 'px'}"
@emojiClick="detail => addReaction(detail.unicode)"
ref="emojiPickerRef"
data-source="/emojis.json"
:is-dark="isDark"
@emojiClick="detail => addReaction(detail.unicode)"
/>
</CustomTransition>
</div>

View File

@ -98,10 +98,10 @@
}"
/>
<Reactions
class="mt-2"
entity-kind="comments"
:entity-id="c.id"
v-model="c.reactions"
class="mt-2"
entity-kind="comments"
:entity-id="c.id"
/>
</div>
</div>

View File

@ -3,7 +3,6 @@ import type {IAbstract} from '@/modelTypes/IAbstract'
import ReactionModel from '@/models/reaction'
import type {IReactionPerEntity} from '@/modelTypes/IReaction'
import UserModel from '@/models/user'
import type {Promise} from 'cypress/types/cy-bluebird'
export default class ReactionService extends AbstractService {
constructor() {
@ -26,8 +25,8 @@ export default class ReactionService extends AbstractService {
return data
}
async delete(model: IAbstract): Promise<any> {
async delete(model: IAbstract) {
const finalUrl = this.getReplacedRoute(this.paths.delete, model)
return super.post(finalUrl, model)
}
}
}

View File

@ -315,9 +315,9 @@
<!-- Reactions -->
<Reactions
entity-kind="tasks"
v-model="task.reactions"
entity-kind="tasks"
:entity-id="task.id"
v-model="task.reactions"
class="details"
/>

View File

@ -23,10 +23,11 @@ import (
"strconv"
"strings"
"time"
"xorm.io/builder"
"code.vikunja.io/api/pkg/config"
"code.vikunja.io/api/pkg/log"
"xorm.io/builder"
"xorm.io/xorm"
"xorm.io/xorm/names"
"xorm.io/xorm/schemas"

View File

@ -17,8 +17,9 @@
package migration
import (
"src.techknowlogick.com/xormigrate"
"time"
"src.techknowlogick.com/xormigrate"
"xorm.io/xorm"
)

View File

@ -17,11 +17,12 @@
package models
import (
"testing"
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/user"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"testing"
)
func TestReaction_ReadAll(t *testing.T) {

View File

@ -23,7 +23,6 @@ import (
"reflect"
"strconv"
"time"
"xorm.io/builder"
"code.vikunja.io/api/pkg/config"
"code.vikunja.io/api/pkg/db"
@ -35,6 +34,7 @@ import (
"github.com/golang-jwt/jwt/v5"
"github.com/labstack/echo/v4"
"golang.org/x/crypto/bcrypt"
"xorm.io/builder"
"xorm.io/xorm"
)