Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consistent layout actions #876

Merged
merged 13 commits into from
Nov 25, 2024
Merged

Consistent layout actions #876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
48e8097
Refactor sidebar components
allanlasser Nov 22, 2024
afb1fb7
Make layouts more consistent
allanlasser Nov 22, 2024
664520a
- Move pinned data into top-level layout.ts
allanlasser Nov 22, 2024
246eaa5
Fix page data access
allanlasser Nov 25, 2024
be4b12e
Fix snapshots
allanlasser Nov 25, 2024
76e262b
Fix check
allanlasser Nov 25, 2024
a73f5c4
Hide empty collaborators on public projects
allanlasser Nov 25, 2024
2f3baee
Refactor document/Access to common component, use in Project header
allanlasser Nov 25, 2024
7fd68f7
Restore "Your Documents" nav item
allanlasser Nov 25, 2024
c6672a5
Adds Upload button to Project actions
allanlasser Nov 25, 2024
eee19cf
Smol icon
allanlasser Nov 25, 2024
8f29be3
Tweak langauge strings
allanlasser Nov 25, 2024
086358e
Merge branch 'sveltekit' of github.com:MuckRock/documentcloud-fronten…
eyeseast Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 18 additions & 15 deletions src/langs/json/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@
"view": "Viewer"
},
"delete": {
"action": "Delete project",
"action": "Delete Project",
"confirm": "Confirm delete",
"really": "Are you sure you want to delete this project ({project})?"
},
Expand All @@ -263,7 +263,7 @@
"collaborators": {
"title": "Collaborators",
"empty": "No collaborators",
"add": "Invite users to this project"
"add": "Invite"
},
"fields": {
"title": "Title",
Expand Down Expand Up @@ -350,15 +350,18 @@
"shareEmbed": "Share & Embed",
"sharedWith": "Shared with",
"revisions": "Revision History",
"edit": "Edit Metadata",
"edit": "Edit Document Metadata",
"upload": "Upload Documents",
"uploadToProject": "Upload to Project",
"download": "Download File",
"reprocess": "Reprocess",
"delete": "Delete",
"shareEmbedProject": "Share & Embed Project",
"editProject": "Edit Project Metadata",
"deleteProject": "Delete Project",
"created": "Created on",
"updated": "Last updated on",
"language": "Language",
"delete": "Delete",
"ocr_engine": "OCR Engine",
"addons": {
"title": "Add-Ons",
Expand Down Expand Up @@ -387,7 +390,7 @@
"cta": "Annotate this document"
},
"edit": {
"title": "Edit document metadata",
"title": "Edit Document Metadata",
"fields": {
"title": "Title",
"description": "Description",
Expand Down Expand Up @@ -422,10 +425,10 @@
}
},
"redact": {
"title": "Redact Document",
"confirm": "Save",
"confirmTitle": "Save Redactions",
"really": "Are you sure you wish to redact the current document? If you continue, the document viewer will be inaccessible temporarily while the document reprocesses with the redactions in place. This change is irreversible.",
"title": "Redact Document",
"instructions": "Click and drag to draw a black rectangle over each portion of the document you’d like to redact. Associated text will be removed when you save your redactions.",
"undo": "Undo",
"cancel": "Discard",
Expand All @@ -437,13 +440,13 @@
"page": "Page",
"title": "Title",
"delete": "Delete",
"new": "Add a new section",
"new": "Add New Section",
"clear": "Clear",
"update": "Update section",
"overwrite": "There is already a section starting on page {n}."
},
"delete": {
"title": "Confirm delete",
"title": "Confirm Delete",
"really": "Proceeding will permanently delete the {n, plural, one {selected document} other {# selected documents}}.",
"continue": "Do you wish to continue?",
"confirm": "Delete",
Expand All @@ -452,7 +455,7 @@
"none": "No documents selected. Close this form and select at least one document first."
},
"data": {
"title": "Edit tags and data",
"title": "Edit Tags & Data",
"key": "Key",
"newkey": "New item",
"value": "Value",
Expand All @@ -462,15 +465,15 @@
"save": "Save",
"cancel": "Cancel",
"addNew": "Add new item:",
"many": "Saving will add the following data and tags to {n, plural, one {the selected document} other {all # selected documents}}. No tags or data will be removed."
"many": "Saving will add the following tags and data to {n, plural, one {the selected document} other {all # selected documents}}. No tags or data will be removed."
},
"bulk": {
"title": "Edit",
"title": "Actions",
"actions": {
"share": "Share",
"edit": "Edit metadata",
"data": "Edit tags & data",
"project": "Move to project",
"share": "Share & Embed",
"edit": "Edit Metadata",
"data": "Edit Tags & Data",
"project": "Move to Project",
"reprocess": "Reprocess",
"delete": "Delete"
}
Expand Down
16 changes: 8 additions & 8 deletions src/lib/components/accounts/tests/__snapshots__/UserMenu.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ exports[`UserMenu 1`] = `
tabindex="0"
>
<span
class="sidebarItem container svelte-1i964q1"
class="sidebarItem container svelte-8l7as"
role="button"
tabindex="0"
title="Open Menu"
Expand All @@ -26,7 +26,7 @@ exports[`UserMenu 1`] = `
</div>

<span
class="label svelte-1i964q1"
class="label svelte-8l7as"
>
<span
class="name"
Expand Down Expand Up @@ -65,7 +65,7 @@ exports[`UserMenu 1`] = `
role="menu"
>
<a
class="sidebarItem container svelte-1i964q1"
class="sidebarItem container svelte-8l7as"
href="https://dev.squarelet.com"
target="_blank"
title=""
Expand All @@ -84,7 +84,7 @@ exports[`UserMenu 1`] = `
</svg>

<span
class="label svelte-1i964q1"
class="label svelte-8l7as"
>
Account settings
</span>
Expand All @@ -93,7 +93,7 @@ exports[`UserMenu 1`] = `


<span
class="sidebarItem container svelte-1i964q1 hover"
class="sidebarItem container svelte-8l7as hover"
role="button"
tabindex="0"
title=""
Expand All @@ -112,7 +112,7 @@ exports[`UserMenu 1`] = `
</svg>

<span
class="label svelte-1i964q1"
class="label svelte-8l7as"
>
Upload via email
</span>
Expand All @@ -121,7 +121,7 @@ exports[`UserMenu 1`] = `


<a
class="sidebarItem container svelte-1i964q1"
class="sidebarItem container svelte-8l7as"
href="https://api.dev.documentcloud.org/accounts/logout/"
title=""
>
Expand All @@ -139,7 +139,7 @@ exports[`UserMenu 1`] = `
</svg>

<span
class="label svelte-1i964q1"
class="label svelte-8l7as"
>
Sign out
</span>
Expand Down
48 changes: 24 additions & 24 deletions src/lib/components/addons/tests/__snapshots__/AddOnsNavigation.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ exports[`AddOnsNavigation 1`] = `
style="display: contents; --hover-background: var(--blue-2);"
>
<a
class="sidebarItem container svelte-1i964q1 active"
class="sidebarItem container svelte-8l7as active"
href="/add-ons/"
title=""
>
Expand All @@ -43,7 +43,7 @@ exports[`AddOnsNavigation 1`] = `
</svg>

<span
class="label svelte-1i964q1"
class="label svelte-8l7as"
>
All
</span>
Expand All @@ -56,7 +56,7 @@ exports[`AddOnsNavigation 1`] = `
style="display: contents; --hover-background: var(--orange-2);"
>
<a
class="sidebarItem container svelte-1i964q1"
class="sidebarItem container svelte-8l7as"
href="/add-ons/?active=true"
title=""
>
Expand All @@ -80,7 +80,7 @@ exports[`AddOnsNavigation 1`] = `
</div>

<span
class="label svelte-1i964q1"
class="label svelte-8l7as"
>
Pinned
</span>
Expand All @@ -93,7 +93,7 @@ exports[`AddOnsNavigation 1`] = `
style="display: contents; --hover-background: var(--yellow-2);"
>
<a
class="sidebarItem container svelte-1i964q1"
class="sidebarItem container svelte-8l7as"
href="/add-ons/?featured=true"
title=""
>
Expand All @@ -112,7 +112,7 @@ exports[`AddOnsNavigation 1`] = `
</svg>

<span
class="label svelte-1i964q1"
class="label svelte-8l7as"
>
Featured
</span>
Expand All @@ -125,7 +125,7 @@ exports[`AddOnsNavigation 1`] = `
style="display: contents; --hover-background: var(--green-2);"
>
<a
class="sidebarItem container svelte-1i964q1"
class="sidebarItem container svelte-8l7as"
href="/add-ons/?premium=true"
title=""
>
Expand Down Expand Up @@ -155,7 +155,7 @@ exports[`AddOnsNavigation 1`] = `
</div>

<span
class="label svelte-1i964q1"
class="label svelte-8l7as"
>
Premium
</span>
Expand All @@ -172,14 +172,14 @@ exports[`AddOnsNavigation 1`] = `
style="display: contents; --color: var(--gray-4);"
>
<span
class="sidebarItem container svelte-1i964q1 small"
class="sidebarItem container svelte-8l7as small"
role="button"
tabindex="0"
title=""
>

<span
class="label svelte-1i964q1"
class="label svelte-8l7as"
>
Collections
</span>
Expand All @@ -189,13 +189,13 @@ exports[`AddOnsNavigation 1`] = `
</div>

<a
class="sidebarItem container svelte-1i964q1"
class="sidebarItem container svelte-8l7as"
href="/add-ons/?category=ai"
title=""
>

<span
class="label svelte-1i964q1"
class="label svelte-8l7as"
>
AI

Expand All @@ -204,13 +204,13 @@ exports[`AddOnsNavigation 1`] = `
</a>

<a
class="sidebarItem container svelte-1i964q1"
class="sidebarItem container svelte-8l7as"
href="/add-ons/?category=statistical"
title=""
>

<span
class="label svelte-1i964q1"
class="label svelte-8l7as"
>
Analyze

Expand All @@ -219,13 +219,13 @@ exports[`AddOnsNavigation 1`] = `
</a>

<a
class="sidebarItem container svelte-1i964q1"
class="sidebarItem container svelte-8l7as"
href="/add-ons/?category=bulk"
title=""
>

<span
class="label svelte-1i964q1"
class="label svelte-8l7as"
>
Bulk

Expand All @@ -234,13 +234,13 @@ exports[`AddOnsNavigation 1`] = `
</a>

<a
class="sidebarItem container svelte-1i964q1"
class="sidebarItem container svelte-8l7as"
href="/add-ons/?category=export"
title=""
>

<span
class="label svelte-1i964q1"
class="label svelte-8l7as"
>
Export

Expand All @@ -249,13 +249,13 @@ exports[`AddOnsNavigation 1`] = `
</a>

<a
class="sidebarItem container svelte-1i964q1"
class="sidebarItem container svelte-8l7as"
href="/add-ons/?category=extraction"
title=""
>

<span
class="label svelte-1i964q1"
class="label svelte-8l7as"
>
Extract

Expand All @@ -264,13 +264,13 @@ exports[`AddOnsNavigation 1`] = `
</a>

<a
class="sidebarItem container svelte-1i964q1"
class="sidebarItem container svelte-8l7as"
href="/add-ons/?category=file"
title=""
>

<span
class="label svelte-1i964q1"
class="label svelte-8l7as"
>
File

Expand All @@ -279,13 +279,13 @@ exports[`AddOnsNavigation 1`] = `
</a>

<a
class="sidebarItem container svelte-1i964q1"
class="sidebarItem container svelte-8l7as"
href="/add-ons/?category=monitor"
title=""
>

<span
class="label svelte-1i964q1"
class="label svelte-8l7as"
>
Monitor

Expand Down
Loading