Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Vue Rewrite] Starred component #2321

Merged
merged 9 commits into from
Aug 22, 2023
Merged
1 change: 1 addition & 0 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export default Vue.extend({
async created() {
await this.$store.dispatch(ACTIONS.FETCH_FOLDERS)
await this.$store.dispatch(ACTIONS.FETCH_FEEDS)
await this.$store.dispatch(ACTIONS.FETCH_STARRED)
},
})
</script>
340 changes: 340 additions & 0 deletions src/components/FeedItem.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,340 @@
<template>
<div class="feed-item-container">
<div class="feed-item-row" @click="expand()">
<div class="link-container">
<a class="external"
target="_blank"
rel="noreferrer"
:href="item.url"
:title="t('news', 'Open website')"
@click="markRead(item); $event.stopPropagation();">
<EarthIcon />
</a>
<RssIcon v-if="!getFeed(item.feedId).faviconLink" />
<span v-if="getFeed(item.feedId).faviconLink" :style="{ 'backgroundImage': 'url(' + Content.getFeed(item.feedId).faviconLink + ')' }" />
</div>
<div class="title-container" :class="{ 'unread': item.unread }">
<span :style="{ 'white-space': !isExpanded ? 'nowrap' : 'normal' }" :dir="item.rtl && 'rtl'">
{{ item.title }}
<span v-if="!isExpanded" class="intro" v-html="item.intro" />

Check warning on line 19 in src/components/FeedItem.vue

View workflow job for this annotation

GitHub Actions / eslint node

'v-html' directive can lead to XSS attack

Check warning on line 19 in src/components/FeedItem.vue

View workflow job for this annotation

GitHub Actions / eslint

'v-html' directive can lead to XSS attack
</span>
</div>
<div class="date-container">
<time class="date" :title="formatDate(item.pubDate*1000, 'yyyy-MM-dd HH:mm:ss')" :datetime="formatDatetime(item.pubDate*1000, 'yyyy-MM-ddTHH:mm:ssZ')">
{{ getRelativeTimestamp(item.pubDate*1000) }}
</time>
</div>
<div class="button-container" @click="$event.stopPropagation()">
<StarIcon :class="{'starred': item.starred }" @click="toggleStarred(item)" />
<Eye :class="{ 'keep-unread': keepUnread }" @click="toggleKeepUnread(item)" />
<NcActions :force-menu="true">
<template #icon>
<ShareVariant />
</template>
<NcActionButton>
<template #default>
<!-- TODO: Share Menu --> TODO
</template>
<template #icon>
<ShareVariant />
</template>
</NcActionButton>
</NcActions>
</div>
</div>

<div v-if="isExpanded" class="article">
<!--div class="heading only-in-expanded">
<time class="date" :title="formatDate(item.pubDate*1000, 'yyyy-MM-dd HH:mm:ss')" :datetime="formatDate(item.pubDate*1000, 'yyyy-MM-ddTHH:mm:ssZ')">
{{ getRelativeTimestamp(item.pubDate*1000) }}
</time>
<h1 :dir="item.rtl && 'rtl'">
<a class="external"
target="_blank"
rel="noreferrer"
:href="item.url"
:title="item.title">
{{ item.title }}
</a>
</h1>
</div-->

<div class="subtitle" :dir="item.rtl && 'rtl'">
<span v-show="item.author !== undefined" class="author">
{{ t('news', 'by') }} {{ item.author }}
</span>
<span v-if="!item.sharedBy" class="source">{{ t('news', 'from') }}
<!-- TODO: Fix link to feed -->
<a :href="`#/items/feeds/${item.feedId}/`">
{{ getFeed(item.feedId).title }}
<img v-if="getFeed(item.feedId).faviconLink && isCompactView()" :src="getFeed(item.feedId).faviconLink" alt="favicon">
</a>
</span>
<span v-if="item.sharedBy">
<span v-if="item.author">-</span>
{{ t('news', 'shared by') }}
{{ item.sharedByDisplayName }}
</span>
</div>

