From 2f20a9c29b8c598ea4d976407c1a210ea43b125b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=A8=D0=B8=D0=BC?=
 =?UTF-8?q?=D0=BA=D1=96=D0=B2?= <322topgamerintheworld228@gmail.com>
Date: Wed, 30 Aug 2023 16:13:25 +0300
Subject: [PATCH 1/5] Added what QA resqusted in card
 52-suggested-challenge-component-filters

---
 .../dropdown-select/dropdown-select.component.html         | 2 +-
 .../dropdown-select/dropdown-select.component.ts           | 2 ++
 .../suggested-challenge/suggested-challenge.component.html | 4 ++--
 .../suggested-challenge/suggested-challenge.component.sass | 7 ++++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/frontend/src/app/shared/components/dropdown-select/dropdown-select.component.html b/frontend/src/app/shared/components/dropdown-select/dropdown-select.component.html
index eb6172248..1c21754db 100644
--- a/frontend/src/app/shared/components/dropdown-select/dropdown-select.component.html
+++ b/frontend/src/app/shared/components/dropdown-select/dropdown-select.component.html
@@ -2,7 +2,7 @@
     <div class="button-wrapper d-flex flex-column d-flex flex-grow-1">
         <label class="title">{{ title }}</label>
         <button class="btn d-flex" id="dropdownMenuButton" ngbDropdownToggle>
-            <span class="float-start">{{ selectedItem ? selectedItem : 'Select' }}</span>
+            <span class="float-start">{{ selectedItem ? selectedItem : selectText }}</span>
             <fa-icon [icon]="'chevron-down'" size="xs"></fa-icon>
         </button>
     </div>
