Skip to content

Commit

Permalink
Merge branch 'esds-3.0-vue3-primevue' into ced-1758-es-form-textarea
Browse files Browse the repository at this point in the history
  • Loading branch information
hroth1994 authored Sep 10, 2024
2 parents 8930604 + 513c2e3 commit e778193
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion es-ds-docs/components/ds-molecules-list.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<ds-link to="/molecules/tabs"> Tabs </ds-link>
</li>
<li>
<ds-link to="/molecules/form-input"> Text input </ds-link>
<ds-link to="/molecules/text-input"> Text input </ds-link>
</li>
</ul>
</template>
2 changes: 1 addition & 1 deletion es-ds-docs/pages/atoms/corners.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const COMPONENT_NAME_URLS = {
// TODO switch popover, textarea, and verification-code to the right route once they exist
popover: '/molecules',
textarea: '/molecules',
'text-input': '/molecules/form-input',
'text-input': '/molecules/text-input',
'verification-code': '/molecules',
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const docCode = ref('');
if ($prism) {
/* eslint-disable import/no-webpack-loader-syntax, import/no-self-import */
const compSource = await import('@energysage/es-ds-components/components/es-form-input.vue?raw');
const docSource = await import('./form-input.vue?raw');
const docSource = await import('./text-input.vue?raw');
/* eslint-enable import/no-webpack-loader-syntax, import/no-self-import */
compCode.value = $prism.normalizeCode(compSource.default);
Expand Down Expand Up @@ -73,7 +73,7 @@ const propTableRows = [
<b-col
cols="12"
md="6"
lg="4">
xxl="4">
<es-form-input
id="basicExample"
v-model="form.firstName">
Expand All @@ -89,7 +89,7 @@ const propTableRows = [
<b-col
cols="12"
md="6"
lg="4">
xxl="4">
<es-form-input
id="requiredExample"
v-model="form.firstName"
Expand All @@ -106,7 +106,7 @@ const propTableRows = [
<b-col
cols="12"
md="6"
lg="4">
xxl="4">
<es-form-input
id="errorExample"
v-model="form.emailWrong"
Expand All @@ -124,7 +124,7 @@ const propTableRows = [
<b-col
cols="12"
md="6"
lg="4">
xxl="4">
<es-form-input
id="successExample"
v-model="form.emailCorrect"
Expand All @@ -142,7 +142,7 @@ const propTableRows = [
<b-col
cols="12"
md="6"
lg="4">
xxl="4">
<es-form-input
id="successMessageExample"
v-model="form.emailCorrect"
Expand All @@ -161,7 +161,7 @@ const propTableRows = [
<b-col
cols="12"
md="6"
lg="4">
xxl="4">
<es-form-input
id="disabledExample"
v-model="form.emailCorrect"
Expand All @@ -179,7 +179,7 @@ const propTableRows = [
<b-col
cols="12"
md="6"
lg="4">
xxl="4">
<es-form-input
id="placeholderExample"
v-model="form.phoneNumber"
Expand All @@ -200,7 +200,7 @@ const propTableRows = [
<b-col
cols="12"
md="6"
lg="4">
xxl="4">
<es-form-input
id="maskedExample"
v-model="form.maskedPhoneNumber"
Expand All @@ -224,7 +224,7 @@ const propTableRows = [
class="d-lg-flex"
cols="12"
md="6"
lg="4">
xxl="4">
<es-form-input
id="hiddenLabelExample"
v-model="form.zipCode"
Expand All @@ -248,7 +248,7 @@ const propTableRows = [
<b-col
cols="12"
md="6"
lg="4">
xxl="4">
<es-form-input
id="prefixIconExample"
v-model="form.zipCode"
Expand All @@ -273,7 +273,7 @@ const propTableRows = [
<b-col
cols="12"
md="6"
lg="4">
xxl="4">
<es-form-input
id="contextAboveExample"
v-model="form.password"
Expand All @@ -291,7 +291,7 @@ const propTableRows = [
<b-col
cols="12"
md="6"
lg="4">
xxl="4">
<es-form-input
id="contextBelowExample"
v-model="form.password"
Expand All @@ -312,6 +312,6 @@ const propTableRows = [
:comp-code="compCode"
comp-source="es-ds-components/src/lib-components/es-form-input.vue"
:doc-code="docCode"
doc-source="es-ds-docs/pages/molecules/form-input.vue" />
doc-source="es-ds-docs/pages/molecules/text-input.vue" />
</div>
</template>

0 comments on commit e778193

Please sign in to comment.