<!-- TODO: Test audio/video -->
<div v-if="getMediaType(item.enclosureMime) == 'audio'" class="enclosure">
<button @click="play(item)">
{{ t('news', 'Play audio') }}
</button>
<a class="button"
:href="item.enclosureLink"
target="_blank"
rel="noreferrer">
{{ t('news', 'Download audio') }}
</a>
</div>
<div v-if="getMediaType(item.enclosureMime) == 'video'" class="enclosure">
<video controls
preload="none"
news-play-one
:src="item.enclosureLink"
:type="item.enclosureMime" />
<a class="button"
:href="item.enclosureLink"
target="_blank"
rel="noreferrer">
{{ t('news', 'Download video') }}
</a>
</div>

<div v-if="item.mediaThumbnail" class="enclosure thumbnail">
<a :href="item.enclosureLink"><img :src="item.mediaThumbnail" alt=""></a>
</div>

<div v-if="item.mediaDescription" class="enclosure description" v-html="item.mediaDescription" />

Check warning on line 110 in src/components/FeedItem.vue

View workflow job for this annotation

GitHub Actions / eslint node

'v-html' directive can lead to XSS attack

Check warning on line 110 in src/components/FeedItem.vue

View workflow job for this annotation

GitHub Actions / eslint

'v-html' directive can lead to XSS attack

<div class="body" :dir="item.rtl && 'rtl'" v-html="item.body" />

Check warning on line 112 in src/components/FeedItem.vue

View workflow job for this annotation

GitHub Actions / eslint node

'v-html' directive can lead to XSS attack

Check warning on line 112 in src/components/FeedItem.vue

View workflow job for this annotation

GitHub Actions / eslint

'v-html' directive can lead to XSS attack
</div>
</div>
</template>

<script lang="ts">
import Vue from 'vue'
import { mapState } from 'vuex'

import EarthIcon from 'vue-material-design-icons/Earth.vue'
import StarIcon from 'vue-material-design-icons/Star.vue'
import Eye from 'vue-material-design-icons/Eye.vue'
import RssIcon from 'vue-material-design-icons/Rss.vue'
import ShareVariant from 'vue-material-design-icons/ShareVariant.vue'

import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'

import { Feed } from '../types/Feed'
import { FeedItem } from '../types/FeedItem'
import { ACTIONS } from '../store'

export default Vue.extend({
name: 'FeedItem',
components: {
EarthIcon,
StarIcon,
Eye,
ShareVariant,
RssIcon,
NcActions,
NcActionButton,
},
props: {
item: {
type: Object,
required: true,
},
},
data: () => {
return {
expanded: false,
keepUnread: false,
}
},
computed: {
isExpanded() {
return this.expanded
},
...mapState(['feeds']),
},
methods: {
expand() {
this.expanded = !this.expanded
this.markRead(this.item)
},
formatDate(epoch: number) {
return new Date(epoch).toLocaleString()
},
formatDatetime(epoch: number) {
return new Date(epoch).toISOString()
},
getRelativeTimestamp(previous: number) {
const current = Date.now()

const msPerMinute = 60 * 1000
const msPerHour = msPerMinute * 60
const msPerDay = msPerHour * 24
const msPerMonth = msPerDay * 30
const msPerYear = msPerDay * 365

const elapsed = current - previous

if (elapsed < msPerMinute) {
return Math.round(elapsed / 1000) + ' ' + t('news', 'seconds')
} else if (elapsed < msPerHour) {
return Math.round(elapsed / msPerMinute) + ' ' + t('news', 'minutes ago')
} else if (elapsed < msPerDay) {
return Math.round(elapsed / msPerHour) + ' ' + t('news', 'hours ago')
} else if (elapsed < msPerMonth) {
return Math.round(elapsed / msPerDay) + ' ' + t('news', 'days ago')
} else if (elapsed < msPerYear) {
return Math.round(elapsed / msPerMonth) + ' ' + t('news', 'months ago')
} else {
return Math.round(elapsed / msPerYear) + ' ' + t('news', 'years ago')
}
},
getFeed(id: number): Feed {
return this.$store.getters.feeds.find((feed: Feed) => feed.id === id) || {}
},
getMediaType(mime: any): 'audio' | 'video' | false {

Check warning on line 202 in src/components/FeedItem.vue

View workflow job for this annotation

GitHub Actions / eslint node

'mime' is defined but never used

Check warning on line 202 in src/components/FeedItem.vue

View workflow job for this annotation

GitHub Actions / eslint node

Unexpected any. Specify a different type

Check warning on line 202 in src/components/FeedItem.vue

View workflow job for this annotation

GitHub Actions / eslint

'mime' is defined but never used

Check warning on line 202 in src/components/FeedItem.vue

View workflow job for this annotation

GitHub Actions / eslint

Unexpected any. Specify a different type
// TODO: figure out how to check media type
return false
},
play(item: any) {

Check warning on line 206 in src/components/FeedItem.vue

View workflow job for this annotation

GitHub Actions / eslint node

'item' is defined but never used

Check warning on line 206 in src/components/FeedItem.vue

View workflow job for this annotation

GitHub Actions / eslint node

Unexpected any. Specify a different type

Check warning on line 206 in src/components/FeedItem.vue

View workflow job for this annotation

GitHub Actions / eslint

'item' is defined but never used

Check warning on line 206 in src/components/FeedItem.vue

View workflow job for this annotation

GitHub Actions / eslint

Unexpected any. Specify a different type
// TODO: implement play audio/video
},
markRead(item: FeedItem): void {
if (!this.keepUnread) {
this.$store.dispatch(ACTIONS.MARK_READ, { item })
}
},
toggleKeepUnread(item: FeedItem): void {
this.keepUnread = !this.keepUnread
this.$store.dispatch(ACTIONS.MARK_UNREAD, { item })
},
toggleStarred(item: FeedItem): void {
this.$store.dispatch(item.starred ? ACTIONS.UNSTAR_ITEM : ACTIONS.STAR_ITEM, { item })
},
},
})

