s416178
/
Punktonerzy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Zmiana wyglądu przycisków -> fiszki

This commit is contained in:
s416122 2019-12-13 18:27:50 +01:00
parent 6df997e287
commit b93d25fb5b
27 changed files with 235 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
FrontEnd/src/app/flashcards/flashcards-add-csv/flashcards-add-csv.component.css
View File

@ -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;
}
}

8
FrontEnd/src/app/flashcards/flashcards-add-csv/flashcards-add-csv.component.html
View File

@ -1,8 +1,8 @@
<div class="wrapper">
<div class="content">
<div class="buttons-container">
<button class="btn btn-study-cave" routerLink="/flashcards/sets"><i class="fas fa-arrow-left"></i> WRÓĆ DO LISTY</button>
<button class="btn btn-study-cave" routerLink="/flashcards/add/table"><i class="fas fa-table"></i> DODAJ ZA POMOCĄ TABELI</button>
<button class="button" routerLink="/flashcards/sets"><i class="fas fa-arrow-left"></i> WRÓĆ DO LISTY</button>
<button class="button" routerLink="/flashcards/add/table"><i class="fas fa-table"></i> DODAJ ZA POMOCĄ TABELI</button>
</div>
</div>
<div class="wrapper-add">
@ -45,9 +45,9 @@
<br />
<input type="checkbox" name="{{ permission }}" class="form-control" [checked]="permission" (change)="changePermission()"/><b>Udostępnij publicznie</b>
</div><br />
<button class="btn btn-study-cave" [disabled]="!selectedFiles" (click)="upload()"><i class="fas fa-check-circle"></i> Dodaj fiszki!</button>
<button class="button" style="font-size: x-large;" [disabled]="!selectedFiles" (click)="upload()"><i class="fas fa-check-circle"></i> Dodaj fiszki!</button>
<br /><br />
<button class="btn btn-study-cave" routerLink="/flashcards/sets/"><i class="fas fa-arrow-left"></i> Powrót</button>
<button class="button" routerLink="/flashcards/sets/"><i class="fas fa-arrow-left"></i> Powrót</button>
</div>
</div>
</div>

16
FrontEnd/src/app/flashcards/flashcards-add-table/flashcards-add-table.component.css
View File

@ -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;
}
}

14
FrontEnd/src/app/flashcards/flashcards-add-table/flashcards-add-table.component.html
View File

@ -1,8 +1,8 @@
<div class="wrapper">
<div class="content">
<div class="buttons-container">
<button class="btn btn-study-cave" routerLink="/flashcards/sets"><i class="fas fa-arrow-left"></i> WRÓĆ DO LISTY</button>
<button class="btn btn-study-cave" routerLink="/flashcards/add/csv"><i class="fas fa-file-csv"></i> DODAJ ZA POMOCĄ CSV</button>
<button class="button" routerLink="/flashcards/sets"><i class="fas fa-arrow-left"></i> WRÓĆ DO LISTY</button>
<button class="button" routerLink="/flashcards/add/csv"><i class="fas fa-file-csv"></i> DODAJ ZA POMOCĄ CSV</button>
</div>
</div>
<div class="wrapper-add">
@ -37,7 +37,7 @@
<input [(ngModel)]="field.right_side" class="form-control" type="text" name="{{field.right_side}}" />
</td>
<td>
<button class="btn btn-study-cave" type="button" (click)="deleteFieldValue(i)"><i class="fas fa-trash-alt"></i> Usuń fiszkę</button>
<button class="button" type="button" (click)="deleteFieldValue(i)"><i class="fas fa-trash-alt"></i> Usuń fiszkę</button>
</td>
</tr>
<tr>
@ -48,7 +48,7 @@
<input class="form-control" type="text" id="newAttributeRight" [(ngModel)]="newAttribute.right_side" name="newAttributeRight" />
</td>
<td>
<button class="btn btn-study-cave" type="button" (click)="addFieldValue()"><i class="fas fa-plus"></i> Dodaj fiszkę</button>
<button class="button" type="button" (click)="addFieldValue()"><i class="fas fa-plus"></i> Dodaj fiszkę</button>
</td>
</tr>
</tbody>
@ -60,9 +60,9 @@
<b>Udostępnij publicznie</b>
</div>
<br /><br />
<button class="btn btn-study-cave" type="submit"><i class="fas fa-check-circle"></i> Dodaj fiszki!</button>
<button class="btn btn-study-cave" routerLink="/flashcards/sets/"><i class="fas fa-arrow-left"></i> Powrót</button>
<button class="button" style="font-size: x-large;" type="submit"><i class="fas fa-check-circle"></i> Dodaj fiszki!</button><br />
<button class="button" routerLink="/flashcards/sets/"><i class="fas fa-arrow-left"></i> Powrót</button>
</form>
</div>
</div>
</div>
</div>

