Skip to content

Commit

Permalink
Merge pull request #101 from xfiveco/XCORNER-15-create-account-page
Browse files Browse the repository at this point in the history
Xcorner 15 create account page
  • Loading branch information
mgbelegu authored Feb 12, 2024
2 parents f5ae075 + 04c5edc commit 85c9181
Show file tree
Hide file tree
Showing 25 changed files with 180 additions and 77 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pull_request_review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

strategy:
matrix:
node: [14.x]
node: [18.x]

steps:
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
/assets/dist

*.json
*.html
*.html
1 change: 0 additions & 1 deletion assets/scss/components/_quick-search-results.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/* ==========================================================================
#QUICK-SEARCH-RESULTS
========================================================================== */
Expand Down
11 changes: 5 additions & 6 deletions assets/scss/components/_wishlist-dropdown.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@

/* ==========================================================================
#WISHLIST-DROPDOWN
========================================================================== */

.c-wishlist-dropdown {
.c-button {
align-items: center;
display: inline-flex;
}

> ul {
display: none;

Expand All @@ -24,9 +28,4 @@
}
}
}

.c-button {
align-items: center;
display: inline-flex;
}
}
21 changes: 21 additions & 0 deletions assets/scss/pages/auth-page.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
.p-auth__section {
padding: 1.5rem;
display: flex;
flex-direction: column;
gap: 1.5rem;

@include bp(medium) {
padding: 3rem 5rem;
gap: 3rem;
}
}

.p-auth__title {
color: $color-black;
font-family: $font-semi-bold;
font-size: 2.625rem;
font-style: normal;
font-weight: 600;
line-height: 1.33;
margin: 0;
}
107 changes: 107 additions & 0 deletions assets/scss/pages/create-account-page.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
.p-create-account__form {
display: grid;
gap: 3rem;
}

.p-create-account__fields {
display: grid;
grid-template-columns: repeat(1, 1fr);
gap: 1.5rem;

@include bp(medium) {
grid-template-columns: repeat(2, 1fr);
gap: 3rem;
}

@include bp(large) {
grid-template-columns: repeat(3, 1fr);
gap: 3rem;
}

.c-form__field {
grid-area: auto;

&:nth-child(1) {
@include bp(large) {
grid-area: 1 / 1;
}
}

&:nth-child(2) {
@include bp(large) {
grid-area: 2 / 1;
}
}

&:nth-child(3) {
@include bp(large) {
grid-area: 2 / 2;
}
}

&:nth-child(4) {
@include bp(large) {
grid-area: 3 / 1;
}
}

&:nth-child(5) {
@include bp(large) {
grid-area: 3 / 2;
}
}

&:nth-child(6) {
@include bp(large) {
grid-area: 4 / 1;
}
}

&:nth-child(7) {
@include bp(large) {
grid-area: 4 / 2;
}
}

&:nth-child(8) {
@include bp(large) {
grid-area: 5 / 1;
}
}

&:nth-child(9) {
@include bp(large) {
grid-area: 5 / 2;
}
}

&:nth-child(10) {
@include bp(large) {
grid-area: 5 / 3;
}
}

&:nth-child(11) {
@include bp(large) {
grid-area: 6 / 1;
}
}

&:nth-child(12) {
@include bp(large) {
grid-area: 6 / 2;
}
}

&:nth-child(13) {
@include bp(large) {
grid-area: 6 / 3;
}
}

.c-form__input,
.c-form__input--select {
width: 100%;
}
}
}
36 changes: 6 additions & 30 deletions assets/scss/pages/login-page.scss
Original file line number Diff line number Diff line change
@@ -1,25 +1,3 @@
.p-login__section {
padding: 1.5rem;
display: flex;
flex-direction: column;
gap: 1.5rem;

@include bp(medium) {
padding: 3rem 5rem;
gap: 3rem;
}
}

.p-login__title {
color: $color-black;
font-family: $font-semi-bold;
font-size: 2.625rem;
font-style: normal;
font-weight: 600;
line-height: 1.33;
margin: 0;
}

.p-login__form {
display: flex;
flex-direction: column;
Expand Down Expand Up @@ -97,14 +75,12 @@
}

.p-login__customer-intro {
strong {
color: $color-neutrals-500;
font-family: $font-semi-bold;
font-size: 1rem;
font-style: normal;
font-weight: 600;
line-height: 1.5rem;
}
color: $color-neutrals-500;
font-family: $font-semi-bold;
font-size: 1rem;
font-style: normal;
font-weight: 600;
line-height: 1.5rem;
}

