-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
[OZON-68] Добавлена верстка страницы одного заказа #16
Open
JOJOSoderqvist
wants to merge
1
commit into
dev
Choose a base branch
from
OZON-68
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| <div class="center-container"> | ||
| <h1 class="fade-in-text">Ошибка {{name}}</h1> | ||
| <p class="fade-in-text">{{description}}</p> | ||
| <p class="fade-in-text" href="{{return}}" router="changed-active">Нажмите, сюда, чтобы вернуться на главную!</p> | ||
| <h1 class="error-fade-in-text">Ошибка {{name}}</h1> | ||
| <p class="error-fade-in-text">{{description}}</p> | ||
| <p class="error-fade-in-text" href="{{return}}" router="changed-active">Нажмите, сюда, чтобы вернуться на главную!</p> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| <div class="center-container"> | ||
| <h1 class="bounce-text">Скоро</h1> | ||
| <p class="bounce-text">Будет добавлено позже.</p> | ||
| <p class="bounce-text" href="{{return}}" router="changed-active">Нажмите, сюда, чтобы вернуться на главную!</p> | ||
| <h1 class="soon-bounce-text">Скоро</h1> | ||
| <p class="soon-bounce-text">Будет добавлено позже.</p> | ||
| <p class="soon-bounce-text" href="{{return}}" router="changed-active">Нажмите, сюда, чтобы вернуться на главную!</p> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
src/scripts/components/single-order/single-order-config.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| export const singleOrder = { | ||
| id: 'single-order-container', | ||
| orderNumber: '123456', | ||
| deliveryDate: '9 октября', | ||
| recipientName: 'ivan332', | ||
| recipientAddress: 'г. Москва 2-я Бауманская ул., 5', | ||
| totalItems: 2, | ||
| totalWeight: 10.3, | ||
| totalPrice: '12 345', | ||
| items: [ | ||
| { | ||
| name: 'Робот пылесос', | ||
| price: '2 345', | ||
| quantity: 1, | ||
| image: | ||
| 'https://sun9-27.userapi.com/impg/n4x2LZ7IpCfYgOAYedj3wkDaVS2CF1aATpCVDQ/0D8LB0AiXNs.jpg?size=1000x1000&quality=95&sign=9478ab570b9f6735a2536ec4cabf7777&type=album', | ||
| }, | ||
| { | ||
| name: 'Лонгслив Cave', | ||
| price: '10 000', | ||
| quantity: 1, | ||
| image: | ||
| 'https://sun9-7.userapi.com/impg/H_hFnufaf39UnwPmjsDBfVubEVr0KEVQvivSPQ/hOQU4EEcmEQ.jpg?size=750x1000&quality=95&sign=3316458ee12ef8b56ee560f7d07e2ece&type=album', | ||
| }, | ||
| ], | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| @import "/src/css/parametrs/parameters.css"; | ||
|
|
||
| .single-order-container { | ||
| max-width: var(--max-width-px-long); | ||
| margin: var(--big-margin) auto; | ||
| padding: var(--padding); | ||
| } | ||
|
|
||
| .single-order-title { | ||
| font-size: var(--big-font-size_another); | ||
| font-weight: var(--middle-font-weight); | ||
| margin-bottom: var(--big-margin-bottom); | ||
| } | ||
|
|
||
| .single-order-summary { | ||
| display: flex; | ||
| justify-content: space-between; | ||
| align-items: flex-start; | ||
| margin-bottom: var(--big-margin); | ||
| } | ||
|
|
||
| .single-order-info { | ||
| background-color: #ffffff; | ||
| border: var(--one-border) solid var(--card-border-color); | ||
| border-radius: var(--container-border-radius); | ||
| box-shadow: var(--card-box-shadow) var(--card-shadow-color); | ||
| padding: calc(var(--padding) + 2px); | ||
| width: 600px; | ||
| height: 150px; | ||
| } | ||
|
|
||
| .single-order-status { | ||
| display: flex; | ||
| justify-content: space-between; | ||
| align-items: center; | ||
| } | ||
|
|
||
| .single-order-paid-status { | ||
| font-size: var(--default-font-size); | ||
| } | ||
|
|
||
| .single-order-recipient { | ||
| padding-top: 48px; | ||
| } | ||
|
|
||
| .single-order-recipient-details { | ||
| display: flex; | ||
| flex-direction: row; | ||
| justify-content: space-between; | ||
| padding-top: 11px; | ||
| } | ||
|
|
||
| .single-order-total { | ||
| display: flex; | ||
| flex-direction: column; | ||
| background-color: var(--card-background-color); | ||
| border: var(--one-border) solid var(--card-border-color); | ||
| border-radius: var(--container-border-radius); | ||
| box-shadow: var(--card-box-shadow) var(--card-shadow-color); | ||
| padding: var(--padding); | ||
| width: 500px; | ||
| height: 100px; | ||
| } | ||
|
|
||
| .total-header { | ||
| display: flex; | ||
| justify-content: space-between; | ||
| font-size: calc(var(--small-font-size) + 3px); | ||
| border-bottom: var(--one-border) solid var(--card-border-color); | ||
| padding-bottom: calc(var(--one-padding) + 3px); | ||
| } | ||
|
|
||
| .total-footer { | ||
| display: flex; | ||
| justify-content: space-between; | ||
| padding-top: 22px; | ||
| } | ||
|
|
||
| .total-amount { | ||
| margin-top: auto; | ||
| margin-bottom: auto; | ||
| font-weight: var(--middle-font-weight); | ||
| } | ||
|
|
||
| .single-order-details { | ||
| width: 600px; | ||
| background-color: var(--card-background-color); | ||
| border: var(--one-border) solid var(--card-border-color); | ||
| border-radius: var(--container-border-radius); | ||
| box-shadow: var(--card-box-shadow) var(--card-shadow-color); | ||
| padding: var(--padding); | ||
| } | ||
|
|
||
| .single-order-item { | ||
| display: flex; | ||
| justify-content: flex-start; | ||
| align-items: center; | ||
| padding: calc(var(--padding) + 5px); | ||
| } | ||
|
|
||
| .single-order-item-image { | ||
| width: 75px; | ||
| height: 75px; | ||
| border-radius: 25%; | ||
| object-fit: fill; | ||
| margin-right: var(--big-margin); | ||
| box-shadow: var(--card-box-shadow) var(--card-shadow-color); | ||
| } | ||
|
|
||
| .single-order-item-info { | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: space-evenly; | ||
| height: 75px; | ||
| } | ||
|
|
||
| .item-name, | ||
| .item-quantity { | ||
| font-size: calc(var(--small-font-size) + 2px); | ||
| } | ||
|
|
||
| .item-price { | ||
| font-weight: var(--middle-font-weight); | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| <div id="{{id}}" class="single-order-container"> | ||
| <h2 class="single-order-title">Заказ № {{orderNumber}}</h2> | ||
|
|
||
| <div class="single-order-summary"> | ||
| <div class="single-order-info"> | ||
| <div class="single-order-status"> | ||
| <p>Вы получили {{deliveryDate}}</p> | ||
| <span class="single-order-paid-status">заказ оплачен</span> | ||
| </div> | ||
| <div class="single-order-recipient"> | ||
| <h4>Получатель</h4> | ||
| <div class="single-order-recipient-details"> | ||
| <p>{{recipientName}}</p> | ||
| <p>{{recipientAddress}}</p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="single-order-total"> | ||
| <div class="total-header"> | ||
| <span>Всего: {{totalItems}} товара</span> | ||
| <span>{{totalWeight}} кг</span> | ||
| </div> | ||
| <div class="total-footer"> | ||
| <h2 class="total-label">Итого</h2> | ||
| <span class="total-amount">{{totalPrice}}₽</span> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="single-order-details"> | ||
| <h3>Состав заказа</h3> | ||
| {{#each items as |item|}} | ||
| <div class="single-order-item"> | ||
| <img src="{{item.image}}" alt="{{item.name}}" class="single-order-item-image"/> | ||
| <div class="single-order-item-info"> | ||
| <span class="item-name">{{item.name}}</span> | ||
| <div class="item-price-and-quantity"> | ||
| <span class="item-price">{{item.price}}₽</span> | ||
| <span class="item-quantity">{{item.quantity}} шт</span> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| {{/each}} | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| import { templatize } from '../../constprograms/templatizer/templatizer.js'; | ||
|
|
||
| const singleOrderTemplateURL = 'src/scripts/components/single-order/single-order.hbs'; | ||
|
|
||
| /** | ||
| * Функция для рендеринга страницы одного заказа. | ||
| * | ||
| * @async | ||
| * @param {Object} data - Данные для рендеринга страницы заказа. | ||
| */ | ||
| export async function buildSingleOrderPage(data) { | ||
| return templatize(document.getElementById('main'), singleOrderTemplateURL, data); | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
перепиши на БЭМ