feat(editor): fetch current not-owned projects, add project forking #525
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,7 +27,6 @@ | |
| &--orange, | ||
| &--warning { | ||
| background: $orange; | ||
| } | ||
|
|
||
| p { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| <script> | ||
| import SearchObjects from "@components/editor/SearchObjects.svelte" | ||
| import { projects, currentProject, isSignedIn, isMobile, modal, currentProjectUUID } from "@stores/editor" | ||
| import { getSaveContent } from "@utils/editor" | ||
| import { createProject, destroyCurrentProject, fetchProject, setUrl } from "@utils/project" | ||
| import { escapeable } from "@components/actions/escapeable" | ||
|
|
@@ -12,16 +12,18 @@ | |
| let loading = false | ||
| let active = false | ||
| let showProjectSettings = false | ||
| let ownProjects = [] | ||
| let filteredProjects = [] | ||
|
|
||
| $: ownProjects = $projects.filter(({ is_owner }) => is_owner) | ||
|
Comment on lines
+15
to
+18
Owner
There was a problem hiding this comment. I don't really want the state of projects that are not part of your project to be handled in the projects dropdown, I think it would make more sense somewhere else.
Contributor
Author
There was a problem hiding this comment. Good point. Then |
||
| $: limit = $isMobile ? 5 : 25 | ||
|
|
||
| onMount(() => { | ||
| const urlParams = new URLSearchParams(window.location.search) | ||
| const uuid = urlParams.get("uuid") | ||
|
|
||
| if (uuid) getProject(uuid) | ||
| else if (ownProjects.length) getProject(ownProjects[0].uuid) | ||
| }) | ||
|
|
||
| async function getProject(uuid) { | ||
|
|
@@ -52,7 +54,8 @@ | |
| loading = true | ||
|
|
||
| const content = getSaveContent() | ||
|
|
||
| const data = await createProject(`${$currentProject.title} (Copy)`, content) | ||
| if (data) { | ||
| setUrl(data.uuid) | ||
| await fetchProject(data.uuid) | ||
|
|
@@ -63,39 +66,41 @@ | |
| } | ||
| </script> | ||
|
|
||
| <div class="dropdown" style:max-width="200px" use:outsideClick on:outsideClick={() => active = false}> | ||
| <button class="form-select pt-1/8 pb-1/8 pl-1/4 text-left" on:click|stopPropagation={() => active = !active} style:min-width="{$isMobile ? 75 : 200}px" disabled={loading}> | ||
| {#if loading} | ||
| Loading... | ||
| {:else if $currentProject} | ||
| <span class="w-100 text-truncate nowrap">{$currentProject.title}</span> | ||
| {:else} | ||
| Select a project... | ||
| {/if} | ||
| </button> | ||
|
|
||
| {#if active} | ||
| <div transition:fly={{ duration: 150, y: 20 }} use:escapeable on:escape={() => active = false} class="dropdown__content dropdown__content--left block w-100" style:min-width="200px"> | ||
| <div class="pl-1/8 pr-1/8"> | ||
| <SearchObjects objects={ownProjects} bind:filteredObjects={filteredProjects} /> | ||
| </div> | ||
|
|
||
| <hr /> | ||
|
|
||
| {#each filteredProjects as project (project.uuid)} | ||
| <button class="dropdown__item text-truncate" animate:flip={{ duration: 100 }} on:click={() => getProject(project.uuid)}> | ||
| {project.title} | ||
| </button> | ||
| {/each} | ||
|
|
||
| {#if ownProjects?.length && !filteredProjects.length} | ||
| <em class="block text-dark text-small pl-1/8 pr-1/8">No projects match your search.</em> | ||
| {/if} | ||
|
|
||
| {#if ownProjects?.length} | ||
| <hr /> | ||
| {/if} | ||
|
|
||
| <div class="p-1/4"> | ||
| {#if !ownProjects?.length} | ||
| <em class="text-small block mb-1/4">Create a new project to get started.</em> | ||
| {/if} | ||
| <button class="button button--small w-100" on:click={() => { | ||
|
|
@@ -109,26 +114,28 @@ | |
| {/if} | ||
| </div> | ||
|
|
||
| {#if $isSignedIn && !loading} | ||
| {#if $currentProject?.is_owner} | ||
| <div class="dropdown" use:outsideClick on:outsideClick={() => showProjectSettings = false}> | ||
| <button class="w-auto text-base ml-1/8" on:click|stopPropagation={() => showProjectSettings = !showProjectSettings}> | ||
| Edit | ||
| </button> | ||
|
|
||
| {#if showProjectSettings} | ||
| <div transition:fly={{ duration: 150, y: 20 }} class="dropdown__content dropdown__content--left block w-100" style="width: 200px"> | ||
| <button class="dropdown__item" on:click={() => modal.show("create-project", { type: "rename" })}> | ||
| Rename | ||
| </button> | ||
|
|
||
| <button class="dropdown__item" on:click={() => duplicateProject()}> | ||
| Duplicate | ||
| </button> | ||
|
|
||
| <button class="dropdown__item text-red" on:click={destroyProject}> | ||
| Destroy | ||
| </button> | ||
| </div> | ||
| {/if} | ||
| </div> | ||
| {/if} | ||
| {/if} | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd prefer
$projectsto not ever contain a project that is not owned by the userUh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would you be okay with at least renaming it
$user/ownProjects? Its naming is a bit vague otherwise.I also noticed a lot of checks for
$currentProject?.is_owner, making it seem like we could have a project in$projectsthat could be owned by some other user ($currentProjectderives from$projects).