diff --git a/airwatch/.storybook/main.ts b/airwatch/.storybook/main.ts index bbf01f3..b59c8d2 100644 --- a/airwatch/.storybook/main.ts +++ b/airwatch/.storybook/main.ts @@ -2,7 +2,7 @@ import {StorybookConfig} from '@storybook/angular'; import * as path from 'path'; const config: StorybookConfig = { - stories: ['../src/**/*.stories.@(js|jsx|ts|tsx|mdx)'], + stories: ['../src/**/*.stories.@(js|jsx|ts|tsx|mdx)', './stories/**/*.stories.@(js|jsx|ts|tsx|mdx)'], addons: [ '@storybook/addon-links', '@storybook/addon-docs', diff --git a/airwatch/src/app/chatbot/feedback-button/feedback-button.scss b/airwatch/src/app/chatbot/feedback-button/feedback-button.scss index 5f9b8ba..db05b31 100644 --- a/airwatch/src/app/chatbot/feedback-button/feedback-button.scss +++ b/airwatch/src/app/chatbot/feedback-button/feedback-button.scss @@ -176,16 +176,4 @@ } } -// Spinner animation -.spinning { - animation: spin 1s linear infinite; -} -@keyframes spin { - from { - transform: rotate(0deg); - } - to { - transform: rotate(360deg); - } -} diff --git a/my-workspace/projects/sae-lib/buttons/main-button/main-button.ts b/my-workspace/projects/sae-lib/buttons/main-button/main-button.ts index 26e8c5d..a6af3f4 100644 --- a/my-workspace/projects/sae-lib/buttons/main-button/main-button.ts +++ b/my-workspace/projects/sae-lib/buttons/main-button/main-button.ts @@ -9,7 +9,7 @@ export type inconPositionKindType = '' | 'left' | 'right'; selector: 'sae-m-button', standalone: true, imports: [ - NgClass + NgClass, ], templateUrl: './main-button.html', styleUrl: './main-button.scss' diff --git a/my-workspace/projects/sae-lib/typo/index/index.css b/my-workspace/projects/sae-lib/typo/index/index.scss similarity index 100% rename from my-workspace/projects/sae-lib/typo/index/index.css rename to my-workspace/projects/sae-lib/typo/index/index.scss diff --git a/my-workspace/projects/sae-lib/typo/index/index.ts b/my-workspace/projects/sae-lib/typo/index/index.ts index d089708..f74fd10 100644 --- a/my-workspace/projects/sae-lib/typo/index/index.ts +++ b/my-workspace/projects/sae-lib/typo/index/index.ts @@ -4,7 +4,7 @@ import {Component} from '@angular/core'; selector: 'sae-typo', imports: [], templateUrl: './index.html', - styleUrl: './index.css' + styleUrl: './index.scss' }) export class Index { diff --git a/sae-csc/src/app/pages/main/main.html b/sae-csc/src/app/pages/main/main.html index 27ed7db..d33b15e 100644 --- a/sae-csc/src/app/pages/main/main.html +++ b/sae-csc/src/app/pages/main/main.html @@ -24,7 +24,8 @@ - +
@@ -32,7 +33,6 @@ Question analysis @if (appState?.botMessage) { - } diff --git a/sae-csc/src/app/pages/main/main.scss b/sae-csc/src/app/pages/main/main.scss index eb66f10..68f77bc 100644 --- a/sae-csc/src/app/pages/main/main.scss +++ b/sae-csc/src/app/pages/main/main.scss @@ -1,8 +1,6 @@ :host { - //width: 1312px; - //display: block; - + font-family: Barlow; margin: 0 auto; #question_analysis { @@ -36,6 +34,9 @@ padding-bottom: 16px; + width: 1600px; + margin: 0 auto; + span { &:nth-of-type(1) { width: 560px; diff --git a/sae-csc/src/app/pages/main/main.ts b/sae-csc/src/app/pages/main/main.ts index 94ff041..c561f4a 100644 --- a/sae-csc/src/app/pages/main/main.ts +++ b/sae-csc/src/app/pages/main/main.ts @@ -39,4 +39,9 @@ export class Main { onAvailableChoicesChange(e: any) { console.log('onSelectedChoicesChange', e); } + + displayWarningToCheckFilters() { + // update app, displayBotT + this.store.dispatch() + } } diff --git a/sae-csc/src/app/shared/translate-texts/translate-texts.html b/sae-csc/src/app/shared/translate-texts/translate-texts.html index 224d834..10cdd7c 100644 --- a/sae-csc/src/app/shared/translate-texts/translate-texts.html +++ b/sae-csc/src/app/shared/translate-texts/translate-texts.html @@ -3,7 +3,7 @@
- @if (!fileIsUploaded && !textFocused) { + @if (!fileIsUploaded) { - - + @if (!fileIsUploaded) { + + }
@if (loadingResume) { -
- loading... +
+
+
+ +
+
} @if (toText.length > 0) { } - + @if (!loadingResume) { + + }
diff --git a/sae-csc/src/app/shared/translate-texts/translate-texts.scss b/sae-csc/src/app/shared/translate-texts/translate-texts.scss index 86ad8f5..ef927c4 100644 --- a/sae-csc/src/app/shared/translate-texts/translate-texts.scss +++ b/sae-csc/src/app/shared/translate-texts/translate-texts.scss @@ -139,4 +139,36 @@ display: none; } + .loading-container { + display: flex; + justify-content: center; + align-items: center; + height: calc(235px - 16px); + } + + .loading { + width: 3rem; + height: 3rem; + + color: variables.$csc-magic-color; + + i { + font-size: 3rem; + } + } + + // Spinner animation + .spinning { + animation: spin 1s linear infinite; + } + + @keyframes spin { + from { + transform: rotate(0deg); + } + to { + transform: rotate(360deg); + } + } + } diff --git a/sae-csc/src/app/shared/translate-texts/translate-texts.ts b/sae-csc/src/app/shared/translate-texts/translate-texts.ts index 856e4fb..9f79cbe 100644 --- a/sae-csc/src/app/shared/translate-texts/translate-texts.ts +++ b/sae-csc/src/app/shared/translate-texts/translate-texts.ts @@ -18,10 +18,11 @@ export class TranslateTexts { public debounceEnabled: boolean = true; public textFocused: boolean = false; + public fileIsUploaded: boolean = false; public filePath: string = ''; public fileWeight: string = ''; - + // testing display of file selector // public fileIsUploaded: boolean = true; // public filePath: string = 'abcd.csv'; @@ -91,6 +92,7 @@ export class TranslateTexts { console.log('demo mode') this.toText = "Résumé de démo à titre d'exemple" this.loadingResume = false; + }, this.debounceDuration);