misc: Change the way buttons are handled

This commit is contained in:
Xyphyn committed 2023-07-19 13:43:18 -07:00
1 parent d8ac0d807a
commit e243848e17
30 files changed
+215 -152

No files matched your search

@@ -108,8 +108,8 @@
<Button
disabled={loading.subscribing}
loading={loading.subscribing}
large
color={Color.ghost}
color="ghost"
size="lg"
on:click={subscribe}
>
{community_view.subscribed == 'Subscribed' ||
@@ -120,8 +120,8 @@
<Button
disabled={loading.blocking}
loading={loading.blocking}
large
color={Color.danger}
color="danger"
size="lg"
on:click={block}
>
{community_view.blocked ? 'Unblock' : 'Block'}
+80 -32
View File
@@ -1,43 +1,91 @@
<script lang="ts">
import { createEventDispatcher } from 'svelte'
import { Color } from '$lib/ui/colors.js'
import Loading from '$lib/components/ui/loader/Loading.svelte'
import Spinner from '$lib/components/ui/loader/Spinner.svelte'
export let color: Color = Color.secondary
type ButtonColor = keyof typeof buttonColor
type ButtonSize = keyof typeof buttonSize
type ButtonRoundness = keyof typeof buttonRoundness
const buttonColor = {
primary: `border bg-black border-black text-white dark:bg-white
dark:border-white dark:text-black hover:text-inherit hover:bg-transparent
active:bg-black/10 active:dark:bg-white/10`,
secondary: 'bg-transparent hover:bg-slate-100 hover:dark:bg-zinc-800',
danger:
'border border-red-500 bg-red-500 hover:text-red-500 hover:bg-transparent text-white',
ghost: `border border-slate-200 dark:border-zinc-800 hover:bg-slate-100 hover:dark:bg-zinc-800
hover:border-slate-200 hover:dark:border-zinc-700`,
elevated: `bg-slate-100 dark:bg-zinc-800 border border-slate-200
dark:border-zinc-700 hover:bg-slate-200 hover:dark:bg-zinc-700 hover:border-slate-300
hover:dark:border-zinc-600`,
none: '',
}
const buttonSize = {
sm: 'px-3 py-1',
md: 'px-3 py-1.5',
lg: 'px-4 py-2',
}
const buttonRoundness = {
pill: 'rounded-full',
md: 'rounded-md',
none: '',
}
export let loading = false
export let large = false
export let disabled = false
export let submit = false
export let label: string = ''
export let spinner = false
export let color: ButtonColor = 'secondary'
export let size: ButtonSize = 'md'
export let rounded: ButtonRoundness = 'md'
const dispatch = createEventDispatcher()
export let href: string | undefined = undefined
let buttonClass = `
${buttonColor[color]}
${buttonSize[size]}
${buttonRoundness[rounded]}
${
loading ? (color == 'primary' ? '!bg-transparent !text-inherit' : '') : ''
}
text-sm transition-all disabled:opacity-70 disabled:pointer-events-none
${$$props.class}
`
</script>
<button
{disabled}
on:click={(e) => dispatch('click', e)}
class="{large
? 'w-full px-4 py-2'
: 'px-3 py-1.5'} rounded-md {color} text-sm transition-all disabled:opacity-50 disabled:pointer-events-none"
type={submit ? 'submit' : 'button'}
aria-label={label}
>
<div
class="flex flex-row items-center justify-center gap-2"
class:hidden={loading}
{#if href}
<a {href} {...$$restProps} class={buttonClass}>
<div class="flex flex-row items-center justify-center gap-1.5">
{#if loading}
<Spinner />
{:else}
<slot name="icon" />
{/if}
<slot />
</div>
</a>
{:else}
<button
disabled={loading}
{...$$restProps}
on:click={(e) => dispatch('click', e)}
class={buttonClass}
type={submit ? 'submit' : 'button'}
>
<slot name="icon" />
<slot />
</div>
<div class="mx-auto" class:hidden={!loading}>
{#if spinner}
<Spinner />
{:else}
<div class="py-2">
<Loading />
</div>
{/if}
</div>
</button>
<div class="flex flex-row items-center justify-center gap-1.5">
{#if loading}
<Spinner width={20} />
{:else}
<slot name="icon" />
{/if}
<slot />
</div>
</button>
{/if}
+5 -2
View File
@@ -15,9 +15,12 @@
</script>
<label
class="flex flex-col items-center px-8 py-4 mx-auto w-full rounded-lg border border-black border-dashed cursor-pointer min-h-36 transition-colors dark:border-white {dragover
class="flex flex-col items-center px-8 py-4 mx-auto w-full rounded-lg
border border-slate-300 dark:border-zinc-700 bg-white dark:bg-black
cursor-pointer min-h-36 transition-colors {dragover
? 'border-sky-500 text-sky-500'
: ''}"
: ''}
"
on:drop|preventDefault={(event) => (files = event.dataTransfer?.files)}
on:dragover|preventDefault={(event) => {
if (event.dataTransfer) {
+4 -7
View File
@@ -1,16 +1,13 @@
<script lang="ts">
import { Color } from '$lib/ui/colors.js'
export let href: string
export let color: Color = Color.secondary
export let href = ''
export let label: string = ''
export let highlight: boolean
</script>
<a
{href}
class="px-3 py-1 rounded-md {color} flex flex-row items-center
justify-center text-sm transition-all gap-1"
aria-label={label}
class="flex flex-row gap-2 {highlight ? 'text-sky-500' : ''} hover:underline"
{...$$restProps}
>
<slot name="icon" />
<slot />
+3 -3
View File
@@ -27,8 +27,8 @@
{placeholder}
{maxlength}
{rows}
class="w-full px-3 text-sm py-2.5 bg-transparent border border-black/20
dark:border-white/20 dark:focus:border-white focus:outline-none
focus:border-black transition-colors rounded-md {clazz}"
class="w-full px-3 text-sm py-2.5 bg-white dark:bg-black
border border-slate-300 dark:border-zinc-700 dark:focus:border-white
focus:outline-none focus:border-black transition-colors rounded-md {clazz}"
/>
</label>
+11 -19
View File
@@ -3,26 +3,26 @@
export let label: string = ''
export let type: 'text' | 'password' | 'email' | null | undefined = 'text'
export let placeholder: string = ''
export let value: string = ''
export let maxlength: number = -1
export let required = false
export let id = ''
export let pattern: string | undefined = undefined
export let minlength: number = 0
function typeAction(node: Node) {
// @ts-ignore
node.type = type
}
let clazz = ''
export { clazz as class }
const dispatcher = createEventDispatcher()
let className = `
${value.length != 0 ? 'invalid:border-red-400' : ''}
w-full px-3 text-sm py-2.5 bg-white dark:bg-zinc-950
border border-slate-300 dark:border-zinc-700 dark:focus:border-white
focus:outline-none focus:border-black transition-colors rounded-md
${$$props.class}
`
</script>
<label class="flex flex-col items-center {clazz}">
<label class="flex flex-col items-center {$$props.class}">
{#if label != ''}
<span
class="font-bold text-sm text-left mb-1 cursor-pointer w-max self-start"
@@ -38,16 +38,8 @@
bind:value
on:keydown={(e) => dispatcher('keydown', e)}
on:input={(e) => dispatcher('input', e)}
{placeholder}
{maxlength}
{minlength}
{pattern}
{id}
class="{value.length != 0
? 'invalid:border-red-400'
: ''} w-full px-3 text-sm py-2.5 bg-transparent
border border-black/20 dark:border-white/20 dark:focus:border-white
focus:outline-none focus:border-black transition-colors rounded-md {clazz}"
{...$$restProps}
class={className}
{required}
/>
</label>
+2 -1
View File
@@ -51,6 +51,7 @@
<FormattedNumber number={site.counts.communities} />
</span>
</div>
<p class="text-sm">{site.site.description}</p>
<p>{site.site.description}</p>
<hr class="border-slate-300 dark:border-zinc-700" />
<Markdown source={site.site.sidebar} />
</StickyCard>
@@ -17,9 +17,7 @@
</script>
<li
class="py-2 {$page.url.hash == `#${node.comment_view.comment.id}`
? 'bg-slate-200 dark:bg-zinc-800'
: ''} {node.depth == 0
class="py-2 {node.depth == 0
? 'border-b border-slate-200 dark:border-zinc-800'
: ''}"
id="#{node.comment_view.comment.id.toString()}"
@@ -83,7 +81,7 @@
node.children = [
{
children: [],
depth: node.depth,
depth: node.depth + 1,
comment_view: e.detail.comment_view,
},
...node.children,
@@ -55,15 +55,14 @@
class="bg-slate-100 dark:bg-zinc-900"
bind:value={newComment}
/>
<div
class="w-full ml-auto flex flex-row gap-2 md:w-24 md:absolute md:bottom-0 md:right-0 md:m-2"
>
<div class="sm:ml-auto sm:w-28">
<Button
large
on:click={submit}
color={Color.accent}
color="primary"
size="lg"
class="w-full"
{loading}
disabled={loading}
>
Submit
</Button>
@@ -17,6 +17,7 @@
if (isParent && $page.url.hash) {
document.getElementById($page.url.hash)?.scrollIntoView({
behavior: 'smooth',
block: 'center',
})
}
})
@@ -80,7 +81,7 @@
disabled={loadingChildren}
on:click={() => fetchChildren(node)}
>
<Icon src={ChevronDown} width={16} mini />
<Icon src={ChevronDown} width={16} mini slot="icon" />
{node.comment_view.counts.child_count} more
</Button>
</div>
@@ -62,13 +62,23 @@
<div class="flex flex-row gap-2 items-center">
<PostVote post={post.post} vote={post.my_vote} score={post.counts.score} />
<Link color={Color.border} href="/post/{getInstance()}/{post.post.id}">
<Button
color="elevated"
size="sm"
href="/post/{getInstance()}/{post.post.id}"
>
<Icon slot="icon" src={ChatBubbleOvalLeft} mini width={16} height={16} />
<FormattedNumber number={post.counts.comments} />
</Link>
</Button>
<Menu alignment="bottom-right" class="ml-auto overflow-auto" let:toggleOpen>
<Button slot="button" label="Post actions" on:click={toggleOpen}>
<Icon src={EllipsisHorizontal} width={16} mini />
<Button
slot="button"
label="Post actions"
on:click={toggleOpen}
class="!p-1.5"
color="secondary"
>
<Icon slot="icon" src={EllipsisHorizontal} width={16} mini />
</Button>
<li class="mx-4 text-xs opacity-80 text-left my-1 py-1">Creator</li>
<MenuButton
@@ -10,13 +10,15 @@
<!-- svelte-ignore a11y-missing-attribute -->
<img
src={thumbnail_url}
class="rounded-md max-h-[16rem] w-full aspect-[16/9] object-cover"
class="rounded-md max-h-[16rem] w-full aspect-[16/9] object-cover bg-slate-200 dark:bg-zinc-800"
width={600}
height={400}
/>
<span
class="w-full px-4 py-2 overflow-hidden
whitespace-nowrap text-ellipsis text-sm group-hover:underline bg-slate-100 border
dark:border-zinc-700
dark:bg-zinc-800 absolute bottom-0 rounded-b-md flex flex-row gap-1 items-center h-10"
class="w-full px-4 py-2 overflow-hidden whitespace-nowrap text-ellipsis
text-sm group-hover:underline bg-slate-100 border dark:border-zinc-700
dark:bg-zinc-800 absolute bottom-0 rounded-b-md flex flex-row gap-1
items-center h-10"
>
<Icon src={Link} width={16} mini />
{new URL(url).hostname}
@@ -1,4 +1,5 @@
<script lang="ts">
import Button from '$lib/components/input/Button.svelte'
import FormattedNumber from '$lib/components/util/FormattedNumber.svelte'
import { authData, getClient } from '$lib/lemmy'
import { userSettings } from '$lib/settings.js'
@@ -65,8 +66,7 @@
<slot {upvote} {downvote} {vote} {score}>
<div
class="{Color.border} text-sm gap-0.5 rounded-md flex flex-row items-center px-1
py-0.5
class="{Color.border} text-sm gap-0.5 rounded-md flex flex-row items-center
transition-colors cursor-pointer bg-slate-100 dark:bg-zinc-800
hover:bg-slate-200 dark:hover:bg-zinc-700"
>
@@ -74,7 +74,7 @@
aria-label="Upvote"
class:text-orange-500={vote == 1 && $userSettings.revertColors}
class:text-blue-500={vote == 1 && !$userSettings.revertColors}
class="p-0.5 px-1"
class="py-1 pr-0.5 pl-2"
on:click={upvote}
>
<Icon src={ChevronUp} mini width={20} height={20} />
@@ -84,7 +84,7 @@
aria-label="Downvote"
class:text-blue-500={vote == -1 && $userSettings.revertColors}
class:text-red-500={vote == -1 && !$userSettings.revertColors}
class="p-0.5 px-1"
class="py-1 pl-0.5 pr-2"
on:click={downvote}
>
<Icon src={ChevronDown} mini width={20} height={20} />
+1 -1
View File
@@ -17,7 +17,7 @@
<div
class="bg-white break-words
p-1 {getColor(cardColor)} rounded-xl {clazz}"
p-1 {getColor(cardColor)} rounded-md {clazz}"
>
<slot />
</div>
+11 -10
View File
@@ -1,16 +1,17 @@
<script lang="ts">
export let width = 48
export let width = 48
</script>
<svg
{width}
viewBox="0 0 100 100"
fill="none"
xmlns="http://www.w3.org/2000/svg"
{width}
viewBox="0 0 100 100"
fill="none"
xmlns="http://www.w3.org/2000/svg"
aria-label="Home"
>
<path
id="hexagon"
d="M45.5 10.8868C48.594 9.10042 52.406 9.10042 55.5 10.8868L82.3061 26.3632C85.4001 28.1496 87.3061 31.4508 87.3061 35.0235V65.9765C87.3061 69.5492 85.4001 72.8504 82.3061 74.6368L55.5 90.1132C52.406 91.8996 48.594 91.8996 45.5 90.1132L18.6939 74.6368C15.5999 72.8504 13.6939 69.5492 13.6939 65.9765V35.0235C13.6939 31.4508 15.5999 28.1496 18.6939 26.3632L45.5 10.8868Z"
class="fill-black dark:fill-white"
/>
<path
id="hexagon"
d="M45.5 10.8868C48.594 9.10042 52.406 9.10042 55.5 10.8868L82.3061 26.3632C85.4001 28.1496 87.3061 31.4508 87.3061 35.0235V65.9765C87.3061 69.5492 85.4001 72.8504 82.3061 74.6368L55.5 90.1132C52.406 91.8996 48.594 91.8996 45.5 90.1132L18.6939 74.6368C15.5999 72.8504 13.6939 69.5492 13.6939 65.9765V35.0235C13.6939 31.4508 15.5999 28.1496 18.6939 26.3632L45.5 10.8868Z"
class="fill-black dark:fill-white"
/>
</svg>
+12 -16
View File
@@ -3,6 +3,7 @@
import Button from '$lib/components/input/Button.svelte'
import Link from '$lib/components/input/Link.svelte'
import Logo from '$lib/components/ui/Logo.svelte'
import Spinner from '$lib/components/ui/loader/Spinner.svelte'
import Menu from '$lib/components/ui/menu/Menu.svelte'
import MenuButton from '$lib/components/ui/menu/MenuButton.svelte'
import { authData, getInstance, instance, user } from '$lib/lemmy.js'
@@ -23,7 +24,7 @@
<nav
class="flex flex-row gap-2 items-center sticky top-0 bg-slate-50/80
lg:bg-white/80 lg:rounded-b-xl
lg:bg-white/80 lg:rounded-b-md
dark:bg-zinc-950/80 lg:dark:bg-zinc-900/80 backdrop-blur-3xl max-w-5xl
w-full mx-auto px-4 py-2 z-50 lg:border-x lg:border-b transition-all
border-slate-200 dark:border-zinc-800 box-border"
@@ -31,30 +32,25 @@
<div class="flex flex-row gap-2 items-center mr-auto">
<a href="/" class="flex flex-row items-center gap-2">
<Logo width={40} />
<div class="flex flex-col">
<span class="font-bold">Photon</span>
<span
class="text-xs opacity-50
transition-opacity"
>
{$instance}
</span>
</div>
<span class="opacity-30 text-lg">/</span>
<span class="text-sm font-bold">
{$instance}
</span>
</a>
</div>
<div class="flex flex-row gap-2 py-2 px-3">
<Link href="/communities" label="Communities">
<Icon src={GlobeAlt} width={16} />
<span class="hidden sm:inline ml-1">Explore</span>
</Link>
<Button href="/communities" label="Communities">
<Icon src={GlobeAlt} width={16} slot="icon" />
<span class="hidden sm:inline">Explore</span>
</Button>
<Menu let:toggleOpen alignment="bottom-right">
<Button
color={Color.accent}
color="primary"
slot="button"
label="Create"
on:click={toggleOpen}
>
<Icon src={Plus} width={18} mini />
<Icon src={Plus} width={18} mini slot="icon" />
<span class="hidden sm:inline">Create</span>
</Button>
<li class="text-xs opacity-80 text-left mx-4 my-1 py-1">Create</li>
+1 -1
View File
@@ -1,7 +1,7 @@
<aside
class="sticky top-20 border bg-white border-slate-200
dark:border-zinc-800 dark:bg-zinc-900 break-words flex
flex-col gap-4 p-6 w-[20rem] rounded-xl h-max max-h-[calc(100vh-6rem)]
flex-col gap-4 p-6 w-[20rem] rounded-md h-max max-h-[calc(100vh-6rem)]
overflow-auto"
>
<slot />
+8 -4
View File
@@ -1,8 +1,12 @@
<script lang="ts">
export let width: number = 28
export let width: number = 32
</script>
<div class="spinner" style="width: {width}px; height: {width}px;">
<div
class="spinner"
style="width: {width}px; height: {width}px;"
role="progressbar"
>
<div class="bar1" />
<div class="bar2" />
<div class="bar3" />
@@ -25,8 +29,8 @@
}
div.spinner div {
width: 6%;
height: 16%;
width: 7.5%;
height: 22%;
position: absolute;
left: 49%;
top: 43%;