tomas/pocketbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added version number in the footer

Browse Source
This commit is contained in:
Gani Georgiev
2022-08-09 16:16:09 +03:00
parent 8b2b26c196
commit 8288da8372
21 changed files with 379 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/src/components/settings/ImportPopup.svelte
+25 -3
View File
@@ -4,6 +4,7 @@
import CommonHelper from "@/utils/CommonHelper";
import OverlayPanel from "@/components/base/OverlayPanel.svelte";
import { addSuccessToast } from "@/stores/toasts";
import { confirm } from "@/stores/confirmation";
const dispatch = createEventDispatcher();
@@ -17,6 +18,10 @@
loadChanges();
}
$: deletedCollections = oldCollections.filter((old) => {
return !CommonHelper.findByKey(newCollections, "id", old.id)?.id;
});
export function show(a, b) {
oldCollections = a;
newCollections = b;
@@ -103,7 +108,24 @@
return diffsToHtml(diffs, ops);
}
async function submitImport() {
function submitWithConfirm() {
if (deletedCollections.length) {
const deletedNames = deletedCollections.map((c) => c.name);
confirm(
`Do you really want to delete the following collections and their related records data:\n- ${deletedNames.join(
"\n- "
)}?`,
() => {
submit();
}
);
} else {
submit();
}
}
async function submit() {
if (isImporting) {
return;
}
@@ -111,7 +133,7 @@
isImporting = true;
try {
await ApiClient.collections.import(newCollections);
await ApiClient.collections.import(newCollections, true);
addSuccessToast("Successfully imported the collections configuration.");
dispatch("submit");
} catch (err) {
@@ -180,7 +202,7 @@
class="btn btn-expanded"
class:btn-loading={isImporting}
disabled={isImporting}
on:click={() => submitImport()}
on:click={() => submitWithConfirm()}
>
<span class="txt">Confirm and import</span>
</button>
ui/src/components/settings/PageApplication.svelte
+3 -2
View File
@@ -3,6 +3,7 @@
import CommonHelper from "@/utils/CommonHelper";
import { pageTitle, appName } from "@/stores/app";
import { addSuccessToast } from "@/stores/toasts";
import PageWrapper from "@/components/base/PageWrapper.svelte";
import Field from "@/components/base/Field.svelte";
import SettingsSidebar from "@/components/settings/SettingsSidebar.svelte";
@@ -62,7 +63,7 @@
<SettingsSidebar />
<main class="page-wrapper">
<PageWrapper>
<header class="page-header">
<nav class="breadcrumbs">
<div class="breadcrumb-item">Settings</div>
@@ -116,4 +117,4 @@
{/if}
</form>
</div>
</main>
</PageWrapper>
ui/src/components/settings/PageAuthProviders.svelte
+3 -2
View File
@@ -4,6 +4,7 @@
import { pageTitle } from "@/stores/app";
import { setErrors } from "@/stores/errors";
import { addSuccessToast } from "@/stores/toasts";
import PageWrapper from "@/components/base/PageWrapper.svelte";
import SettingsSidebar from "@/components/settings/SettingsSidebar.svelte";
import EmailAuthAccordion from "@/components/settings/EmailAuthAccordion.svelte";
import AuthProviderAccordion from "@/components/settings/AuthProviderAccordion.svelte";
@@ -73,7 +74,7 @@
<SettingsSidebar />
<main class="page-wrapper">
<PageWrapper>
<header class="page-header">
<nav class="breadcrumbs">
<div class="breadcrumb-item">Settings</div>
@@ -140,4 +141,4 @@
{/if}
</form>
</div>
</main>
</PageWrapper>
ui/src/components/settings/PageExportCollections.svelte
+4 -3
View File
@@ -3,6 +3,7 @@
import CommonHelper from "@/utils/CommonHelper";
import { pageTitle } from "@/stores/app";
import { addInfoToast } from "@/stores/toasts";
import PageWrapper from "@/components/base/PageWrapper.svelte";
import CodeBlock from "@/components/base/CodeBlock.svelte";
import SettingsSidebar from "@/components/settings/SettingsSidebar.svelte";
@@ -43,13 +44,13 @@
function copy() {
CommonHelper.copyToClipboard(schema);
addInfoToast("The collections list was copied to your clipboard!", 3000);
addInfoToast("The configuration was copied to your clipboard!", 3000);
}
</script>
<SettingsSidebar />
<main class="page-wrapper">
<PageWrapper>
<header class="page-header">
<nav class="breadcrumbs">
<div class="breadcrumb-item">Settings</div>
@@ -106,7 +107,7 @@
{/if}
</div>
</div>
</main>
</PageWrapper>
<style>
.export-preview {
ui/src/components/settings/PageImportCollections.svelte
+15 -14
View File
@@ -5,6 +5,7 @@
import { pageTitle } from "@/stores/app";
import { addErrorToast } from "@/stores/toasts";
import { setErrors } from "@/stores/errors";
import PageWrapper from "@/components/base/PageWrapper.svelte";
import Field from "@/components/base/Field.svelte";
import SettingsSidebar from "@/components/settings/SettingsSidebar.svelte";
import ImportPopup from "@/components/settings/ImportPopup.svelte";
@@ -150,7 +151,7 @@
<SettingsSidebar />
<main class="page-wrapper">
<PageWrapper>
<header class="page-header">
<nav class="breadcrumbs">
<div class="breadcrumb-item">Settings</div>
@@ -163,19 +164,19 @@
{#if isLoadingOldCollections}
<div class="loader" />
{:else}
<div class="content txt-xl m-b-base">
<input
bind:this={fileInput}
type="file"
class="hidden"
accept=".json"
on:change={() => {
if (fileInput.files.length) {
loadFile(fileInput.files[0]);
}
}}
/>
<input
bind:this={fileInput}
type="file"
class="hidden"
accept=".json"
on:change={() => {
if (fileInput.files.length) {
loadFile(fileInput.files[0]);
}
}}
/>
<div class="content txt-xl m-b-base">
<p>
Paste below the collections configuration you want to import or
<button
@@ -283,7 +284,7 @@
{/if}
</div>
</div>
</main>
</PageWrapper>
<ImportPopup bind:this={importPopup} on:submit={() => clear()} />
ui/src/components/settings/PageMail.svelte
+3 -2
View File
@@ -4,6 +4,7 @@
import CommonHelper from "@/utils/CommonHelper";
import { pageTitle } from "@/stores/app";
import { addSuccessToast } from "@/stores/toasts";
import PageWrapper from "@/components/base/PageWrapper.svelte";
import Field from "@/components/base/Field.svelte";
import ObjectSelect from "@/components/base/ObjectSelect.svelte";
import RedactedPasswordInput from "@/components/base/RedactedPasswordInput.svelte";
@@ -67,7 +68,7 @@
<SettingsSidebar />
<main class="page-wrapper">
<PageWrapper>
<header class="page-header">
<nav class="breadcrumbs">
<div class="breadcrumb-item">Settings</div>
@@ -240,4 +241,4 @@
{/if}
</form>
</div>
</main>
</PageWrapper>
ui/src/components/settings/PageStorage.svelte
+4 -3
View File
@@ -5,10 +5,11 @@
import { pageTitle } from "@/stores/app";
import { setErrors } from "@/stores/errors";
import { addSuccessToast } from "@/stores/toasts";
import tooltip from "@/actions/tooltip";
import PageWrapper from "@/components/base/PageWrapper.svelte";
import Field from "@/components/base/Field.svelte";
import RedactedPasswordInput from "@/components/base/RedactedPasswordInput.svelte";
import SettingsSidebar from "@/components/settings/SettingsSidebar.svelte";
import tooltip from "@/actions/tooltip";
$pageTitle = "Files storage";
@@ -63,7 +64,7 @@
<SettingsSidebar />
<main class="page-wrapper">
<PageWrapper>
<header class="page-header">
<nav class="breadcrumbs">
<div class="breadcrumb-item">Settings</div>
@@ -191,4 +192,4 @@
{/if}
</form>
</div>
</main>
</PageWrapper>
ui/src/components/settings/PageTokenOptions.svelte
+3 -2
View File
@@ -3,6 +3,7 @@
import CommonHelper from "@/utils/CommonHelper";
import { pageTitle } from "@/stores/app";
import { addSuccessToast } from "@/stores/toasts";
import PageWrapper from "@/components/base/PageWrapper.svelte";
import Field from "@/components/base/Field.svelte";
import SettingsSidebar from "@/components/settings/SettingsSidebar.svelte";
@@ -73,7 +74,7 @@
<SettingsSidebar />
<main class="page-wrapper">
<PageWrapper>
<header class="page-header">
<nav class="breadcrumbs">
<div class="breadcrumb-item">Settings</div>
@@ -134,4 +135,4 @@
{/if}
</form>
</div>
</main>
</PageWrapper>