From 6b44181b2e0d3cbe31136327ef06bf5e45208bba Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 22 Jun 2022 10:31:00 +0200 Subject: [PATCH 1/8] chore: update css packages --- package-lock.json | 28 ++++++++++++++-------------- package.json | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index aed02b9a1..c8b0da162 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,8 +8,8 @@ "name": "@appwrite/console", "version": "0.0.1", "dependencies": { - "@aw-labs/icons": "^0.0.0-13", - "@aw-labs/ui": "^0.0.0-13" + "@aw-labs/icons": "^0.0.0-14", + "@aw-labs/ui": "^0.0.0-14" }, "devDependencies": { "@playwright/test": "^1.22.2", @@ -57,14 +57,14 @@ } }, "node_modules/@aw-labs/icons": { - "version": "0.0.0-13", - "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-13.tgz", - "integrity": "sha512-ZzCoaxfhcaE3j57xzpFsw+QQ79wpDSRN+vi9VGZJRBKpVTE1j3T860SrYsh6viNGXmq2molf79ICb4/hyK4t7Q==" + "version": "0.0.0-14", + "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-14.tgz", + "integrity": "sha512-cvh/SXMdxc07w3ygA/fGiIN8d0+7L4k5nhf5cn9tjgN2x1qFco4oaqxqRc6h4AB/ScPnlusDuKqcXfSQYnGiEA==" }, "node_modules/@aw-labs/ui": { - "version": "0.0.0-13", - "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-13.tgz", - "integrity": "sha512-r00vTDAB72L1nCKgJWyqJIpA67eO9LEyezz5hBDwls02TOMmkungJaJidlmLDJHhzLpRpqNik8Ey1udp7Wve0Q==", + "version": "0.0.0-14", + "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-14.tgz", + "integrity": "sha512-IZhFmuFdM0Dkmse8q5lRPClhrlLIKhin231yV4weeujlIyd35B4cCR+J3TpsFZ6zs+2Sn2fV9PNDEBjiGwKanQ==", "dependencies": { "@aw-labs/icons": "*" } @@ -7779,14 +7779,14 @@ } }, "@aw-labs/icons": { - "version": "0.0.0-13", - "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-13.tgz", - "integrity": "sha512-ZzCoaxfhcaE3j57xzpFsw+QQ79wpDSRN+vi9VGZJRBKpVTE1j3T860SrYsh6viNGXmq2molf79ICb4/hyK4t7Q==" + "version": "0.0.0-14", + "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-14.tgz", + "integrity": "sha512-cvh/SXMdxc07w3ygA/fGiIN8d0+7L4k5nhf5cn9tjgN2x1qFco4oaqxqRc6h4AB/ScPnlusDuKqcXfSQYnGiEA==" }, "@aw-labs/ui": { - "version": "0.0.0-13", - "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-13.tgz", - "integrity": "sha512-r00vTDAB72L1nCKgJWyqJIpA67eO9LEyezz5hBDwls02TOMmkungJaJidlmLDJHhzLpRpqNik8Ey1udp7Wve0Q==", + "version": "0.0.0-14", + "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-14.tgz", + "integrity": "sha512-IZhFmuFdM0Dkmse8q5lRPClhrlLIKhin231yV4weeujlIyd35B4cCR+J3TpsFZ6zs+2Sn2fV9PNDEBjiGwKanQ==", "requires": { "@aw-labs/icons": "*" } diff --git a/package.json b/package.json index 814a92dac..b8835959b 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,8 @@ "e2e": "playwright test tests/e2e" }, "dependencies": { - "@aw-labs/ui": "^0.0.0-13", - "@aw-labs/icons": "^0.0.0-13" + "@aw-labs/ui": "^0.0.0-14", + "@aw-labs/icons": "^0.0.0-14" }, "devDependencies": { "@playwright/test": "^1.22.2", From fe580cfdcd8e8ed243b0b5251c5f39d2c04ea07e Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 22 Jun 2022 10:31:26 +0200 Subject: [PATCH 2/8] feat: create box & cardGrid component --- src/lib/components/box.svelte | 9 +++++++++ src/lib/components/cardGrid.svelte | 17 +++++++++++++++++ src/lib/components/index.ts | 2 ++ 3 files changed, 28 insertions(+) create mode 100644 src/lib/components/box.svelte create mode 100644 src/lib/components/cardGrid.svelte diff --git a/src/lib/components/box.svelte b/src/lib/components/box.svelte new file mode 100644 index 000000000..c16d116ea --- /dev/null +++ b/src/lib/components/box.svelte @@ -0,0 +1,9 @@ +
+
+ +
+ + +
+
+
diff --git a/src/lib/components/cardGrid.svelte b/src/lib/components/cardGrid.svelte new file mode 100644 index 000000000..04e3a561a --- /dev/null +++ b/src/lib/components/cardGrid.svelte @@ -0,0 +1,17 @@ + + + +
+
+ +
+
+ +
+
+
+ +
+ diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts index 2407a4d88..b1ecf9f35 100644 --- a/src/lib/components/index.ts +++ b/src/lib/components/index.ts @@ -1,6 +1,7 @@ export { default as Modal } from './modal.svelte'; export { default as Pagination } from './pagination.svelte'; export { default as Card } from './card.svelte'; +export { default as CardGrid } from './cardGrid.svelte'; export { default as Tile } from './tile.svelte'; export { default as Tiles } from './tiles.svelte'; export { default as Back } from './back.svelte'; @@ -20,3 +21,4 @@ export { default as Avatar } from './avatar.svelte'; export { default as SwitchBox } from './switchBox.svelte'; export { default as SwitchBoxes } from './switchBoxes.svelte'; export { default as Alert } from './alert.svelte'; +export { default as Box } from './box.svelte'; From 33eb8929e35b07182871db0e2cf99d4b13b3983e Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 22 Jun 2022 10:36:40 +0200 Subject: [PATCH 3/8] fix: alignment with class update --- src/lib/components/modal.svelte | 2 +- .../console/[project]/users/user/[user]/memberships.svelte | 2 +- src/routes/console/[project]/users/user/[user]/sessions.svelte | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/components/modal.svelte b/src/lib/components/modal.svelte index eda6d80cc..c5bfe4a3d 100644 --- a/src/lib/components/modal.svelte +++ b/src/lib/components/modal.svelte @@ -55,7 +55,7 @@
-
+
diff --git a/src/routes/console/[project]/users/user/[user]/memberships.svelte b/src/routes/console/[project]/users/user/[user]/memberships.svelte index 69d9e7b34..fa0d1f5d7 100644 --- a/src/routes/console/[project]/users/user/[user]/memberships.svelte +++ b/src/routes/console/[project]/users/user/[user]/memberships.svelte @@ -37,7 +37,7 @@
{:then response} {#if response.total} -
+
diff --git a/src/routes/console/[project]/users/user/[user]/sessions.svelte b/src/routes/console/[project]/users/user/[user]/sessions.svelte index a697f312a..e0e4ad4dd 100644 --- a/src/routes/console/[project]/users/user/[user]/sessions.svelte +++ b/src/routes/console/[project]/users/user/[user]/sessions.svelte @@ -33,7 +33,7 @@
{:then response} {#if response.total} -
+
+ From 05bd1cf92419a29eecee910f1441cb8dcad349dc Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 22 Jun 2022 10:45:38 +0200 Subject: [PATCH 5/8] feat: implemented new cards --- .../[project]/users/teams/[team]/index.svelte | 83 ++++--- .../[project]/users/user/[user]/index.svelte | 214 ++++++++++-------- 2 files changed, 164 insertions(+), 133 deletions(-) diff --git a/src/routes/console/[project]/users/teams/[team]/index.svelte b/src/routes/console/[project]/users/teams/[team]/index.svelte index e938b1e9c..36d979be5 100644 --- a/src/routes/console/[project]/users/teams/[team]/index.svelte +++ b/src/routes/console/[project]/users/teams/[team]/index.svelte @@ -1,6 +1,6 @@ - -
- -
+ + + {/if} -
- - -
+ + + +
Update Name
+ + +
    {errorMessage} {/if}
-
-
+ + + -
- - -
+ + + +
Update Email
+ +
    {errorMessage} {/if}
-
-
+ + + -
- - -
+ + + +
Update Password
-

- Enter a new password. A password must contain at least 8 characters. -

+

+ Enter a new password. A password must contain at least 8 characters. +

+ +
    {errorMessage} {/if}
-
-
+ + + -
- - -
-
-
User Preferences
-

- You can update your user preferences by storing information on the user's - objects so they can easily be shared across devices and sessions. -

-
-
- {#if prefs} - {#each prefs as [key, value]} -
    - - - -
- {/each} - {#if prefs.length === 0 || newPref} -
    - - - -
+ + + + +
User Preferences
+

+ You can update your user preferences by storing information on the user's objects so + they can easily be shared across devices and sessions. +

+ + +
+
    + {#if prefs} + {#each prefs as [key, value]} +
  • + + +
    + +
    +
    • + {/each} + {#if prefs.length === 0 || newPref} +
  • + + +
    + +
    +
    • + {/if} {/if} - {/if} - +
-
-
-
- -
- + + - -
+ + + + + + +
Danger Zone
-

- The user will be permanently deleted, including all data associated with this - user. This action is irreversible. -

-
- -
-
-
+ + +
{$user.response.name}
+ +

{$user.response.email}

+ + + + -
- + + From 68efc3c9bc476b2319750df8aa8f08a795a6fff8 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 22 Jun 2022 10:51:49 +0200 Subject: [PATCH 6/8] refactor: replace named slot with generic --- src/lib/components/cardGrid.svelte | 2 +- .../[project]/users/teams/[team]/index.svelte | 20 +++--- .../[project]/users/user/[user]/index.svelte | 72 ++++++++----------- 3 files changed, 39 insertions(+), 55 deletions(-) diff --git a/src/lib/components/cardGrid.svelte b/src/lib/components/cardGrid.svelte index 04e3a561a..886edfd2b 100644 --- a/src/lib/components/cardGrid.svelte +++ b/src/lib/components/cardGrid.svelte @@ -5,7 +5,7 @@
- +
diff --git a/src/routes/console/[project]/users/teams/[team]/index.svelte b/src/routes/console/[project]/users/teams/[team]/index.svelte index 36d979be5..8a9183563 100644 --- a/src/routes/console/[project]/users/teams/[team]/index.svelte +++ b/src/routes/console/[project]/users/teams/[team]/index.svelte @@ -65,9 +65,7 @@ - -
Update Name
- +
Update Name
    @@ -93,16 +91,14 @@ - -
    -
    Danger Zone
    -
    +
    +
    Danger Zone
    +
    -

    - The team will be permanently deleted, including all data associated with this - team. This action is irreversible. -

    -     +

    + The team will be permanently deleted, including all data associated with this team. + This action is irreversible. +

    diff --git a/src/routes/console/[project]/users/user/[user]/index.svelte b/src/routes/console/[project]/users/user/[user]/index.svelte index ff3d78f6f..0cf68059a 100644 --- a/src/routes/console/[project]/users/user/[user]/index.svelte +++ b/src/routes/console/[project]/users/user/[user]/index.svelte @@ -170,18 +170,16 @@ - -
    - -
    {$user.response.name}
    - {#if !$user.response.status} - Blocked - {:else} - {$user.response.emailVerification ? 'Verified' : 'Unverified'} - {/if} -
    -     +
    + +
    {$user.response.name}
    + {#if !$user.response.status} + Blocked + {:else} + {$user.response.emailVerification ? 'Verified' : 'Unverified'} + {/if} +
    {$user.response.email} @@ -202,9 +200,7 @@ - -
    Update Name
    -     +
    Update Name
      @@ -229,9 +225,7 @@ - -
      Update Email
      -       +
      Update Email
        - -
        -
        Update Password
        -
        +
        +
        Update Password
        +
        -

        - Enter a new password. A password must contain at least 8 characters. -

        -         +

        + Enter a new password. A password must contain at least 8 characters. +

          - -
          User Preferences
          -

          - You can update your user preferences by storing information on the user's objects so - they can easily be shared across devices and sessions. -

          -           +
          User Preferences
          +

          + You can update your user preferences by storing information on the user's objects so + they can easily be shared across devices and sessions. +

            @@ -346,15 +336,13 @@ - -
            -
            Danger Zone
            -
            -

            - The user will be permanently deleted, including all data associated with this user. - This action is irreversible. -

            -             +
            +
            Danger Zone
            +
            +

            + The user will be permanently deleted, including all data associated with this user. This + action is irreversible. +

            From ad635361a9ad1ed7fe446cda7d1ab7229123236c Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 22 Jun 2022 11:00:29 +0200 Subject: [PATCH 7/8] fix: user not showing on first load --- .../[project]/users/user/[user]/index.svelte | 373 +++++++++--------- 1 file changed, 187 insertions(+), 186 deletions(-) diff --git a/src/routes/console/[project]/users/user/[user]/index.svelte b/src/routes/console/[project]/users/user/[user]/index.svelte index 0cf68059a..095df403c 100644 --- a/src/routes/console/[project]/users/user/[user]/index.svelte +++ b/src/routes/console/[project]/users/user/[user]/index.svelte @@ -168,200 +168,201 @@ } - - -
            - -
            {$user.response.name}
            - {#if !$user.response.status} - Blocked - {:else} - {$user.response.emailVerification ? 'Verified' : 'Unverified'} - {/if} -
            - -
            - {$user.response.email} -

            Joined: {toLocaleDate($user.response.registration)}

            +{#if $user.response} + + +
            + +
            {$user.response.name}
            + {#if !$user.response.status} + Blocked + {:else} + {$user.response.emailVerification ? 'Verified' : 'Unverified'} + {/if}
            - + +
            + {$user.response.email} +

            Joined: {toLocaleDate($user.response.registration)}

            +
            +             - - - {#if $user.response.status} - - {/if} - -             - -
            Update Name
            - - -
              - - {#if showError === 'name'} - {errorMessage} + + + {#if $user.response.status} + {/if} -
            -             + +             + +
            Update Name
            - - - -             - -
            Update Email
            - -
              - - {#if showError === 'email'} - {errorMessage} - {/if} -
            -             - - - - -             - -
            -
            Update Password
            -
            - -

            - Enter a new password. A password must contain at least 8 characters. -

            - -
              - - {#if showError === 'password'} - {errorMessage} - {/if} -
            -             - - - - -             - -
            User Preferences
            -

            - You can update your user preferences by storing information on the user's objects so - they can easily be shared across devices and sessions. -

            - - -
              - {#if prefs} - {#each prefs as [key, value]} -
            • - - -
              - -
              -
              • - {/each} - {#if prefs.length === 0 || newPref} -
            • - - -
              - -
              -
              • - {/if} + +
                + + {#if showError === 'name'} + {errorMessage} {/if}
              - - -               + - - - - + + + + + +
              Update Email
              + +
                + + {#if showError === 'email'} + {errorMessage} + {/if} +
              +               - -
              -
              Danger Zone
              -
              -

              - The user will be permanently deleted, including all data associated with this user. This - action is irreversible. -

              - - - - - - -
              {$user.response.name}
              -               -

              {$user.response.email}

              -               -               + + + +               + +
              +
              Update Password
              +
              - - - -               - +

              + Enter a new password. A password must contain at least 8 characters. +

              + +
                + + {#if showError === 'password'} + {errorMessage} + {/if} +
              +               + + + +               + +
              User Preferences
              +

              + You can update your user preferences by storing information on the user's objects so + they can easily be shared across devices and sessions. +

              + +
              +
                + {#if prefs} + {#each prefs as [key, value]} +
              • + + +
                + +
                +
                • + {/each} + {#if prefs.length === 0 || newPref} +
              • + + +
                + +
                +
                • + {/if} + {/if} +
              + +
              +               + + + + +               + + +
              +
              Danger Zone
              +
              +

              + The user will be permanently deleted, including all data associated with this user. + This action is irreversible. +

              + + + + + + +
              {$user.response.name}
              +               +

              {$user.response.email}

              +               +               + + + + +               + +{/if} From 6b842e3d90a4c0b8328fa48ed3d2a942839eee20 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 22 Jun 2022 11:08:48 +0200 Subject: [PATCH 8/8] feat: implement new card & some refactoring --- .../console/[project]/users/security.svelte | 83 ++++++++++--------- 1 file changed, 43 insertions(+), 40 deletions(-) diff --git a/src/routes/console/[project]/users/security.svelte b/src/routes/console/[project]/users/security.svelte index 5238b0f72..029dfd003 100644 --- a/src/routes/console/[project]/users/security.svelte +++ b/src/routes/console/[project]/users/security.svelte @@ -1,5 +1,5 @@ - -
              -
              -
              -

              Users Limit

              -

              - This limits new users from signing up for your project, regardless of - authentication method. You can still create users from your Appwrite - console. -

              -
              -
              + +

              Users Limit

              +

              + This limits new users from signing up for your project, regardless of authentication + method. You can still create users from your Appwrite console. +

              + +
              • @@ -112,38 +109,44 @@ bind:value={newLimit} />
              -
              -
              + + + -
              -               + + - -
              -
              -
              -

              Session Length

              -

              - If you reduce the limit, users who are currently logged in will be logged - out of the application. -

              -
              -
              -
                - - -
              -
              -
              + +

              Session Length

              +

              + If you reduce the limit, users who are currently logged in will be logged out of the + application. +

              + +
              +
                +
              • + + +
                • +
              +
              +               + + -
              -               + +