11
FrontEnd/src/app/flashcards/flashcards-add/flashcards-add.component.css
View File

@ -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;
}
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
}

8
FrontEnd/src/app/flashcards/flashcards-add/flashcards-add.component.html
View File

@ -1,9 +1,9 @@
<div class="wrapper">
<div class="content">
<div class="buttons-container">
<button class="btn btn-study-cave" routerLink="/flashcards/sets"><i class="fas fa-arrow-left"></i> WRÓĆ DO LISTY</button>
<button class="btn btn-study-cave" routerLink="/flashcards/add/table"><i class="fas fa-table"></i> DODAJ ZA POMOCĄ TABELI</button>
<button class="btn btn-study-cave" routerLink="/flashcards/add/csv"><i class="fas fa-file-csv"></i> DODAJ ZA POMOCĄ CSV</button>
<button class="button" routerLink="/flashcards/sets"><i class="fas fa-arrow-left"></i> WRÓĆ DO LISTY</button>
<button class="button" routerLink="/flashcards/add/table"><i class="fas fa-table"></i> DODAJ ZA POMOCĄ TABELI</button>
<button class="button" routerLink="/flashcards/add/csv"><i class="fas fa-file-csv"></i> DODAJ ZA POMOCĄ CSV</button>
</div>
</div>
</div>
</div>

13
FrontEnd/src/app/flashcards/flashcards-edit-table/flashcards-edit-table.component.css
View File

@ -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;
}
}

12
FrontEnd/src/app/flashcards/flashcards-edit-table/flashcards-edit-table.component.html
View File

@ -1,7 +1,7 @@
<div class="wrapper">
<div class="content">
<div class="buttons-container">
<button class="btn btn-study-cave" (click)="returnToSet()"><i class="fas fa-arrow-left"></i> WRÓĆ DO ZESTAWU</button>
<button class="button" (click)="returnToSet()"><i class="fas fa-arrow-left"></i> WRÓĆ DO ZESTAWU</button>
</div>
</div>
<div class="wrapper-add">
@ -45,7 +45,7 @@
<input [(ngModel)]="field.right_side" class="form-control" type="text" name="{{field.right_side}}" />
</td>
<td>
<button class="btn btn-study-cave" type="button" (click)="deleteFieldValue(i)"><i class="fas fa-trash-alt"></i> Usuń fiszkę</button>
<button class="button" type="button" (click)="deleteFieldValue(i)"><i class="fas fa-trash-alt"></i> Usuń fiszkę</button>
</td>
</tr>
<tr>
@ -56,7 +56,7 @@
<input class="form-control" type="text" id="newAttributeRight" [(ngModel)]="newAttribute['right_side']" name="newAttributeRight" />
</td>
<td>
<button class="btn btn-study-cave" type="button" (click)="addFieldValue()"><i class="fas fa-file-csv"></i> Dodaj fiszkę</button>
<button class="button" type="button" (click)="addFieldValue()"><i class="fas fa-file-csv"></i> Dodaj fiszkę</button>
</td>
</tr>
</tbody>
@ -64,10 +64,10 @@
</label>
<br />
<div>
<button class="btn btn-study-cave" type="submit"><i class="fas fa-check-circle"></i> Edytuj fiszki!</button>
<button class="btn btn-study-cave" [routerLink]="['/flashcards/sets', ident]"><i class="fas fa-arrow-left"></i> Powrót</button>
<button class="button" style="font-size: x-large;" type="submit"><i class="fas fa-check-circle"></i> Edytuj fiszki!</button><br />
<button class="button" [routerLink]="['/flashcards/sets', ident]"><i class="fas fa-arrow-left"></i> Powrót</button>
</div>
</form>
</div>
</div>
</div>
</div>

15
FrontEnd/src/app/flashcards/flashcards-filling-in-test/flashcards-filling-in-test.component.css
View File

