From e6f4751db19aaf5da0d4d128fe57ede2dc959b36 Mon Sep 17 00:00:00 2001
From: Limbo2332 <vorobiovalosha@gmail.com>
Date: Thu, 31 Aug 2023 20:35:59 +0300
Subject: [PATCH 1/4] fixed link after signin/signup and autofill input text
 color

---
 .../src/app/modules/login/log-in-page/log-in-page.component.ts  | 2 +-
 .../src/app/modules/login/sign-up-page/sign-up.component.ts     | 2 +-
 frontend/src/styles/global.sass                                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/modules/login/log-in-page/log-in-page.component.ts b/frontend/src/app/modules/login/log-in-page/log-in-page.component.ts
index 00b4cc8f2..68107d626 100644
--- a/frontend/src/app/modules/login/log-in-page/log-in-page.component.ts
+++ b/frontend/src/app/modules/login/log-in-page/log-in-page.component.ts
@@ -31,7 +31,7 @@ export class LogInPageComponent implements OnInit {
 
     signIn() {
         this.authService.login(this.logInForm.value.email!, this.logInForm.value.password!).subscribe(() => {
-            this.router.navigateByUrl('');
+            this.router.navigate(['/main']);
         });
     }
 }
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
index 48ec551fa..6a0b24381 100644
--- 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
@@ -26,7 +26,7 @@ export class SignUpComponent {
                 this.registrationForm.value.password!,
             )
             .subscribe(() => {
-                this.router.navigateByUrl('');
+                this.router.navigate(['/main']);
             });
     }
 }
diff --git a/frontend/src/styles/global.sass b/frontend/src/styles/global.sass
index 7a39a5899..0a1862276 100644
--- a/frontend/src/styles/global.sass
+++ b/frontend/src/styles/global.sass
@@ -27,7 +27,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

From 643843faf54b9340ac6645a472c6c22f3175085b Mon Sep 17 00:00:00 2001
From: Limbo2332 <vorobiovalosha@gmail.com>
Date: Thu, 31 Aug 2023 20:43:38 +0300
Subject: [PATCH 2/4] fixed main-page and suggested challenge ui

---
 .../src/app/modules/main/main-page/main-page.component.html   | 4 ++--
 .../suggested-challenge/suggested-challenge.component.sass    | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

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
index 5102f7ea8..ae492d4c6 100644
--- 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,6 @@
     <div class="container">
         <app-suggested-challenge></app-suggested-challenge>
         <app-filtering-section></app-filtering-section>
-        <router-outlet></router-outlet>
+        <!-- <router-outlet></router-outlet> -->
     </div>
-</div>
\ No newline at end of file
+</div>
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
index d351d070c..5f43b0b31 100644
--- 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
 

From a5cbb03a18bc4fe867f3baf9d827cadebbe25cc7 Mon Sep 17 00:00:00 2001
From: Limbo2332 <vorobiovalosha@gmail.com>
Date: Thu, 31 Aug 2023 21:19:04 +0300
Subject: [PATCH 3/4] remove unnecessary comments

---
 .../app/modules/main/main-page/main-page.component.html   | 1 -
 frontend/src/app/modules/main/main-routing.module.ts      | 8 --------
 2 files changed, 9 deletions(-)

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
index ae492d4c6..9bd347b37 100644
--- 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>
diff --git a/frontend/src/app/modules/main/main-routing.module.ts b/frontend/src/app/modules/main/main-routing.module.ts
index 02c0cdf71..a932bbcfa 100644
--- a/frontend/src/app/modules/main/main-routing.module.ts
+++ b/frontend/src/app/modules/main/main-routing.module.ts
@@ -1,6 +1,5 @@
 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';
 
@@ -8,13 +7,6 @@ const routes: Routes = [
     {
         path: '',
         component: MainComponent,
-        children: [
-            {
-                path: '**',
-                component: NotFoundComponent,
-                pathMatch: 'full',
-            },
-        ],
     },
 ];
 

From 7bb3938ea38ede0b092c4f7a99f78d90f344781e Mon Sep 17 00:00:00 2001
From: Limbo2332 <vorobiovalosha@gmail.com>
Date: Thu, 31 Aug 2023 23:33:11 +0300
Subject: [PATCH 4/4] small changes to components and modules

