IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the backend test

Browse Source
This commit is contained in:
Wolfgang Huß 2019-08-15 11:07:57 +02:00
parent 0d66cc4dcf
commit 6ab9a3204b
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/schema/types/type/Notification.gql
View File

@ -3,5 +3,6 @@ type Notification {
read: Boolean read: Boolean
user: User @relation(name: "NOTIFIED", direction: "OUT") user: User @relation(name: "NOTIFIED", direction: "OUT")
post: Post @relation(name: "NOTIFIED", direction: "IN") post: Post @relation(name: "NOTIFIED", direction: "IN")
comment: Comment @relation(name: "NOTIFIED", direction: "IN")
createdAt: String createdAt: String
} }

30
webapp/components/Editor/Editor.vue
View File

@ -18,7 +18,9 @@
<!-- if query is not empty and is find fully in the suggestions array ... --> <!-- if query is not empty and is find fully in the suggestions array ... -->
<div v-if="query && !filteredItems.find(el => el.name === query)"> <div v-if="query && !filteredItems.find(el => el.name === query)">
<div class="suggestion-list__item is-empty">{{ $t('editor.hashtag.addHashtag') }}</div> <div class="suggestion-list__item is-empty">{{ $t('editor.hashtag.addHashtag') }}</div>
<div class="suggestion-list__item" @click="selectItem({ name: query })">#{{ query }}</div> <div class="suggestion-list__item" @click="selectItem({ name: query })">
#{{ query }}
</div>
</div> </div>
<!-- otherwise if sanitized query is empty advice the user to add a char --> <!-- otherwise if sanitized query is empty advice the user to add a char -->
<div v-else-if="!query"> <div v-else-if="!query">
@ -28,19 +30,19 @@
</template> </template>
<!-- if "!hasResults" --> <!-- if "!hasResults" -->
<div v-else> <div v-else>
<div <div v-if="isMention" class="suggestion-list__item is-empty">
v-if="isMention" {{ $t('editor.mention.noUsersFound') }}
class="suggestion-list__item is-empty" </div>
>{{ $t('editor.mention.noUsersFound') }}</div>
<div v-if="isHashtag"> <div v-if="isHashtag">
<div <div v-if="query === ''" class="suggestion-list__item is-empty">
v-if="query === ''" {{ $t('editor.hashtag.noHashtagsFound') }}
class="suggestion-list__item is-empty" </div>
>{{ $t('editor.hashtag.noHashtagsFound') }}</div>
<!-- if "query" is not empty --> <!-- if "query" is not empty -->
<div v-else> <div v-else>
<div class="suggestion-list__item is-empty">{{ $t('editor.hashtag.addHashtag') }}</div> <div class="suggestion-list__item is-empty">{{ $t('editor.hashtag.addHashtag') }}</div>
<div class="suggestion-list__item" @click="selectItem({ name: query })">#{{ query }}</div> <div class="suggestion-list__item" @click="selectItem({ name: query })">
#{{ query }}
</div>
</div> </div>
</div> </div>
</div> </div>
@ -126,14 +128,18 @@
size="small" size="small"
:ghost="!isActive.heading({ level: 3 })" :ghost="!isActive.heading({ level: 3 })"
@click.prevent="commands.heading({ level: 3 })" @click.prevent="commands.heading({ level: 3 })"
>H3</ds-button> >
H3
</ds-button>
<ds-button <ds-button
class="menubar__button" class="menubar__button"
size="small" size="small"
:ghost="!isActive.heading({ level: 4 })" :ghost="!isActive.heading({ level: 4 })"
@click.prevent="commands.heading({ level: 4 })" @click.prevent="commands.heading({ level: 4 })"
>H4</ds-button> >
H4
</ds-button>
<ds-button <ds-button
class="menubar__button" class="menubar__button"