-
Notifications
You must be signed in to change notification settings - Fork 563
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7082 from ever-co/develop
Release
- Loading branch information
Showing
39 changed files
with
833 additions
and
202 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,18 @@ | ||
| import { NgModule } from '@angular/core'; | ||
| import { CommonModule } from '@angular/common'; | ||
| import { NbIconModule, NbSelectModule } from '@nebular/theme'; | ||
| import { TranslateModule } from '../translate/translate.module'; | ||
| import { PaginationComponent } from './pagination.component'; | ||
| import { NbIconModule, NbSelectModule } from '@nebular/theme'; | ||
|
|
||
| @NgModule({ | ||
| declarations: [PaginationComponent], | ||
| imports: [ | ||
| CommonModule, | ||
| TranslateModule, | ||
| NbIconModule, | ||
| NbSelectModule | ||
| NbIconModule, | ||
| NbSelectModule | ||
| ], | ||
| declarations: [PaginationComponent], | ||
| exports: [PaginationComponent] | ||
|
|
||
| }) | ||
| export class PaginationModule {} | ||
| export class PaginationModule { } |
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
25 changes: 25 additions & 0 deletions
25
...ed/table-components/github/issue-title-description/issue-title-description.component.html
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,25 @@ | ||
| <div class="issue-details"> | ||
| <div class="issue-header"> | ||
| <div class="issue-labels"> | ||
| <ng-template [ngIf]="rowData?.labels"> | ||
| <ga-only-tags | ||
| [value]="rowData?.labels" | ||
| [rowData]="rowData" | ||
| ></ga-only-tags> | ||
| </ng-template> | ||
| </div> | ||
| <div class="issue-title"> | ||
| <a href="javascript:void(0)" (click)="openIssue()"> | ||
| <nb-icon icon="eye-outline" pack="eva" [nbTooltip]="rowData?.title"></nb-icon> | ||
| {{ rowData?.title }} | ||
| </a> | ||
| </div> | ||
| </div> | ||
| <div class="issue-body"> | ||
| <div class="issue-description"> | ||
| <ngx-security-trust-html | ||
| [value]="rowData?.body" | ||
| ></ngx-security-trust-html> | ||
| </div> | ||
| </div> | ||
| </div> |
33 changes: 33 additions & 0 deletions
33
...ed/table-components/github/issue-title-description/issue-title-description.component.scss
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,33 @@ | ||
| :host { | ||
| .issue-details { | ||
| letter-spacing: 0em; | ||
| text-align: left; | ||
| .issue-header { | ||
| .issue-labels { | ||
| font-size: 14px; | ||
| display: block; | ||
| margin-top: 15px; | ||
| } | ||
| .issue-title { | ||
| font-size: 16px; | ||
| font-weight: 600; | ||
| text-decoration: none; | ||
| padding-top: 10px; | ||
| a { | ||
| color: var(--text-basic-color); | ||
| &:hover { | ||
| text-decoration: none; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| .issue-body { | ||
| margin-top: 20px; | ||
| .issue-description { | ||
| font-size: 14px; | ||
| margin-top: 10px; | ||
| line-height: 17px | ||
| } | ||
| } | ||
| } | ||
| } |
34 changes: 34 additions & 0 deletions
34
...ared/table-components/github/issue-title-description/issue-title-description.component.ts
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,34 @@ | ||
| import { Component, Input } from '@angular/core'; | ||
| import { TranslateService } from '@ngx-translate/core'; | ||
| import { ViewCell } from 'ng2-smart-table'; | ||
| import { TranslationBaseComponent } from './../../../../@shared/language-base'; | ||
|
|
||
| @Component({ | ||
| selector: 'issue-title-description', | ||
| templateUrl: './issue-title-description.component.html', | ||
| styleUrls: ['./issue-title-description.component.scss'] | ||
| }) | ||
| export class GithubIssueTitleDescriptionComponent extends TranslationBaseComponent implements ViewCell { | ||
|
|
||
| @Input() rowData: any; | ||
| @Input() value: string | number; | ||
|
|
||
| constructor( | ||
| public readonly translateService: TranslateService | ||
| ) { | ||
| super(translateService); | ||
| } | ||
|
|
||
| /** | ||
| * | ||
| * @returns | ||
| */ | ||
| public openIssue() { | ||
| if (!this.rowData) { | ||
| return; | ||
| } | ||
| if (this.rowData?.html_url) { | ||
| window.open(this.rowData.html_url, '_blank'); | ||
| } | ||
| } | ||
| } |
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
4 changes: 1 addition & 3 deletions
4
apps/gauzy/src/app/@shared/table-components/trust-html/trust-html.component.html
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,3 +1 @@ | ||
| <div class="container"> | ||
| <p [innerHTML]="value | nl2br"></p> | ||
| </div> | ||
| <p [innerHTML]="value | nl2br"></p> |
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
Oops, something went wrong.