Merge pull request #69 from BinaryStudioAcademy/bug/11-main-page-afte…

…r-authentication bug/11 main page after authentication
BinaryStudioAcademy · Aug 31, 2023 · 9b98b8d · 9b98b8d
2 parents d6db3c1 + 7bb3938
commit 9b98b8d
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 119 deletions.
diff --git a/frontend/src/app/modules/challenges/editor-question/editor-question.component.ts b/frontend/src/app/modules/challenges/editor-question/editor-question.component.ts
@@ -24,7 +24,7 @@ export class EditorQuestionComponent implements OnInit {
 
     public markdownText: string;
 
-    public steps: string[] = ['Question', 'Solutions', 'Testcases'];
+    public steps: string[] = ['Question', 'Solutions', 'Test Cases'];
 
     public customInputHeight = '48px';
 

diff --git a/frontend/src/app/modules/login/sign-up-page/sign-up.component.ts b/frontend/src/app/modules/login/sign-up-page/sign-up.component.ts
@@ -56,7 +56,7 @@ export class SignUpComponent {
             )
             .subscribe(
                 () => {
-                    this.router.navigateByUrl('');
+                    this.router.navigate(['/main']);
                     this.toastrNotification.showSuccess('You have successfully registered.');
                 },
                 error => {

diff --git a/frontend/src/app/modules/main/main-page/main-page.component.html b/frontend/src/app/modules/main/main-page/main-page.component.html
@@ -2,6 +2,5 @@
     <div class="container">
         <app-suggested-challenge></app-suggested-challenge>
         <app-filtering-section></app-filtering-section>
-        <router-outlet></router-outlet>
     </div>
-</div>
+</div>
diff --git a/frontend/src/app/modules/main/main-routing.module.ts b/frontend/src/app/modules/main/main-routing.module.ts
@@ -1,20 +1,12 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { NotFoundComponent } from '@shared/components/not-found/not-found.component';
 
 import { MainComponent } from './main-page/main-page.component';
 
 const routes: Routes = [
     {
         path: '',
         component: MainComponent,
-        children: [
-            {
-                path: '**',
-                component: NotFoundComponent,
-                pathMatch: 'full',
-            },
-        ],
     },
 ];
 

diff --git a/frontend/src/app/modules/main/suggested-challenge/suggested-challenge.component.sass b/frontend/src/app/modules/main/suggested-challenge/suggested-challenge.component.sass
@@ -40,9 +40,12 @@ h5
     margin-top: 24px
 
 .dropdowns-container
+    margin-top: 20px
     display: flex
     flex-direction: column
     justify-content: flex-start
+    gap: 10px
+
 .dropdown
     width: 95%!important
 

diff --git a/...pp/shared/components/challenges-dropdown-select/challenges-dropdown-select.component.html b/...pp/shared/components/challenges-dropdown-select/challenges-dropdown-select.component.html
diff --git a/...pp/shared/components/challenges-dropdown-select/challenges-dropdown-select.component.sass b/...pp/shared/components/challenges-dropdown-select/challenges-dropdown-select.component.sass
diff --git a/.../app/shared/components/challenges-dropdown-select/challenges-dropdown-select.component.ts b/.../app/shared/components/challenges-dropdown-select/challenges-dropdown-select.component.ts
diff --git a/frontend/src/styles/global.sass b/frontend/src/styles/global.sass
@@ -30,7 +30,7 @@ ul, p
 input:-webkit-autofill,
 input:-webkit-autofill:active
     box-shadow: 0 0 0 30px $charcoal-grey inset
-    color: $white !important
+    -webkit-text-fill-color: $white
 input:-webkit-autofill::first-line
     color: $white !important
 input:-webkit-autofill:focus