</script>

<style>
.feed-item-container {
border-bottom: 1px solid #222;
}

.feed-item-row {
display: flex; padding: 5px 10px;
}

.feed-item-row:hover {
background-color: #222;
}

.feed-item-row, .feed-item-row * {
cursor: pointer;
}

.feed-item-row .link-container {
padding-right: 5px;
display: flex;
flex-direction: row;
align-self: start;
}

.feed-item-row .title-container {
color: var(--color-text-lighter);

flex-grow: 1;
overflow: hidden;
text-overflow: ellipsis;
}

.feed-item-row .title-container.unread {
color: var(--color-main-text);
font-weight: bold;
}

.feed-item-row .intro {
color: var(--color-text-lighter);
font-size: 10pt;
font-weight: normal;
margin-left: 20px;
}

.feed-item-row .date-container {
color: var(--color-text-lighter);
padding-left: 4px;
white-space: nowrap;
}

.feed-item-row .button-container {
display: flex;
flex-direction: row;
align-self: start;
}

.button-container .action-item .button-vue, .button-container .material-design-icon {
width: 30px !important;
min-width: 30px;
min-height: 30px;
height: 30px;
}

.material-design-icon {
color: #555555;
}

.material-design-icon:hover {
color: var(--color-main-text);
}

.material-design-icon.rss-icon:hover {
color: #555555;
}

.material-design-icon.starred {
color: rgb(255, 204, 0);
}

.material-design-icon.keep-unread {
color: var(--color-main-text);
}

.material-design-icon.starred:hover {
color: #555555;
}

.article {
padding: 0 50px 50px 50px;
}

.article .body {
color: var(--color-main-text);
font-size: 15px;
}

.article a {
text-decoration: underline;
}

.article .body a {
color: #3a84e4
}

.article .subtitle {
color: var(--color-text-lighter);
font-size: 15px;
padding: 25px 0;
}

.article .author {
color: var(--color-text-lighter);
font-size: 15px;
}
</style>
32 changes: 32 additions & 0 deletions src/components/ItemSkeleton.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<!--
- Copyright (c) 2020. The Nextcloud Bookmarks contributors.
-
- This file is licensed under the Affero General Public License version 3 or later. See the COPYING file.
-->

<template>
<div class="item-skeleton">
<div class="item__labels" />
<div class="item__actions" />
</div>
</template>

<script>
import Vue from 'vue'

export default Vue.extend({
name: 'ItemSkeleton',
components: {
},
computed: {

},
})
</script>

<style>
.item-skeleton {
background: 'var(--color-placeholder-dark)';
height: '45px';
}
</style>
Loading
Loading