From dfcb5e97d7fb7cbd808cac3bc5f728c20f074be7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Stawujak?= <przsta1@st.amu.edu.pl>
Date: Thu, 13 Dec 2018 20:57:45 +0100
Subject: [PATCH] SKE-51 SKE-52 changes in competitions list

---
 .../categories-list.component.css             |  6 +++-
 .../competitions-list.component.css           | 28 +++++++++++++++----
 .../competitions-list.component.html          | 10 +++++--
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/SystemKonkursow/4.2.1/angular/src/app/categories-list/categories-list.component.css b/SystemKonkursow/4.2.1/angular/src/app/categories-list/categories-list.component.css
index e7c6e4e..e03d053 100644
--- a/SystemKonkursow/4.2.1/angular/src/app/categories-list/categories-list.component.css
+++ b/SystemKonkursow/4.2.1/angular/src/app/categories-list/categories-list.component.css
@@ -14,9 +14,13 @@
     line-height: 90px;
     font-size: 25px;
     border-radius: 25px;
-    border: 1px solid gray;
+    border: 1px solid white;
     color: darkolivegreen;
     text-shadow: 2px 2px 6px ghostwhite;
     font-weight: bold;
     cursor: pointer;
 }
+
+.flex-item:hover {
+    box-shadow: 0px 0px 10px #2196F3;
+}
diff --git a/SystemKonkursow/4.2.1/angular/src/app/competitions-list/competitions-list.component.css b/SystemKonkursow/4.2.1/angular/src/app/competitions-list/competitions-list.component.css
index d909db2..23a941c 100644
--- a/SystemKonkursow/4.2.1/angular/src/app/competitions-list/competitions-list.component.css
+++ b/SystemKonkursow/4.2.1/angular/src/app/competitions-list/competitions-list.component.css
@@ -7,16 +7,32 @@
 }
 
 .flex-item {
-    background-color: darkgrey;
-    width: 300px;
+    background-color: #DED4F4;
+    width: 450px;
     margin: 10px;
     text-align: center;
-    line-height: 90px;
     font-size: 20px;
-    border-radius: 25px;
+    border-radius: 5px;
     border: 1px solid gray;
+    border-left: 10px #739CB9 solid;
     color: darkblue;
-    text-shadow: 2px 2px 6px ghostwhite;
+    text-shadow: 2px 2px 6px #ab93ab;
     font-weight: bold;
     cursor: pointer;
-}
\ No newline at end of file
+}
+
+.flex-item:hover {
+    box-shadow: 0px 0px 10px #2196F3;
+}
+
+.organizer {
+    font-size: 14px;
+    color: #f44336;
+    font-weight: bold;
+    margin-bottom: 6px;
+}
+
+.bottom-flex {
+    color: white;
+    background-color: #2196F3;
+}
diff --git a/SystemKonkursow/4.2.1/angular/src/app/competitions-list/competitions-list.component.html b/SystemKonkursow/4.2.1/angular/src/app/competitions-list/competitions-list.component.html
index 96f8f5b..1a76b02 100644
--- a/SystemKonkursow/4.2.1/angular/src/app/competitions-list/competitions-list.component.html
+++ b/SystemKonkursow/4.2.1/angular/src/app/competitions-list/competitions-list.component.html
@@ -1,5 +1,11 @@
 <div class="flex-container" id="competitions-list-area">
-    <div class="flex-item" (click)="goToDetail(competition)" *ngFor="let competition of (competitionsList | filterClasses : [2, 6])">
-        {{ competition.name }}
+    <div class="flex-item" (click)="goToDetail(competition)" *ngFor="let competition of (competitionsList | filterClasses : [1, 8])">
+        <p><u>{{ competition.name }}</u></p>
+        <div class="organizer">Organizowany przez: {{ competition.creatorName }}</div>
+    
+        <div class="bottom-flex">
+            <p>Czas trwania: {{ competition.startDate | date:"dd/MM/yyyy" }} - {{ competition.endDate | date:"dd/MM/yyyy" }}</p>
+            <p>Przedział klasowy: {{ competition.minClass }}-{{ competition.maxClass }}</p>
+        </div>
     </div>
 </div>
\ No newline at end of file