misc: add account logging in

This commit is contained in:
Xyphyn committed 2023-07-03 14:57:53 -07:00
1 parent 7d3f29d9eb
commit f71ad4be8e
21 files changed
+686 -151

No files matched your search

+2 -2
View File
@@ -2,7 +2,7 @@
import { goto } from '$app/navigation'
import { page } from '$app/stores'
import Button from '$lib/components/input/Button.svelte'
import Card from '$lib/components/ui/Card.svelte'
import Card from '$lib/components/ui/StickyCard.svelte'
import Link from '$lib/components/input/Link.svelte'
import MultiSelect from '$lib/components/input/MultiSelect.svelte'
import {
@@ -90,7 +90,7 @@
rounded-md"
/>
<div
class="w-36 h-4 bg-slate-200 dark:bg-zinc-700 animate-pulse
class="w-36 mt-4 h-4 bg-slate-200 dark:bg-zinc-700 animate-pulse
rounded-md"
/>
<div
+4 -2
View File
@@ -1,7 +1,8 @@
import { getClient } from '$lib/lemmy.js'
import { authData, getClient } from '$lib/lemmy.js'
import type { ListingType, SortType } from 'lemmy-js-client'
import { get } from 'svelte/store'
export function load({ url }) {
export async function load({ url }) {
const page = Number(url.searchParams.get('page') || 1) || 1
const sort: SortType = (url.searchParams.get('sort') as SortType) || 'Active'
@@ -14,6 +15,7 @@ export function load({ url }) {
page: page,
sort: sort,
type_: listingType,
auth: get(authData)?.token,
}),
streamed: {
site: getClient().getSite({}),
+1 -1
View File
@@ -16,7 +16,7 @@
UserGroup,
} from 'svelte-hero-icons'
import FormattedNumber from '$lib/components/util/FormattedNumber.svelte'
import Card from '$lib/components/ui/Card.svelte'
import Card from '$lib/components/ui/StickyCard.svelte'
export let data
</script>
+54
View File
@@ -0,0 +1,54 @@
<script lang="ts">
import Button from '$lib/components/input/Button.svelte'
import TextInput from '$lib/components/input/TextInput.svelte'
import Card from '$lib/components/ui/Card.svelte'
import { DEFAULT_INSTANCE_URL, authData, getClient } from '$lib/lemmy.js'
import { Color } from '$lib/ui/colors.js'
let data = {
username: '',
password: '',
loading: false,
}
async function logIn() {
data.loading = true
try {
const response = await getClient().login({
username_or_email: data.username,
password: data.password,
})
if (response.jwt) {
authData.set({
instance: DEFAULT_INSTANCE_URL,
token: response.jwt,
username: data.username,
})
}
} catch (error) {
alert('failed')
}
data.loading = false
}
</script>
<Card class="mx-auto p-6">
<form on:submit|preventDefault={logIn} class="flex flex-col gap-4">
<h1 class="font-bold text-lg">Log in</h1>
<TextInput
bind:value={data.username}
label="Username"
placeholder="Example"
/>
<TextInput bind:value={data.password} label="Password" type="password" />
<Button
loading={data.loading}
disabled={data.loading}
large
color={Color.accent}
>
Submit
</Button>
</form>
</Card>
+39 -10
View File
@@ -7,18 +7,18 @@
CommentView,
} from 'lemmy-js-client'
import type { CommentNodeI } from './comments.js'
import Comments from './Comments.svelte'
import Comments from './comment/Comments.svelte'
import SvelteMarkdown from 'svelte-markdown'
import CommunityLink from '$lib/components/community/CommunityLink.svelte'
import { isImage } from '$lib/ui/image.js'
import { user } from '$lib/lemmy.js'
import CommentForm from './comment/CommentForm.svelte'
export let data: { post: GetPostResponse; comments: GetCommentsResponse }
export let data
const postData = data.post.post_view
const post = postData.post
const comments = data.comments.comments
function getCommentParentId(comment?: Comment): number | undefined {
const split = comment?.path.split('.')
// remove the 0
@@ -124,10 +124,39 @@
{postData.counts.comments}
</span>
</div>
<MultiSelect
options={['hot', 'new', 'top']}
optionNames={['Hot', 'New', 'Top']}
selected="hot"
/>
<Comments nodes={buildCommentsTree(comments, false)} isParent={true} />
{#await data.streamed.comments}
<div class="flex flex-col gap-8">
{#each new Array(10) as comment}
<div class="flex flex-col gap-2">
<div
class="dark:bg-zinc-700 bg-slate-200 animate-pulse w-64 h-3 rounded-md"
/>
<div
class="dark:bg-zinc-700 bg-slate-200 animate-pulse w-128 h-4 rounded-md"
/>
</div>
{/each}
</div>
{:then comments}
{#if $user}
<CommentForm
postId={post.id}
on:comment={(comment) => comments.comments.unshift(comment.detail)}
/>
{/if}
<MultiSelect
options={['hot', 'new', 'top']}
optionNames={['Hot', 'New', 'Top']}
selected="hot"
/>
<Comments
{post}
nodes={buildCommentsTree(comments.comments, false)}
isParent={true}
/>
{:catch}
<div class="bg-red-500/10 border border-red-500 rounded-md p-4">
Failed to load posts
</div>
{/await}
</div>
+16 -11
View File
@@ -1,18 +1,23 @@
import { getClient } from '$lib/lemmy.js'
import { authData, getClient } from '$lib/lemmy.js'
import { get } from 'svelte/store'
export async function load({ params }) {
return {
post: await getClient().getPost({
post: getClient().getPost({
id: Number(params.id),
auth: get(authData)?.token,
}),
comments: await getClient().getComments({
post_id: Number(params.id),
type_: 'All',
limit: 250,
page: 1,
max_depth: 6,
saved_only: false,
sort: 'Hot',
}),
streamed: {
comments: getClient().getComments({
post_id: Number(params.id),
type_: 'All',
limit: 250,
page: 1,
max_depth: 6,
saved_only: false,
sort: 'Hot',
auth: get(authData)?.token,
}),
},
}
}
-77
View File
@@ -1,77 +0,0 @@
<script lang="ts">
import { ArrowDown, ArrowUp, Icon, Minus, Plus } from 'svelte-hero-icons'
import Avatar from './Avatar.svelte'
import type { CommentNodeI } from './comments.js'
import SvelteMarkdown from 'svelte-markdown'
import RelativeDate from '$lib/components/util/RelativeDate.svelte'
import Button from '$lib/components/input/Button.svelte'
import { Color } from '$lib/ui/colors.js'
export let node: CommentNodeI
export let open = true
</script>
<li class="py-3">
<details bind:open class="flex flex-col gap-1">
<summary
class="flex flex-row cursor-pointer arrow gap-2 items-center group"
>
<Avatar
url={node.comment_view.creator.avatar ??
`https://api.dicebear.com/6.x/initials/svg?seed=${node.comment_view.creator.name}`}
width={24}
/>
<span class="text-sm">{node.comment_view.creator.name}</span>
<span class="text-sm opacity-60">
{node.comment_view.counts.score} point{node.comment_view.counts.score ==
1
? ''
: 's'}
</span>
<span class="text-sm opacity-60">
<RelativeDate date={new Date(node.comment_view.comment.published)} />
</span>
<span
class="ml-auto translate-x-1 opacity-0
group-hover:translate-x-0 group-hover:opacity-100 text-xs transition-all
flex flex-row items-center gap-1 hover:dark:bg-white/10 p-1 rounded-md
hover:bg-black/10 px-2"
>
{#if open}
<div class="inline">
<Icon src={Minus} width={16} height={16} mini />
</div>
Collapse
{:else}
<Icon src={Plus} width={16} height={16} mini />
Expand
{#if node.children.length > 0}
<span class="text-xs opacity-50">+{node.children.length}</span>
{/if}
{/if}
</span>
</summary>
<div class="mt-1">
<div
class="flex flex-col gap-1 whitespace-pre-wrap
max-w-full"
>
<div class="max-w-full break-words">
<SvelteMarkdown source={node.comment_view.comment.content} />
</div>
<div class="flex flex-row gap-2">
<button>
<Icon src={ArrowUp} width={16} mini />
</button>
<span class="text-sm font-medium">
{node.comment_view.counts.score}
</span>
<button>
<Icon src={ArrowDown} width={16} mini />
</button>
</div>
</div>
</div>
<slot />
</details>
</li>
+57 -7
View File
@@ -15,13 +15,43 @@
ChevronUp,
Icon,
} from 'svelte-hero-icons'
import type { CommentNodeI } from './comments.js'
import RelativeDate from '$lib/components/util/RelativeDate.svelte'
import CommunityLink from '$lib/components/community/CommunityLink.svelte'
import { isImage } from '$lib/ui/image.js'
import { authData, getClient } from '$lib/lemmy.js'
let postRes: PostView
export { postRes as post }
let vote = postRes.my_vote
async function upvote() {
if (!$authData) return
const upvoted = postRes.my_vote == 1
await getClient()
.likePost({
score: upvoted ? 0 : 1,
auth: $authData.token,
post_id: postRes.post.id,
})
.catch((_) => undefined)
}
async function downvote() {
if (!$authData) return
const upvoted = postRes.my_vote == -1
await getClient()
.likePost({
score: upvoted ? 0 : -1,
auth: $authData.token,
post_id: postRes.post.id,
})
.catch((_) => undefined)
}
</script>
<div
@@ -65,13 +95,26 @@
</p>
{/if}
</div>
<div class="flex flex-row gap-2 p-2">
<div class="flex flex-row gap-2 pb-4 px-4">
<div
class="flex flex-row items-center gap-1 rounded-md
bg-slate-100 dark:bg-zinc-800 hover:bg-slate-200
dark:hover:bg-zinc-700 transition-colors cursor-pointer"
class="flex flex-row items-center gap-1 rounded-md transition-colors cursor-pointer
{// upvote
vote == 1
? 'bg-orange-600/20 text-orange-500'
: // downvote
vote == -1
? 'bg-blue-600/40 text-blue-400'
: // no vote
'bg-slate-100 dark:bg-zinc-800 hover:bg-slate-200 dark:hover:bg-zinc-700'}"
>
<button aria-label="Upvote" class="p-1 px-1.5">
<button
aria-label="Upvote"
class="p-1 px-1.5"
on:click={() => {
vote = vote == 1 ? 0 : 1
upvote()
}}
>
<Icon src={ChevronUp} mini width={20} height={20} />
</button>
<span class="text-sm">
@@ -79,7 +122,14 @@
postRes.counts.score
)}
</span>
<button aria-label="Downvote" class="p-1 px-1.5">
<button
aria-label="Downvote"
class="p-1 px-1.5"
on:click={() => {
vote = vote == -1 ? 0 : -1
downvote()
}}
>
<Icon src={ChevronDown} mini width={20} height={20} />
</button>
</div>
+150
View File
@@ -0,0 +1,150 @@
<script lang="ts">
import {
ArrowDown,
ArrowUp,
ChatBubbleOvalLeft,
Icon,
Minus,
Plus,
} from 'svelte-hero-icons'
import Avatar from '../Avatar.svelte'
import type { CommentNodeI } from '../comments.js'
import SvelteMarkdown from 'svelte-markdown'
import RelativeDate from '$lib/components/util/RelativeDate.svelte'
import { getClient, authData } from '$lib/lemmy.js'
import { Color } from '$lib/ui/colors.js'
import CommentForm from './CommentForm.svelte'
export let node: CommentNodeI
export let postId: number
export let open = true
export let replying = false
async function upvote() {
if (!$authData) return
const upvoted = node.comment_view.my_vote == 1
await getClient()
.likeComment({
score: upvoted ? 0 : 1,
auth: $authData.token,
comment_id: node.comment_view.comment.id,
})
.catch((_) => undefined)
node.comment_view.my_vote = Number(!upvoted)
}
async function downvote() {
if (!$authData) return
const upvoted = node.comment_view.my_vote == -1
await getClient()
.likeComment({
score: upvoted ? 0 : -1,
auth: $authData.token,
comment_id: node.comment_view.comment.id,
})
.catch((_) => undefined)
node.comment_view.my_vote = -Number(!upvoted)
}
</script>
<li class="py-3">
<details bind:open class="flex flex-col gap-1">
<summary
class="flex flex-row cursor-pointer arrow gap-2 items-center group"
>
<Avatar
url={node.comment_view.creator.avatar ??
`https://api.dicebear.com/6.x/initials/svg?seed=${node.comment_view.creator.name}`}
width={24}
/>
<span class="text-sm">{node.comment_view.creator.name}</span>
<span class="text-sm opacity-60">
{node.comment_view.counts.score} point{node.comment_view.counts.score ==
1
? ''
: 's'}
</span>
<span class="text-sm opacity-60">
<RelativeDate date={new Date(node.comment_view.comment.published)} />
</span>
<span
class="ml-auto translate-x-1 opacity-0
group-hover:translate-x-0 group-hover:opacity-100 text-xs transition-all
flex flex-row items-center gap-1 hover:dark:bg-white/10 p-1 rounded-md
hover:bg-black/10 px-2"
>
{#if open}
<div class="inline">
<Icon src={Minus} width={16} height={16} mini />
</div>
Collapse
{:else}
<Icon src={Plus} width={16} height={16} mini />
Expand
{#if node.children.length > 0}
<span class="text-xs opacity-50">+{node.children.length}</span>
{/if}
{/if}
</span>
</summary>
<div class="mt-1">
<div
class="flex flex-col gap-1 whitespace-pre-wrap
max-w-full"
>
<div class="max-w-full break-words">
<SvelteMarkdown source={node.comment_view.comment.content} />
</div>
<div class="flex flex-row gap-2 items-center">
<div class="flex flex-row gap-2 items-center">
<button
on:click={upvote}
class={node.comment_view.my_vote == 1 ? 'text-orange-500' : ''}
>
<Icon src={ArrowUp} width={16} mini />
</button>
<span class="text-sm font-medium">
{node.comment_view.counts.score}
</span>
<button
on:click={downvote}
class={node.comment_view.my_vote == -1 ? 'text-blue-500' : ''}
>
<Icon src={ArrowDown} width={16} mini />
</button>
</div>
<button
class="flex flex-row gap-1 items-center transition-colors px-2 py-1
rounded-md {Color.secondary}"
on:click={() => (replying = !replying)}
>
<Icon src={ChatBubbleOvalLeft} width={16} height={16} mini />
<span class="text-xs">Reply</span>
</button>
</div>
</div>
</div>
{#if replying}
<div class="max-w-sm my-2">
<h1 class="font-bold text-sm mb-2">Reply</h1>
<CommentForm
{postId}
parentId={node.comment_view.comment.id}
on:comment={(e) => {
node.children.unshift(e.detail)
replying = false
}}
/>
</div>
{/if}
<slot />
</details>
</li>
@@ -0,0 +1,58 @@
<script lang="ts">
import Button from '$lib/components/input/Button.svelte'
import { Color } from '$lib/ui/colors.js'
import type { Comment, Post } from 'lemmy-js-client'
import { authData, getClient, user } from '$lib/lemmy.js'
import { createEventDispatcher } from 'svelte'
export let postId: number
export let parentId: number | undefined = undefined
const dispatch = createEventDispatcher()
let newComment = ''
let loading = false
async function submit() {
if (!$user || !$authData || newComment == '') return
loading = true
try {
const response = await getClient().createComment({
auth: $authData.token,
content: newComment,
post_id: postId,
parent_id: parentId,
})
dispatch('comment', response)
newComment = ''
} catch (err) {
alert('Failed to comment')
}
loading = false
}
</script>
<div class="max-w-lg flex flex-col gap-2">
<textarea
rows="3"
class="w-full bg-slate-100 dark:bg-zinc-900 border border-slate-200
dark:border-zinc-800 p-4 outline-none focus:border-black
focus:dark:border-white transition-colors rounded-md"
bind:value={newComment}
/>
<div class="w-24 ml-auto">
<Button
large
on:click={submit}
color={Color.accent}
{loading}
disabled={loading}
>
Submit
</Button>
</div>
</div>
@@ -1,11 +1,13 @@
<script lang="ts">
import Comment from './Comment.svelte'
import type { CommentNodeI } from './comments.js'
import type { CommentNodeI } from '../comments.js'
import type { Post } from 'lemmy-js-client'
const maxComments = 250
export let nodes: CommentNodeI[]
export let isParent: boolean
export let post: Post
</script>
<ul
@@ -14,9 +16,9 @@
: 'ml-2.5 mt-2 px-2.5 border-l-2 border-black/10 dark:border-white/10'}
>
{#each nodes.slice(0, maxComments) as node}
<Comment {node} open={true}>
<Comment postId={post.id} {node} open={true}>
{#if node.children?.length > 0}
<svelte:self nodes={node.children} isParent={false} />
<svelte:self {post} nodes={node.children} isParent={false} />
{/if}
</Comment>
{/each}