---
 .../editor-question.component.ts              |  2 +-
 .../challenges-dropdown-select.component.html | 24 --------
 .../challenges-dropdown-select.component.sass | 58 -------------------
 .../challenges-dropdown-select.component.ts   | 24 --------
 4 files changed, 1 insertion(+), 107 deletions(-)
 delete mode 100644 frontend/src/app/shared/components/challenges-dropdown-select/challenges-dropdown-select.component.html
 delete mode 100644 frontend/src/app/shared/components/challenges-dropdown-select/challenges-dropdown-select.component.sass
 delete mode 100644 frontend/src/app/shared/components/challenges-dropdown-select/challenges-dropdown-select.component.ts

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
index 5cfd102f0..7b14e04f7 100644
--- 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/shared/components/challenges-dropdown-select/challenges-dropdown-select.component.html b/frontend/src/app/shared/components/challenges-dropdown-select/challenges-dropdown-select.component.html
deleted file mode 100644
index eb68007fc..000000000
--- a/frontend/src/app/shared/components/challenges-dropdown-select/challenges-dropdown-select.component.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<div ngbDropdown class="dropdown d-inline-flex" [autoClose]="true">
-    <div class="button-wrapper d-flex flex-column d-flex flex-grow-1">
-        <button class="btn d-flex" id="dropdownMenuButton" ngbDropdownToggle>
-            <div class="float-start d-flex">
-                <fa-icon *ngIf="selectedItem.iconName" [icon]="['fab', selectedItem.iconName]"></fa-icon>
-                <p>{{ selectedItem.content }}</p>
-            </div>
-            <span class="circle-icon">
-                <fa-icon [icon]="['fas', 'chevron-down']" size="2xs"></fa-icon>
-            </span>
-        </button>
-    </div>
-
-    <div class="w-100 dropdown-menu" ngbDropdownMenu aria-labelledby="dropdownMenuButton">
-        <ng-container>
-            <a ngbDropdownItem (click)="selectItem(item)" *ngFor="let item of items"
-                class="d-inline-flex dropdown-menu-link">
-                <fa-icon [icon]="'check'" size="xs"
-                    [ngStyle]="{ visibility: selectedItem === item ? 'visible' : 'hidden' }"></fa-icon>
-                <span class="link-text">{{ item.content }}</span>
-            </a>
-        </ng-container>
-    </div>
-</div>
\ No newline at end of file
diff --git a/frontend/src/app/shared/components/challenges-dropdown-select/challenges-dropdown-select.component.sass b/frontend/src/app/shared/components/challenges-dropdown-select/challenges-dropdown-select.component.sass
deleted file mode 100644
index 2ef23e838..000000000
--- a/frontend/src/app/shared/components/challenges-dropdown-select/challenges-dropdown-select.component.sass
+++ /dev/null
@@ -1,58 +0,0 @@
-@import 'color-variables'
-
-button
-    all: revert
-
-.dropdown
-    width: 100%
-    font-family: 'Lato', sans-serif
-    min-width: 160px
-
-    &-toggle::after
-        display: none !important
-
-    &-menu
-        background-color: $deep-dark-grey
-        border: 1px solid $transparent-white
-        overflow: auto
-        border-radius: 0
-
-    &-item
-        color: $grey
-
-        &:hover
-            background-color: $slightly-transparent-light-grey
-
-        &:focus
-            background-color: transparent
-
-.dropdown-item 
-    padding: 4px 11px
-    
-.circle-icon
-    display: inline-flex
-    align-items: center
-    justify-content: center
-    width: 12px
-    height: 12px
-    border-radius: 50%
-    background-color: #EFEFEF
-    
-    fa-icon
-        color: $black
-
-.btn
-    font-family: inherit
-    align-items: center
-    height: 43px
-    justify-content: space-between
-    padding: 11px 16px 11px 11px
-    color: $white-grey
-    background-color: $ultra-transparent-black
-    border: 1px solid $transparent-white
-
-.float-start
-    gap: 5px
-
-.dropdown-menu-link
-    gap: 7px
\ No newline at end of file
diff --git a/frontend/src/app/shared/components/challenges-dropdown-select/challenges-dropdown-select.component.ts b/frontend/src/app/shared/components/challenges-dropdown-select/challenges-dropdown-select.component.ts
deleted file mode 100644
index 06316dba7..000000000
--- a/frontend/src/app/shared/components/challenges-dropdown-select/challenges-dropdown-select.component.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { DropdownItem } from '@shared/models/dropdown-item';
-
-@Component({
-    selector: 'app-challenges-dropdown-select',
-    templateUrl: './challenges-dropdown-select.component.html',
-    styleUrls: ['./challenges-dropdown-select.component.sass'],
-})
-export class ChallengesDropdownSelectComponent implements OnInit {
-    @Input() items: DropdownItem[] = [];
-
-    @Output() SelectedItemsChanged: EventEmitter<DropdownItem> = new EventEmitter<DropdownItem>();
-
-    selectedItem: DropdownItem;
-
-    ngOnInit(): void {
-        [this.selectedItem] = this.items;
-    }
-
-    selectItem(item: DropdownItem) {
-        this.selectedItem = item;
-        this.SelectedItemsChanged.emit(this.selectedItem);
-    }
-}