.p-login__customer-facts {
Expand Down
2 changes: 2 additions & 0 deletions assets/scss/pages/pages.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
@import './contact-page';
@import './auth-page';
@import './login-page';
@import './create-account-page';
2 changes: 1 addition & 1 deletion assets/scss/settings/_colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ $color-gray-6: #666;
$color-gray-c: #ccc;
$color-gray-e5: #e5e5e5;

//X-Corner V2
// X-Corner V2

$color-black: #272727;
$color-white: white;
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/tools/_container.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
padding-right: rem-calc(10px);
margin-left: auto;
margin-right: auto;

@include bp(medium) {
padding-left: 0;
padding-right: 0;
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/utilities/_colors.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$u-color-red-300: #d74444;
$u-color-red-300: $color-red-300;

.u-required {
color: $u-color-red-300;
Expand Down
1 change: 0 additions & 1 deletion assets/scss/utilities/_container.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/* ==========================================================================
#CONTAINER
========================================================================== */
Expand Down
2 changes: 1 addition & 1 deletion templates/components/common/forms/checkbox.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div
id="{{id}}"
class="js-form-field c-form__checkbox-field"
class="js-form-field c-form__field"
data-validation="{{validation}}"
{{#if private_id}}
data-type="{{private_id}}"
Expand Down
6 changes: 3 additions & 3 deletions templates/components/common/forms/date-options.html
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{{#unless this.value}}
<option class="c-input-option" value="">---</option>
<option class="c-form__input" value="">---</option>
{{#each this.items}}
<option value="{{value}}">
{{label}}
</option>
{{/each}}
{{else}}
{{#unless this.isRequired}}
<option class="c-input-option" value="">---</option>
<option class="c-form__input" value="">---</option>
{{/unless}}
{{#each this.items}}
<option class="c-input-option"
<option class="c-form__input"
{{#if ../this.value '==' value}}
selected
{{/if}}
Expand Down
10 changes: 5 additions & 5 deletions templates/components/common/forms/date.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div
class="js-form-field"
class="js-form-field c-form__field"
id="{{id}}"
data-validation="{{validation}}"
{{#if private_id}}
Expand All @@ -15,7 +15,7 @@
{{/if}}
</label>
<div>
<div class="js-form-field c-datepicker-field">
<div class="js-form-field c-form__field">
<label for="{{id}}_month" class="u-visually-hidden">Select month</label>
<select
name="{{month.name}}"
Expand All @@ -32,12 +32,12 @@
{{> components/common/forms/date-options month isRequired=required}}
</select>
</div>
<div class="js-form-field c-datepicker-field">
<div class="js-form-field c-form__field">
<label for="{{id}}_day" class="u-visually-hidden">Select day</label>
<select
name="{{day.name}}"
id="{{id}}_day"
class="js-input js-select-input"
class="js-input js-select-input c-form__input c-form__input--select"
data-label="day"
aria-required="{{required}}"
aria-labelledby="{{id}}"
Expand All @@ -49,7 +49,7 @@
{{> components/common/forms/date-options day isRequired=required}}
</select>
</div>
<div class="js-form-field c-datepicker-field">
<div class="js-form-field c-form__field">
<label for="{{id}}_year" class="u-visually-hidden">Select year</label>
<select
name="{{year.name}}"
Expand Down
2 changes: 1 addition & 1 deletion templates/components/common/forms/multiline.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="js-form-field c-textarea-field" id="{{id}}" data-validation="{{validation}}">
<div class="js-form-field c-form__field" id="{{id}}" data-validation="{{validation}}">
<label for="{{id}}_input" class="c-form__label">
{{label}}
{{#if required}}
Expand Down
4 changes: 2 additions & 2 deletions templates/components/common/forms/number.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div
class="js-form-field c-number-field"
class="js-form-field c-form__field"
id="{{id}}"
data-validation="{{validation}}"
>
Expand All @@ -8,7 +8,7 @@
<small>*</small>
{{/if}}
</label>
<input type="number" class="js-form-input js-input c-number-input" data-label="{{label}}" data-rule="lowerThan" min="{{limitfrom}}" max="{{limitto}}"
<input type="number" class="js-form-input js-input c-form__input" data-label="{{label}}" data-rule="lowerThan" min="{{limitfrom}}" max="{{limitto}}"
title="{{lang 'forms.range' limitFrom=limitfrom limitTo=limitto}}" value="{{value}}" id="{{id}}_input" name="{{name}}"
aria-required="{{required}}" aria-labelledby="{{id}}" aria-live="polite" {{#if private_id}} data-field-type="{{private_id}}" {{/if}} {{#if
required}} required {{/if}} >
Expand Down
4 changes: 2 additions & 2 deletions templates/components/common/forms/password.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div
class="js-form-field c-password-field"
class="js-form-field c-form__field"
id="{{id}}"
data-validation="{{validation}}"
{{#if private_id}}
Expand All @@ -14,7 +14,7 @@
</label>
<input
type="password"
class="js-form-input c-form__input c-form__input--password"
class="js-form-input c-form__input"
id="{{id}}_input"
data-label="{{label}}"
name="{{name}}"
Expand Down
2 changes: 1 addition & 1 deletion templates/components/common/forms/radio.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div
class="js-form-field c-form__radio-field"
class="js-form-field c-form__field"
id="{{id}}"
data-validation="{{validation}}"
>
Expand Down
2 changes: 1 addition & 1 deletion templates/components/common/forms/select.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div
class="js-form-field c-select-field"
class="js-form-field c-form__field"
id="{{id}}"
data-validation="{{validation}}"
{{#if private_id}}
Expand Down
4 changes: 2 additions & 2 deletions templates/components/common/forms/selectortext.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div
class="js-form-field c-text-field"
class="js-form-field c-form__field"
id="{{id}}"
data-validation="{{validation}}"
{{#if private_id}}
Expand All @@ -18,7 +18,7 @@
id="{{id}}_input"
name="{{name}}"
value="{{value}}"
class="js-form-input js-input c-form__input c-form__input--text"
class="js-form-input js-input c-form__input"
aria-required="{{required}}"
aria-labelledby="{{id}}"
aria-live="polite"
Expand Down
Loading

0 comments on commit 85c9181

Please sign in to comment.