Skip to content

Commit d290de7

Browse files
committed
Merge remote-tracking branch 'origin/dev'
2 parents 307913f + 24da2c3 commit d290de7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1523
-225
lines changed

.storybook/stories/Faqs.stories.mdx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@ At this moment, you should add the property `skipLibCheck: true` to **tsconfig.j
2323
This will skip the check for missing declaration types.
2424
We will try to fix this issue in the future.
2525

26+
<br/>
27+
28+
#### **CSS Variables & Polaris Tokens**
29+
30+
All tokens & variables are following the [Polaris Design Tokens](https://polaris.shopify.com/tokens/all-tokens).
31+
Feel free to change the variables, based on your project scheme.
32+
2633

2734

2835

.storybook/stories/GetStarted.stories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Polaris Vue by Qikify is a component library for [Vue 3](https://vuejs.org/) bas
2626

2727
Polaris Vue by qikify only supports **Vue 3.0+**.
2828

29-
**Follow Polaris React version:** [9.4.0](https://github.com/Shopify/polaris/releases/tag/v9.4.0) - Migrated date: *Apr 9th, 2022*.
29+
**Follow Polaris React version:** [9.5.0](https://github.com/Shopify/polaris/releases/tag/v9.5.0) - Migrated date: *Apr 23rd, 2022*.
3030

3131
<br/>
3232
<br/>

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Polaris Vue by qikify only supports **Vue 3.0+**.
55
Polaris Vue by Qikify based on [Shopify Polaris style guide](https://polaris.shopify.com/), built especially for Vue 3.
66
We're trying to make it mostly close with Shopify style guide and get a better performance.
77

8-
**Follow Polaris React version:** [9.4.0](https://github.com/Shopify/polaris/releases/tag/v9.4.0) - Migrated date: *Apr 9th, 2022*.
8+
**Follow Polaris React version:** [9.5.0](https://github.com/Shopify/polaris/releases/tag/v9.5.0) - Migrated date: *Apr 23rd, 2022*.
99

1010
<br/>
1111

package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@qikify/polaris-vue",
3-
"version": "0.5.10",
4-
"polaris_version": "9.4.0",
3+
"version": "0.6.0",
4+
"polaris_version": "9.5.0",
55
"description": "Shopify Polaris UI library for Vue 3",
66
"author": {
77
"name": "Qikify"
@@ -34,7 +34,6 @@
3434
},
3535
"dependencies": {
3636
"@shopify/polaris-icons": "^4.18.4",
37-
"lodash": "^4.17.21",
3837
"vite-svg-loader": "^3.1.2",
3938
"vue": "^3.2.31"
4039
},
@@ -51,7 +50,6 @@
5150
"@storybook/builder-vite": "^0.1.23",
5251
"@storybook/theming": "^6.4.20",
5352
"@storybook/vue3": "^6.4.20",
54-
"@types/lodash": "^4.14.178",
5553
"@types/node": "^16.11.25",
5654
"@vitejs/plugin-vue": "^2.2.4",
5755
"@vue/eslint-config-prettier": "^7.0.0",

src/classes/AccountConnection.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"TermsOfService":"Polaris-AccountConnection__TermsOfService","Content":"Polaris-AccountConnection__Content"}

src/classes/Badge-Pip.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"Pip":"Polaris-Badge-Pip","statusSuccess":"Polaris-Badge-Pip--statusSuccess","statusInfo":"Polaris-Badge-Pip--statusInfo","statusAttention":"Polaris-Badge-Pip--statusAttention","statusWarning":"Polaris-Badge-Pip--statusWarning","statusCritical":"Polaris-Badge-Pip--statusCritical","progressIncomplete":"Polaris-Badge-Pip--progressIncomplete","progressPartiallyComplete":"Polaris-Badge-Pip--progressPartiallyComplete","progressComplete":"Polaris-Badge-Pip--progressComplete"}

src/classes/Badge.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"Badge":"Polaris-Badge","sizeSmall":"Polaris-Badge--sizeSmall","statusSuccess":"Polaris-Badge--statusSuccess","statusInfo":"Polaris-Badge--statusInfo","statusAttention":"Polaris-Badge--statusAttention","statusWarning":"Polaris-Badge--statusWarning","statusCritical":"Polaris-Badge--statusCritical","statusNew":"Polaris-Badge--statusNew","Pip":"Polaris-Badge__Pip","progressIncomplete":"Polaris-Badge--progressIncomplete","progressPartiallyComplete":"Polaris-Badge--progressPartiallyComplete","progressComplete":"Polaris-Badge--progressComplete","withinFilter":"Polaris-Badge--withinFilter","Icon":"Polaris-Badge__Icon"}
1+
{"Badge":"Polaris-Badge","sizeSmall":"Polaris-Badge--sizeSmall","statusSuccess":"Polaris-Badge--statusSuccess","statusInfo":"Polaris-Badge--statusInfo","statusAttention":"Polaris-Badge--statusAttention","statusWarning":"Polaris-Badge--statusWarning","statusCritical":"Polaris-Badge--statusCritical","statusNew":"Polaris-Badge--statusNew","withinFilter":"Polaris-Badge--withinFilter","Icon":"Polaris-Badge__Icon","PipContainer":"Polaris-Badge__PipContainer"}

src/classes/Banner.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"Banner":"Polaris-Banner","statusCritical":"Polaris-Banner--statusCritical","PrimaryAction":"Polaris-Banner__PrimaryAction","Button":"Polaris-Banner__Button","statusWarning":"Polaris-Banner--statusWarning","statusInfo":"Polaris-Banner--statusInfo","statusSuccess":"Polaris-Banner--statusSuccess","ContentWrapper":"Polaris-Banner__ContentWrapper","withinContentContainer":"Polaris-Banner--withinContentContainer","Dismiss":"Polaris-Banner__Dismiss","Ribbon":"Polaris-Banner__Ribbon","keyFocused":"Polaris-Banner--keyFocused","Actions":"Polaris-Banner__Actions","withinPage":"Polaris-Banner--withinPage","hasDismiss":"Polaris-Banner--hasDismiss","Heading":"Polaris-Banner__Heading","Content":"Polaris-Banner__Content","SecondaryAction":"Polaris-Banner__SecondaryAction","Text":"Polaris-Banner__Text","pressed":"Polaris-Banner--pressed","loading":"Polaris-Banner--loading","Spinner":"Polaris-Banner__Spinner"}

src/classes/MediaCard.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"MediaCard":"Polaris-MediaCard","portrait":"Polaris-MediaCard--portrait","MediaContainer":"Polaris-MediaCard__MediaContainer","sizeSmall":"Polaris-MediaCard--sizeSmall","InfoContainer":"Polaris-MediaCard__InfoContainer","Popover":"Polaris-MediaCard__Popover","Heading":"Polaris-MediaCard__Heading","PrimaryAction":"Polaris-MediaCard__PrimaryAction","SecondaryAction":"Polaris-MediaCard__SecondaryAction","ActionContainer":"Polaris-MediaCard__ActionContainer"}
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<template lang="pug">
2+
Card(sectioned)
3+
SettingAction
4+
template(#action)
5+
ButtonFrom(
6+
v-if="action",
7+
:action="action",
8+
:overrides="{ primary: !connected }",
9+
)
10+
template(#setting)
11+
Stack
12+
Avatar(
13+
v-if="connected",
14+
accessibilityLabel="",
15+
:name="accountName",
16+
:initials="initials",
17+
:source="avatarUrl",
18+
)
19+
StackItem(fill)
20+
div(:class="styles.Content")
21+
div(v-if="title || hasSlot(slots.title)")
22+
template(v-if="hasSlot(slots.title)")
23+
slot(name="title")
24+
template(v-else)
25+
| {{ title }}
26+
div(v-else-if="accountName") {{ accountName }}
27+
div(v-if="details || hasSlot(slots.details)")
28+
TextStyle(variation="subdued")
29+
template(v-if="hasSlot(slots.details)")
30+
slot(name="details")
31+
template(v-else)
32+
| {{ details }}
33+
div(v-if="termsOfService || hasSlot(slots.termsOfService)", :class="styles.TermsOfService")
34+
template(v-if="hasSlot(slots.termsOfService)")
35+
slot(name="termsOfService")
36+
template(v-else)
37+
| {{ termsOfService }}
38+
</template>
39+
<script setup lang="ts">
40+
import { computed, useSlots } from 'vue';
41+
import type { Action } from '@/utilities/type';
42+
import { hasSlot } from '@/utilities/has-slot';
43+
import { Avatar, ButtonFrom, Card, Stack, StackItem, TextStyle, SettingAction } from '@/components';
44+
import styles from '@/classes/AccountConnection.json';
45+
46+
interface AccountConnectionProps {
47+
/** Content to display as title */
48+
title?: string;
49+
/** Content to display as additional details */
50+
details?: string;
51+
/** Content to display as terms of service */
52+
termsOfService?: string;
53+
/** The name of the service */
54+
accountName?: string;
55+
/** URL for the user’s avatar image */
56+
avatarUrl?: string;
57+
/** Set if the account is connected */
58+
connected?: boolean;
59+
/** Action for account connection */
60+
action?: Action;
61+
}
62+
63+
const props = withDefaults(defineProps<AccountConnectionProps>(), {
64+
connected: false,
65+
accountName: '',
66+
});
67+
68+
const slots = useSlots();
69+
70+
const initials = computed(() => {
71+
return props.accountName
72+
? props.accountName
73+
.split(/\s+/)
74+
.map((name) => name[0])
75+
.join('')
76+
: undefined
77+
});
78+
</script>
79+
<style lang="scss">
80+
@import 'polaris/polaris-react/src/components/AccountConnection/AccountConnection.scss';
81+
</style>

0 commit comments

Comments
 (0)