Browse Source

refactor: remove fIltered proposals components

and embed the now much simpiler code into the required pages
master
DanConwayDev 2 years ago
parent
commit
670d24bbd0
No known key found for this signature in database
GPG Key ID: 68E15486D73F75E1
  1. 2
      src/lib/components/proposals/ProposalsList.svelte
  2. 17
      src/lib/wrappers/OpenProposals.svelte
  3. 20
      src/lib/wrappers/RecentProposals.svelte
  4. 17
      src/routes/+page.svelte
  5. 14
      src/routes/repo/[repo_id]/+page.svelte

2
src/lib/components/proposals/ProposalsList.svelte

@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
<ProposalsListItem loading={true} />
<ProposalsListItem loading={true} />
{/if}
{:else if allow_more && proposals.length > current_limit}
{:else if allow_more && limit !== 0 && proposals.length > current_limit}
<button
on:click={() => {
current_limit = current_limit + 5

17
src/lib/wrappers/OpenProposals.svelte

@ -1,17 +0,0 @@ @@ -1,17 +0,0 @@
<script lang="ts">
import ProposalsList from '$lib/components/proposals/ProposalsList.svelte'
import {
ensureProposalSummaries,
proposal_summaries,
} from '$lib/stores/Proposals'
export let repo_id: string = ''
ensureProposalSummaries(repo_id)
</script>
<ProposalsList
title="Open Proposals"
proposals={$proposal_summaries.summaries}
loading={$proposal_summaries.loading}
/>

20
src/lib/wrappers/RecentProposals.svelte

@ -1,20 +0,0 @@ @@ -1,20 +0,0 @@
<script lang="ts">
import ProposalsList from '$lib/components/proposals/ProposalsList.svelte'
import {
ensureProposalSummaries,
proposal_summaries,
} from '$lib/stores/Proposals'
ensureProposalSummaries(undefined)
let limit = 6
let allow_more = true
</script>
<ProposalsList
title="Recent Proposals"
proposals={$proposal_summaries.summaries}
show_repo={true}
loading={$proposal_summaries.loading}
{limit}
{allow_more}
/>

17
src/routes/+page.svelte

@ -1,7 +1,13 @@ @@ -1,7 +1,13 @@
<script lang="ts">
import Container from '$lib/components/Container.svelte'
import PatchesRecent from '$lib/wrappers/RecentProposals.svelte'
import ProposalsList from '$lib/components/proposals/ProposalsList.svelte'
import {
ensureProposalSummaries,
proposal_summaries,
} from '$lib/stores/Proposals'
import ReposRecent from '$lib/wrappers/ReposRecent.svelte'
ensureProposalSummaries(undefined)
</script>
<div role="alert" class="alert">
@ -68,7 +74,14 @@ @@ -68,7 +74,14 @@
</div>
</div>
<div class="hero md:basis-1/2">
<PatchesRecent />
<ProposalsList
title="Recent Proposals"
proposals={$proposal_summaries.summaries}
show_repo={true}
loading={$proposal_summaries.loading}
limit={6}
allow_more={true}
/>
</div>
</div>
<Container>

14
src/routes/repo/[repo_id]/+page.svelte

@ -1,6 +1,5 @@ @@ -1,6 +1,5 @@
<script lang="ts">
import RepoDetails from '$lib/wrappers/RepoDetails.svelte'
import OpenProposals from '$lib/wrappers/OpenProposals.svelte'
import {
ensureSelectedRepoCollection,
selected_repo_collection,
@ -8,13 +7,20 @@ @@ -8,13 +7,20 @@
} from '$lib/stores/repo'
import RepoHeader from '$lib/components/repo/RepoHeader.svelte'
import Container from '$lib/components/Container.svelte'
import {
ensureProposalSummaries,
proposal_summaries,
} from '$lib/stores/Proposals'
import ProposalsList from '$lib/components/proposals/ProposalsList.svelte'
export let data: { repo_id: string }
let identifier = data.repo_id
ensureSelectedRepoCollection(identifier)
ensureProposalSummaries(identifier)
let repo_error = false
$: {
repo_error =
!$selected_repo_collection.loading &&
@ -46,7 +52,11 @@ @@ -46,7 +52,11 @@
<Container>
<div class="mt-2 md:flex">
<div class="md:mr-2 md:w-2/3">
<OpenProposals repo_id={identifier} />
<ProposalsList
title="Open Proposals"
proposals={$proposal_summaries.summaries}
loading={$proposal_summaries.loading}
/>
</div>
<div class="prose ml-2 hidden w-1/3 md:flex">
<RepoDetails repo_id={identifier} />

Loading…
Cancel
Save