diff --git a/sae-csc/src/app/app.scss b/sae-csc/src/app/app.scss index 6b97bd1..060f9a8 100644 --- a/sae-csc/src/app/app.scss +++ b/sae-csc/src/app/app.scss @@ -3,3 +3,7 @@ app-top-navigation { width: 100%; z-index: 200; } + +a { + cursor: pointer; +} diff --git a/sae-csc/src/app/pages/login/login.html b/sae-csc/src/app/pages/login/login.html index 6e7766e..b6d1f79 100644 --- a/sae-csc/src/app/pages/login/login.html +++ b/sae-csc/src/app/pages/login/login.html @@ -14,9 +14,24 @@ Your AI assistant - for the best solution + for finding the most relevant solutions to your CSC cases +

+ + + + + + Login to start + + + | + + + +

+

First time to use CSC Solution Matcher ? @@ -25,20 +40,9 @@

-

- - - Login to start - - - | - - - -

-
+
diff --git a/sae-csc/src/app/pages/login/login.scss b/sae-csc/src/app/pages/login/login.scss index 0d0514a..63ca0e0 100644 --- a/sae-csc/src/app/pages/login/login.scss +++ b/sae-csc/src/app/pages/login/login.scss @@ -10,6 +10,12 @@ padding: 121px 127px; + .Aligner { + width: 80vw; + margin: 0 auto; + min-height: 1000px; + } + .sub-title { color: #FFF; font-family: Barlow; @@ -18,6 +24,7 @@ font-weight: 600; line-height: normal; margin-bottom: 40px; + width: 440px; } @@ -69,6 +76,14 @@ font-weight: 600; line-height: 24px; /* 150% */ } + + .request_access { + margin-top: 32px; + } + + .technical-contact { + margin-top: 225px; + } } .Aligner { @@ -88,7 +103,7 @@ .bg-login { background: url(/safran_bg.jpg) center no-repeat; background-size: cover; - width: 600px; + width: 591px; height: 100%; border-radius: 8px; } diff --git a/sae-csc/src/app/pages/login/login.ts b/sae-csc/src/app/pages/login/login.ts index 8eed97a..db993b5 100644 --- a/sae-csc/src/app/pages/login/login.ts +++ b/sae-csc/src/app/pages/login/login.ts @@ -1,5 +1,5 @@ import {Component} from '@angular/core'; -import {RouterLink} from '@angular/router'; +import {Router, RouterLink} from '@angular/router'; @Component({ selector: 'app-login', @@ -11,4 +11,10 @@ import {RouterLink} from '@angular/router'; }) export class Login { + constructor(private router: Router) { + } + + login() { + this.router.navigate(['/main']); + } } diff --git a/sae-csc/src/app/pages/main/main.html b/sae-csc/src/app/pages/main/main.html index 56104e5..90e48c5 100644 --- a/sae-csc/src/app/pages/main/main.html +++ b/sae-csc/src/app/pages/main/main.html @@ -24,7 +24,7 @@
-
diff --git a/sae-csc/src/app/pages/main/main.scss b/sae-csc/src/app/pages/main/main.scss index 68f77bc..13f1c58 100644 --- a/sae-csc/src/app/pages/main/main.scss +++ b/sae-csc/src/app/pages/main/main.scss @@ -4,6 +4,13 @@ margin: 0 auto; #question_analysis { + .title { + font-family: Barlow; + font-size: 16px; + + line-height: 140%; + } + sae-bot-talks { top: -50px; position: relative; @@ -34,12 +41,12 @@ padding-bottom: 16px; - width: 1600px; + //width: 1600px; margin: 0 auto; span { &:nth-of-type(1) { - width: 560px; + width: 624px; display: inline-block; text-align: right; } diff --git a/sae-csc/src/app/redux/filters.ts b/sae-csc/src/app/redux/filters.ts index e69de29..adb79d8 100644 --- a/sae-csc/src/app/redux/filters.ts +++ b/sae-csc/src/app/redux/filters.ts @@ -0,0 +1,3 @@ +export const filtersCSC = { + engineType: [] +} diff --git a/sae-csc/src/app/redux/initialState.ts b/sae-csc/src/app/redux/initialState.ts index 0239d83..494565e 100644 --- a/sae-csc/src/app/redux/initialState.ts +++ b/sae-csc/src/app/redux/initialState.ts @@ -51,15 +51,24 @@ export const initialState: StateInterface = { },] }, ata: { - availableList: [], + availableList: [{ + label: 'DEF', + value: 'DEF', + }], selectedList: [] }, partNumber: { - availableList: [], + availableList: [{ + label: 'DEF', + value: 'DEF', + }], selectedList: [] }, technicalManual: { - availableList: [], + availableList: [{ + label: 'DEF', + value: 'DEF', + }], selectedList: [{ label: 'DEF', value: 'DEF', diff --git a/sae-csc/src/app/shared/navigation/bottom-navigation/bottom-navigation.html b/sae-csc/src/app/shared/navigation/bottom-navigation/bottom-navigation.html index fb9e44b..c2f42e2 100644 --- a/sae-csc/src/app/shared/navigation/bottom-navigation/bottom-navigation.html +++ b/sae-csc/src/app/shared/navigation/bottom-navigation/bottom-navigation.html @@ -3,9 +3,12 @@ privacy policy - + contact + + mentions légales +
diff --git a/sae-csc/src/app/shared/navigation/bottom-navigation/bottom-navigation.scss b/sae-csc/src/app/shared/navigation/bottom-navigation/bottom-navigation.scss index a8c9cbf..34e73b8 100644 --- a/sae-csc/src/app/shared/navigation/bottom-navigation/bottom-navigation.scss +++ b/sae-csc/src/app/shared/navigation/bottom-navigation/bottom-navigation.scss @@ -3,6 +3,10 @@ top: 1000px; padding: 0 60px 16px; + a { + text-decoration: none; + } + .nav-item { display: inline-flex; padding: 12px 16px; 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 1fe786e..bda2171 100644 --- a/sae-csc/src/app/shared/translate-texts/translate-texts.scss +++ b/sae-csc/src/app/shared/translate-texts/translate-texts.scss @@ -18,6 +18,7 @@ height: 235px; width: 648px; overflow-y: auto; + border-radius: 8px; } .delete-button { diff --git a/sae-csc/src/styles/_variables-barrel.scss b/sae-csc/src/styles/_variables-barrel.scss index 83f117d..7868790 100644 --- a/sae-csc/src/styles/_variables-barrel.scss +++ b/sae-csc/src/styles/_variables-barrel.scss @@ -3,5 +3,7 @@ .all-pages { padding: 70px 64px; - width: 100%; + width: 1440px; + margin: 0 auto; + background: #F5F5F5; } diff --git a/sae-csc/src/styles/app/styles/pages/_main.scss b/sae-csc/src/styles/app/styles/pages/_main.scss index bfc7864..b44095e 100644 --- a/sae-csc/src/styles/app/styles/pages/_main.scss +++ b/sae-csc/src/styles/app/styles/pages/_main.scss @@ -1,5 +1,11 @@ @use '../../../../styles/variables-barrel' as variables; +body { + + font-family: Barlow; + background: #F5F5F5; +} + #main_page { main { @extend .all-pages; @@ -24,6 +30,11 @@ margin-left: 12px; } + + i { + font-size: 16px; + + } }