@ -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;
}
}
}

12
FrontEnd/src/app/flashcards/flashcards-filling-in-test/flashcards-filling-in-test.component.html
View File

@ -27,7 +27,7 @@
<div id="container-large">
<div *ngIf="started">
<div *ngIf="this.filled >= 1 && !finish">
Poprzednia odpowiedź:<br />
{{flashcards[index-1].content}} {{allAnswers[index-1].answer}}
</div>
@ -35,7 +35,7 @@
Podaj odpowiedź:<br />
{{flashcards[index].content}}
<input appAutofocus [(ngModel)]="answer" class="mr-2" placeholder="odpowiedź" (keyup.enter)="verifyAnswer()" >
<button class="btn btn-study-cave" (click)="verifyAnswer()"><i class="fas fa-check-circle"></i> Sprawdź</button>
<button class="button" style="min-width: 200px;" (click)="verifyAnswer()"><i class="fas fa-check-circle"></i> Sprawdź</button>
</div>
<div *ngIf="this.is_correct === true && !finish">ODPOWIEDŹ POPRAWNA</div>
<div *ngIf="this.is_correct === false && !finish">ODPOWIEDŹ NIEPOPRAWNA</div>
@ -50,10 +50,10 @@
<app-test-results [result]="good" [maxPts]="length_test"></app-test-results>
</div>
<div *ngIf="!finish">
<button class="btn btn-study-cave" *ngIf="!started" (click)="start()"><i class="far fa-play-circle"></i> Rozpocznij test</button>
<button class="button" *ngIf="!started" (click)="start()"><i class="far fa-play-circle"></i> Rozpocznij test</button>
</div>
<button class="btn btn-study-cave" *ngIf="finish" routerLink="/flashcards/sets/{{ id }}"><i class="far fa-stop-circle"></i> Zakończ test</button>
<button class="btn btn-study-cave" *ngIf="started && !finish && !not_last"(click)="finished()"><i class="fas fa-arrow-left"></i> Przejdź do wyniku</button>
<button class="button" *ngIf="finish" routerLink="/flashcards/sets/{{ id }}"><i class="far fa-stop-circle"></i> Zakończ test</button>
<button class="button" *ngIf="started && !finish && !not_last"(click)="finished()"><i class="fas fa-arrow-left"></i> Przejdź do wyniku</button>
<br />
<button class="btn btn-study-cave" routerLink="/flashcards/sets/{{ id }}"><i class="fas fa-arrow-left"></i> Wróć do zestawu</button>
<button class="button" routerLink="/flashcards/sets/{{ id }}"><i class="fas fa-arrow-left"></i> Wróć do zestawu</button>
</div>

15
FrontEnd/src/app/flashcards/flashcards-memory-test/flashcards-memory-test.component.css
View File

@ -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;
}
}
}

10
FrontEnd/src/app/flashcards/flashcards-memory-test/flashcards-memory-test.component.html
View File

@ -38,12 +38,12 @@
</div>
<br />
<div *ngIf="!finish">
<button class="btn btn-study-cave" *ngIf="!started" (click)="start()"><i class="far fa-play-circle"></i> Rozpocznij test</button>
<button class="btn btn-study-cave" *ngIf="checked && not_last" (click)="increment()"><i class="fas fa-arrow-right"></i>Przejdź dalej</button>
<button class="btn btn-study-cave" *ngIf="checked && !not_last" (click)="increment()"><i class="far fa-stop-circle"></i> Zakończ test</button>
<button class="button" *ngIf="!started" (click)="start()"><i class="far fa-play-circle"></i> Rozpocznij test</button>
<button class="button" *ngIf="checked && not_last" (click)="increment()"><i class="fas fa-arrow-right"></i>Przejdź dalej</button>
<button class="button" *ngIf="checked && !not_last" (click)="increment()"><i class="far fa-stop-circle"></i> Zakończ test</button>
</div>
<br />
<button class="btn btn-study-cave" routerLink="/flashcards/sets/{{ id }}"><i class="fas fa-arrow-left"></i> Wróć do zestawu</button>
<button class="button" routerLink="/flashcards/sets/{{ id }}"><i class="fas fa-arrow-left"></i> Wróć do zestawu</button>
</div>
</div>
</div>
</div>

22
FrontEnd/src/app/flashcards/flashcards-pairs-test-set/flashcards-pairs-test-set.component.css
View File

@ -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;
}
}

4
FrontEnd/src/app/flashcards/flashcards-pairs-test-set/flashcards-pairs-test-set.component.html
View File

@ -27,5 +27,5 @@
</div>
<br />
<button *ngIf="!verify" class="btn btn-study-cave" (click)="nextQuestion()"><i class="fas fa-check-circle"></i> Sprawdź</button>
</div>
<button *ngIf="!verify" class="button" style="min-width: 200px;" (click)="nextQuestion()"><i class="fas fa-check-circle"></i> Sprawdź</button>
</div>

15
FrontEnd/src/app/flashcards/flashcards-pairs-test/flashcards-pairs-test.component.css
View File

@ -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;
}
}
}

8
FrontEnd/src/app/flashcards/flashcards-pairs-test/flashcards-pairs-test.component.html
View File

@ -45,11 +45,11 @@
</div>
<br />
<div *ngIf="!finish">
<button class="btn btn-study-cave" *ngIf="!started" (click)="start()"><i class="far fa-play-circle"></i> Rozpocznij test</button>
<button class="btn btn-study-cave" *ngIf="checked && not_last" (click)="increment()"><i class="far fa-play-circle"></i> Przejdź dalej</button>
<button class="btn btn-study-cave" *ngIf="checked && !not_last" (click)="increment()"><i class="far fa-stop-circle"></i> Zakończ test</button>
<button class="button" *ngIf="!started" (click)="start()"><i class="far fa-play-circle"></i> Rozpocznij test</button>
<button class="button" *ngIf="checked && not_last" (click)="increment()"><i class="far fa-play-circle"></i> Przejdź dalej</button>
<button class="button" *ngIf="checked && !not_last" (click)="increment()"><i class="far fa-stop-circle"></i> Zakończ test</button>
</div>
<br />
<button class="btn btn-study-cave" routerLink="/flashcards/sets/{{ id }}"><i class="fas fa-arrow-left"></i> Wróć do zestawu</button>
<button class="button" routerLink="/flashcards/sets/{{ id }}"><i class="fas fa-arrow-left"></i> Wróć do zestawu</button>
</div>
</div>

9
FrontEnd/src/app/flashcards/flashcards-set-detail/flashcards-set-detail.component.css
View File

@ -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;

16
FrontEnd/src/app/flashcards/flashcards-set-detail/flashcards-set-detail.component.html
View File

@ -1,12 +1,12 @@
<div class="wrapper">
<div class="content">
<div class="button-container">
<button class="btn btn-study-cave" (click)="goBack()"><i class="fas fa-arrow-left"></i> POWRÓT</button>
<button class="btn btn-study-cave" (click)="showTestTypeMenu()"><i class="fas fa-pencil-ruler"></i> GENERUJ TESTY</button>
<button *ngIf="owned && set && set.permission !== 'GROUP'" class="btn btn-study-cave" (click)="navigateToEditMode()"><i class="fas fa-edit"></i> EDYTUJ FISZKI</button>
<button *ngIf="owned && set && set.permission !== 'GROUP'" class="btn btn-study-cave" (click)="showPopup()"><i class="fas fa-trash-alt"></i> USUŃ FISZKI</button>
<button class="button" (click)="goBack()"><i class="fas fa-arrow-left"></i> POWRÓT</button>
<button class="button" (click)="showTestTypeMenu()"><i class="fas fa-pencil-ruler"></i> GENERUJ TESTY</button>
<button *ngIf="owned && set && set.permission !== 'GROUP'" class="button" (click)="navigateToEditMode()"><i class="fas fa-edit"></i> EDYTUJ FISZKI</button>
<button *ngIf="owned && set && set.permission !== 'GROUP'" class="button" (click)="showPopup()"><i class="fas fa-trash-alt"></i> USUŃ FISZKI</button>
<div *ngIf="user && owned && set && set.permission !== 'GROUP'">
<button class="btn btn-study-cave" (click)="changePermission()"><i class="fas fa-unlock"></i> ZMIEŃ UPRAWNIENIA</button>
<button class="button" (click)="changePermission()"><i class="fas fa-unlock"></i> ZMIEŃ UPRAWNIENIA</button>
</div>
</div>
@ -38,8 +38,8 @@
<p-dialog header="Potwierdź" [(visible)]="display">
Czy chcesz usunąć fiszkę?
<p-footer>
<button type="button" pButton icon="pi pi-check" (click)="deleteSet()" label="TAK"></button>
<button type="button" pButton icon="pi pi-close" (click)="display=false" label="NIE" class="ui-button-secondary"></button>
<button type="button" class="button" pButton icon="pi pi-check" (click)="deleteSet()" label="TAK"></button>
<button type="button" class="button" pButton icon="pi pi-close" (click)="display=false" label="NIE" class="ui-button-secondary"></button>
</p-footer>
</p-dialog>
</div>
</div>

45
FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.css
View File

@ -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;
}
}
.radio-answer
{
display: none;
}

18
FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.html
View File

@ -6,30 +6,30 @@
<br />
<div class="buttons-container">
<div *ngIf="logged">
<button class="btn btn-study-cave" (click)="toFlashcardsMaker()"><i class="fas fa-plus"></i> Dodaj fiszki</button>
<button class="button" (click)="toFlashcardsMaker()"><i class="fas fa-plus"></i> Dodaj fiszki</button>
</div>
<div *ngIf="logged" class="btn-group btn-group-toggle" data-toggle="buttons">
<label class="btn btn-study-cave active" (click)="ShowPublic()">
<input type="radio" name="options" id="option1" autocomplete="off" checked><i class="fas fa-globe"></i> Publiczne
<label class="button active" (click)="ShowPublic()">
<input type="radio" class="radio-answer" name="options" id="option1" autocomplete="off" checked><i class="fas fa-globe"></i> Publiczne
</label>
<label class="btn btn-study-cave" (click)="ShowPrivate()">
<input type="radio" name="options" id="option2" autocomplete="off"><i class="fas fa-user-secret"></i> Prywatne
<label class="button" (click)="ShowPrivate()">
<input type="radio" class="radio-answer" name="options" id="option2" autocomplete="off"><i class="fas fa-user-secret"></i> Prywatne
</label>
</div>
</div>
<br />
<ag-grid-angular style="width: 100%; height: 475px;" class="ag-theme-dark" [rowData]="sets" [columnDefs]="columnDefs" [enableSorting]="true"
[enableFilter]="true" (gridReady)="onGridReady($event)" (gridSizeChanged)="onGridSizeChanged($event)" [gridOptions]="gridOptions"
[pagination]="true" [paginationAutoPageSize]="true" (rowClicked)="onRowClicked($event)" [localeText]="localeText"
[pagination]="true" [paginationAutoPageSize]="true" (rowClicked)="onRowClicked($event)" [localeText]="localeText"
(gridColumnsChanged)="onGidColumnsChanged($event)">
</ag-grid-angular>
<p-dialog header="Potwierdź" [(visible)]="display">
Czy chcesz usunąć fiszkę?
<p-footer>
<button type="button" pButton icon="pi pi-check" (click)="deleteSet()" label="TAK"></button>
<button type="button" pButton icon="pi pi-close" (click)="display=false" label="NIE" class="ui-button-secondary"></button>
<button type="button" class="button" pButton icon="pi pi-check" (click)="deleteSet()" label="TAK"></button>
<button type="button" class="button" pButton icon="pi pi-close" (click)="display=false" label="NIE" class="ui-button-secondary"></button>
</p-footer>
</p-dialog>
</div>
</div>
</div>

10
FrontEnd/src/app/flashcards/flashcards-test-type-menu/flashcards-test-type-menu.component.css
View File

@ -1,4 +1,12 @@
div{
margin-top: 5px;
margin-bottom: 5px;
}
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
min-width: 200px;
}

12
FrontEnd/src/app/flashcards/flashcards-test-type-menu/flashcards-test-type-menu.component.html
View File

@ -1,7 +1,7 @@
<div>
<button class="btn btn-study-cave" (click)="goToTestGenFill()">Uzupełnij</button>
<button class="btn btn-study-cave" (click)="goToTestGen()">Pary</button>
<button class="btn btn-study-cave" (click)="goToTestGenTyperace()">Na czas</button>
<button class="btn btn-study-cave" (click)="goToTestGenMemory()">Memory</button>
<button class="btn btn-study-cave" (click)="cancelMenu()"><i class="fas fa-times"></i> Anuluj</button>
</div>
<button class="button" (click)="goToTestGenFill()">Uzupełnij</button>
<button class="button" (click)="goToTestGen()">Pary</button>
<button class="button" (click)="goToTestGenTyperace()">Na czas</button>
<button class="button" (click)="goToTestGenMemory()">Memory</button><br />
<button class="button" (click)="cancelMenu()"><i class="fas fa-times"></i> Anuluj</button>
</div>

