Skip to content

Commit

Permalink
Merge branch 'main' into movie
Browse files Browse the repository at this point in the history
  • Loading branch information
MishaZhem authored Aug 15, 2024
2 parents e9bc788 + 09a684f commit 90d3afc
Show file tree
Hide file tree
Showing 33 changed files with 3,448 additions and 1,578 deletions.
7 changes: 5 additions & 2 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,11 @@
"forecastday",
"mintemp",
"maxtemp",
"Tiko",
"Deadpool",
"Create"
"Create",
"Unstake",
"Unstaking",
"Create",
"Tiko"
]
}
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].4
- uses: taiga-family/ci/actions/setup/[email protected].4
- uses: taiga-family/ci/actions/setup/[email protected].6
- uses: taiga-family/ci/actions/setup/[email protected].6
- 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].4
- uses: taiga-family/ci/actions/run/[email protected].6
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].4
- uses: taiga-family/ci/actions/setup/[email protected].4
- uses: taiga-family/ci/actions/auto/approve/[email protected].4
- uses: taiga-family/ci/actions/setup/[email protected].6
- uses: taiga-family/ci/actions/setup/[email protected].6
- uses: taiga-family/ci/actions/auto/approve/[email protected].6
with:
token1: ${{ secrets.GITHUB_TOKEN }}
token2: ${{ secrets.TAIGA_FAMILY_APPROVE_BOT_PAT }}
- uses: taiga-family/ci/actions/run/[email protected].4
- uses: taiga-family/ci/actions/run/[email protected].6
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].4
- uses: taiga-family/ci/actions/setup/[email protected].4
- uses: taiga-family/ci/actions/setup/[email protected].4
- uses: taiga-family/ci/actions/setup/[email protected].6
- uses: taiga-family/ci/actions/setup/[email protected].6
- uses: taiga-family/ci/actions/setup/[email protected].6
- 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].4
- uses: taiga-family/ci/actions/setup/[email protected].4
- uses: taiga-family/ci/actions/setup/[email protected].4
- uses: taiga-family/ci/actions/setup/[email protected].6
- uses: taiga-family/ci/actions/setup/[email protected].6
- uses: taiga-family/ci/actions/setup/[email protected].6
- 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].4
- uses: taiga-family/ci/actions/setup/[email protected].4
- uses: taiga-family/ci/actions/setup/[email protected].4
- uses: taiga-family/ci/actions/setup/[email protected].6
- uses: taiga-family/ci/actions/setup/[email protected].6
- uses: taiga-family/ci/actions/setup/[email protected].6
- 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].4
- uses: taiga-family/ci/actions/setup/[email protected].4
- uses: taiga-family/ci/actions/setup/[email protected].4
- uses: taiga-family/ci/actions/setup/[email protected].6
- uses: taiga-family/ci/actions/setup/[email protected].6
- uses: taiga-family/ci/actions/setup/[email protected].6
- run: npm run typecheck

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

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

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

eslint:
runs-on: ubuntu-latest
steps:
- uses: taiga-family/ci/actions/setup/[email protected].4
- uses: taiga-family/ci/actions/setup/[email protected].4
- uses: taiga-family/ci/actions/setup/[email protected].4
- uses: taiga-family/ci/actions/setup/[email protected].6
- uses: taiga-family/ci/actions/setup/[email protected].6
- uses: taiga-family/ci/actions/setup/[email protected].6
- 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].4
- uses: taiga-family/ci/actions/setup/[email protected].4
- uses: taiga-family/ci/actions/setup/[email protected].4
- uses: taiga-family/ci/actions/setup/[email protected].6
- uses: taiga-family/ci/actions/setup/[email protected].6
- uses: taiga-family/ci/actions/setup/[email protected].6
- name: Install Playwright
run: npx playwright install --with-deps
- name: Run Tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,6 @@ test('Have right names', async ({page}) => {
await expect(inputs.nth(2).locator('label')).toHaveText('Air humidity, % ');
});

test('Numbers can increase', async ({page}) => {
await page.goto('/dashboards/iot');
const inputs = page.locator('tui-input-number');
const button = inputs.nth(0).locator('button').first();

await expect(inputs.nth(0).locator('input')).toHaveValue('32');

button.click();

await expect(inputs.nth(0).locator('input')).toHaveValue('33');
});

test('Numbers can decrease', async ({page}) => {
await page.goto('/dashboards/iot');
const inputs = page.locator('tui-input-number');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {expect, test} from '@playwright/test';

test('Have 5 cards', async ({page}) => {
test('Have 4 cards', async ({page}) => {
await page.goto('/dashboards/iot');

const cards = page.locator('.button-card');

await expect(cards).toHaveCount(5);
await expect(cards).toHaveCount(4);
});
7 changes: 7 additions & 0 deletions apps/taiga-lumbermill/src/components/app/app.routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@ export const appRoutes: Route[] = [
},
],
},
{
path: 'theme',
loadComponent: async () =>
import('../../dashboards/theme-generator/theme-generator.component').then(
(mod) => mod.ThemeGeneratorComponent,
),
},
{
path: '',
loadComponent: async () =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
</button>
<span tuiNavigationLogo>
<tui-icon icon="@tui.home" />
<span tuiFade>A very very long product name</span>
<tui-badge>Test</tui-badge>
<span tuiFade>Taiga lumbermill</span>
</span>
<button
appearance="secondary"
Expand Down Expand Up @@ -48,69 +47,22 @@
[tuiNavigationAside]="expanded"
>
<header>
<button
<a
iconStart="@tui.home"
routerLink="/"
tuiAsideItem
>
<span tuiFade>A very very long product name</span>
</button>
<span tuiFade>Taiga lumbermill</span>
</a>
</header>
<button
iconStart="@tui.search"
tuiAsideItem
>
Search
</button>
<a
iconStart="@tui.users"
iconStart="@tui.palette"
routerLink="/theme"
tuiAsideItem
>
Groups
Theme Generator
</a>
<button
iconStart="@tui.settings"
tuiAsideItem
[tuiAppearanceState]="open ? 'hover' : null"
[tuiChevron]="expanded && submenu"
[tuiDropdown]="dropdown"
[tuiDropdownEnabled]="!expanded"
[(tuiDropdownOpen)]="open"
(click)="submenu = expanded && !submenu"
>
Settings
<ng-template #dropdown>
<tui-data-list size="s">
<button tuiOption>Account</button>
<button tuiOption>Notifications</button>
<button tuiOption>Privacy</button>
</tui-data-list>
</ng-template>
</button>
<tui-expand [expanded]="expanded && submenu">
<button tuiButton>Account</button>
<button tuiButton>Notifications</button>
<button tuiButton>Privacy</button>
</tui-expand>
<button
iconStart="@tui.heart"
tuiAsideItem
>
<span tuiFade>By default ellipsis is used but you can use fade too</span>
</button>
<hr />
<button
iconStart="@tui.plus"
tuiAsideItem
>
Add
</button>
<footer>
<button
iconStart="@tui.star"
tuiAsideItem
>
Favorites
</button>
<button
tuiAsideItem
[iconStart]="expanded ? '@tui.chevron-left' : '@tui.chevron-right'"
Expand Down
Loading

0 comments on commit 90d3afc

Please sign in to comment.