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

Merge branch 'master' of https://git.wmi.amu.edu.pl/s416178/Punktonerzy

This commit is contained in:
yetju000 2019-12-14 22:03:48 +01:00
parent 1fd7f8315c ca5f1f2765
commit 3bf021aa3b
47 changed files with 425 additions and 200 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>

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

@ -10,6 +10,10 @@
cursor: pointer;
}
.wrapper{
width: 100%;
padding: 30px;
@ -17,6 +21,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 +40,7 @@
.content{
background-color: #181616;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 2rem;
text-align: center;
@ -43,4 +54,7 @@ ag-grid-angular{
.buttons-container > div{
margin: 10px;
}
}

16
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
<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="btn btn-study-cave " (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>

12
FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.ts
View File

@ -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 `
<button type="button" data-action-type="remove" class="btn btn-study-cave btn-sm" title="Usuń">
<button type="button" data-action-type="remove" class="btn btn-study-cave " title="Usuń">
<i class="fas fa-trash-alt" data-action-type="remove"></i></button>
<button type="button" data-action-type="changePermission" class="btn btn-study-cave btn-sm" title="Uprawnienia">
<button type="button" data-action-type="changePermission" class="btn btn-study-cave " title="Uprawnienia">
<i class="fas fa-unlock" data-action-type="changePermission"></i></button>
`;
} 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,

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>

19
FrontEnd/src/app/groups/group-details/group-details.component.html
View File

@ -1,35 +1,36 @@
<div class="wrapper">
<div class="content">
<div>
<button class="btn btn-study-cave float-right mr-1" (click)="goToAddingResource()"><i class="fas fa-plus"></i>
<button class="btn btn-study-cave float-right mr-1 mb-4" (click)="goToAddingResource()"><i class="fas fa-plus"></i>
Dodaj zasoby do grupy</button>
<button class="btn btn-study-cave float-right mr-1" (click)="goToRankings()"><i class="fas fa-trophy"></i>
<button class="btn btn-study-cave float-right mr-1 mb-4" (click)="goToRankings()"><i class="fas fa-trophy"></i>
Rankingi</button>
<button *ngIf="group?.owner===currentUser.username" class="btn btn-study-cave float-right mr-1" (click)="goToTestsResults()"><i class="fas fa-trophy"></i>
<button *ngIf="group?.owner===currentUser.username" class="btn btn-study-cave float-right mr-1 mb-4" (click)="goToTestsResults()"><i class="fas fa-trophy"></i>
Wyniki za testy</button>
<div style="clear: both;"></div>
</div>
<br />
<div>
<button class="btn btn-study-cave float-right mr-1" (click)="goToHistory()"><i class="fas fa-user-clock"></i> Twoja historia aktywności</button>
<button class="btn btn-study-cave float-right mr-1 mb-4" (click)="goToHistory()"><i class="fas fa-user-clock"></i> Twoja historia aktywności</button>
<div style="clear: both;"></div>
</div>
<br />
<h1>{{group?.name}}</h1>
<br />
<h3>Opis grupy:</h3>
<p>{{group?.description}}</p>
<div class="buttons-container">
<div>
<button class="btn btn-study-cave" (click)="goToGroupsList()"><i class="fas fa-arrow-left"></i> Do listy grup</button>
<button *ngIf="group?.owner===currentUser.username" class="btn btn-study-cave" (click)="goToEditing()"><i class="fas fa-edit"></i> Edytuj grupę</button>
<button class="btn btn-study-cave mb-4" (click)="goToGroupsList()"><i class="fas fa-arrow-left"></i> Do listy grup</button>
<button *ngIf="group?.owner===currentUser.username" class="btn btn-study-cave mb-4" (click)="goToEditing()"><i class="fas fa-edit"></i> Edytuj grupę</button>
</div>
<div>
<button class="btn btn-study-cave" (click)="isDisplayed('materiałów')"><i class="fas fa-book-open"></i>
<button class="btn btn-study-cave mb-4" (click)="isDisplayed('materiałów')"><i class="fas fa-book-open"></i>
Materiały</button>
<button class="btn btn-study-cave" (click)="isDisplayed('fiszek')"><i class="fas fa-scroll"></i> Fiszki</button>
<button class="btn btn-study-cave" (click)="isDisplayed('testów')"><i class="fas fa-pencil-ruler"></i>Testy</button>
<button class="btn btn-study-cave mb-4" (click)="isDisplayed('fiszek')"><i class="fas fa-scroll"></i> Fiszki</button>
<button class="btn btn-study-cave mb-4" (click)="isDisplayed('testów')"><i class="fas fa-pencil-ruler"></i>Testy</button>
</div>
</div>

17
FrontEnd/src/app/groups/group-details/group-details.component.ts
View File

@ -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 ?
`<button type="button" data-action-type="remove" class="btn btn-danger btn-sm"title="Usuń">
`<button type="button" data-action-type="remove" class="btn btn-danger "title="Usuń">
<i class="fas fa-trash-alt" data-action-type="remove"></i>
</button>` : '';
}
@ -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,

2
FrontEnd/src/app/groups/manage-group/manage-group.component.css
View File

@ -1,4 +1,4 @@
a.wrapper{
.wrapper{
width: 100%;
padding: 30px;
min-height: 100%;

2
FrontEnd/src/app/groups/manage-group/manage-group.component.ts
View File

@ -49,7 +49,7 @@ export class ManageGroupComponent implements OnInit, OnDestroy {
}
customCellRendererFunc(params) {
return `<button type="button" data-action-type="remove" class="btn btn-study-cave btn-sm" title="Usuń">
return `<button type="button" data-action-type="remove" class="btn btn-study-cave " title="Usuń">
<i class="fas fa-trash-alt" data-action-type="remove"></i></button>`;
}

2
FrontEnd/src/app/groups/my-groups/my-groups.component.ts
View File

@ -95,7 +95,7 @@ export class MyGroupsComponent implements OnInit, OnDestroy {
customCellRendererFunc(params) {
if (params.data['role'] === 'Lider') {
return `
<button type="button" data-action-type="edit" class="btn btn-study-cave btn-sm" title="Zarządzaj grupą">
<button type="button" data-action-type="edit" class="btn btn-study-cave " title="Zarządzaj grupą">
<i class="fas fa-tools" data-action-type="edit"></i></button>
`;
} else {

9
FrontEnd/src/app/groups/ranking/ranking.component.ts
View File

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

13
FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.ts
View File

@ -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
@ -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) {
@ -148,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();

6
FrontEnd/src/app/groups/waiting-resources/waiting-resources.component.ts
View File

@ -323,11 +323,11 @@ export class WaitingResourcesComponent implements OnInit, OnDestroy {
customCellRendererFunc(params) {
return `
<button type="button" data-action-type="preview" class="btn btn-study-cave btn-sm" title="Podgląd">
<button type="button" data-action-type="preview" class="btn btn-study-cave " title="Podgląd">
<i class="far fa-eye" data-action-type="preview"></i></button>
<button type="button" data-action-type="accept" class="btn btn-study-cave btn-sm" title="Akceptuj">
<button type="button" data-action-type="accept" class="btn btn-study-cave " title="Akceptuj">
<i class="fas fa-check-circle" data-action-type="accept"></i></button>
<button type="button" data-action-type="reject" class="btn btn-study-cave btn-sm" title="Odrzuć">
<button type="button" data-action-type="reject" class="btn btn-study-cave " title="Odrzuć">
<i class="fas fa-times" data-action-type="reject"></i></button>
`;
}

8
FrontEnd/src/app/login/login.component.html
View File

@ -1,15 +1,15 @@
<div class="content">
<div id="container-login">
<button class="btn btn-study-cave" (click)="loginWithUsos()">Zaloguj przez USOS</button>
<button class="button" (click)="loginWithUsos()">Zaloguj przez USOS</button>
<br /><br /><br /><br />
<div>
<form (ngSubmit)="login()">
Nazwa użytkownika:<br />
<input type = "text" [(ngModel)] = "model.username" name="username"><br />
Hasło:<br />
Hasło:<br />
<input type = "password" [(ngModel)] = "model.password" name = "password"><br /><br />
<input class="btn btn-study-cave" type="submit" value = "Zaloguj" />
<input class="button" type="submit" value = "Zaloguj" />
</form>
</div>
</div>
</div>
</div>

17
FrontEnd/src/app/materials/materials-add/materials-add.component.css
View File

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

7
FrontEnd/src/app/materials/materials-add/materials-add.component.html
View File

@ -1,7 +1,7 @@
<div class="wrapper">
<div class="content">
<div class="buttons-container">
<button class="btn btn-study-cave" routerLink="/materials/list"><i class="fas fa-arrow-left"></i> WRÓĆ DO LISTY</button>
<button class="button" routerLink="/materials/list"><i class="fas fa-arrow-left"></i> WRÓĆ DO LISTY</button>
</div>
</div>
<div class="wrapper-add">
@ -33,10 +33,9 @@
<b>Udostępnij publicznie</b>
<br /><br />
</div>
<button class="btn btn-study-cave" [disabled]="!selectedFiles" (click)="upload()"><i class="fas fa-check-circle"></i> Dodaj materiały!</button>
<button class="button" style ="font-size: x-large; padding-left: 30px; padding-right: 30px;" [disabled]="!selectedFiles" (click)="upload()"><i class="fas fa-check-circle"></i> Dodaj materiały!</button>
<br /><br />
<button class="btn btn-study-cave" routerLink="/materials/list/"><i class="fas fa-arrow-left"></i> Powrót</button>
<button class="button" routerLink="/materials/list/"><i class="fas fa-arrow-left"></i> Powrót</button>
</div>
</div>
</div>

11
FrontEnd/src/app/materials/materials-details/materials-details.component.css
View File

@ -14,8 +14,15 @@
.content{
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;
}

10
FrontEnd/src/app/materials/materials-list/materials-list.component.css
View File

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

4
FrontEnd/src/app/materials/materials-list/materials-list.component.html
View File

@ -7,7 +7,7 @@
<br />
<div class="buttons-container">
<div *ngIf="logged">
<button class="btn btn-study-cave" (click)="toMaterialsMaker()"><i class="fas fa-plus"></i> Dodaj materiały</button>
<button class="button" (click)="toMaterialsMaker()"><i class="fas fa-plus"></i> Dodaj materiały</button>
</div>
<div *ngIf="logged" class="btn-group btn-group-toggle" data-toggle="buttons">
<label class="btn btn-study-cave active" (click)="ShowPublic()">
@ -21,7 +21,7 @@
<br />
<ag-grid-angular style="width: 100%; height: 475px;" class="ag-theme-dark" [rowData]="mats" [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>

13
FrontEnd/src/app/materials/materials-list/materials-list.component.ts
View File

@ -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 `
<button type="button" data-action-type="remove" class="btn btn-study-cave btn-sm" title="Usuń">
<button type="button" data-action-type="remove" class="btn btn-study-cave " title="Usuń">
<i class="fas fa-trash-alt" data-action-type="remove"></i></button>
<button type="button" data-action-type="changePermission" class="btn btn-study-cave btn-sm" title="Uprawnienia">
<button type="button" data-action-type="changePermission" class="btn btn-study-cave " title="Uprawnienia">
<i class="fas fa-unlock" data-action-type="changePermission"></i></button>
`;
} 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,

6
FrontEnd/src/app/materials/materials-menu/materials-menu.component.css
View File

@ -0,0 +1,6 @@
.button{
font-size: large;
min-width: 200px;
}

6
FrontEnd/src/app/materials/materials-menu/materials-menu.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>
</div>
<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>

14
FrontEnd/src/app/tests/tests-list/tests-list.component.ts
View File

@ -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 '<button type="button" data-action-type="get" class="btn btn-study-cave">PDF</button>';
} else if (params.data['owner'] === currentUser.username) {
return `
<button type="button" data-action-type="remove" class="btn btn-study-cave btn-sm" title="Usuń">
<button type="button" data-action-type="remove" class="btn btn-study-cave " title="Usuń">
<i class="fas fa-trash-alt" data-action-type="remove"></i></button>
<button type="button" data-action-type="edit" class="btn btn-study-cave btn-sm" title="Edytuj">
<button type="button" data-action-type="edit" class="btn btn-study-cave " title="Edytuj">
<i class="fas fa-edit" data-action-type="edit"></i></button>
<button type="button" data-action-type="get" class="btn btn-study-cave btn-sm" title="PDF">
<button type="button" data-action-type="get" class="btn btn-study-cave " title="PDF">
<i class="fas fa-file-pdf" data-action-type="get"></i></button>
`;
} 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: '',

2
FrontEnd/src/index.html
View File

@ -5,7 +5,7 @@
<title>Punktonerzy</title>
<base href="/">
<!-- <script>document.write('<base href="' + document.location + '" />');</script> -->
<link href="https://fonts.googleapis.com/css?family=Roboto+Slab&display=swap" rel="stylesheet">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="assets/logo-punktonerzy.PNG">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.1/css/all.css" integrity="sha384-gfdkjb5BdAXd+lj+gudLWI+BXq4IuLW5IT+brZEZsLFm++aCMlF1V92rMkPaX4PP" crossorigin="anonymous">

130
FrontEnd/src/styles.css
View File

@ -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
@ -157,6 +157,7 @@ a:hover{
border-bottom: #000080;
color: white;
font-size: x-large;
outline: none;
}
.button:hover
@ -165,7 +166,116 @@ 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 {
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;
}
}
@media screen and (max-width: 470px) {
.ag-theme-dark {
font-size: 14px !important;
}
.ag-header {
font-size: 14px !important;
}
.ag-paging-panel {
font-size: 12px !important;
}
}