add: support for new notifs
This commit is contained in:
parent
bb8e894f8e
commit
93879ecdaa
|
|
@ -1,5 +1,11 @@
|
|||
# Change Log
|
||||
|
||||
## [Version 1.0.6]
|
||||
|
||||
- refactored notifications
|
||||
- added support for aggregated notifications
|
||||
- added support for follow notification
|
||||
|
||||
## [Version 1.0.5]
|
||||
|
||||
- added: `setting` to enable right click page context like at user suggestion
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "yup live",
|
||||
"description": "Light alternative extension for yup protocol",
|
||||
"version": "1.0.5",
|
||||
"version": "1.0.6",
|
||||
"manifest_version": 3,
|
||||
"icons": {
|
||||
"16": "src/assets/icons/yup_ext_16.png",
|
||||
|
|
|
|||
|
|
@ -1,93 +1,202 @@
|
|||
<script lang="ts">
|
||||
import { timeSince } from '@/utils/time';
|
||||
import ImgLoader from './ImgLoader.svelte';
|
||||
import type { Notification } from '@/utils/types';
|
||||
import { mainStore } from '@/utils/store';
|
||||
import { chromeUrl } from '@/utils/chrome-misc';
|
||||
import { extrenalNavigate } from "@/utils/chrome-misc";
|
||||
import { timeSince } from "@/utils/time";
|
||||
import ImgLoader from "./ImgLoader.svelte";
|
||||
import type { Notification } from "@/utils/types";
|
||||
import { mainStore } from "@/utils/store";
|
||||
import { chromeUrl } from "@/utils/chrome-misc";
|
||||
import { extrenalNavigate } from "@/utils/chrome-misc";
|
||||
|
||||
let loader
|
||||
let loader;
|
||||
|
||||
export let notif: Notification
|
||||
export let notif: Notification;
|
||||
</script>
|
||||
|
||||
{#if notif.action === 'vote'}
|
||||
{@const url = notif.post.url }
|
||||
{@const length = url.length}
|
||||
{@const shortUrl = url.slice(0, 10) + '...' + url.slice(length - 10, length) }
|
||||
{@const finalUrl = length > 24 ? shortUrl : url }
|
||||
<div class="flex flex-row notifBody">
|
||||
<ImgLoader bind:this={loader} source="{notif.image} ">
|
||||
<img class="notificationImage" on:load="{() => loader.onLoad()}" on:error={() => loader.onError()} style="{ $mainStore.settings.theme === 'light'? 'filter: invert(0.9);' : '' }" slot="img" src="{notif.image}" alt="preview">
|
||||
<svg class="notificationImage" style="{ $mainStore.settings.theme === 'light'? 'filter: invert(0.9);' : '' }" slot="error" viewBox="0 0 512 512"><g><polygon points="40,38.999 40,468.998 215,293.998 270,348.998 360,258.998 470,358.998 470,38.999 " style="fill:#EFF3F6;"/>
|
||||
<g><circle cx="150" cy="158.999" r="40" style="fill:#FCD884;"/></g><g><polygon points="470,358.998 470,468.998 385,468.998 385,463.998 270,348.998 360,258.998 " style="fill:#70993F;"/></g><g><polygon points="385,463.998 385,468.998 40,468.998 215,293.998 270,348.998" style="fill:#80AF52;"/></g></g><g/></svg>
|
||||
</ImgLoader>
|
||||
<div class="ml-4 text-left" style="width: 97%">
|
||||
<p class="text-xs text-gray-200 my-0 mt-1">
|
||||
{#if notif.like}
|
||||
<svg class="w-4 like-dsilike" viewBox="0 0 24 24">
|
||||
<path fill="#fff" d="M12,3.172L5.586,9.586c-0.781,0.781-0.781,2.047,0,2.828s2.047,0.781,2.828,0L10,10.828v7.242c0,1.104,0.895,2,2,2 c1.104,0,2-0.896,2-2v-7.242l1.586,1.586C15.977,12.805,16.488,13,17,13s1.023-0.195,1.414-0.586c0.781-0.781,0.781-2.047,0-2.828 L12,3.172z"/>
|
||||
</svg>
|
||||
{:else}
|
||||
<svg class="w-4 down like-dsilike" viewBox="0 0 24 24">
|
||||
<path fill="#fff" d="M12,3.172L5.586,9.586c-0.781,0.781-0.781,2.047,0,2.828s2.047,0.781,2.828,0L10,10.828v7.242c0,1.104,0.895,2,2,2 c1.104,0,2-0.896,2-2v-7.242l1.586,1.586C15.977,12.805,16.488,13,17,13s1.023-0.195,1.414-0.586c0.781-0.781,0.781-2.047,0-2.828 L12,3.172z"/>
|
||||
</svg>
|
||||
{/if}
|
||||
by {notif.voter.length > 12 ? notif.voter.slice(0, 12) + '...' : notif.voter}
|
||||
</p>
|
||||
<p class="text-xs text-gray-200 my-0 mt-1">
|
||||
<span on:click={() => extrenalNavigate(`https://yup-live.pages.dev/post/${notif.postid}`)}
|
||||
aria-hidden
|
||||
class="text-blue-200 interactive-svg">{finalUrl}</span>
|
||||
</p>
|
||||
<p class="text-xs text-gray-200 my-0 my-1 text-right mr-2">
|
||||
<svg class="w-3 inline" viewBox="0 0 20 20" ><path fill="#fff" d="M10 20a10 10 0 1 1 0-20 10 10 0 0 1 0 20zm0-2a8 8 0 1 0 0-16 8 8 0 0 0 0 16zm-1-7.59V4h2v5.59l3.95 3.95-1.41 1.41L9 10.41z"/></svg>
|
||||
{timeSince(new Date(notif.createdAt))}</p>
|
||||
</div>
|
||||
</div>
|
||||
{:else if notif.action === 'reward'}
|
||||
<div class="flex flex-row notifBody">
|
||||
<img class="notificationImage" src="{chromeUrl('src/assets/res/reward_optimized.png')}" alt="reward">
|
||||
<div class="ml-4 text-left" style="width: 97%">
|
||||
<p class="text-xs text-gray-200 my-0 mt-1">You were alocated a future reward of {notif?.quantity ?? 'unknown'} amount of YUP.
|
||||
</p>
|
||||
<p class="text-xs text-gray-500 my-0 my-1 text-right mr-2">
|
||||
<svg class="w-3 inline" viewBox="0 0 20 20" ><path fill="#fff" d="M10 20a10 10 0 1 1 0-20 10 10 0 0 1 0 20zm0-2a8 8 0 1 0 0-16 8 8 0 0 0 0 16zm-1-7.59V4h2v5.59l3.95 3.95-1.41 1.41L9 10.41z"/></svg>
|
||||
{timeSince(new Date(notif.createdAt))}</p>
|
||||
</div>
|
||||
</div>
|
||||
{:else }
|
||||
<div class="flex flex-row items-center notifBody">
|
||||
<div class="ml-4 text-left" style="width: 97%">
|
||||
<p class="text-xs text-gray-200 my-0 mt-1">{notif?.message ?? 'unknown notification type'}</p>
|
||||
<p class="text-xs text-gray-500 my-0 my-1 text-right mr-2">
|
||||
<svg viewBox="0 0 20 20" ><path fill="#fff" d="M10 20a10 10 0 1 1 0-20 10 10 0 0 1 0 20zm0-2a8 8 0 1 0 0-16 8 8 0 0 0 0 16zm-1-7.59V4h2v5.59l3.95 3.95-1.41 1.41L9 10.41z"/></svg>
|
||||
{timeSince(new Date(notif.createdAt))}</p>
|
||||
</div>
|
||||
</div>
|
||||
{#if notif.action === "vote"}
|
||||
{@const url = notif.post.url}
|
||||
{@const length = url.length}
|
||||
{@const shortUrl = url.slice(0, 10) + "..." + url.slice(length - 10, length)}
|
||||
{@const finalUrl = length > 24 ? shortUrl : url}
|
||||
<div class="flex flex-row notifBody">
|
||||
<ImgLoader bind:this={loader} source="{notif.image} ">
|
||||
<img
|
||||
class="notificationImage"
|
||||
on:load={() => loader.onLoad()}
|
||||
on:error={() => loader.onError()}
|
||||
style={$mainStore.settings.theme === "light" ? "filter: invert(0.9);" : ""}
|
||||
slot="img"
|
||||
src={notif.image}
|
||||
alt="preview"
|
||||
/>
|
||||
<svg
|
||||
class="notificationImage"
|
||||
style={$mainStore.settings.theme === "light" ? "filter: invert(0.9);" : ""}
|
||||
slot="error"
|
||||
viewBox="0 0 512 512"
|
||||
><g
|
||||
><polygon
|
||||
points="40,38.999 40,468.998 215,293.998 270,348.998 360,258.998 470,358.998 470,38.999 "
|
||||
style="fill:#EFF3F6;"
|
||||
/>
|
||||
<g><circle cx="150" cy="158.999" r="40" style="fill:#FCD884;" /></g><g
|
||||
><polygon
|
||||
points="470,358.998 470,468.998 385,468.998 385,463.998 270,348.998 360,258.998 "
|
||||
style="fill:#70993F;"
|
||||
/></g
|
||||
><g><polygon points="385,463.998 385,468.998 40,468.998 215,293.998 270,348.998" style="fill:#80AF52;" /></g
|
||||
></g
|
||||
><g /></svg
|
||||
>
|
||||
</ImgLoader>
|
||||
<div class="ml-4 text-left" style="width: 97%">
|
||||
<p class="text-xs text-gray-200 my-0 mt-1">
|
||||
{#if notif.like}
|
||||
<svg class="w-4 like-dislike" viewBox="0 0 24 24">
|
||||
<path
|
||||
fill="#fff"
|
||||
d="M12,3.172L5.586,9.586c-0.781,0.781-0.781,2.047,0,2.828s2.047,0.781,2.828,0L10,10.828v7.242c0,1.104,0.895,2,2,2 c1.104,0,2-0.896,2-2v-7.242l1.586,1.586C15.977,12.805,16.488,13,17,13s1.023-0.195,1.414-0.586c0.781-0.781,0.781-2.047,0-2.828 L12,3.172z"
|
||||
/>
|
||||
</svg>
|
||||
{:else}
|
||||
<svg class="w-4 down like-dislike" viewBox="0 0 24 24">
|
||||
<path
|
||||
fill="#fff"
|
||||
d="M12,3.172L5.586,9.586c-0.781,0.781-0.781,2.047,0,2.828s2.047,0.781,2.828,0L10,10.828v7.242c0,1.104,0.895,2,2,2 c1.104,0,2-0.896,2-2v-7.242l1.586,1.586C15.977,12.805,16.488,13,17,13s1.023-0.195,1.414-0.586c0.781-0.781,0.781-2.047,0-2.828 L12,3.172z"
|
||||
/>
|
||||
</svg>
|
||||
{/if}
|
||||
|
||||
|
||||
by
|
||||
{#if notif?.notifications?.length > 1}
|
||||
{notif?.notifications[0].VoterHandle}
|
||||
{#if notif.notifications.length - 1 > 0}
|
||||
<span class="opacity-60"> and {notif.notifications.length - 1} more</span>
|
||||
{/if}
|
||||
{:else}
|
||||
{notif.voter.length > 12 ? notif.voter.slice(0, 12) + "..." : notif.voter}
|
||||
{/if}
|
||||
</p>
|
||||
<p class="text-xs text-gray-200 my-0 mt-1">
|
||||
<span
|
||||
on:click={() => extrenalNavigate(`https://yup-live.pages.dev/post/${notif.postid}`)}
|
||||
aria-hidden
|
||||
class="text-blue-200 interactive-svg">{finalUrl}</span
|
||||
>
|
||||
</p>
|
||||
<p class="text-xs text-gray-200 my-0 my-1 text-right mr-2">
|
||||
<svg class="w-3 inline" viewBox="0 0 20 20"
|
||||
><path
|
||||
fill="#fff"
|
||||
d="M10 20a10 10 0 1 1 0-20 10 10 0 0 1 0 20zm0-2a8 8 0 1 0 0-16 8 8 0 0 0 0 16zm-1-7.59V4h2v5.59l3.95 3.95-1.41 1.41L9 10.41z"
|
||||
/></svg
|
||||
>
|
||||
{timeSince(new Date(notif.createdAt))}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
{:else if notif.action === "reward"}
|
||||
<div class="flex flex-row notifBody">
|
||||
<img class="notificationImage" src={chromeUrl("src/assets/res/reward_optimized.png")} alt="reward" />
|
||||
<div class="ml-4 text-left" style="width: 97%">
|
||||
<p class="text-xs text-gray-200 my-0 mt-1">
|
||||
You were alocated a future reward of {notif?.quantity ?? "unknown"} amount of YUP.
|
||||
</p>
|
||||
<p class="text-xs text-gray-500 my-0 my-1 text-right mr-2">
|
||||
<svg class="w-3 inline" viewBox="0 0 20 20"
|
||||
><path
|
||||
fill="#fff"
|
||||
d="M10 20a10 10 0 1 1 0-20 10 10 0 0 1 0 20zm0-2a8 8 0 1 0 0-16 8 8 0 0 0 0 16zm-1-7.59V4h2v5.59l3.95 3.95-1.41 1.41L9 10.41z"
|
||||
/></svg
|
||||
>
|
||||
{timeSince(new Date(notif.createdAt))}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
{:else if ["follow", "unfollow"].includes(notif.action)}
|
||||
<div class="flex flex-row notifBody">
|
||||
<ImgLoader bind:this={loader} source="{notif?.EVMRecipient?.avatar} ">
|
||||
<img
|
||||
class="notificationImage"
|
||||
on:load={() => loader.onLoad()}
|
||||
on:error={() => loader.onError()}
|
||||
style={$mainStore.settings.theme === "light" ? "filter: invert(0.9);" : ""}
|
||||
slot="img"
|
||||
src={notif.image}
|
||||
alt="preview"
|
||||
/>
|
||||
<svg
|
||||
class="notificationImage"
|
||||
style={$mainStore.settings.theme === "light" ? "filter: invert(0.9);" : ""}
|
||||
slot="error"
|
||||
viewBox="0 0 512 512"
|
||||
><g
|
||||
><polygon
|
||||
points="40,38.999 40,468.998 215,293.998 270,348.998 360,258.998 470,358.998 470,38.999 "
|
||||
style="fill:#EFF3F6;"
|
||||
/>
|
||||
<g><circle cx="150" cy="158.999" r="40" style="fill:#FCD884;" /></g><g
|
||||
><polygon
|
||||
points="470,358.998 470,468.998 385,468.998 385,463.998 270,348.998 360,258.998 "
|
||||
style="fill:#70993F;"
|
||||
/></g
|
||||
><g><polygon points="385,463.998 385,468.998 40,468.998 215,293.998 270,348.998" style="fill:#80AF52;" /></g
|
||||
></g
|
||||
><g /></svg
|
||||
>
|
||||
</ImgLoader>
|
||||
<div class="ml-4 text-left" style="width: 97%">
|
||||
<p
|
||||
aria-hidden
|
||||
class="text-xs text-gray-200 my-0 mt-1"
|
||||
on:click={() => extrenalNavigate(`https://yup-live.pages.dev/web3-profile/${notif.EVMRecipient?.address}`)}
|
||||
>
|
||||
<b>{notif?.EVMRecipient?.handle || `${notif.EVMRecipient?.address?.slice(0, 6)}...`}</b>
|
||||
{notif.action === "follow" ? "followed" : "unfollowed"} you.
|
||||
</p>
|
||||
<p class="text-xs text-gray-200 my-0 my-1 text-right mr-2">
|
||||
<svg class="w-3 inline" viewBox="0 0 20 20"
|
||||
><path
|
||||
fill="#fff"
|
||||
d="M10 20a10 10 0 1 1 0-20 10 10 0 0 1 0 20zm0-2a8 8 0 1 0 0-16 8 8 0 0 0 0 16zm-1-7.59V4h2v5.59l3.95 3.95-1.41 1.41L9 10.41z"
|
||||
/></svg
|
||||
>
|
||||
{timeSince(new Date(notif.createdAt))}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
{:else}
|
||||
<div class="flex flex-row items-center notifBody">
|
||||
<div class="ml-4 text-left" style="width: 97%">
|
||||
<p class="text-xs text-gray-200 my-0 mt-1">{notif?.message ?? "unknown notification type"}</p>
|
||||
<p class="text-xs text-gray-500 my-0 my-1 text-right mr-2">
|
||||
<svg class="w-3 inline" viewBox="0 0 20 20"
|
||||
><path
|
||||
fill="#fff"
|
||||
d="M10 20a10 10 0 1 1 0-20 10 10 0 0 1 0 20zm0-2a8 8 0 1 0 0-16 8 8 0 0 0 0 16zm-1-7.59V4h2v5.59l3.95 3.95-1.41 1.41L9 10.41z"
|
||||
/></svg
|
||||
>
|
||||
{timeSince(new Date(notif.createdAt))}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<style class="scss">
|
||||
.notificationImage {
|
||||
width: 50px;
|
||||
height: 50px;
|
||||
border-radius: 50%;
|
||||
object-fit: cover;
|
||||
border-radius: 6px;
|
||||
margin-left: 0.5rem;
|
||||
margin-top: 0.5rem;
|
||||
}
|
||||
.notificationImage {
|
||||
width: 50px;
|
||||
height: 50px;
|
||||
border-radius: 50%;
|
||||
object-fit: cover;
|
||||
border-radius: 6px;
|
||||
margin-left: 0.5rem;
|
||||
margin-top: 0.5rem;
|
||||
}
|
||||
|
||||
.notifBody {
|
||||
background: #00000061;
|
||||
border: 1px solid rgba(0, 0, 0, 0.938);
|
||||
}
|
||||
.notifBody {
|
||||
background: #00000061;
|
||||
border: 1px solid rgba(0, 0, 0, 0.938);
|
||||
}
|
||||
|
||||
.like-dsilike {
|
||||
position: relative;
|
||||
top: 0.2rem;
|
||||
}
|
||||
|
||||
</style>
|
||||
.like-dislike {
|
||||
position: relative;
|
||||
top: 0.2rem;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ let loading = true;
|
|||
let noNotifications = false;
|
||||
let notifs = [];
|
||||
let pastNotifsPromise
|
||||
let type = 'all'
|
||||
let type = null
|
||||
|
||||
onMount(async () => {
|
||||
notifs = await getNotifications({
|
||||
|
|
@ -35,13 +35,9 @@ onMount(async () => {
|
|||
|
||||
});
|
||||
|
||||
const changeNotifsType = async (t :string) => {
|
||||
if(type === t) return;
|
||||
if(!['all', 'rewards'].includes(t)){
|
||||
console.error('Invalid type');
|
||||
return;
|
||||
}
|
||||
type = t;
|
||||
const changeNotifsType = async (t : string[] | null) => {
|
||||
if(String(type) === String(t)) return;
|
||||
type = t
|
||||
loading = true;
|
||||
notifs = await getNotifications({
|
||||
userId: $mainStore.user.auth.userId,
|
||||
|
|
@ -71,8 +67,8 @@ const changeNotifsType = async (t :string) => {
|
|||
{/await}
|
||||
{:else}
|
||||
<div class="text-[0.75rem] py-1">
|
||||
<span on:click={() => changeNotifsType('all')} aria-hidden class="inline-block mr-2 interactive-svg text-blue-200 interactive-svg" >All</span>
|
||||
<span on:click={() => changeNotifsType('rewards')} aria-hidden class="text-blue-200 interactive-svg interactive-svg text-blue-200 interactive-svg">Rewards</span>
|
||||
<span on:click={() => changeNotifsType(null)} aria-hidden class="inline-block mr-2 interactive-svg text-blue-200 interactive-svg" >All</span>
|
||||
<span on:click={() => changeNotifsType(['reward'])} aria-hidden class="text-blue-200 interactive-svg interactive-svg text-blue-200 interactive-svg">Rewards</span>
|
||||
</div>
|
||||
<div class="flex flex-col">
|
||||
{#each notifs.reverse() as notif}
|
||||
|
|
|
|||
|
|
@ -3,33 +3,30 @@ import type { StorageType } from '@/utils/storage'
|
|||
import { fetchWAuth } from '@/utils/auth'
|
||||
import { wait } from '@/utils/time'
|
||||
|
||||
export const notificationTypes = ['vote', 'reward', 'all-followers', 'follow', 'unfollow']
|
||||
|
||||
export const getNotifications = async (
|
||||
{ type, limit, skip, userId } = { type: 'all', limit: '10', skip: '0' } as { userId: string, type: string; limit?: string; skip?: string }
|
||||
{ type, limit, skip, userId } = { type: null, limit: '10', skip: '0' } as { userId: string, type: null | string[]; limit?: string; skip?: string }
|
||||
) => {
|
||||
let req
|
||||
|
||||
if (type === 'all') {
|
||||
req = await fetch(`${API_BASE}/notifications/${userId}?skip=${skip}&limit=${limit}`, {
|
||||
method: 'GET',
|
||||
headers: {
|
||||
'Content-Type': 'application/json;charset=utf-8'
|
||||
}
|
||||
})
|
||||
} else if (type === 'vote') {
|
||||
req = await fetch(`${API_BASE}/notifications/${userId}?skip=${skip}&limit=${limit}&type=vote`, {
|
||||
method: 'GET',
|
||||
headers: {
|
||||
'Content-Type': 'application/json;charset=utf-8'
|
||||
}
|
||||
})
|
||||
} else {
|
||||
req = await fetch(`${API_BASE}/notifications/${userId}?skip=${skip}&limit=${limit}&type=reward`, {
|
||||
method: 'GET',
|
||||
headers: {
|
||||
'Content-Type': 'application/json;charset=utf-8'
|
||||
}
|
||||
})
|
||||
let queryType = ''
|
||||
if (type) {
|
||||
queryType = `&inType=${type.join(',')}`
|
||||
}
|
||||
if (!limit) {
|
||||
limit = '10'
|
||||
}
|
||||
|
||||
if (!skip) {
|
||||
skip = '0'
|
||||
}
|
||||
|
||||
req = await fetch(`${API_BASE}/notifications/${userId}?skip=${skip}&limit=${limit}${queryType}`, {
|
||||
method: 'GET',
|
||||
headers: {
|
||||
'Content-Type': 'application/json;charset=utf-8'
|
||||
}
|
||||
})
|
||||
|
||||
if (!req.ok) {
|
||||
return false
|
||||
|
|
|
|||
|
|
@ -27,6 +27,12 @@ export interface Vote {
|
|||
title: string
|
||||
tag: string
|
||||
}
|
||||
EVMRecipient: {
|
||||
handle: string
|
||||
address: string
|
||||
avatar: string
|
||||
}
|
||||
notifications: Notification[]
|
||||
seen: boolean
|
||||
postid: string
|
||||
rating: number
|
||||
|
|
@ -35,4 +41,5 @@ export interface Vote {
|
|||
createdAt: string
|
||||
quantity?: string
|
||||
message?: string
|
||||
VoterHandle: string
|
||||
}
|
||||
|
|
@ -67,7 +67,7 @@ export const executeVote = async ({
|
|||
body: JSON.stringify(body)
|
||||
})
|
||||
if (req.ok) {
|
||||
noVoteAlert || $alertStore?.show('Rating submited!')
|
||||
noVoteAlert || $alertStore?.show('Rating submitted!')
|
||||
return await req.json()
|
||||
} else {
|
||||
const err = await req.text()
|
||||
|
|
@ -76,9 +76,9 @@ export const executeVote = async ({
|
|||
} else if(err.includes('requests')) {
|
||||
$alertStore?.show('You have made too many request try again after 24h', 'warning')
|
||||
} else if(err.toLocaleLowerCase().includes('unauthorized')) {
|
||||
$alertStore?.show('Seems your auth token is not valid anymore re-login!!', 'error')
|
||||
$alertStore?.show('Seems your auth token has expired re-login!!', 'error')
|
||||
} else {
|
||||
$alertStore?.show('Vote not submited due to error try to re-login!', 'error')
|
||||
$alertStore?.show('Rating not submitted due to error try to re-login!', 'error')
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue