Skip to content
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

chore(demo): use tbank logo #7633

Merged
merged 2 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"**/addon-commerce/utils/get-currency-symbol.ts"
],
"ignoreWords": [
"Acpekt",
"avatarurl",
"benji",
"meowtec",
Expand Down
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@

END OF TERMS AND CONDITIONS

Copyright 2020 Tinkoff Bank
Copyright 2024 Acpekt

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -187,4 +187,4 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

[![CodeFactor](https://www.codefactor.io/repository/github/taiga-family/taiga-ui/badge)](https://www.codefactor.io/repository/github/taiga-family/taiga-ui)
[![npm version](https://img.shields.io/npm/v/@taiga-ui/cdk.svg)](https://npmjs.com/package/@taiga-ui/cdk)
[![codecov](https://codecov.io/gh/tinkoff/taiga-ui/branch/main/graphs/badge.svg)](https://app.codecov.io/gh/Tinkoff/taiga-ui/tree/main/projects)
[![codecov](https://codecov.io/gh/taiga-family/taiga-ui/branch/main/graphs/badge.svg)](https://app.codecov.io/gh/taiga-family/taiga-ui/tree/main/projects)
[![All packages CI](https://github.com/taiga-family/taiga-ui/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/taiga-family/taiga-ui/actions/workflows/build.yml)
[![Deploy](https://github.com/taiga-family/taiga-ui/actions/workflows/deploy-gh-pages.yml/badge.svg?branch=main)](https://github.com/taiga-family/taiga-ui/actions/workflows/deploy-gh-pages.yml)
[![Downloads per month](https://img.shields.io/npm/dm/@taiga-ui/cdk?color=dark-green)](https://www.npmjs.com/package/@taiga-ui/cdk)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@taiga-ui/components",
"version": "3.82.0",
"description": "Taiga UI by Tinkoff is a set of components, services, directives and other tools to build high quality UI using modern Angular framework",
"description": "Taiga UI by TBank is a set of components, services, directives and other tools to build high quality UI using modern Angular framework",
"keywords": [
"angular",
"kit",
Expand Down
16 changes: 6 additions & 10 deletions projects/cdk/schematics/ng-update/v3-78/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ import {getFileSystem} from '../utils/get-file-system';
import {replaceText} from '../utils/replace-text';
import {ICONS} from './constants/icons';

function hasProprietaryIcons(tree: Tree): boolean {
return !!getPackageJsonDependency(tree, '@taiga-ui/proprietary-icons');
function hasProprietaryCore(tree: Tree): boolean {
return !!getPackageJsonDependency(tree, '@taiga-ui/proprietary-core');
}

export function updateToV3_78(options: TuiSchema): Rule {
return (tree: Tree, _: SchematicContext) => {
if (!hasProprietaryIcons(tree)) {
if (!hasProprietaryCore(tree)) {
!options['skip-logs'] &&
titleLog(`${FINISH_SYMBOL} No migrations required\n`);

Expand All @@ -28,13 +28,9 @@ export function updateToV3_78(options: TuiSchema): Rule {

const fileSystem = getFileSystem(tree);

if (options.experimental) {
!options['skip-logs'] &&
infoLog(
`${SMALL_TAB_SYMBOL}${REPLACE_SYMBOL} replacing deprecated logos...`,
);
replaceText(ICONS);
}
!options['skip-logs'] &&
infoLog(`${SMALL_TAB_SYMBOL}${REPLACE_SYMBOL} replacing deprecated logos...`);
replaceText(ICONS);

fileSystem.commitEdits();
saveActiveProject();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,7 @@ describe('ng-update', () => {
const tree = await runner
.runSchematicAsync(
'updateToV3_78',
{
experimental: true,
'skip-logs': process.env['TUI_CI'] === 'true',
} as Partial<TuiSchema>,
{'skip-logs': process.env['TUI_CI'] === 'true'} as Partial<TuiSchema>,
host,
)
.toPromise();
Expand All @@ -83,6 +80,6 @@ function createMainFiles(): void {
createAngularJson();
createSourceFile(
'package.json',
'{"dependencies": {"@angular/core": "~13.0.0", "@taiga-ui/proprietary-icons": "~3.78.0"}}',
'{"dependencies": {"@angular/core": "~13.0.0", "@taiga-ui/proprietary-core": "~3.78.0"}}',
);
}
35 changes: 35 additions & 0 deletions projects/demo/src/assets/images/by.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 7 additions & 3 deletions projects/demo/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
name="keywords"
/>
<meta
content="Tinkoff"
content="T-Bank"
name="author"
/>
<meta
content="Tinkoff"
content="T-Bank"
name="copyright"
/>
<meta
Expand Down Expand Up @@ -65,7 +65,7 @@
name="twitter:card"
/>
<meta
content="@ItsTinkoff"
content="@ItsTBank"
name="twitter:site"
/>
<meta
Expand Down Expand Up @@ -151,6 +151,10 @@
href="https://taiga-family.github.io/preview-landing-components/"
rel="prefetch"
/>
<link
href="assets/images/by.svg"
rel="prefetch"
/>
<link
href="assets/images/taiga.svg"
rel="prefetch"
Expand Down
6 changes: 6 additions & 0 deletions projects/demo/src/modules/app/landing/landing.template.html
Original file line number Diff line number Diff line change
Expand Up @@ -189,4 +189,10 @@ <h2 class="opensource">It’s open source</h2>
[class.scroll_hidden]="current === 2"
(click)="onClick()"
></button>
<img
alt="by T-Bank"
loading="lazy"
src="assets/images/by.svg"
class="by"
/>
</footer>
6 changes: 6 additions & 0 deletions projects/demo/src/modules/app/logo/logo.template.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,9 @@
Taiga UI
</span>
</a>

<img
alt="by T-Bank"
src="assets/images/by.svg"
class="t-by"
/>
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
Other libraries
<ng-template tuiAccordionItemContent>
<a
*ngFor="let link of tinkoff"
*ngFor="let link of links"
href="https://github.com/taiga-family/{{ link }}"
rel="noreferrer"
target="_blank"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,7 @@ export class TuiSidebarExample1 {

readonly webApis = ['Common', 'Audio', 'Canvas', 'Geolocation', 'MIDI', 'Workers'];

readonly tinkoff = [
'Taiga-UI',
'ng-event-plugins',
'ng-polymorpheus',
'ng-dompurify',
];
readonly links = ['Taiga-UI', 'ng-event-plugins', 'ng-polymorpheus', 'ng-dompurify'];

toggle(open: boolean): void {
this.open = open;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ <h3 class="title">Angular contenteditable accessor</h3>
>
<img
alt="ng-polymorpheus logo"
src="https://raw.githubusercontent.com/Tinkoff/ng-polymorpheus/master/projects/demo/assets/logo.svg"
src="https://raw.githubusercontent.com/taiga-family/ng-polymorpheus/master/projects/demo/assets/logo.svg"
class="img"
/>
<h3 class="title title_size_s">&#64;tinkoff/ng-polymorpheus</h3>
Expand Down Expand Up @@ -179,7 +179,7 @@ <h3 class="title title_size_s">Web APIs for Angular</h3>
>
<img
alt="maskito logo"
src="https://raw.githubusercontent.com/Tinkoff/maskito/main/projects/demo/src/assets/icons/maskito.svg"
src="https://raw.githubusercontent.com/taiga-family/maskito/main/projects/demo/src/assets/icons/maskito.svg"
class="img img-min"
/>
<h3 class="title title_size_s">Maskito</h3>
Expand Down
6 changes: 3 additions & 3 deletions projects/experimental/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
[![Discord](https://img.shields.io/discord/748677963142135818?color=7289DA&label=%23taiga-ui&logo=discord&logoColor=white)](https://discord.gg/Us8d8JVaTg)

[Website](https://taiga-ui.dev) • [Documentation](https://taiga-ui.dev/getting-started) •
[Core team](https://github.com/tinkoff/taiga-ui/#core-team)
[Core team](https://github.com/taiga-family/taiga-ui/#core-team)

> A library with new version of components following updated design specs

It's a part of [**Taiga UI**](https://github.com/tinkoff/taiga-ui) that is fully-treeshakable Angular UI Kit consisting
of multiple base libraries and several add-ons
It's a part of [**Taiga UI**](https://github.com/taiga-family/taiga-ui) that is fully-treeshakable Angular UI Kit
consisting of multiple base libraries and several add-ons

## How to install

Expand Down