-
Notifications
You must be signed in to change notification settings - Fork 2
fix design #516
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
Merged
+28
−11
Merged
fix design #516
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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 hidden or 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 | ||||
|---|---|---|---|---|---|---|
|
|
@@ -42,7 +42,7 @@ <h4 class="my-0 font-semibold text-base text-on-surface">Add New Block</h4> | |||||
| @if (!isEditMode) { | ||||||
| <mat-stepper | ||||||
| #stepper | ||||||
| class="rounded-lg grow mat-stepper-starched shadow-sm" | ||||||
| class="rounded-lg grow stepper-starched shadow-sm" | ||||||
| labelPosition="bottom" | ||||||
| [animationDuration]="0" | ||||||
| [linear]="true" | ||||||
|
|
@@ -190,7 +190,7 @@ <h4 class="my-0 font-semibold text-base text-on-surface">Add New Block</h4> | |||||
| <ng-template matStepLabel>Billable Metrics / Items</ng-template> | ||||||
| <div class="flex flex-col justify-between gap-4 h-full"> | ||||||
| <ng-container *ngTemplateOutlet="billableMetrics"></ng-container> | ||||||
| <div class="flex items-end justify-end pt-4 border-t border-outline/20"> | ||||||
| <div class="flex items-end justify-end pt-4"> | ||||||
| <button type="button" matButton="filled" (click)="getPaymentDetailsFormData()" matStepperNext> | ||||||
| Next<mat-icon class="material-icons-outlined mat-icon-18 mat-icon-suffix" | ||||||
| >navigate_next</mat-icon | ||||||
|
|
@@ -203,7 +203,7 @@ <h4 class="my-0 font-semibold text-base text-on-surface">Add New Block</h4> | |||||
| <ng-template matStepLabel>Payment Details</ng-template> | ||||||
| <div class="flex flex-col justify-between gap-4 h-full"> | ||||||
| <ng-container *ngTemplateOutlet="paymentDetails"></ng-container> | ||||||
| <div class="flex items-end justify-end pt-4 border-t border-outline/20"> | ||||||
| <div class="flex items-end justify-end pt-4"> | ||||||
| <button type="button" matButton="filled" (click)="getCreatePlansFormData()" matStepperNext> | ||||||
| skip<mat-icon class="material-icons-outlined mat-icon-18 mat-icon-suffix" | ||||||
| >navigate_next</mat-icon | ||||||
|
|
@@ -217,7 +217,7 @@ <h4 class="my-0 font-semibold text-base text-on-surface">Add New Block</h4> | |||||
| <ng-template matStepLabel>Create Plan</ng-template> | ||||||
| <div class="flex flex-col h-full"> | ||||||
| <ng-container *ngTemplateOutlet="createPlan"></ng-container> | ||||||
| <div class="flex items-end justify-end pt-4 border-t border-outline/20"> | ||||||
| <div class="flex items-end justify-end pt-4"> | ||||||
| <button type="button" matButton="filled" (click)="createPlanAndGenerateSnippet()"> | ||||||
| Create Plan & Generate Snippet | ||||||
| </button> | ||||||
|
|
@@ -232,7 +232,7 @@ <h4 class="my-0 font-semibold text-base text-on-surface">Add New Block</h4> | |||||
| <ng-container *ngTemplateOutlet="plansOverview"></ng-container> | ||||||
| </form> | ||||||
| <ng-container *ngTemplateOutlet="designAndCode"></ng-container> | ||||||
| <div class="flex justify-between items-center mt-6 pt-4 border-t border-outline/20"> | ||||||
| <div class="flex justify-between items-center mt-6 pt-4"> | ||||||
| <ng-container *ngTemplateOutlet="preview"></ng-container> | ||||||
| @if (createUpdateObject$ | async; as createUpdateObject) { | ||||||
| <button | ||||||
|
|
@@ -253,7 +253,7 @@ <h4 class="my-0 font-semibold text-base text-on-surface">Add New Block</h4> | |||||
| <ng-template matStepLabel>Design & code</ng-template> | ||||||
| <div class="flex flex-col h-full"> | ||||||
| <ng-container *ngTemplateOutlet="designAndCode"></ng-container> | ||||||
| <div class="flex justify-between items-center mt-6 pt-4 border-t border-outline/20"> | ||||||
| <div class="flex justify-between items-center mt-6 pt-4"> | ||||||
| <ng-container *ngTemplateOutlet="preview"></ng-container> | ||||||
| @if (createUpdateObject$ | async; as createUpdateObject) { | ||||||
| <button | ||||||
|
|
@@ -576,7 +576,7 @@ <h3 class="template-card__title">Custom Mapping</h3> | |||||
| </ng-template> | ||||||
|
|
||||||
| <ng-template #configureMethodFormContent let-serviceForm="serviceForm"> | ||||||
| <div class="flex flex-col grow card-with-header" [class.border]="!serviceForm"> | ||||||
| <div class="flex flex-col grow" [class]="!serviceForm ? 'border card-with-header' : ''"> | ||||||
| @if ((selectedMethod | async)?.method_services; as methodServices) { @if (!serviceForm) { | ||||||
| <div class="card-with-header--header"> | ||||||
| <mat-icon class="!text-base !w-4 text-color">tune</mat-icon> | ||||||
|
|
@@ -586,7 +586,7 @@ <h3 class="template-card__title">Custom Mapping</h3> | |||||
| > | ||||||
| </div> | ||||||
| } @if (serviceForm ?? featureForm.get('serviceDetails')?.at(selectedServiceIndex); as formToUse) { | ||||||
| <div class="bg-color flex flex-col gap-3" [class.p-4]="!serviceForm"> | ||||||
| <div class="flex flex-col gap-3" [class]="!serviceForm ? 'p-4 bg-color' : ''"> | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Consider using Angular's more readable class binding syntax:
Suggested change
|
||||||
| <form [formGroup]="formToUse" class="flex flex-col gap-1"> | ||||||
| @if (methodServices?.[selectedServiceIndex]?.requirements; as requirements) { @if | ||||||
| ((formToUse.controls.requirements.controls | keyvalue)?.length) { | ||||||
|
|
@@ -669,7 +669,7 @@ <h2 mat-dialog-title class="m-0">{{ getSelectedServiceName() }}</h2> | |||||
|
|
||||||
| <ng-template #createBlockConfigureMethodTemplate> | ||||||
| @if (selectedMethod | async; as method) { | ||||||
| <div class="flex flex-col gap-3 my-6 grow text-color"> | ||||||
| <div class="flex flex-col gap-3 mb-6 grow text-color"> | ||||||
| @if (configureMethodsTableData.length === 0) { | ||||||
| <div | ||||||
| class="flex flex-col items-center justify-center py-10 gap-2 rounded-xl border border-dashed border-color bg-color" | ||||||
|
|
||||||
This file contains hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -38,6 +38,7 @@ body { | |
| overflow-y: auto; | ||
| @media (max-width: 768px) { | ||
| overflow-x: auto; | ||
| padding: 16px; | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -7,3 +7,6 @@ | |
| font-weight: normal; | ||
| } | ||
| } | ||
| :host { | ||
| flex-grow: 1; | ||
| } | ||
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.
Consider using Angular's more readable class binding syntax: