From b93d25fb5b6e6354c08481c4ff01a9b59935b000 Mon Sep 17 00:00:00 2001 From: s416122 Date: Fri, 13 Dec 2019 18:27:50 +0100 Subject: [PATCH 1/6] =?UTF-8?q?Zmiana=20wygl=C4=85du=20przycisk=C3=B3w=20-?= =?UTF-8?q?>=20fiszki?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flashcards-add-csv.component.css | 11 +++-- .../flashcards-add-csv.component.html | 8 ++-- .../flashcards-add-table.component.css | 16 +++++-- .../flashcards-add-table.component.html | 14 +++--- .../flashcards-add.component.css | 11 ++++- .../flashcards-add.component.html | 8 ++-- .../flashcards-edit-table.component.css | 13 ++++-- .../flashcards-edit-table.component.html | 12 ++--- .../flashcards-filling-in-test.component.css | 15 +++++-- .../flashcards-filling-in-test.component.html | 12 ++--- .../flashcards-memory-test.component.css | 15 +++++-- .../flashcards-memory-test.component.html | 10 ++--- .../flashcards-pairs-test-set.component.css | 22 ++++++--- .../flashcards-pairs-test-set.component.html | 4 +- .../flashcards-pairs-test.component.css | 15 +++++-- .../flashcards-pairs-test.component.html | 8 ++-- .../flashcards-set-detail.component.css | 9 +++- .../flashcards-set-detail.component.html | 16 +++---- .../flashcards-sets-list.component.css | 45 ++++++++++++++++++- .../flashcards-sets-list.component.html | 18 ++++---- .../flashcards-test-type-menu.component.css | 10 ++++- .../flashcards-test-type-menu.component.html | 12 ++--- .../flashcards-typerace-test.component.css | 15 +++++-- .../flashcards-typerace-test.component.html | 12 ++--- .../flashcards/flashcards.component.css | 9 ++-- .../flashcards/flashcards.component.html | 4 +- FrontEnd/src/styles.css | 1 + 27 files changed, 235 insertions(+), 110 deletions(-) diff --git a/FrontEnd/src/app/flashcards/flashcards-add-csv/flashcards-add-csv.component.css b/FrontEnd/src/app/flashcards/flashcards-add-csv/flashcards-add-csv.component.css index f8e46bb..9899c5d 100644 --- a/FrontEnd/src/app/flashcards/flashcards-add-csv/flashcards-add-csv.component.css +++ b/FrontEnd/src/app/flashcards/flashcards-add-csv/flashcards-add-csv.component.css @@ -6,10 +6,15 @@ margin-top: 1rem; text-align: left; } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + } .container { background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; @@ -38,7 +43,7 @@ margin-top: 1rem; .content{ background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; @@ -52,4 +57,4 @@ ag-grid-angular{ .buttons-container > div{ margin: 10px; -} \ No newline at end of file +} diff --git a/FrontEnd/src/app/flashcards/flashcards-add-csv/flashcards-add-csv.component.html b/FrontEnd/src/app/flashcards/flashcards-add-csv/flashcards-add-csv.component.html index 20361ca..30df933 100644 --- a/FrontEnd/src/app/flashcards/flashcards-add-csv/flashcards-add-csv.component.html +++ b/FrontEnd/src/app/flashcards/flashcards-add-csv/flashcards-add-csv.component.html @@ -1,8 +1,8 @@
- - + +
@@ -45,9 +45,9 @@
Udostępnij publicznie

- +

- +
diff --git a/FrontEnd/src/app/flashcards/flashcards-add-table/flashcards-add-table.component.css b/FrontEnd/src/app/flashcards/flashcards-add-table/flashcards-add-table.component.css index 8507619..96ad491 100644 --- a/FrontEnd/src/app/flashcards/flashcards-add-table/flashcards-add-table.component.css +++ b/FrontEnd/src/app/flashcards/flashcards-add-table/flashcards-add-table.component.css @@ -7,9 +7,19 @@ table, th, td, tr { background-color: transparent; } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; + outline: none; +} + + + .container { background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; @@ -32,7 +42,7 @@ table, th, td, tr { .content{ background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; @@ -46,4 +56,4 @@ ag-grid-angular{ .buttons-container > div{ margin: 10px; -} \ No newline at end of file +} diff --git a/FrontEnd/src/app/flashcards/flashcards-add-table/flashcards-add-table.component.html b/FrontEnd/src/app/flashcards/flashcards-add-table/flashcards-add-table.component.html index 1eae5dc..cdda2d0 100644 --- a/FrontEnd/src/app/flashcards/flashcards-add-table/flashcards-add-table.component.html +++ b/FrontEnd/src/app/flashcards/flashcards-add-table/flashcards-add-table.component.html @@ -1,8 +1,8 @@
- - + +
@@ -37,7 +37,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -60,9 +60,9 @@ Udostępnij publicznie


- - +
+
- \ No newline at end of file + diff --git a/FrontEnd/src/app/flashcards/flashcards-add/flashcards-add.component.css b/FrontEnd/src/app/flashcards/flashcards-add/flashcards-add.component.css index a57c9dd..f2ace5a 100644 --- a/FrontEnd/src/app/flashcards/flashcards-add/flashcards-add.component.css +++ b/FrontEnd/src/app/flashcards/flashcards-add/flashcards-add.component.css @@ -19,7 +19,7 @@ .content{ background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; @@ -33,4 +33,11 @@ ag-grid-angular{ .buttons-container > div{ margin: 10px; -} \ No newline at end of file +} + +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} diff --git a/FrontEnd/src/app/flashcards/flashcards-add/flashcards-add.component.html b/FrontEnd/src/app/flashcards/flashcards-add/flashcards-add.component.html index 0d9ede8..a34df8c 100644 --- a/FrontEnd/src/app/flashcards/flashcards-add/flashcards-add.component.html +++ b/FrontEnd/src/app/flashcards/flashcards-add/flashcards-add.component.html @@ -1,9 +1,9 @@
- - - + + +
-
\ No newline at end of file + diff --git a/FrontEnd/src/app/flashcards/flashcards-edit-table/flashcards-edit-table.component.css b/FrontEnd/src/app/flashcards/flashcards-edit-table/flashcards-edit-table.component.css index 8507619..13de380 100644 --- a/FrontEnd/src/app/flashcards/flashcards-edit-table/flashcards-edit-table.component.css +++ b/FrontEnd/src/app/flashcards/flashcards-edit-table/flashcards-edit-table.component.css @@ -9,12 +9,19 @@ table, th, td, tr { .container { background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} + .wrapper-add { width: 100%; display: flex; @@ -32,7 +39,7 @@ table, th, td, tr { .content{ background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; @@ -46,4 +53,4 @@ ag-grid-angular{ .buttons-container > div{ margin: 10px; -} \ No newline at end of file +} diff --git a/FrontEnd/src/app/flashcards/flashcards-edit-table/flashcards-edit-table.component.html b/FrontEnd/src/app/flashcards/flashcards-edit-table/flashcards-edit-table.component.html index 4e4346c..4e97ae8 100644 --- a/FrontEnd/src/app/flashcards/flashcards-edit-table/flashcards-edit-table.component.html +++ b/FrontEnd/src/app/flashcards/flashcards-edit-table/flashcards-edit-table.component.html @@ -1,7 +1,7 @@
- +
@@ -45,7 +45,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -64,10 +64,10 @@
- - +
+
- \ No newline at end of file + diff --git a/FrontEnd/src/app/flashcards/flashcards-filling-in-test/flashcards-filling-in-test.component.css b/FrontEnd/src/app/flashcards/flashcards-filling-in-test/flashcards-filling-in-test.component.css index f5d8eae..dcc4148 100644 --- a/FrontEnd/src/app/flashcards/flashcards-filling-in-test/flashcards-filling-in-test.component.css +++ b/FrontEnd/src/app/flashcards/flashcards-filling-in-test/flashcards-filling-in-test.component.css @@ -1,8 +1,8 @@ #container-small { background-color: #181616; - padding: 30px; + padding: 30px; width: 32%; - height: 400px; + height: 400px; box-sizing: border-box; position: relative; text-align: center; @@ -15,9 +15,16 @@ margin-top: 2rem; } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} + #container-large { background-color: #181616; - padding: 30px; + padding: 30px; width: 62%; min-height: 400px; text-align: center; @@ -40,4 +47,4 @@ width: 90%; margin-bottom: 2.5rem; } -} \ No newline at end of file +} diff --git a/FrontEnd/src/app/flashcards/flashcards-filling-in-test/flashcards-filling-in-test.component.html b/FrontEnd/src/app/flashcards/flashcards-filling-in-test/flashcards-filling-in-test.component.html index a480f7f..13d92d8 100644 --- a/FrontEnd/src/app/flashcards/flashcards-filling-in-test/flashcards-filling-in-test.component.html +++ b/FrontEnd/src/app/flashcards/flashcards-filling-in-test/flashcards-filling-in-test.component.html @@ -27,7 +27,7 @@
- + Poprzednia odpowiedź:
{{flashcards[index-1].content}} {{allAnswers[index-1].answer}}
@@ -35,7 +35,7 @@ Podaj odpowiedź:
{{flashcards[index].content}} - +
ODPOWIEDŹ POPRAWNA
ODPOWIEDŹ NIEPOPRAWNA
@@ -50,10 +50,10 @@
- +
- - + +
- + diff --git a/FrontEnd/src/app/flashcards/flashcards-memory-test/flashcards-memory-test.component.css b/FrontEnd/src/app/flashcards/flashcards-memory-test/flashcards-memory-test.component.css index f5d8eae..dcc4148 100644 --- a/FrontEnd/src/app/flashcards/flashcards-memory-test/flashcards-memory-test.component.css +++ b/FrontEnd/src/app/flashcards/flashcards-memory-test/flashcards-memory-test.component.css @@ -1,8 +1,8 @@ #container-small { background-color: #181616; - padding: 30px; + padding: 30px; width: 32%; - height: 400px; + height: 400px; box-sizing: border-box; position: relative; text-align: center; @@ -15,9 +15,16 @@ margin-top: 2rem; } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} + #container-large { background-color: #181616; - padding: 30px; + padding: 30px; width: 62%; min-height: 400px; text-align: center; @@ -40,4 +47,4 @@ width: 90%; margin-bottom: 2.5rem; } -} \ No newline at end of file +} diff --git a/FrontEnd/src/app/flashcards/flashcards-memory-test/flashcards-memory-test.component.html b/FrontEnd/src/app/flashcards/flashcards-memory-test/flashcards-memory-test.component.html index ebdfc27..fe97f57 100644 --- a/FrontEnd/src/app/flashcards/flashcards-memory-test/flashcards-memory-test.component.html +++ b/FrontEnd/src/app/flashcards/flashcards-memory-test/flashcards-memory-test.component.html @@ -38,12 +38,12 @@
- - - + + +

- + - + diff --git a/FrontEnd/src/app/flashcards/flashcards-pairs-test-set/flashcards-pairs-test-set.component.css b/FrontEnd/src/app/flashcards/flashcards-pairs-test-set/flashcards-pairs-test-set.component.css index 50130c9..ca8b842 100644 --- a/FrontEnd/src/app/flashcards/flashcards-pairs-test-set/flashcards-pairs-test-set.component.css +++ b/FrontEnd/src/app/flashcards/flashcards-pairs-test-set/flashcards-pairs-test-set.component.css @@ -1,8 +1,8 @@ #container-small { background-color: #181616; - padding: 30px; + padding: 30px; width: 25%; - height: 400px; + height: 400px; margin: 25px; float:left; box-sizing: border-box; @@ -12,17 +12,25 @@ .content{ position:fixed; width:100%; - box-sizing: border-box; + box-sizing: border-box; max-width: 100%; } + +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} + #container-large { background-color: #181616; - padding: 30px; + padding: 30px; width: 65%; - height: 400px; + height: 400px; margin: 25px; float: right; - box-sizing: border-box; + box-sizing: border-box; position: relative; text-align: center; } @@ -91,4 +99,4 @@ .wrong{ background-color: red; -} \ No newline at end of file +} diff --git a/FrontEnd/src/app/flashcards/flashcards-pairs-test-set/flashcards-pairs-test-set.component.html b/FrontEnd/src/app/flashcards/flashcards-pairs-test-set/flashcards-pairs-test-set.component.html index 60e160e..ab3d61e 100644 --- a/FrontEnd/src/app/flashcards/flashcards-pairs-test-set/flashcards-pairs-test-set.component.html +++ b/FrontEnd/src/app/flashcards/flashcards-pairs-test-set/flashcards-pairs-test-set.component.html @@ -27,5 +27,5 @@
- - \ No newline at end of file + + diff --git a/FrontEnd/src/app/flashcards/flashcards-pairs-test/flashcards-pairs-test.component.css b/FrontEnd/src/app/flashcards/flashcards-pairs-test/flashcards-pairs-test.component.css index 48eaf62..fd096b7 100644 --- a/FrontEnd/src/app/flashcards/flashcards-pairs-test/flashcards-pairs-test.component.css +++ b/FrontEnd/src/app/flashcards/flashcards-pairs-test/flashcards-pairs-test.component.css @@ -1,8 +1,8 @@ #container-small { background-color: #181616; - padding: 30px; + padding: 30px; width: 32%; - height: 400px; + height: 400px; box-sizing: border-box; position: relative; text-align: center; @@ -15,9 +15,16 @@ margin-top: 2rem; } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} + #container-large { background-color: #181616; - padding: 30px; + padding: 30px; width: 62%; min-height: 400px; text-align: center; @@ -48,4 +55,4 @@ height: 350px; } -} \ No newline at end of file +} diff --git a/FrontEnd/src/app/flashcards/flashcards-pairs-test/flashcards-pairs-test.component.html b/FrontEnd/src/app/flashcards/flashcards-pairs-test/flashcards-pairs-test.component.html index 554bd88..3bfd7b5 100644 --- a/FrontEnd/src/app/flashcards/flashcards-pairs-test/flashcards-pairs-test.component.html +++ b/FrontEnd/src/app/flashcards/flashcards-pairs-test/flashcards-pairs-test.component.html @@ -45,11 +45,11 @@
- - - + + +

- + diff --git a/FrontEnd/src/app/flashcards/flashcards-set-detail/flashcards-set-detail.component.css b/FrontEnd/src/app/flashcards/flashcards-set-detail/flashcards-set-detail.component.css index a93a165..158f7a3 100644 --- a/FrontEnd/src/app/flashcards/flashcards-set-detail/flashcards-set-detail.component.css +++ b/FrontEnd/src/app/flashcards/flashcards-set-detail/flashcards-set-detail.component.css @@ -12,9 +12,16 @@ margin-bottom: 5px; } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} + .content{ background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; diff --git a/FrontEnd/src/app/flashcards/flashcards-set-detail/flashcards-set-detail.component.html b/FrontEnd/src/app/flashcards/flashcards-set-detail/flashcards-set-detail.component.html index b5af84a..a9f5642 100644 --- a/FrontEnd/src/app/flashcards/flashcards-set-detail/flashcards-set-detail.component.html +++ b/FrontEnd/src/app/flashcards/flashcards-set-detail/flashcards-set-detail.component.html @@ -1,12 +1,12 @@
- - - - + + + +
- +
@@ -38,8 +38,8 @@ Czy chcesz usunąć fiszkę? - - + + -
\ No newline at end of file +
diff --git a/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.css b/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.css index f4a5593..d11b4f2 100644 --- a/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.css +++ b/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.css @@ -10,6 +10,34 @@ cursor: pointer; } + + +label +{ + clip-path: polygon(0% 50%, 15% 0%, 85% 0%, 100% 50%, 85% 100%, 15% 100%); + background-color: #000080; + width: 300px; + text-align: center; + border: 3px solid #000080; + border-bottom: #000080; + color: white; + cursor: pointer; + margin-top:10px; + font-size: x-large; +} + +label:hover +{ + background-color: orange; + border-color: orange; +} + +.radio-answer:checked + label +{ + background-color: orange; + border-color: orange; +} + .wrapper{ width: 100%; padding: 30px; @@ -17,6 +45,13 @@ margin-bottom: 40px; } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} + @media screen and (max-width: 800px) { .mobile{ display: none; @@ -29,7 +64,7 @@ .content{ background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; @@ -43,4 +78,10 @@ ag-grid-angular{ .buttons-container > div{ margin: 10px; -} \ No newline at end of file +} + +.radio-answer +{ + display: none; +} + diff --git a/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.html b/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.html index 6710519..5fe237f 100644 --- a/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.html +++ b/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.html @@ -6,30 +6,30 @@
- +
-

Czy chcesz usunąć fiszkę? - - + + - \ No newline at end of file + diff --git a/FrontEnd/src/app/flashcards/flashcards-test-type-menu/flashcards-test-type-menu.component.css b/FrontEnd/src/app/flashcards/flashcards-test-type-menu/flashcards-test-type-menu.component.css index ebd4ed4..0e85a02 100644 --- a/FrontEnd/src/app/flashcards/flashcards-test-type-menu/flashcards-test-type-menu.component.css +++ b/FrontEnd/src/app/flashcards/flashcards-test-type-menu/flashcards-test-type-menu.component.css @@ -1,4 +1,12 @@ div{ margin-top: 5px; margin-bottom: 5px; -} \ No newline at end of file +} + +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; + min-width: 200px; +} diff --git a/FrontEnd/src/app/flashcards/flashcards-test-type-menu/flashcards-test-type-menu.component.html b/FrontEnd/src/app/flashcards/flashcards-test-type-menu/flashcards-test-type-menu.component.html index e01d94e..69efe46 100644 --- a/FrontEnd/src/app/flashcards/flashcards-test-type-menu/flashcards-test-type-menu.component.html +++ b/FrontEnd/src/app/flashcards/flashcards-test-type-menu/flashcards-test-type-menu.component.html @@ -1,7 +1,7 @@
- - - - - -
\ No newline at end of file + + + +
+ + diff --git a/FrontEnd/src/app/flashcards/flashcards-typerace-test/flashcards-typerace-test.component.css b/FrontEnd/src/app/flashcards/flashcards-typerace-test/flashcards-typerace-test.component.css index e1f5971..402a422 100644 --- a/FrontEnd/src/app/flashcards/flashcards-typerace-test/flashcards-typerace-test.component.css +++ b/FrontEnd/src/app/flashcards/flashcards-typerace-test/flashcards-typerace-test.component.css @@ -1,7 +1,7 @@ #container-small { background-color: #181616; - padding: 30px; - width: 32%; + padding: 30px; + width: 32%; min-height: 400px; box-sizing: border-box; position: relative; @@ -15,9 +15,16 @@ margin-top: 2rem; } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} + #container-large { background-color: #181616; - padding: 30px; + padding: 30px; width: 62%; min-height: 400px; text-align: center; @@ -40,4 +47,4 @@ width: 90%; margin-bottom: 2.5rem; } -} \ No newline at end of file +} diff --git a/FrontEnd/src/app/flashcards/flashcards-typerace-test/flashcards-typerace-test.component.html b/FrontEnd/src/app/flashcards/flashcards-typerace-test/flashcards-typerace-test.component.html index 0d0cb41..c55ca81 100644 --- a/FrontEnd/src/app/flashcards/flashcards-typerace-test/flashcards-typerace-test.component.html +++ b/FrontEnd/src/app/flashcards/flashcards-typerace-test/flashcards-typerace-test.component.html @@ -32,13 +32,13 @@
Poprzednia odpowiedź:
- {{flashcards[index-1].content}} {{stoptimes[index-1].m}} m {{stoptimes[index-1].s}} s {{stoptimes[index-1].ms}} ms + {{flashcards[index-1].content}} {{stoptimes[index-1].m}} m {{stoptimes[index-1].s}} s {{stoptimes[index-1].ms}} ms
Podaj odpowiedź:
{{flashcards[index].content}} - +
ODPOWIEDŹ POPRAWNA
ODPOWIEDŹ NIEPOPRAWNA
@@ -52,11 +52,11 @@
- +
- - + +
- + diff --git a/FrontEnd/src/app/flashcards/flashcards/flashcards.component.css b/FrontEnd/src/app/flashcards/flashcards/flashcards.component.css index 01530aa..8ff3ab8 100644 --- a/FrontEnd/src/app/flashcards/flashcards/flashcards.component.css +++ b/FrontEnd/src/app/flashcards/flashcards/flashcards.component.css @@ -1,3 +1,6 @@ -.btn{ - margin-bottom: 5px; -} \ No newline at end of file +.button{ + font-size: large; + min-width: 200px; +} + + diff --git a/FrontEnd/src/app/flashcards/flashcards/flashcards.component.html b/FrontEnd/src/app/flashcards/flashcards/flashcards.component.html index 3c5b93d..1814118 100644 --- a/FrontEnd/src/app/flashcards/flashcards/flashcards.component.html +++ b/FrontEnd/src/app/flashcards/flashcards/flashcards.component.html @@ -1,4 +1,4 @@
- - + +
diff --git a/FrontEnd/src/styles.css b/FrontEnd/src/styles.css index 02a8ba3..d5c0dfb 100644 --- a/FrontEnd/src/styles.css +++ b/FrontEnd/src/styles.css @@ -157,6 +157,7 @@ a:hover{ border-bottom: #000080; color: white; font-size: x-large; + outline: none; } .button:hover From 4900fc9c6e0ef7e11e867e3b28b2416fedfc89ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Fri, 13 Dec 2019 22:28:58 +0100 Subject: [PATCH 2/6] PUNKT-39 Headery w plikach CSV --- FrontEnd/src/app/groups/ranking/ranking.component.ts | 9 ++++++++- .../tests-in-group-results.component.ts | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/FrontEnd/src/app/groups/ranking/ranking.component.ts b/FrontEnd/src/app/groups/ranking/ranking.component.ts index e371f60..7a7c65b 100644 --- a/FrontEnd/src/app/groups/ranking/ranking.component.ts +++ b/FrontEnd/src/app/groups/ranking/ranking.component.ts @@ -62,10 +62,17 @@ export class RankingComponent implements OnInit, OnDestroy { } downloadCSVResults() { + const options = { + fieldSeparator: ';', + quoteStrings: '', + decimalseparator: ',', + showLabels: true, + headers: ['Punkty', 'Imię', 'Nazwisko'] + }; const arr = this.data; arr.map(x => delete x['username']); // tslint:disable-next-line:no-unused-expression - new ngxCsv(arr, this.group.name + '_ranking_' + this.typeOfRankingToDisplay); + new ngxCsv(arr, this.group.name + '_ranking_' + this.typeOfRankingToDisplay, options); } ngOnDestroy(): void { diff --git a/FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.ts b/FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.ts index 4fd37a1..320fd81 100644 --- a/FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.ts +++ b/FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.ts @@ -103,8 +103,15 @@ export class TestsInGroupResultsComponent implements OnInit, OnDestroy { } downloadCSVResults() { + const options = { + fieldSeparator: ';', + quoteStrings: '', + decimalseparator: ',', + showLabels: true, + headers: ['Imię', 'Nazwisko', 'Wynik', 'Wynik (%)'] + }; // tslint:disable-next-line:no-unused-expression - new ngxCsv(this.testdata, this.group.name + '_' + this.selectedTest.title + '_wyniki'); + new ngxCsv(this.testdata, this.group.name + '_' + this.selectedTest.title + '_wyniki', options); } getResults(id: number) { From e532373dbd8bf2c16974a80429ef3e9041e49b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sat, 14 Dec 2019 00:50:58 +0100 Subject: [PATCH 3/6] =?UTF-8?q?PUNKT-38=20Wygl=C4=85d=20tabel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flashcards-sets-list.component.ts | 12 +- .../group-details.component.html | 19 +-- .../group-details/group-details.component.ts | 17 +- .../manage-group/manage-group.component.css | 2 +- .../manage-group/manage-group.component.ts | 2 +- .../groups/my-groups/my-groups.component.ts | 2 +- .../waiting-resources.component.ts | 6 +- .../materials-list.component.ts | 13 +- .../tests/tests-list/tests-list.component.ts | 14 +- FrontEnd/src/styles.css | 151 ++++++++++++++++-- 10 files changed, 171 insertions(+), 67 deletions(-) diff --git a/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.ts b/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.ts index a60bf94..d23574f 100644 --- a/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.ts +++ b/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.ts @@ -40,8 +40,6 @@ export class FlashcardsSetsListComponent implements OnInit, OnDestroy { { headerName: 'Nazwa', field: 'name', headerTooltip: 'Nazwa' }, { headerName: 'Data dodania', field: 'add_date', headerTooltip: 'Data dodania', hide: false }, { headerName: 'Data modyfikacji', field: 'edit_date', headerTooltip: 'Data modyfikacji', hide: false }, - { headerName: 'Właściciel', field: 'owner', headerTooltip: 'Właściciel', hide: false }, - { headerName: 'Grupa', field: 'group', headerTooltip: 'Grupa', hide: !this.isGroup }, { headerName: '', suppressMenu: true, @@ -59,9 +57,9 @@ export class FlashcardsSetsListComponent implements OnInit, OnDestroy { return ''; } else if (params.data['owner'] === currentUser.username) { return ` - - `; } else { @@ -208,8 +206,6 @@ export class FlashcardsSetsListComponent implements OnInit, OnDestroy { { headerName: 'Nazwa', field: 'name', headerTooltip: 'Nazwa' }, { headerName: 'Data dodania', field: 'add_date', headerTooltip: 'Data dodania', hide: true }, { headerName: 'Data modyfikacji', field: 'edit_date', headerTooltip: 'Data modyfikacji', hide: true }, - { headerName: 'Właściciel', field: 'owner', headerTooltip: 'Właściciel', hide: true }, - { headerName: 'Grupa', field: 'group', headerTooltip: 'Grupa', hide: !this.isGroup }, { headerName: '', suppressMenu: true, @@ -223,8 +219,6 @@ export class FlashcardsSetsListComponent implements OnInit, OnDestroy { { headerName: 'Nazwa', field: 'name', headerTooltip: 'Nazwa' }, { headerName: 'Data dodania', field: 'add_date', headerTooltip: 'Data dodania', hide: false }, { headerName: 'Data modyfikacji', field: 'edit_date', headerTooltip: 'Data modyfikacji', hide: false }, - { headerName: 'Właściciel', field: 'owner', headerTooltip: 'Właściciel', hide: false }, - { headerName: 'Grupa', field: 'group', headerTooltip: 'Grupa', hide: !this.isGroup }, { headerName: '', suppressMenu: true, @@ -257,8 +251,6 @@ export class FlashcardsSetsListComponent implements OnInit, OnDestroy { { headerName: 'Nazwa', field: 'name', headerTooltip: 'Nazwa' }, { headerName: 'Data dodania', field: 'add_date', headerTooltip: 'Data dodania', hide: false }, { headerName: 'Data modyfikacji', field: 'edit_date', headerTooltip: 'Data modyfikacji', hide: false }, - { headerName: 'Właściciel', field: 'owner', headerTooltip: 'Właściciel', hide: false }, - { headerName: 'Grupa', field: 'group', headerTooltip: 'Grupa', hide: !this.isGroup }, { headerName: '', suppressMenu: true, diff --git a/FrontEnd/src/app/groups/group-details/group-details.component.html b/FrontEnd/src/app/groups/group-details/group-details.component.html index 77fff7f..d9c6533 100644 --- a/FrontEnd/src/app/groups/group-details/group-details.component.html +++ b/FrontEnd/src/app/groups/group-details/group-details.component.html @@ -1,35 +1,36 @@
- - -

- +
+

{{group?.name}}


Opis grupy:

{{group?.description}}

- - + +
- - - + +
diff --git a/FrontEnd/src/app/groups/group-details/group-details.component.ts b/FrontEnd/src/app/groups/group-details/group-details.component.ts index 2bf54a4..0e777f6 100644 --- a/FrontEnd/src/app/groups/group-details/group-details.component.ts +++ b/FrontEnd/src/app/groups/group-details/group-details.component.ts @@ -30,10 +30,9 @@ export class GroupDetailsComponent implements OnInit, OnDestroy { columnDefs = [ - { headerName: 'ID', field: 'id', headerTooltip: 'ID' }, { headerName: 'Nazwa', field: 'title', headerTooltip: 'Nazwa' }, - { headerName: 'Data dodania', field: 'addDate', headerTooltip: 'Data dodania', hide: false }, - { headerName: 'Właściciel', field: 'owner', headerTooltip: 'Właściciel', hide: false }, + { headerName: 'Ocena', field: 'grade', headerTooltip: 'Ocena' }, + { headerName: 'Max.', field: 'maxScore', headerTooltip: 'Max.', hide: false }, { headerName: '', suppressMenu: true, @@ -49,7 +48,7 @@ export class GroupDetailsComponent implements OnInit, OnDestroy { const currentUsername = JSON.parse(localStorage.getItem('currentUser')).username; const groupOwnerUsername = localStorage.getItem('groupOwnerUsername'); return groupOwnerUsername === currentUsername ? - `` : ''; } @@ -159,10 +158,9 @@ export class GroupDetailsComponent implements OnInit, OnDestroy { onGridSizeChanged(params) { if (params.clientWidth < 800) { this.columnDefs = [ - { headerName: 'ID', field: 'id', headerTooltip: 'ID' }, { headerName: 'Nazwa', field: 'title', headerTooltip: 'Nazwa' }, - { headerName: 'Data dodania', field: 'addDate', headerTooltip: 'Data dodania', hide: false }, - { headerName: 'Właściciel', field: 'owner', headerTooltip: 'Właściciel', hide: false }, + { headerName: 'Ocena', field: 'grade', headerTooltip: 'Ocena' }, + { headerName: 'Max.', field: 'maxScore', headerTooltip: 'Max.', hide: true }, { headerName: '', suppressMenu: true, @@ -172,10 +170,9 @@ export class GroupDetailsComponent implements OnInit, OnDestroy { ]; } else { this.columnDefs = [ - { headerName: 'ID', field: 'id', headerTooltip: 'ID' }, { headerName: 'Nazwa', field: 'title', headerTooltip: 'Nazwa' }, - { headerName: 'Data dodania', field: 'addDate', headerTooltip: 'Data dodania', hide: false }, - { headerName: 'Właściciel', field: 'owner', headerTooltip: 'Właściciel', hide: false }, + { headerName: 'Ocena', field: 'grade', headerTooltip: 'Ocena' }, + { headerName: 'Max.', field: 'maxScore', headerTooltip: 'Max.' }, { headerName: '', suppressMenu: true, diff --git a/FrontEnd/src/app/groups/manage-group/manage-group.component.css b/FrontEnd/src/app/groups/manage-group/manage-group.component.css index 9b353e3..722b21b 100644 --- a/FrontEnd/src/app/groups/manage-group/manage-group.component.css +++ b/FrontEnd/src/app/groups/manage-group/manage-group.component.css @@ -1,4 +1,4 @@ -a.wrapper{ +.wrapper{ width: 100%; padding: 30px; min-height: 100%; diff --git a/FrontEnd/src/app/groups/manage-group/manage-group.component.ts b/FrontEnd/src/app/groups/manage-group/manage-group.component.ts index 64ba718..453d5fb 100644 --- a/FrontEnd/src/app/groups/manage-group/manage-group.component.ts +++ b/FrontEnd/src/app/groups/manage-group/manage-group.component.ts @@ -49,7 +49,7 @@ export class ManageGroupComponent implements OnInit, OnDestroy { } customCellRendererFunc(params) { - return ``; } diff --git a/FrontEnd/src/app/groups/my-groups/my-groups.component.ts b/FrontEnd/src/app/groups/my-groups/my-groups.component.ts index 39c8f53..892f729 100644 --- a/FrontEnd/src/app/groups/my-groups/my-groups.component.ts +++ b/FrontEnd/src/app/groups/my-groups/my-groups.component.ts @@ -95,7 +95,7 @@ export class MyGroupsComponent implements OnInit, OnDestroy { customCellRendererFunc(params) { if (params.data['role'] === 'Lider') { return ` - `; } else { diff --git a/FrontEnd/src/app/groups/waiting-resources/waiting-resources.component.ts b/FrontEnd/src/app/groups/waiting-resources/waiting-resources.component.ts index 0b95591..66a6188 100644 --- a/FrontEnd/src/app/groups/waiting-resources/waiting-resources.component.ts +++ b/FrontEnd/src/app/groups/waiting-resources/waiting-resources.component.ts @@ -323,11 +323,11 @@ export class WaitingResourcesComponent implements OnInit, OnDestroy { customCellRendererFunc(params) { return ` - - - `; } diff --git a/FrontEnd/src/app/materials/materials-list/materials-list.component.ts b/FrontEnd/src/app/materials/materials-list/materials-list.component.ts index ae901c9..b395d2e 100644 --- a/FrontEnd/src/app/materials/materials-list/materials-list.component.ts +++ b/FrontEnd/src/app/materials/materials-list/materials-list.component.ts @@ -38,8 +38,6 @@ export class MaterialsListComponent implements OnInit, OnDestroy { { headerName: 'Nazwa', field: 'title', headerTooltip: 'Nazwa' }, { headerName: 'Data dodania', field: 'add_date', headerTooltip: 'Data dodania', hide: false }, { headerName: 'Data modyfikacji', field: 'edit_date', headerTooltip: 'Data modyfikacji', hide: false }, - { headerName: 'Właściciel', field: 'owner', headerTooltip: 'Właściciel', hide: false }, - { headerName: 'Grupa', field: 'group', headerTooltip: 'Grupa', hide: !this.isGroup }, { headerName: '', suppressMenu: true, @@ -57,9 +55,9 @@ export class MaterialsListComponent implements OnInit, OnDestroy { return ''; } else if (params.data['owner'] === currentUser.username) { return ` - - `; } else { @@ -211,8 +209,6 @@ export class MaterialsListComponent implements OnInit, OnDestroy { { headerName: 'Nazwa', field: 'title', headerTooltip: 'Nazwa' }, { headerName: 'Data dodania', field: 'add_date', headerTooltip: 'Data dodania', hide: true }, { headerName: 'Data modyfikacji', field: 'edit_date', headerTooltip: 'Data modyfikacji', hide: true }, - { headerName: 'Właściciel', field: 'owner', headerTooltip: 'Właściciel', hide: true }, - { headerName: 'Grupa', field: 'group', headerTooltip: 'Grupa', hide: !this.isGroup }, { headerName: '', suppressMenu: true, @@ -226,9 +222,6 @@ export class MaterialsListComponent implements OnInit, OnDestroy { { headerName: 'Nazwa', field: 'title', headerTooltip: 'Nazwa' }, { headerName: 'Data dodania', field: 'add_date', headerTooltip: 'Data dodania', hide: false }, { headerName: 'Data modyfikacji', field: 'edit_date', headerTooltip: 'Data modyfikacji', hide: false }, - { headerName: 'Właściciel', field: 'owner', headerTooltip: 'Właściciel', hide: false }, - { headerName: 'Ocena', field: 'grade', headerTooltip: 'Ocena', hide: false }, - { headerName: 'Grupa', field: 'group', headerTooltip: 'Grupa', hide: !this.isGroup }, { headerName: '', suppressMenu: true, @@ -263,8 +256,6 @@ export class MaterialsListComponent implements OnInit, OnDestroy { { headerName: 'Nazwa', field: 'title', headerTooltip: 'Nazwa' }, { headerName: 'Data dodania', field: 'add_date', headerTooltip: 'Data dodania', hide: false }, { headerName: 'Data modyfikacji', field: 'edit_date', headerTooltip: 'Data modyfikacji', hide: false }, - { headerName: 'Właściciel', field: 'owner', headerTooltip: 'Właściciel', hide: false }, - { headerName: 'Grupa', field: 'group', headerTooltip: 'Grupa', hide: !this.isGroup }, { headerName: '', suppressMenu: true, diff --git a/FrontEnd/src/app/tests/tests-list/tests-list.component.ts b/FrontEnd/src/app/tests/tests-list/tests-list.component.ts index a250b28..f475b1f 100644 --- a/FrontEnd/src/app/tests/tests-list/tests-list.component.ts +++ b/FrontEnd/src/app/tests/tests-list/tests-list.component.ts @@ -31,8 +31,6 @@ export class TestsListComponent implements OnInit, OnDestroy { { headerName: 'Nazwa', field: 'title', headerTooltip: 'Nazwa' }, { headerName: 'Data dodania', field: 'addDate', headerTooltip: 'Data dodania', hide: false }, { headerName: 'Data modyfikacji', field: 'editDate', headerTooltip: 'Data modyfikacji', hide: false }, - { headerName: 'Właściciel', field: 'owner', headerTooltip: 'Właściciel', hide: false }, - { headerName: 'Grupa', field: 'group', headerTooltip: 'Grupa', hide: !this.isGroup }, { headerName: 'Ocena', field: 'grade', headerTooltip: 'Ocena', hide: false }, { headerName: '', @@ -52,11 +50,11 @@ export class TestsListComponent implements OnInit, OnDestroy { return ''; } else if (params.data['owner'] === currentUser.username) { return ` - - - `; } else { @@ -202,8 +200,6 @@ export class TestsListComponent implements OnInit, OnDestroy { { headerName: 'Nazwa', field: 'title', headerTooltip: 'Nazwa' }, { headerName: 'Data dodania', field: 'addDate', headerTooltip: 'Data dodania', hide: true }, { headerName: 'Data modyfikacji', field: 'editDate', headerTooltip: 'Data modyfikacji', hide: true }, - { headerName: 'Właściciel', field: 'owner', headerTooltip: 'Właściciel', hide: true }, - { headerName: 'Grupa', field: 'group', headerTooltip: 'Grupa', hide: !this.isGroup }, { headerName: 'Ocena', field: 'grade', headerTooltip: 'Ocena', hide: true }, { headerName: '', @@ -218,8 +214,6 @@ export class TestsListComponent implements OnInit, OnDestroy { { headerName: 'Nazwa', field: 'title', headerTooltip: 'Nazwa' }, { headerName: 'Data dodania', field: 'addDate', headerTooltip: 'Data dodania', hide: false }, { headerName: 'Data modyfikacji', field: 'editDate', headerTooltip: 'Data modyfikacji', hide: false }, - { headerName: 'Właściciel', field: 'owner', headerTooltip: 'Właściciel', hide: false }, - { headerName: 'Grupa', field: 'group', headerTooltip: 'Grupa', hide: !this.isGroup }, { headerName: 'Ocena', field: 'grade', headerTooltip: 'Ocena', hide: false }, { headerName: '', @@ -255,8 +249,6 @@ export class TestsListComponent implements OnInit, OnDestroy { { headerName: 'Nazwa', field: 'title', headerTooltip: 'Nazwa' }, { headerName: 'Data dodania', field: 'addDate', headerTooltip: 'Data dodania', hide: false }, { headerName: 'Data modyfikacji', field: 'editDate', headerTooltip: 'Data modyfikacji', hide: false }, - { headerName: 'Właściciel', field: 'owner', headerTooltip: 'Właściciel', hide: false }, - { headerName: 'Grupa', field: 'group', headerTooltip: 'Grupa', hide: !this.isGroup }, { headerName: 'Ocena', field: 'grade', headerTooltip: 'Ocena', hide: false }, { headerName: '', diff --git a/FrontEnd/src/styles.css b/FrontEnd/src/styles.css index d5c0dfb..4fcde13 100644 --- a/FrontEnd/src/styles.css +++ b/FrontEnd/src/styles.css @@ -1,13 +1,13 @@ @import "~ag-grid-community/dist/styles/ag-grid.css"; @import "~ag-grid-community/dist/styles/ag-theme-dark.css"; @import "~@angular/material/prebuilt-themes/indigo-pink.css"; -@import url('https://fonts.googleapis.com/css?family=Roboto'); +@import url('https://fonts.googleapis.com/css?family=Roboto+Slab'); body{ margin: 0 auto; background-color: #272324; width: 100%; - font-family: 'Roboto', Arial, Helvetica, sans-serif; + font-family: 'Roboto Slab', 'Cambria', serif !important; color: white; background-size: auto 100%; background-image: url("./assets/tlo.png"); @@ -17,7 +17,7 @@ body{ background-color: #000080; } -.btn{ +.btn { cursor: pointer; } @@ -64,10 +64,6 @@ body{ margin: 2rem auto !important; } -.btn-study-cave:not([disabled]):not(.disabled).active { - box-shadow: 0 0 0 .2rem rgba(112, 81, 14, 0.5); -} - .alert-grey { background-color: #22272a; } @@ -111,14 +107,17 @@ a:hover{ height: 50px !important; } +label.btn-study-cave { + margin-left: 5px !important; +} + .btn-study-cave { color: #fff; - background-color: #272324; - border-color: #cea856; + background-color: #000080; } .btn-study-cave:hover { - border-color: rgb(202, 144, 17); + background-color: orange; color: #FFF !important; } @@ -144,6 +143,7 @@ a:hover{ .mat-simple-snackbar { justify-content: center !important; + font-family: 'Roboto Slab', 'Cambria', serif !important; } .button @@ -166,7 +166,138 @@ a:hover{ border-color: orange; } +button:hover, a:hover { + transition: 400ms !important; +} + +.content .wrapper .content { + background-color: #28102f !important; + border: 1px solid #625283 !important; +} + +.ui-dialog * { + font-family: 'Roboto Slab', 'Cambria', serif !important; +} + +.ui-dialog .fa, .ui-dialog .fas, .ui-dialog .far, .ui-dialog .pi { + font-family: "primeicons" !important; +} + +.ag-theme-dark * { + font-family: 'Roboto Slab', 'Cambria', serif !important; +} + +.ag-theme-dark .fa, .ag-theme-dark .fas, .ag-theme-dark .far { + font-family: "Font Awesome 5 Free" !important; +} + +.ag-theme-dark .ag-body, .ag-theme-dark .ag-row-odd, .ag-theme-dark .ag-menu { + background-color: #19032f !important; +} + +.ag-theme-dark input, .ag-theme-dark select { + background-color: #1e0935 !important; + padding: 1rem !important; +} + +.ag-filter-body-wrapper > div { + padding: 0.5rem !important; + background-color: #0c0118 !important; +} + +.ag-theme-dark .ag-row-even { + background-color: #29054d !important; +} + +.ag-theme-dark .ag-paging-panel { + border-bottom: 1px solid darkgrey !important; + border-left: 1px solid darkgrey !important; + border-right: 1px solid darkgrey !important; + border-top-width: 0 !important; +} + +.ag-theme-dark, .ag-theme-dark .ag-header { + background-color: #0c0118 !important; +} + +.ag-theme-dark .ag-row-focus { + background-color: #6c08d7 !important; +} + +.ag-theme-dark .ag-row-hover { + background-color: #4f069d !important; +} + .ui-listbox { display: block !important; width: 700px !important; } + +.ag-theme-dark { + font-size: 24px !important; +} + +.ag-header { + font-size: 24px !important; + height: 60px !important; + min-height: 60px !important; + text-align: center; +} + +.ag-header-row, .ag-header-cell, .ag-body-container, .ag-row { + height: 60px !important; + min-height: 60px !important; +} + +.ag-theme-dark .ag-header-cell { + line-height: 50px !important; +} + +@media screen and (max-width: 700px) { + .ag-theme-dark { + font-size: 16px !important; + } + + .ag-header { + font-size: 16px !important; + height: 80px !important; + min-height: 80px !important; + } + + .ag-header-row, .ag-header-cell, .ag-body-container, .ag-row { + height: 80px !important; + min-height: 80px !important; + } + + .ag-theme-dark .ag-header-cell { + line-height: 70px !important; + } + + +} + +@media screen and (max-width: 470px) { + .ag-theme-dark { + font-size: 14px !important; + } + + .ag-header { + font-size: 14px !important; + height: 100px !important; + min-height: 100px !important; + } + + .ag-paging-panel { + font-size: 12px !important; + } + + .ag-header-row, .ag-header-cell, .ag-body-container, .ag-row { + height: 100px !important; + min-height: 100px !important; + } + + .ag-theme-dark .ag-header-cell { + line-height: 90px !important; + } + +} \ No newline at end of file From 07fc2f32fb6db35e64f459e4ccaec6f3dd480353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sat, 14 Dec 2019 01:12:25 +0100 Subject: [PATCH 4/6] PUNKT-38 Fix CSS --- .../tests-in-group-results.component.ts | 4 +-- FrontEnd/src/styles.css | 26 ++----------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.ts b/FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.ts index 320fd81..79f7619 100644 --- a/FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.ts +++ b/FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.ts @@ -31,7 +31,7 @@ export class TestsInGroupResultsComponent implements OnInit, OnDestroy { public columnDefs = [ { headerName: 'ID', field: 'id', headerTooltip: 'ID' }, { headerName: 'Nazwa', field: 'title', headerTooltip: 'Nazwa' }, - { headerName: 'Liczba punktów do zdobycia', field: 'maxScore', headerTooltip: 'Liczba punktów do zdobycia', hide: false } + { headerName: 'Max.', field: 'maxScore', headerTooltip: 'Liczba punktów do zdobycia', hide: false } ]; // showTestResult @@ -155,7 +155,7 @@ export class TestsInGroupResultsComponent implements OnInit, OnDestroy { this.columnDefs = [ { headerName: 'ID', field: 'id', headerTooltip: 'ID' }, { headerName: 'Nazwa', field: 'title', headerTooltip: 'Nazwa' }, - { headerName: 'Liczba punktów do zdobycia', field: 'maxScore', headerTooltip: 'Liczba punktów do zdobycia', hide: false } + { headerName: 'Max.', field: 'maxScore', headerTooltip: 'Liczba punktów do zdobycia', hide: false } ]; params.api.sizeColumnsToFit(); diff --git a/FrontEnd/src/styles.css b/FrontEnd/src/styles.css index 4fcde13..65d6b22 100644 --- a/FrontEnd/src/styles.css +++ b/FrontEnd/src/styles.css @@ -244,7 +244,7 @@ button:hover, a:hover { text-align: center; } -.ag-header-row, .ag-header-cell, .ag-body-container, .ag-row { +.ag-header-row, .ag-header-cell { height: 60px !important; min-height: 60px !important; } @@ -260,20 +260,8 @@ button:hover, a:hover { .ag-header { font-size: 16px !important; - height: 80px !important; - min-height: 80px !important; } - .ag-header-row, .ag-header-cell, .ag-body-container, .ag-row { - height: 80px !important; - min-height: 80px !important; - } - - .ag-theme-dark .ag-header-cell { - line-height: 70px !important; - } - - } @media screen and (max-width: 470px) { @@ -283,21 +271,11 @@ button:hover, a:hover { .ag-header { font-size: 14px !important; - height: 100px !important; - min-height: 100px !important; + } .ag-paging-panel { font-size: 12px !important; } - - .ag-header-row, .ag-header-cell, .ag-body-container, .ag-row { - height: 100px !important; - min-height: 100px !important; - } - - .ag-theme-dark .ag-header-cell { - line-height: 90px !important; - } } \ No newline at end of file From e51700eaddd30bf3cf681581ffe25b201d3fa1ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sat, 14 Dec 2019 01:26:45 +0100 Subject: [PATCH 5/6] PUNKT-38 Update czcionki --- FrontEnd/src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FrontEnd/src/index.html b/FrontEnd/src/index.html index e29022b..3b1914c 100644 --- a/FrontEnd/src/index.html +++ b/FrontEnd/src/index.html @@ -5,7 +5,7 @@ Punktonerzy - + From ca5f1f2765f6ed09da538893f9a6c23fb8c19eaa Mon Sep 17 00:00:00 2001 From: s416122 Date: Sat, 14 Dec 2019 21:28:55 +0100 Subject: [PATCH 6/6] =?UTF-8?q?Zmiana=20wygl=C4=85du=20przycisk=C3=B3w=20-?= =?UTF-8?q?>=20materia=C5=82y?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flashcards-sets-list.component.css | 29 +------------------ .../flashcards-sets-list.component.html | 4 +-- FrontEnd/src/app/login/login.component.html | 8 ++--- .../materials-add/materials-add.component.css | 17 +++++++++-- .../materials-add.component.html | 7 ++--- .../materials-details.component.css | 11 +++++-- .../materials-list.component.css | 10 ++++++- .../materials-list.component.html | 4 +-- .../materials-menu.component.css | 6 ++++ .../materials-menu.component.html | 6 ++-- 10 files changed, 53 insertions(+), 49 deletions(-) diff --git a/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.css b/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.css index d11b4f2..1e777b2 100644 --- a/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.css +++ b/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.css @@ -12,31 +12,7 @@ -label -{ - clip-path: polygon(0% 50%, 15% 0%, 85% 0%, 100% 50%, 85% 100%, 15% 100%); - background-color: #000080; - width: 300px; - text-align: center; - border: 3px solid #000080; - border-bottom: #000080; - color: white; - cursor: pointer; - margin-top:10px; - font-size: x-large; -} -label:hover -{ - background-color: orange; - border-color: orange; -} - -.radio-answer:checked + label -{ - background-color: orange; - border-color: orange; -} .wrapper{ width: 100%; @@ -80,8 +56,5 @@ ag-grid-angular{ margin: 10px; } -.radio-answer -{ - display: none; -} + diff --git a/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.html b/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.html index 5fe237f..fa3f6d4 100644 --- a/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.html +++ b/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.html @@ -9,10 +9,10 @@
-
diff --git a/FrontEnd/src/app/login/login.component.html b/FrontEnd/src/app/login/login.component.html index dd2ee7a..be7d622 100644 --- a/FrontEnd/src/app/login/login.component.html +++ b/FrontEnd/src/app/login/login.component.html @@ -1,15 +1,15 @@
- +



Nazwa użytkownika:

- Hasło:
+ Hasło:


- +
-
\ No newline at end of file +
diff --git a/FrontEnd/src/app/materials/materials-add/materials-add.component.css b/FrontEnd/src/app/materials/materials-add/materials-add.component.css index f5a0a77..4e6af2f 100644 --- a/FrontEnd/src/app/materials/materials-add/materials-add.component.css +++ b/FrontEnd/src/app/materials/materials-add/materials-add.component.css @@ -9,7 +9,7 @@ .container { background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; @@ -38,7 +38,7 @@ .content{ background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; @@ -52,4 +52,15 @@ ag-grid-angular{ .buttons-container > div{ margin: 10px; -} \ No newline at end of file +} + +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} + +p{ + color:white; +} diff --git a/FrontEnd/src/app/materials/materials-add/materials-add.component.html b/FrontEnd/src/app/materials/materials-add/materials-add.component.html index 9a2c2b8..6cbaa6d 100644 --- a/FrontEnd/src/app/materials/materials-add/materials-add.component.html +++ b/FrontEnd/src/app/materials/materials-add/materials-add.component.html @@ -1,7 +1,7 @@
- +
@@ -33,10 +33,9 @@ Udostępnij publicznie

- +

- +
- \ No newline at end of file diff --git a/FrontEnd/src/app/materials/materials-details/materials-details.component.css b/FrontEnd/src/app/materials/materials-details/materials-details.component.css index 5780197..d9a73f7 100644 --- a/FrontEnd/src/app/materials/materials-details/materials-details.component.css +++ b/FrontEnd/src/app/materials/materials-details/materials-details.component.css @@ -14,8 +14,15 @@ .content{ background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; -} \ No newline at end of file +} + +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} diff --git a/FrontEnd/src/app/materials/materials-list/materials-list.component.css b/FrontEnd/src/app/materials/materials-list/materials-list.component.css index ada8734..6113e32 100644 --- a/FrontEnd/src/app/materials/materials-list/materials-list.component.css +++ b/FrontEnd/src/app/materials/materials-list/materials-list.component.css @@ -30,7 +30,7 @@ .content{ background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; @@ -45,3 +45,11 @@ ag-grid-angular{ .buttons-container > div{ margin: 10px; } + + +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} diff --git a/FrontEnd/src/app/materials/materials-list/materials-list.component.html b/FrontEnd/src/app/materials/materials-list/materials-list.component.html index 2e3eadd..1ed6856 100644 --- a/FrontEnd/src/app/materials/materials-list/materials-list.component.html +++ b/FrontEnd/src/app/materials/materials-list/materials-list.component.html @@ -7,7 +7,7 @@
- +