Skip to content

Rss ecomm 3 21 #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
InStageTwo merged 3 commits into from
May 25, 2024
Merged

Rss ecomm 3 21 #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d27a66a
feat(header): add catalogue, about, profile buttons
dashaborzova May 24, 2024
3830aaa
feat(header): add cart button
dashaborzova May 24, 2024
a3fa5e8
refactor(login): change email input type from email to text
dashaborzova May 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/utils/validators/email-validator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { IValidator } from './validator';
const emailValidator: IValidator = {
validateFunction: (value: string): boolean => {
const regex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
return regex.test(value.trim());
return regex.test(value);
},
invalidMessage: 'Please enter a valid email address.',
};
Expand Down
14 changes: 12 additions & 2 deletions src/app/views/header/header.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import Router from '@utils/router';
import { customerClear, isCustomerAuthorized } from '@models/customer';
import logoUrl from '@assets/logo.webp';


export default class HeaderView extends View {
private headerInitialized: boolean;

Expand Down Expand Up @@ -97,11 +98,20 @@ export default class HeaderView extends View {
const menuItems = [];

if (isCustomerAuthorized()) {
menuItems.push(createMenuItem('#login', 'Sign out', customerClear));
menuItems.push(
createMenuItem('#catalogue', 'Catalogue'),
createMenuItem('#about-us', 'About Us'),
createMenuItem('#login', 'Sign out', customerClear),
createMenuItem('#profile', 'Profile'),
createMenuItem('#cart', 'Cart')
);
} else {
menuItems.push(
createMenuItem('#catalogue', 'Catalogue'),
createMenuItem('#about-us', 'About Us'),
createMenuItem('#login', 'Sign in'),
createMenuItem('#registration', 'Sign up')
createMenuItem('#registration', 'Sign up'),
createMenuItem('#cart', 'Cart')
);
}
menuItems.forEach((item) => this.menuListUl.appendChild(item));
Expand Down
4 changes: 2 additions & 2 deletions src/app/views/login/login-page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export default class LoginView extends View {
const inputAttrs: IInputAttributes = {
placeholder: 'example@mail.com',
id: 'email',
type: 'email',
type: 'text',
required: true,
};

Expand Down Expand Up @@ -117,7 +117,7 @@ export default class LoginView extends View {
content: 'Sign in',
onClick: () => {
if (this.emailField.isValid() && this.passwordField.isValid()) {
const email = this.emailField.getValue();
const email = this.emailField.getValue().trim();
Copy link
Owner

@Friday-13 Friday-13 May 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Как выяснилось, для поля type='email' обрезка лидирующих пробелов выполняется автоматически. Думаю, не стоит её повторять

const password = this.passwordField.getValue();
login({ email, password }, LoginView.sucessLogin, showErrorMessage);
}
Expand Down