diff --git a/src/app/app.constants.ts b/src/app/app.constants.ts index 797898e..e247b5b 100644 --- a/src/app/app.constants.ts +++ b/src/app/app.constants.ts @@ -22,16 +22,25 @@ export const PageListWithBonus: Page[] = [ resName: 'auth', onSideBar: false, }, + { + code: PageCode.BonusProgram, + name: 'Ваша карта лояльности', + description: 'Lorem Ipsum - это текст-"рыба", часто используемый в печати и вэб-дизайне.', + resName: 'bonus-program', + onSideBar: true, + }, { code: PageCode.Orders, - name: 'Заказы', + name: 'Ваши чеки', + description: 'Lorem Ipsum - это текст-"рыба", часто используемый в печати и вэб-дизайне.', resName: 'orders', onSideBar: true, }, { - code: PageCode.BonusProgram, - name: 'Бонусная карта', - resName: 'bonus-program', + code: PageCode.RefSystem, + name: 'Пригласить друга', + description: 'Lorem Ipsum - это текст-"рыба", часто используемый в печати и вэб-дизайне.', + resName: 'ref-system', onSideBar: true, }, ]; diff --git a/src/app/components/footer-buttons/footer-buttons.component.scss b/src/app/components/footer-buttons/footer-buttons.component.scss index 09c90c8..54569c2 100644 --- a/src/app/components/footer-buttons/footer-buttons.component.scss +++ b/src/app/components/footer-buttons/footer-buttons.component.scss @@ -10,7 +10,7 @@ &__button { width: 100%; height: 34px; - background: #197664; + background: #09467f; color: #fff; border-radius: 5px; font-weight: 600; diff --git a/src/app/components/navbar/navbar.component.html b/src/app/components/navbar/navbar.component.html index 43cf6ae..a790c72 100644 --- a/src/app/components/navbar/navbar.component.html +++ b/src/app/components/navbar/navbar.component.html @@ -1,5 +1,5 @@
- @@ -18,6 +18,6 @@ -

Card Project

- +

Card Project

--> + Логотип
diff --git a/src/app/components/navbar/navbar.component.scss b/src/app/components/navbar/navbar.component.scss index ae5900c..d7f8be2 100644 --- a/src/app/components/navbar/navbar.component.scss +++ b/src/app/components/navbar/navbar.component.scss @@ -1,18 +1,14 @@ .container { - display: flex; box-sizing: border-box; - padding: 12px 16px; + padding: 7px 0 0 5px; width: 100%; - flex-direction: row; - align-items: center; - white-space: nowrap; - height: 64px; - background: #008376; + height: 39px; + background: #09467F; color: #fff; } .title { font-weight: 400; - font-size: 20px; + font-size: 18px; margin-left: 12px; } \ No newline at end of file diff --git a/src/app/interface/data.ts b/src/app/interface/data.ts index a06a673..6694035 100644 --- a/src/app/interface/data.ts +++ b/src/app/interface/data.ts @@ -3,13 +3,15 @@ export enum PageCode { Auth, Orders, - BonusProgram + BonusProgram, + RefSystem } export interface Page { code: PageCode; component?: any; name: string; + description?: string; getMethod?: string; resName?: string; onSideBar: boolean diff --git a/src/app/pages/account/account.component.html b/src/app/pages/account/account.component.html index 70f45f0..070faeb 100644 --- a/src/app/pages/account/account.component.html +++ b/src/app/pages/account/account.component.html @@ -1,34 +1,57 @@
- -
- - - - - - - - - -
+
+
+ + + + + + + + +
- \ No newline at end of file + +
diff --git a/src/app/pages/account/account.component.scss b/src/app/pages/account/account.component.scss index f035246..2b086af 100644 --- a/src/app/pages/account/account.component.scss +++ b/src/app/pages/account/account.component.scss @@ -1,36 +1,74 @@ :host { - .woocommerce { - min-height: calc(100vh - 64px); - padding: 24px 12px; - nav { - margin-bottom: 24px; + .woocommerce { + min-height: calc(100vh - 39px); + padding: 20px 18px; + nav { + margin-bottom: 24px; + display: flex; + justify-content: center; + ul { + max-width: 400px; + width: 100%; + border-radius: 6px; + display: flex; + justify-content: space-between; + flex-direction: column; + li { + padding: 12px; + width: 100%; + text-align: center; + cursor: pointer; + height: 81px; + margin-bottom: 10px; + background: #ffffff; + box-shadow: 0px 0px 5px rgb(0 0 0 / 15%); + color: #000; + border-radius: 15px; + &.is-active { + // background-color: #009688; + display: none; + } + &.first { + // border-radius: 7px 0 0 7px; + } + .container { display: flex; - justify-content: center; - ul { - max-width: 400px; - width: 100%; - background: #161616; - border-radius: 6px; - display: flex; - justify-content: space-between; - li { - padding: 12px; - width: 100%; - white-space: nowrap; - text-align: center; - cursor: pointer; - &.is-active { - background-color: #009688; - } - &.first { - border-radius: 7px 0 0 7px; - } - a { - text-decoration: none; - color: #fff; - } - } + align-items: center; + height: 100%; + .menu-item-info { + margin-left: 16px; + & > a { + font-style: normal; + font-weight: 700; + font-size: 18px; + line-height: 22px; + text-decoration: none; + color: #000; + display: block; + text-align-last: left; + } + & > p { + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 15px; + text-align: left; + } } + } } + li:nth-child(odd) { + background-color: #EBEBEB; + } + } } -} \ No newline at end of file + .top-left-attribute { + width: 10px; + height: 5px; + background: #09467f; + left: 0; + position: absolute; + top: 69px; + } + } +} diff --git a/src/app/pages/account/account.component.ts b/src/app/pages/account/account.component.ts index 9251fb8..c0e058f 100644 --- a/src/app/pages/account/account.component.ts +++ b/src/app/pages/account/account.component.ts @@ -32,12 +32,12 @@ export class AccountComponent implements OnInit { readonly pageList = environment.hasBonusProgram ? PageListWithBonus : PageList; ngOnInit(): void { - this.currentPage = this.getToken() ? this.pageList[2] : this.pageList[0]; + this.currentPage = this.getToken() ? this.pageList[1] : this.pageList[0]; document.body.classList.add('woocommerce-account', 'woocommerce-page', 'woocommerce-orders'); } phoneConfirmed(): void{ - this.currentPage = this.pageList[2]; + this.currentPage = this.pageList[1]; } changePage(event: MouseEvent, page: Page): void{ diff --git a/src/app/pages/account/auth/auth.component.html b/src/app/pages/account/auth/auth.component.html index e662b84..dfd977b 100644 --- a/src/app/pages/account/auth/auth.component.html +++ b/src/app/pages/account/auth/auth.component.html @@ -1,16 +1,14 @@
-

Вход

+

Вход

- + @@ -40,24 +38,23 @@ >

+
+

Вход

-

+