Skip to content

Commit

Permalink
Merge branch 'main' into theme-url
Browse files Browse the repository at this point in the history
  • Loading branch information
MishaZhem authored Aug 21, 2024
2 parents 6268d9f + 1d828a4 commit 78623ce
Show file tree
Hide file tree
Showing 24 changed files with 847 additions and 354 deletions.
7 changes: 4 additions & 3 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@
"forecastday",
"mintemp",
"maxtemp",
"Unstake",
"Unstaking",
"Tiko",
"Create",
"Tiko"
"NFTTABLE",
"Unstake",
"Unstaking"
]
}
14 changes: 7 additions & 7 deletions .github/workflows/auto-approve.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
outputs:
matrix: ${{ steps.matrix.outputs.value }}
steps:
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].1
- uses: taiga-family/ci/actions/setup/[email protected].1
- id: matrix
if: env.IS_TAIGA_FAMILY_BOT_PR_AUTHOR == 'true'
run: echo "value=$PR_JOBS_NAME" >> $GITHUB_OUTPUT
Expand All @@ -24,7 +24,7 @@ jobs:
matrix:
value: ${{ fromJSON(needs.setup.outputs.matrix) }}
steps:
- uses: taiga-family/ci/actions/run/[email protected].0
- uses: taiga-family/ci/actions/run/[email protected].1
with:
token: ${{ secrets.GITHUB_TOKEN }}
job: ${{ matrix.value }}
Expand All @@ -33,13 +33,13 @@ jobs:
needs: [wait]
runs-on: ubuntu-latest
steps:
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/auto/approve/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].1
- uses: taiga-family/ci/actions/setup/[email protected].1
- uses: taiga-family/ci/actions/auto/approve/[email protected].1
with:
token1: ${{ secrets.GITHUB_TOKEN }}
token2: ${{ secrets.TAIGA_FAMILY_APPROVE_BOT_PAT }}
- uses: taiga-family/ci/actions/run/[email protected].0
- uses: taiga-family/ci/actions/run/[email protected].1
if: env.IS_RELEASE_BRANCH == 'false'
with:
token: ${{ secrets.TAIGA_FAMILY_BOT_PAT }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ jobs:
name: Build app
runs-on: ubuntu-latest
steps:
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].1
- uses: taiga-family/ci/actions/setup/[email protected].1
- uses: taiga-family/ci/actions/setup/[email protected].1
- run: npx nx build

concurrency:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ jobs:
name: Firebase
runs-on: ubuntu-latest
steps:
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].1
- uses: taiga-family/ci/actions/setup/[email protected].1
- uses: taiga-family/ci/actions/setup/[email protected].1
- run: npx nx build --base-href='/'
- name: Debug output
run: tree dist/apps/taiga-lumbermill/browser -P '*.html'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].1
- uses: taiga-family/ci/actions/setup/[email protected].1
- uses: taiga-family/ci/actions/setup/[email protected].1
- run: npx nx build-gh-pages taiga-lumbermill
- uses: JamesIves/[email protected]
with:
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,41 +5,41 @@ jobs:
typecheck:
runs-on: ubuntu-latest
steps:
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].1
- uses: taiga-family/ci/actions/setup/[email protected].1
- uses: taiga-family/ci/actions/setup/[email protected].1
- run: npm run typecheck

cspell:
runs-on: ubuntu-latest
steps:
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].1
- uses: taiga-family/ci/actions/setup/[email protected].1
- uses: taiga-family/ci/actions/setup/[email protected].1
- run: npm run cspell -- --no-progress

prettier:
runs-on: ubuntu-latest
steps:
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].1
- uses: taiga-family/ci/actions/setup/[email protected].1
- uses: taiga-family/ci/actions/setup/[email protected].1
- run: npm run prettier -- --check

stylelint:
runs-on: ubuntu-latest
steps:
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].1
- uses: taiga-family/ci/actions/setup/[email protected].1
- uses: taiga-family/ci/actions/setup/[email protected].1
- run: npm run stylelint

eslint:
runs-on: ubuntu-latest
steps:
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].1
- uses: taiga-family/ci/actions/setup/[email protected].1
- uses: taiga-family/ci/actions/setup/[email protected].1
- run: npm run lint

result:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
name: Run tests
runs-on: ubuntu-latest
steps:
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].0
- uses: taiga-family/ci/actions/setup/[email protected].1
- uses: taiga-family/ci/actions/setup/[email protected].1
- uses: taiga-family/ci/actions/setup/[email protected].1
- name: Install Playwright
run: npx playwright install --with-deps
- name: Run Tests
Expand Down
Binary file added apps/taiga-lumbermill/public/nft/1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/taiga-lumbermill/public/nft/2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/taiga-lumbermill/public/nft/3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/taiga-lumbermill/public/nft/4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
@let nftData = nft();
@if (nftData) {
<div class="info">
<tui-avatar
class="logo-nft nft-icon"
[src]="nftData.src"
/>
<div
tuiHeader
class="text"
[style.text-align]="'center'"
>
<h2 class="tui-space_top-0 tui-space_bottom-2">{{ nftData.name }}</h2>
<p
tuiSubtitle
class="tui-space_top-0 tui-space_bottom-0"
>
{{ nftData.price | tuiAmount: 'USD' | async }}
</p>
<div class="badges">
@for (tag of nftData.tags; track $index) {
<tui-badge
appearance="primary"
[style.background]="tag | tuiAutoColor"
>
{{ tag }}
</tui-badge>
}
</div>
</div>
<button
appearance="icon"
iconStart="@tui.circle-x"
size="s"
tuiIconButton
(click)="goBack()"
></button>
</div>
<tui-scrollbar>
<cdk-virtual-scroll-viewport
#viewport
tuiScrollable
class="viewport tui-zero-scrollbar"
[itemSize]="46"
[maxBufferPx]="500"
[minBufferPx]="200"
>
<table
tuiTable
[columns]="columns"
>
<thead>
<tr tuiThGroup>
@for (column of columns; track $index) {
@if (column === 'from' || column === 'to') {
<th
*tuiHead="column"
tuiTh
[sorter]="null"
[sticky]="true"
[style.top.px]="-(viewport.getOffsetToRenderedContentStart() || 0)"
>
{{ column }}
</th>
} @else {
<th
*tuiHead="column"
tuiTh
[sticky]="true"
[style.top.px]="-(viewport.getOffsetToRenderedContentStart() || 0)"
>
{{ column === 'priceUsd' ? 'price, $' : column }}
</th>
}
}
</tr>
</thead>
<tbody tuiTbody>
<tr
*cdkVirtualFor="let item of nftData.transactions | tuiTableSort"
tuiTr
>
@for (column of columns; track $index) {
<td
*tuiCell="column"
tuiTd
>
{{ column === 'time' ? (item[column] | date: 'dd.MM.yyyy') : item[column] }}
</td>
}
</tr>
</tbody>
</table>
</cdk-virtual-scroll-viewport>
</tui-scrollbar>
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
.nft-icon {
border-radius: 1rem;
width: 10rem;
height: 10rem;
}

.info {
position: relative;
display: flex;
padding: 1rem 0;
justify-content: space-between;
}

.text {
display: flex;
width: 100%;
flex-direction: column;
align-items: center;
justify-content: center;
}

table {
width: 100%;

tr {
height: 2.875rem;
}

td {
&:first-child {
width: 10rem;
font-weight: bold;
}

&:last-child {
width: 3rem;
}
}
}

.viewport {
height: 15.625rem;
}

.badges {
display: flex;
gap: 0.5rem;
margin-top: 0.4rem;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import {
CdkFixedSizeVirtualScroll,
CdkVirtualForOf,
CdkVirtualScrollViewport,
} from '@angular/cdk/scrolling';
import {CommonModule, DatePipe} from '@angular/common';
import {
ChangeDetectionStrategy,
Component,
EventEmitter,
input,
Output,
} from '@angular/core';
import {TuiAmountPipe} from '@taiga-ui/addon-commerce';
import {TuiTable} from '@taiga-ui/addon-table';
import {
TuiAppearance,
TuiAutoColorPipe,
TuiButton,
TuiScrollbar,
TuiTitle,
} from '@taiga-ui/core';
import {TuiAvatar, TuiBadge} from '@taiga-ui/kit';
import {TuiHeader} from '@taiga-ui/layout';

import type {NFT} from '../nft.service';

@Component({
standalone: true,
selector: 'lmb-nft-item',
imports: [
CdkFixedSizeVirtualScroll,
CdkVirtualForOf,
CdkVirtualScrollViewport,
CommonModule,
DatePipe,
TuiAmountPipe,
TuiAppearance,
TuiAutoColorPipe,
TuiAvatar,
TuiBadge,
TuiButton,
TuiHeader,
TuiScrollbar,
TuiTable,
TuiTitle,
],
templateUrl: './nft-item.component.html',
styleUrl: './nft-item.component.less',
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class NftItemComponent {
protected readonly columns = ['type', 'priceUsd', 'from', 'to', 'time'];

@Output()
public readonly nftChange = new EventEmitter<NFT | null>();

public nft = input.required<NFT | null>();

protected goBack(): void {
this.nftChange.emit(null);
}
}
Loading

0 comments on commit 78623ce

Please sign in to comment.