aljaz/hypergolic
1
0
Fork 0
mirror of https://github.com/aljazceru/hypergolic.git synced 2025-12-19 22:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

problem: bad layout

Browse Source
This commit is contained in:
gsovereignty
2024-07-11 14:11:15 +08:00
parent e8d651e302
commit 66d29147d1
6 changed files with 130 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/CreateNewProduct.svelte
View File

@@ -48,7 +48,7 @@
</script> </script>
<Dialog.Root> <Dialog.Root>
<Dialog.Trigger class={buttonVariants({ variant: 'default' })}>Create a Product</Dialog.Trigger> <Dialog.Trigger class={buttonVariants({ variant: 'default' })}>Propose a New Product</Dialog.Trigger>
<Dialog.Content class="sm:max-w-[425px]"> <Dialog.Content class="sm:max-w-[425px]">
<Todo text={["validate sane field entries", "name.length > 5 < 20", "description length > 20", "image url resolves and is image"]} /> <Todo text={["validate sane field entries", "name.length > 5 < 20", "description length > 20", "image url resolves and is image"]} />
{#if !currentUser} {#if !currentUser}

60
src/components/ProductFomo.svelte
View File

@@ -1,30 +1,40 @@
<script lang="ts"> <script lang="ts">
import * as Card from '$lib/components/ui/card/index.js';
import * as Card from "$lib/components/ui/card/index.js"; import * as Table from '$lib/components/ui/table/index.js';
import * as Table from "$lib/components/ui/table/index.js"; import { RocketProduct } from '@/event_helpers/rockets';
import type { RocketProduct } from "@/event_helpers/rockets"; import type { NDKEvent } from '@nostr-dev-kit/ndk';
import type { NDKEvent } from "@nostr-dev-kit/ndk"; import ProductCardFromId from './ProductCardFromID.svelte';
import ProductCardFromId from "./ProductCardFromID.svelte"; import ProductPurchases from './ProductPurchases.svelte';
import ProductPurchases from "./ProductPurchases.svelte"; import { writable, type Writable } from 'svelte/store';
export let product:RocketProduct; //export let product:RocketProduct;
export let rocket:NDKEvent; export let rocket: NDKEvent;
let products: Writable<RocketProduct[]> = writable([]);
$: {
//fetch products from rocket and populate a store of them
let _products: RocketProduct[] = [];
for (let p of rocket.getMatchingTags('product')) {
_products.push(new RocketProduct(p));
}
products.set(_products);
}
</script>
<Card.Root class="sm:col-span-3"> <Card.Root class="sm:col-span-3">
<Card.Root class="sm:col-span-3"> <Card.Header class="pb-3">
<Card.Header class="pb-3"> <Card.Title>Products and Purchases</Card.Title>
<Card.Title>Products and Purchases</Card.Title> <Card.Description class="grid grid-cols-2">
<Card.Description class="grid grid-cols-2"> {#each $products as product}
<div class=" grid-cols-1"> <div class=" grid-cols-1">
<ProductCardFromId {rocket} productID={product.ID} /> <ProductCardFromId {rocket} productID={product.ID} />
</div> </div>
<div class="grid-cols-1"> <div class="grid-cols-1">
<ProductPurchases {rocket} {product} /> <ProductPurchases {rocket} {product} />
</div> </div>
</Card.Description> {/each}
</Card.Header> </Card.Description>
<Card.Footer> </Card.Header>
</Card.Footer> <Card.Footer></Card.Footer>
</Card.Root>

11
src/components/ProductPurchases.svelte
View File

@@ -79,15 +79,6 @@
//todo: validate zaps against product, publish store of all successful payments including those already in rocket. Publish another store with successful payments that are not yet included in rocket state so we can update the state and republish. //todo: validate zaps against product, publish store of all successful payments including those already in rocket. Publish another store with successful payments that are not yet included in rocket state so we can update the state and republish.
</script> </script>
{#each $zaps as z}<a
href="#"
on:click={() => {
console.log(z.rawEvent());
}}>{z.id}</a
><br />{/each}
{#each $newZaps as [id, zapReceipt]}{/each}
<Card.Root> <Card.Root>
<Card.Header class="px-7"> <Card.Header class="px-7">
<Card.Title>Purchases</Card.Title> <Card.Title>Purchases</Card.Title>
@@ -106,7 +97,7 @@
</Table.Header> </Table.Header>
<Table.Body> <Table.Body>
{#each $newZaps as [id, zapReceipt]} {#each $newZaps as [id, zapReceipt]}
<Table.Row class=" bg-red-800"> <Table.Row on:click={()=>{console.log(getZapRequest(zapReceipt)?.rawEvent())}} class=" bg-red-800">
<Table.Cell> <Table.Cell>
<div class="flex flex-nowrap"> <div class="flex flex-nowrap">
<Avatar <Avatar

34
src/components/ProposedProducts.svelte Normal file
View File

@@ -0,0 +1,34 @@
<script lang="ts">
import { ndk } from '@/ndk';
import type { NDKEvent } from '@nostr-dev-kit/ndk';
import { onDestroy } from 'svelte';
import ProductCard from './ProductCard.svelte';
import { derived } from 'svelte/store';
export let rocket: NDKEvent;
let proposals = $ndk.storeSubscribe(
[
{ '#a': [`31108:${rocket.author.pubkey}:${rocket.dTag}`], kinds: [1908 as number] }
],
{ subId: rocket.dTag }
);
onDestroy(()=>{
proposals.unsubscribe()
})
let unratified = derived(proposals, ($proposals)=>{
return $proposals.filter((p)=>{
let found = false;
for (let product of rocket.getMatchingTags("product")){
if (product[1].split(":")[0] == p.id) {
found = true
}
}
return !found
})
})
</script>
{#each $unratified as r}<ProductCard {rocket} product={r} />{/each}

103
src/components/RocketDashboard.svelte
View File

@@ -1,57 +1,60 @@
<script lang="ts"> <script lang="ts">
import * as Breadcrumb from '$lib/components/ui/breadcrumb/index.js';
import * as Breadcrumb from "$lib/components/ui/breadcrumb/index.js"; import { RocketProduct } from '@/event_helpers/rockets';
import { RocketProduct } from "@/event_helpers/rockets"; import type { NDKEvent } from '@nostr-dev-kit/ndk';
import type { NDKEvent } from "@nostr-dev-kit/ndk"; import { writable, type Readable, type Writable } from 'svelte/store';
import { writable, type Writable } from "svelte/store"; import MeritsAndSatflow from './MeritsAndSatflow.svelte';
import MeritsAndSatflow from "./MeritsAndSatflow.svelte"; import ProductFomo from './ProductFomo.svelte';
import ProductFomo from "./ProductFomo.svelte"; import Todo from './Todo.svelte';
import ProductCard from './ProductCard.svelte';
import CreateNewProduct from './CreateNewProduct.svelte';
import type { ExtendedBaseType } from '@nostr-dev-kit/ndk-svelte';
import ProposedProducts from './ProposedProducts.svelte';
import * as Card from '@/components/ui/card';
export let rocket:NDKEvent; export let rocket: NDKEvent;
</script>
<div class="flex flex-col sm:gap-4">
let products: Writable<RocketProduct[]> = writable([]) <header
class="sticky top-0 z-30 flex h-14 items-center gap-4 border-b bg-background px-4 sm:static sm:h-auto sm:border-0 sm:bg-transparent sm:px-6"
>
<Breadcrumb.Root class="hidden md:flex">
<Breadcrumb.List>
<Breadcrumb.Item>
<Breadcrumb.Link href="##">{rocket.getMatchingTags('d')[0][1]}</Breadcrumb.Link>
</Breadcrumb.Item>
<Breadcrumb.Separator />
<Breadcrumb.Item>
<Breadcrumb.Page>Dashboard</Breadcrumb.Page>
</Breadcrumb.Item>
</Breadcrumb.List>
</Breadcrumb.Root>
</header>
<main
class="grid flex-1 items-start gap-4 p-4 sm:px-6 sm:py-0 md:gap-2 lg:grid-cols-3 xl:grid-cols-3"
>
<MeritsAndSatflow {rocket} />
$: { <ProductFomo {rocket} />
//fetch products from rocket and populate a store of them
let _products:RocketProduct[] = []
for (let p of rocket.getMatchingTags("product")) {
_products.push(new RocketProduct(p))
}
products.set(_products)
}
<ProposedProducts {rocket} />
<Card.Root class="sm:col-span-3">
</script> <Card.Header class="pb-3">
<div class="flex flex-col sm:gap-4"> <Card.Title>Actions</Card.Title>
<header <Card.Description class="grid grid-cols-6">
class="sticky top-0 z-30 flex h-14 items-center gap-4 border-b bg-background px-4 sm:static sm:h-auto sm:border-0 sm:bg-transparent sm:px-6" <CreateNewProduct rocketEvent={rocket} />
> </Card.Description>
</Card.Header>
<Breadcrumb.Root class="hidden md:flex"> <Card.Footer></Card.Footer>
<Breadcrumb.List> </Card.Root>
<Breadcrumb.Item>
<Breadcrumb.Link href="##">{rocket.getMatchingTags('d')[0][1]}</Breadcrumb.Link>
</Breadcrumb.Item>
<Breadcrumb.Separator />
<Breadcrumb.Item>
<Breadcrumb.Page>Dashboard</Breadcrumb.Page>
<Todo
</Breadcrumb.List> text={[
</Breadcrumb.Root> 'delete rocket (if current user is rocket creator)',
</header> 'modify relevant data and republish event according to https://github.com/nostrocket/NIPS/blob/main/31108.md and https://github.com/nostrocket/NIPS/blob/main/MSBR334000.md '
<main ]}
class="grid flex-1 items-start gap-4 p-4 sm:px-6 sm:py-0 md:gap-8 lg:grid-cols-3 xl:grid-cols-3" />
> </main>
<MeritsAndSatflow {rocket} /> </div>
{#each $products as product}
<ProductFomo {rocket} {product} />
{/each}
</main>
</div>

17
src/routes/rockets/[ignition]/+page.svelte
View File

@@ -92,16 +92,16 @@
</script> </script>
{#if latestRocketEvent && $latestRocketEvent} {#if latestRocketEvent && $latestRocketEvent}
<RocketDashboard rocket={$latestRocketEvent} /> <RocketDashboard rocket={$latestRocketEvent} />
{:else}
<Heading title="Fetching events for the requested rocket" />
IGNITION: {rIgnitionOrActual} <br />
NAME: {rName} <br />
PUBKEY: {rPubkey} <br />
{/if} {/if}
{#if latestRocketEvent && $latestRocketEvent && false} {#if latestRocketEvent && $latestRocketEvent && false}
<Heading title={$latestRocketEvent.getMatchingTags('d')[0][1]} /> <Heading title={$latestRocketEvent.getMatchingTags('d')[0][1]} />
<Todo
text={[
'delete rocket (if current user is rocket creator)',
'modify relevant data and republish event according to https://github.com/nostrocket/NIPS/blob/main/31108.md and https://github.com/nostrocket/NIPS/blob/main/MSBR334000.md '
]}
/>
<div class="flex flex-col gap-1 text-left"> <div class="flex flex-col gap-1 text-left">
<h3 class="text-xl font-bold tracking-tight"> <h3 class="text-xl font-bold tracking-tight">
{$latestRocketEvent.getMatchingTags('d')[0][1].toLocaleUpperCase()} Products {$latestRocketEvent.getMatchingTags('d')[0][1].toLocaleUpperCase()} Products
@@ -122,9 +122,4 @@
</div> </div>
{#each $candidateProducts as r}<ProductCard rocket={$latestRocketEvent} product={r} />{/each} {#each $candidateProducts as r}<ProductCard rocket={$latestRocketEvent} product={r} />{/each}
<CreateNewProduct rocketEvent={$latestRocketEvent} /> <CreateNewProduct rocketEvent={$latestRocketEvent} />
{:else}
<Heading title="Fetching events for the requested rocket" />
IGNITION: {rIgnitionOrActual} <br />
NAME: {rName} <br />
PUBKEY: {rPubkey} <br />
{/if} {/if}