diff --git a/frontend/src/app/shared/components/dropdown-select/dropdown-select.component.ts b/frontend/src/app/shared/components/dropdown-select/dropdown-select.component.ts
index 5dcc45e57..742b82046 100644
--- a/frontend/src/app/shared/components/dropdown-select/dropdown-select.component.ts
+++ b/frontend/src/app/shared/components/dropdown-select/dropdown-select.component.ts
@@ -12,6 +12,8 @@ export class DropdownSelectComponent {
 
     @Input() items: string[] = [];
 
+    @Input() selectText: string = 'Select';
+
     @Output() SelectedItemsChanged: EventEmitter<string[] | string> = new EventEmitter<string[] | string>();
 
     selectedItem: string | undefined;
diff --git a/frontend/src/app/shared/components/suggested-challenge/suggested-challenge.component.html b/frontend/src/app/shared/components/suggested-challenge/suggested-challenge.component.html
index 0c76135eb..71fc3e5bc 100644
--- a/frontend/src/app/shared/components/suggested-challenge/suggested-challenge.component.html
+++ b/frontend/src/app/shared/components/suggested-challenge/suggested-challenge.component.html
@@ -2,8 +2,8 @@
     <div class="filters">
         <h5>Suggested Challenge</h5>
         <div class="dropdowns-container">
-            <app-dropdown-select [items]="languages" ></app-dropdown-select>
-            <app-dropdown-select [items]="score"></app-dropdown-select>
+            <app-dropdown-select [selectText]="'Choose Language...'" [items]="languages" ></app-dropdown-select>
+            <app-dropdown-select [selectText]="'Choose Today\'s Focus...'" [items]="score"></app-dropdown-select>
         </div>
         <div class="button-group">
             <button class="suggested-button skip">
diff --git a/frontend/src/app/shared/components/suggested-challenge/suggested-challenge.component.sass b/frontend/src/app/shared/components/suggested-challenge/suggested-challenge.component.sass
index aeb6223d3..87df84705 100644
--- a/frontend/src/app/shared/components/suggested-challenge/suggested-challenge.component.sass
+++ b/frontend/src/app/shared/components/suggested-challenge/suggested-challenge.component.sass
@@ -51,7 +51,7 @@ h5
     justify-content: center
 
 .suggested-button
-    width: 105px
+    width: 28%
     height: 45px
     color: $white
     text-align: center
@@ -147,7 +147,7 @@ h5
 
 .constraints li::marker
     color: $green
-    font-size: 18px
+    font-size: 1em
 
 .constraints-item
     color: $white
@@ -196,5 +196,6 @@ h5
     padding-bottom: 4px 
 
 .constraints::-webkit-scrollbar,
-.tags::-webkit-scrollbar
+.tags::-webkit-scrollbar,
+.description-text::-webkit-scrollbar
     width: 0

From 5daca343c6857cefa81aa567129f3f93a8c3602c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=A8=D0=B8=D0=BC?=
 =?UTF-8?q?=D0=BA=D1=96=D0=B2?= <322topgamerintheworld228@gmail.com>
Date: Wed, 30 Aug 2023 16:21:21 +0300
Subject: [PATCH 2/5] eslint correction

---
 .../challenges-dropdown-select.component.ts                   | 4 ++--
 frontend/src/app/shared/shared.module.ts                      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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
index 6507ed767..06316dba7 100644
--- 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
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DropdownItem } from '@shared/models/dropdown-item';
 
 @Component({
@@ -14,7 +14,7 @@ export class ChallengesDropdownSelectComponent implements OnInit {
     selectedItem: DropdownItem;
 
     ngOnInit(): void {
-        this.selectedItem = this.items[0];
+        [this.selectedItem] = this.items;
     }
 
     selectItem(item: DropdownItem) {
diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index 106cf59be..556a5a43d 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -12,6 +12,7 @@ import { ProgressbarModule } from 'ngx-bootstrap/progressbar';
 import { MonacoEditorModule } from 'ngx-monaco-editor-v2';
 
 import { ChallengeComponent } from './components/challenge/challenge.component';
+import { ChallengesDropdownSelectComponent } from './components/challenges-dropdown-select/challenges-dropdown-select.component';
 import { CodeEditorComponent } from './components/code-editor/code-editor.component';
 import { ConfirmationModalComponent } from './components/confirmation-modal/confirmation-modal.component';
 import { CustomInputComponent } from './components/custom-input/custom-input.component';
@@ -25,7 +26,6 @@ import { PieChartComponent } from './components/pie-chart/pie-chart.component';
 import { ProgressBarComponent } from './components/progress-bar/progress-bar.component';
 import { StepsOfProgressComponent } from './components/steps-of-progress/steps-of-progress.component';
 import { SuggestedChallengeComponent } from './components/suggested-challenge/suggested-challenge.component';
-import { ChallengesDropdownSelectComponent } from './components/challenges-dropdown-select/challenges-dropdown-select.component';
 
 @NgModule({
     imports: [

From 79a77290ffc78f85416506574afce825737b97e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=A8=D0=B8=D0=BC?=
 =?UTF-8?q?=D0=BA=D1=96=D0=B2?= <322topgamerintheworld228@gmail.com>
Date: Wed, 30 Aug 2023 17:07:42 +0300
Subject: [PATCH 3/5] merge fix

---
 frontend/src/app/shared/shared.module.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index cb98677a5..c8b65b43b 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -60,6 +60,7 @@ import { SuggestedChallengeComponent } from './components/suggested-challenge/su
         ProgressBarComponent,
         HeaderComponent,
         StepsOfProgressComponent,
+        ChallengesDropdownSelectComponent,
         EditorQuestionComponent,
     ],
     exports: [

From 84dbaaabfc0f43ae952972074bad493f4733c8fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=A8=D0=B8=D0=BC?=
 =?UTF-8?q?=D0=BA=D1=96=D0=B2?= <322topgamerintheworld228@gmail.com>
Date: Wed, 30 Aug 2023 20:41:50 +0300
Subject: [PATCH 4/5] delete comment

---
 .../challenges-dropdown-select.component.sass                  | 3 ---
 1 file changed, 3 deletions(-)

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
index 0572f808a..2ef23e838 100644
--- 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
@@ -28,9 +28,6 @@ button
 
 .dropdown-item 
     padding: 4px 11px
-
-// .link-text
-//     margin-left: 5px
     
 .circle-icon
     display: inline-flex

From cc2a6b7a9efc5af66efe9ef4bd8060a80e3556b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=A8=D0=B8=D0=BC?=
 =?UTF-8?q?=D0=BA=D1=96=D0=B2?= <322topgamerintheworld228@gmail.com>
Date: Thu, 31 Aug 2023 20:09:50 +0300
Subject: [PATCH 5/5] Add more merge conflict fixes

---
 frontend/src/app/shared/shared.module.ts | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index 9755a2fea..fc420f7a7 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -14,11 +14,6 @@ import { TabsetConfig, TabsModule } from 'ngx-bootstrap/tabs';
 import { MarkdownModule } from 'ngx-markdown';
 import { MonacoEditorModule } from 'ngx-monaco-editor-v2';
 
-<<<<<<< HEAD
-import { ChallengeComponent } from './components/challenge/challenge.component';
-import { ChallengesDropdownSelectComponent } from './components/challenges-dropdown-select/challenges-dropdown-select.component';
-=======
->>>>>>> dev
 import { CodeEditorComponent } from './components/code-editor/code-editor.component';
 import { ConfirmationModalComponent } from './components/confirmation-modal/confirmation-modal.component';
 import { CustomInputComponent } from './components/custom-input/custom-input.component';
@@ -70,11 +65,6 @@ import { ProgressBarComponent } from './components/progress-bar/progress-bar.com
         ConfirmationModalComponent,
         GeneralModalComponent,
         DropdownSelectComponent,
-<<<<<<< HEAD
-        ChallengesDropdownSelectComponent,
-        SuggestedChallengeComponent,
-=======
->>>>>>> dev
         CustomInputComponent,
         PieChartComponent,
         ProgressBarComponent,