15
FrontEnd/src/app/flashcards/flashcards-typerace-test/flashcards-typerace-test.component.css
View File

@ -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;
}
}
}

12
FrontEnd/src/app/flashcards/flashcards-typerace-test/flashcards-typerace-test.component.html
View File

@ -32,13 +32,13 @@
<div *ngIf="started">
<div *ngIf="this.filled >= 1 && !finish">
Poprzednia odpowiedź:<br />
{{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
</div>
<div *ngIf="this.filled < this.length_test && !finish">
Podaj odpowiedź:<br />
{{flashcards[index].content}}
<input appAutofocus [(ngModel)]="answer" class="mr-2" placeholder="odpowiedź" (keyup.enter)="verifyAnswer()" >
<button class="btn btn-study-cave" (click)="verifyAnswer()" ><i class="fas fa-check-circle"></i> Sprawdź</button>
<button class="button" style="min-width: 200px;" (click)="verifyAnswer()" ><i class="fas fa-check-circle"></i> Sprawdź</button>
</div>
<div *ngIf="this.is_correct === true && !finish">ODPOWIEDŹ POPRAWNA</div>
<div *ngIf="this.is_correct === false && !finish">ODPOWIEDŹ NIEPOPRAWNA</div>
@ -52,11 +52,11 @@
<app-test-results [result]="good" [maxPts]="length_test" [minutes]="finalminute" [seconds]="finalsecond" [milliseconds]="finalmillisecond" [timer]="true"></app-test-results>
</div>
<div *ngIf="!finish">
<button class="btn btn-study-cave" *ngIf="!started" (click)="start()"><i class="far fa-play-circle"></i> Rozpocznij test</button>
<button class="button" *ngIf="!started" (click)="start()"><i class="far fa-play-circle"></i> Rozpocznij test</button>
</div>
<button class="btn btn-study-cave" *ngIf="finish" routerLink="/flashcards/sets/{{ id }}"><i class="far fa-stop-circle"></i> Zakończ test</button>
<button class="btn btn-study-cave" *ngIf="started && !finish && !not_last"(click)="finished()"><i class="far fa-stop-circle"></i> Przejdź do wyniku</button>
<button class="button" *ngIf="finish" routerLink="/flashcards/sets/{{ id }}"><i class="far fa-stop-circle"></i> Zakończ test</button>
<button class="button" *ngIf="started && !finish && !not_last"(click)="finished()"><i class="far fa-stop-circle"></i> Przejdź do wyniku</button>
<br />
<button class="btn btn-study-cave" routerLink="/flashcards/sets/{{ id }}"><i class="fas fa-arrow-left"></i> Wróć do zestawu</button>
<button class="button" routerLink="/flashcards/sets/{{ id }}"><i class="fas fa-arrow-left"></i> Wróć do zestawu</button>
</div>
</div>

9
FrontEnd/src/app/flashcards/flashcards/flashcards.component.css
View File

@ -1,3 +1,6 @@
.btn{
margin-bottom: 5px;
}
.button{
font-size: large;
min-width: 200px;
}

4
FrontEnd/src/app/flashcards/flashcards/flashcards.component.html
View File

@ -1,4 +1,4 @@
<div>
<button class="btn btn-study-cave" routerLink="/flashcards/sets"><i class="fas fa-scroll"></i> FISZKI</button>
<button class="btn btn-study-cave" routerLink="/materials/list"><i class="fas fa-book-open"></i> MATERIAŁY</button>
<button class="button" routerLink="/flashcards/sets"><i class="fas fa-scroll"></i> FISZKI</button>
<button class="button" routerLink="/materials/list"><i class="fas fa-book-open"></i> MATERIAŁY</button>
</div>

1
FrontEnd/src/styles.css
View File

@ -157,6 +157,7 @@ a:hover{
border-bottom: #000080;
color: white;
font-size: x-large;
outline: none;
}
.button:hover