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 23:26:47 +01:00
parent 812a74447d def718a76a
commit 09e88feeb4
52 changed files with 428 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
FrontEnd/src/app/groups/group-creator/group-creator.component.css
View File

@ -4,7 +4,7 @@ label {
.container {
background-color: #181616;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 2rem;
text-align: center;
@ -18,6 +18,13 @@ label {
margin-bottom: 4rem;
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
}
.wrapper {
width: 100%;
padding: 30px;
@ -27,7 +34,7 @@ label {
.content {
background-color: #181616;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 2rem;
text-align: center;

4
FrontEnd/src/app/groups/group-creator/group-creator.component.html
View File

@ -14,8 +14,8 @@
<textarea name="description" class="form-control" ngModel required></textarea>
</label>
<br /><br />
<button #btn class="btn btn-study-cave" type="submit"><i class="fas fa-check-circle"></i> Dodaj grupę!</button>
<button class="btn btn-study-cave" routerLink="/my-groups"><i class="fas fa-arrow-left"></i> Powrót</button>
<button #btn class="button max" type="submit"><i class="fas fa-check-circle"></i> Dodaj grupę!</button>
<button class="button" routerLink="/my-groups"><i class="fas fa-arrow-left"></i> Powrót</button>
</form>
</div>
</div>

9
FrontEnd/src/app/groups/group-details/group-details.component.css
View File

@ -7,7 +7,7 @@
.content{
background-color: #181616;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 2rem;
text-align: center;
@ -15,6 +15,13 @@
margin-right: auto;
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
}
ag-grid-angular{
margin: 10px;
}

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

@ -1,19 +1,19 @@
<div class="wrapper">
<div class="content">
<div>
<button class="btn btn-study-cave float-right mr-1 mb-4" (click)="goToAddingResource()"><i class="fas fa-plus"></i>
<button class="button 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 mb-4" (click)="goToRankings()"><i class="fas fa-trophy"></i>
<button class="button 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 mb-4" (click)="goToTestsResults()"><i class="fas fa-trophy"></i>
<button *ngIf="group?.owner===currentUser.username" class="button 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 mb-4" (click)="goToHistory()"><i class="fas fa-user-clock"></i> Twoja historia aktywności</button>
<button class="button 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 />
@ -23,14 +23,14 @@
<p>{{group?.description}}</p>
<div class="buttons-container">
<div>
<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>
<button class="button mb-4" (click)="goToGroupsList()"><i class="fas fa-arrow-left"></i> Do listy grup</button>
<button *ngIf="group?.owner===currentUser.username" class="button mb-4" (click)="goToEditing()"><i class="fas fa-edit"></i> Edytuj grupę</button>
</div>
<div>
<button class="btn btn-study-cave mb-4" (click)="isDisplayed('materiałów')"><i class="fas fa-book-open"></i>
<button class="button mb-4" (click)="isDisplayed('materiałów')"><i class="fas fa-book-open"></i>
Materiały</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>
<button class="button mb-4" (click)="isDisplayed('fiszek')"><i class="fas fa-scroll"></i> Fiszki</button>
<button class="button mb-4" (click)="isDisplayed('testów')"><i class="fas fa-pencil-ruler"></i>Testy</button>
</div>
</div>
@ -52,4 +52,4 @@
<button type="button" pButton icon="pi pi-close" (click)="display=false" label="NIE" class="ui-button-secondary"></button>
</p-footer>
</p-dialog>
</div>
</div>

9
FrontEnd/src/app/groups/history-of-activity-in-group/history-of-activity-in-group.component.css
View File

@ -7,7 +7,7 @@
.content {
background-color: #181616;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 2rem;
text-align: center;
@ -18,3 +18,10 @@
.buttons-container > div {
margin: 10px;
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
}

22
FrontEnd/src/app/groups/history-of-activity-in-group/history-of-activity-in-group.component.html
View File

@ -1,7 +1,7 @@
<div class="wrapper">
<div class="content">
<div>
<button class="btn btn-study-cave float-right mr-1" [routerLink]="['/groups/', id]"><i class="fas fa-arrow-left"></i> Powrót</button>
<button class="button float-right mr-1" [routerLink]="['/groups/', id]"><i class="fas fa-arrow-left"></i> Powrót</button>
<div style="clear: both;"></div>
</div>
<h1>Twoja historia aktywności</h1>
@ -26,7 +26,7 @@
<br />
<span>Pokaż wszystkie aktywności</span>
<br /><br />
<button class="btn btn-study-cave" (click)="getHistory(true)">Pokaż wszystko</button>
<button class="button" (click)="getHistory(true)">Pokaż wszystko</button>
<br /><br /><br />
<p>Pokaż aktywności z wybranego przedziału</p>
<mat-form-field>
@ -40,7 +40,7 @@
<mat-datepicker #picker2></mat-datepicker>
</mat-form-field>
<br />
<button class="btn btn-study-cave" (click)="getHistory()">Pokaż w wybranym przedziale</button>
<button class="button" (click)="getHistory()">Pokaż w wybranym przedziale</button>
</div>
</div>
</div>
@ -52,20 +52,20 @@
<p *ngFor="let activity of activityHistory">
<span><b>{{ activity.date }}</b> - </span>
<span *ngIf="activity.from && user && activity.from !== user">
lider grupy {{ activity.from }}
lider grupy {{ activity.from }}
<span *ngIf="activity.type === 'acceptedResource'">
zatwierdził dodany przez Ciebie
zatwierdził dodany przez Ciebie
<span *ngIf="activity.resourceType === 'test'">test </span>
<span *ngIf="activity.resourceType === 'material'">materiał </span>
<span *ngIf="activity.resourceType === 'flashcards'">zestaw fiszek </span>
<span><b>{{ activity.resourceName }}</b>. </span>
<span *ngIf="activity.points === 0">Nie przyznał Ci za to punktów.</span>
<span *ngIf="activity.points !== 0">Przyznał Ci za to
<span *ngIf="activity.points !== 0">Przyznał Ci za to
{{ activity.points }} pkt.
</span>
</span>
<span *ngIf="activity.type === 'rejectedResource'">
odrzucił dodany przez Ciebie
odrzucił dodany przez Ciebie
<span *ngIf="activity.resourceType === 'test'">test </span>
<span *ngIf="activity.resourceType === 'material'">materiał </span>
<span *ngIf="activity.resourceType === 'flashcards'">zestaw fiszek </span>
@ -85,7 +85,7 @@
<span *ngIf="activity.resourceType === 'flashcards'">zestaw fiszek </span>
<span><b>{{ activity.resourceName }}</b> użytkownika {{ activity.to }}. </span>
<span *ngIf="activity.points === 0">Nie przyznałeś mu za to punktów.</span>
<span *ngIf="activity.points !== 0">Przyznałeś mu za to
<span *ngIf="activity.points !== 0">Przyznałeś mu za to
{{ activity.points }} pkt.
</span>
</span>
@ -103,12 +103,12 @@
</span>
</span>
<span *ngIf="!activity.from">
<span *ngIf="activity.type === 'solvedTest'">otrzymałeś
<span>{{ activity.points }} pkt</span> za rozwiązany test
<span *ngIf="activity.type === 'solvedTest'">otrzymałeś
<span>{{ activity.points }} pkt</span> za rozwiązany test
<span><b>{{ activity.resourceName }}</b>.</span>
</span>
<span *ngIf="activity.type === 'addedResource'">
dodałeś do grupy
dodałeś do grupy
<span *ngIf="activity.resourceType === 'test'">test </span>
<span *ngIf="activity.resourceType === 'material'">materiał </span>
<span *ngIf="activity.resourceType === 'flashcards'">zestaw fiszek </span>

10
FrontEnd/src/app/groups/join-to-group/join-to-group.component.css
View File

@ -7,7 +7,7 @@
.content{
background-color: #181616;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 2rem;
text-align: center;
@ -15,6 +15,12 @@
margin-right: auto;
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
}
.join-to-group-form-item{
margin-bottom: 10px;
@ -22,4 +28,4 @@
.join-to-group-form{
margin-top: 10px;
}
}

4
FrontEnd/src/app/groups/join-to-group/join-to-group.component.html
View File

@ -6,7 +6,7 @@
<div class="ui-message ui-widget ui-corner-all ui-message-success" *ngIf="reditectToGroup">Dołączyłeś do grupy, przekierowanie do niej nastąpi za 3 sekundy.</div>
<form class="join-to-group-form" #f="ngForm" (ngSubmit)="joinToGroup(f.value)" *ngIf="!reditectToGroup">
<input type="text" name="code" class="form-control join-to-group-form-item" placeholder="Kod dostępu" ngModel required/>
<button type="submit" class="btn btn-study-cave join-to-group-form-item" [disabled]="f.form.invalid"><i class="fas fa-check-circle"></i> Dołącz!</button>
<button type="submit" class="button join-to-group-form-item" [disabled]="f.form.invalid"><i class="fas fa-check-circle"></i> Dołącz!</button>
</form>
</div>
</div>
</div>

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

@ -7,7 +7,7 @@
.content{
background-color: #181616;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 2rem;
text-align: center;
@ -15,6 +15,13 @@
margin-right: auto;
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
}
ag-grid-angular{
margin: 10px;
}

14
FrontEnd/src/app/groups/manage-group/manage-group.component.html
View File

@ -4,21 +4,21 @@
<p>Klucz: {{group?.groupKey}}</p>
<br/>
<div class="buttons-container">
<button class="btn btn-study-cave" (click)="goToGroup()"><i class="fas fa-arrow-left"></i> Wróć do grupy</button>
<button class="btn btn-study-cave" (click)="newKeyGenerate()"><i class="fas fa-key"></i> Generuj nowy klucz</button>
<button class="btn btn-study-cave" (click)="showWaitingResources()"><i class="fas fa-stopwatch"></i> Oczekujące zasoby</button>
<button class="btn btn-study-cave" (click)="showDialog()"><i class="fas fa-trash-alt"></i> Usuń grupę</button>
<button class="button" (click)="goToGroup()"><i class="fas fa-arrow-left"></i> Wróć do grupy</button>
<button class="button" (click)="newKeyGenerate()"><i class="fas fa-key"></i> Generuj nowy klucz</button>
<button class="button" (click)="showWaitingResources()"><i class="fas fa-stopwatch"></i> Oczekujące zasoby</button>
<button class="button" (click)="showDialog()"><i class="fas fa-trash-alt"></i> Usuń grupę</button>
</div>
<br/>
<h2> Lista użytkowników </h2>
<ag-grid-angular style="width: 100%; height: 475px;" class="ag-theme-dark" [rowData]="group?.users" [columnDefs]="columnDefs"
[enableSorting]="true" [enableFilter]="true" (gridReady)="onGridReady($event)" [gridOptions]="gridOptions"
[pagination]="true" [paginationAutoPageSize]="true" [localeText]="localeText"
[pagination]="true" [paginationAutoPageSize]="true" [localeText]="localeText"
(gridColumnsChanged)="onGridColumnsChanged($event)" (rowClicked)="onRowClicked($event)" (gridSizeChanged)="onGridSizeChanged($event)">
</ag-grid-angular>
</div>
</div>
</div>
<p-dialog header="Potwierdź" [(visible)]="display">
Czy chcesz usunąć grupę?
@ -26,4 +26,4 @@
<button type="button" pButton icon="pi pi-check" (click)="deleteGroup()" label="TAK"></button>
<button type="button" pButton icon="pi pi-close" (click)="display=false" label="NIE" class="ui-button-secondary"></button>
</p-footer>
</p-dialog>
</p-dialog>

9
FrontEnd/src/app/groups/my-groups/my-groups.component.css
View File

@ -7,7 +7,7 @@
.content{
background-color: #181616;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 2rem;
text-align: center;
@ -19,6 +19,13 @@ ag-grid-angular{
margin: 10px;
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
}
.buttons-container > div{
margin: 10px;
}

6
FrontEnd/src/app/groups/my-groups/my-groups.component.html
View File

@ -4,16 +4,16 @@
<br />
<div class="buttons-container">
<div>
<button class="btn btn-study-cave" (click)="toGroupMaker()"><i class="fas fa-plus"></i> Dodaj grupę</button>
<button class="button" (click)="toGroupMaker()"><i class="fas fa-plus"></i> Dodaj grupę</button>
</div>
<div>
<button class="btn btn-study-cave" (click)="goToJoinToGroup()"><i class="fas fa-users"></i> Dołącz do grupy</button>
<button class="button" (click)="goToJoinToGroup()"><i class="fas fa-users"></i> Dołącz do grupy</button>
</div>
</div>
<br />
<ag-grid-angular style="width: 100%; height: 475px;" class="ag-theme-dark" [rowData]="groups" [columnDefs]="columnDefs"
[enableSorting]="true" [enableFilter]="true" (gridReady)="onGridReady($event)" [gridOptions]="gridOptions"
[pagination]="true" [paginationAutoPageSize]="true" (rowClicked)="onRowClicked($event)" [localeText]="localeText"
[pagination]="true" [paginationAutoPageSize]="true" (rowClicked)="onRowClicked($event)" [localeText]="localeText"
(gridColumnsChanged)="onGridColumnsChanged($event)" (gridSizeChanged)="onGridSizeChanged($event)">
</ag-grid-angular>
</div>

11
FrontEnd/src/app/groups/ranking/ranking.component.css
View File

@ -7,7 +7,7 @@
.content {
background-color: #181616;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 2rem;
text-align: center;
@ -19,9 +19,16 @@
margin: 10px;
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
}
.chart-container {
margin: 10px;
width: 100%;
height: 500px;
position: relative;
}
}

6
FrontEnd/src/app/groups/ranking/ranking.component.html
View File

@ -1,7 +1,7 @@
<div class="wrapper">
<div class="content">
<div>
<button class="btn btn-study-cave float-right mr-1" [routerLink]="['/groups/', id]"><i class="fas fa-arrow-left"></i> Powrót</button>
<button class="button float-right mr-1" [routerLink]="['/groups/', id]"><i class="fas fa-arrow-left"></i> Powrót</button>
<div style="clear: both;"></div>
</div>
<h1>{{group?.name}}</h1>
@ -17,7 +17,7 @@
</div>
<br />
<div *ngIf="group">
<button class="btn btn-study-cave float-right mr-1" (click)="downloadCSVResults()">Eksportuj ranking do pliku CSV</button>
<button class="button float-right mr-1" (click)="downloadCSVResults()">Eksportuj ranking do pliku CSV</button>
<div style="clear: both;"></div>
</div>
<br />
@ -31,4 +31,4 @@
</div>
</div>
</div>
</div>

11
FrontEnd/src/app/groups/sharing-resources-in-groups/sharing-resources-in-groups.component.css
View File

@ -7,7 +7,7 @@
.content {
background-color: #181616;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 2rem;
text-align: center;
@ -15,6 +15,13 @@
margin-right: auto;
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
}
.buttons-container > div {
margin: 10px;
}
@ -22,4 +29,4 @@
.multiselect-wrapper{
display: flex;
justify-content: center;
}
}

12
FrontEnd/src/app/groups/sharing-resources-in-groups/sharing-resources-in-groups.component.html
View File

@ -1,7 +1,7 @@
<div class="wrapper">
<div class="content">
<div>
<button class="btn btn-study-cave float-right mr-1" [routerLink]="['/groups/', id]"><i class="fas fa-arrow-left"></i> Powrót</button>
<button class="button float-right mr-1" [routerLink]="['/groups/', id]"><i class="fas fa-arrow-left"></i> Powrót</button>
<div style="clear: both;"></div>
</div>
<h1>Dodawanie zasobów do grupy</h1>
@ -9,9 +9,9 @@
<div>
<p>Wybierz typ zasobu do dodania:</p>
<div>
<button [disabled]="materialsToAdd.length > 0" class="btn btn-study-cave mr-1" (click)="getMaterialsToAdd()"><i class="fas fa-book-open"></i> Materiały</button>
<button [disabled]="flashcardsToAdd.length > 0" class="btn btn-study-cave mr-1" (click)="getFlashcardsToAdd()"><i class="fas fa-book-open"></i> Fiszki</button>
<button [disabled]="testsToAdd.length > 0" class="btn btn-study-cave mr-1" (click)="getTestsToAdd()"><i class="fas fa-book-open"></i> Testy</button>
<button [disabled]="materialsToAdd.length > 0" class="button mr-1" (click)="getMaterialsToAdd()"><i class="fas fa-book-open"></i> Materiały</button>
<button [disabled]="flashcardsToAdd.length > 0" class="button mr-1" (click)="getFlashcardsToAdd()"><i class="fas fa-book-open"></i> Fiszki</button>
<button [disabled]="testsToAdd.length > 0" class="button mr-1" (click)="getTestsToAdd()"><i class="fas fa-book-open"></i> Testy</button>
</div>
</div>
<br /><br />
@ -26,11 +26,11 @@
</p-header>
</p-listbox>
<br /><br />
<button [disabled]="selected.length === 0" class="btn btn-study-cave mr-1" (click)="addResources()"><i class="fas fa-check-circle"></i> Dodaj</button>
<button [disabled]="selected.length === 0" class="button mr-1" (click)="addResources()"><i class="fas fa-check-circle"></i> Dodaj</button>
</div>
<div *ngIf="!(materialsToAdd.length > 0 || flashcardsToAdd.length > 0 || testsToAdd.length > 0)">
Brak elementów do dodania
</div>
</div>
</div>
</div>
</div>

9
FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.css
View File

@ -7,7 +7,7 @@
.content{
background-color: #181616;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 2rem;
text-align: center;
@ -19,6 +19,13 @@ ag-grid-angular{
margin: 10px;
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
}
.buttons-container > div{
margin: 10px;
}

6
FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.html
View File

@ -1,7 +1,7 @@
<div class="wrapper">
<div class="content">
<div>
<button class="btn btn-study-cave float-right mr-1" [routerLink]="['/groups/', id]"><i class="fas fa-arrow-left"></i> Powrót</button>
<button class="button float-right mr-1" [routerLink]="['/groups/', id]"><i class="fas fa-arrow-left"></i> Powrót</button>
<div style="clear: both;"></div>
</div>
<h1>Wyniki za testy w grupie: {{group?.name}}</h1>
@ -19,7 +19,7 @@
<div *ngIf="selectedTest">
<h2>Wybrany test: {{selectedTest.title}}</h2>
<br />
<button *ngIf="group" class="btn btn-study-cave float-right mr-1" (click)="downloadCSVResults()">Eksportuj wyniki do pliku CSV</button>
<button *ngIf="group" class="button float-right mr-1" (click)="downloadCSVResults()">Eksportuj wyniki do pliku CSV</button>
<div style="clear: both;"></div>
<br />
<ag-grid-angular style="width: 100%; height: 475px;" class="ag-theme-dark" [rowData]="testdata" [columnDefs]="testcolumnDefs"
@ -29,4 +29,4 @@
</ag-grid-angular>
</div>
</div>
</div>
</div>

6
FrontEnd/src/app/groups/waiting-resources/material-to-group-preview/material-to-group-preview.component.css
View File

@ -0,0 +1,6 @@
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
}

2
FrontEnd/src/app/groups/waiting-resources/material-to-group-preview/material-to-group-preview.component.html
View File

@ -1,5 +1,5 @@
<div>
<h2>{{ title }}</h2>
<br />
<a [href]="serverURL + id"><button class="btn btn-study-cave"><i class="fas fa-file-download"></i> Pobierz materiał</button></a>
<a [href]="serverURL + id"><button class="button"><i class="fas fa-file-download"></i> Pobierz materiał</button></a>
</div>

9
FrontEnd/src/app/groups/waiting-resources/waiting-resources.component.css
View File

@ -7,7 +7,7 @@
.content {
background-color: #181616;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 2rem;
text-align: center;
@ -15,6 +15,13 @@
margin-right: auto;
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
}
.buttons-container > div {
margin: 10px;
}

24
FrontEnd/src/app/groups/waiting-resources/waiting-resources.component.html
View File

@ -1,7 +1,7 @@
<div class="wrapper">
<div class="content">
<div>
<button class="btn btn-study-cave float-right mr-1" [routerLink]="['/groups/manage/', id]"><i class="fas fa-arrow-left"></i> Powrót</button>
<button class="button float-right mr-1" [routerLink]="['/groups/manage/', id]"><i class="fas fa-arrow-left"></i> Powrót</button>
<div style="clear: both;"></div>
</div>
<h1>Oczekujące zasoby</h1>
@ -9,9 +9,9 @@
<div>
<p>Wybierz typ zasobu:</p>
<div>
<button [disabled]="displayMaterials" class="btn btn-study-cave mr-1" (click)="getWaitingMaterials()"><i class="fas fa-book-open"></i> Materiały</button>
<button [disabled]="displayFlashcards" class="btn btn-study-cave mr-1" (click)="getWaitingFlashcards()"><i class="fas fa-scroll"></i> Fiszki</button>
<button [disabled]="displayTests" class="btn btn-study-cave mr-1" (click)="getWaitingTests()"><i class="fas fa-pencil-ruler"></i> Testy</button>
<button [disabled]="displayMaterials" class="button mr-1" (click)="getWaitingMaterials()"><i class="fas fa-book-open"></i> Materiały</button>
<button [disabled]="displayFlashcards" class="button mr-1" (click)="getWaitingFlashcards()"><i class="fas fa-scroll"></i> Fiszki</button>
<button [disabled]="displayTests" class="button mr-1" (click)="getWaitingTests()"><i class="fas fa-pencil-ruler"></i> Testy</button>
</div>
</div>
<br /><br />
@ -20,21 +20,21 @@
<div *ngIf="displayMaterials">
<ag-grid-angular style="width: 100%; height: 475px;" class="ag-theme-dark" [rowData]="waitingMaterials" [columnDefs]="columnDefs"
[enableSorting]="true" [enableFilter]="true" (gridReady)="onGridReady($event)" [gridOptions]="gridOptions"
[pagination]="true" [paginationAutoPageSize]="true" (rowClicked)="onRowClicked($event)" [localeText]="localeText"
[pagination]="true" [paginationAutoPageSize]="true" (rowClicked)="onRowClicked($event)" [localeText]="localeText"
(gridColumnsChanged)="onGridColumnsChanged($event)" (gridSizeChanged)="onGridSizeChanged($event)">
</ag-grid-angular>
</div>
<div *ngIf="displayTests">
<ag-grid-angular style="width: 100%; height: 475px;" class="ag-theme-dark" [rowData]="waitingTests" [columnDefs]="columnDefs"
[enableSorting]="true" [enableFilter]="true" (gridReady)="onGridReady($event)" [gridOptions]="gridOptions"
[pagination]="true" [paginationAutoPageSize]="true" (rowClicked)="onRowClicked($event)" [localeText]="localeText"
[pagination]="true" [paginationAutoPageSize]="true" (rowClicked)="onRowClicked($event)" [localeText]="localeText"
(gridColumnsChanged)="onGridColumnsChanged($event)" (gridSizeChanged)="onGridSizeChanged($event)">
</ag-grid-angular>
</div>
<div *ngIf="displayFlashcards">
<ag-grid-angular style="width: 100%; height: 475px;" class="ag-theme-dark" [rowData]="waitingFlashcards" [columnDefs]="columnDefs"
[enableSorting]="true" [enableFilter]="true" (gridReady)="onGridReady($event)" [gridOptions]="gridOptions"
[pagination]="true" [paginationAutoPageSize]="true" (rowClicked)="onRowClicked($event)" [localeText]="localeText"
[pagination]="true" [paginationAutoPageSize]="true" (rowClicked)="onRowClicked($event)" [localeText]="localeText"
(gridColumnsChanged)="onGridColumnsChanged($event)" (gridSizeChanged)="onGridSizeChanged($event)">
</ag-grid-angular>
</div>
@ -51,7 +51,7 @@
<app-flashcards-to-group-preview *ngIf="waitingFlashcards.length > 0" [set]="set"></app-flashcards-to-group-preview>
</div>
<br />
<button class="btn btn-study-cave" (click)="displayPreviewDialog = false"><i class="fas fa-times"></i> Zamknij</button>
<button class="button" (click)="displayPreviewDialog = false"><i class="fas fa-times"></i> Zamknij</button>
<br /><br />
</p-dialog>
@ -67,8 +67,8 @@
<textarea class="form-control" name="commentAccepted" [(ngModel)]="selectedResource.comment"></textarea>
</label>
<br /><br />
<button class="btn btn-study-cave" (click)="save(selectedResource)" ><i class="fas fa-check-circle"></i> Zapisz</button>
<button class="btn btn-study-cave" (click)="displayAcceptDialog = false"><i class="fas fa-times"></i> Anuluj</button>
<button class="button" (click)="save(selectedResource)" ><i class="fas fa-check-circle"></i> Zapisz</button>
<button class="button" (click)="displayAcceptDialog = false"><i class="fas fa-times"></i> Anuluj</button>
<br />
</p-dialog>
@ -79,7 +79,7 @@
<textarea class="form-control" name="commentRejected" [(ngModel)]="selectedResource.comment"></textarea>
</label>
<br /><br />
<button class="btn btn-study-cave" (click)="reject(selectedResource)"><i class="fas fa-check-circle"></i> Zapisz</button>
<button class="btn btn-study-cave" (click)="displayRejectDialog = false"><i class="fas fa-times"></i> Anuluj</button>
<button class="button max" (click)="reject(selectedResource)"><i class="fas fa-check-circle"></i> Zapisz</button>
<button class="button" (click)="displayRejectDialog = false"><i class="fas fa-times"></i> Anuluj</button>
<br />
</p-dialog>

22
FrontEnd/src/app/login/login.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;
@ -14,7 +14,7 @@
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
padding: 30px;
padding: 30px;
width: 50%;
min-width: 250px;
box-sizing: border-box;
@ -24,17 +24,17 @@
.content{
position:fixed;
width:100%;
box-sizing: border-box;
box-sizing: border-box;
max-width: 100%;
}
#container-large {
background-color: #181616;
padding: 30px;
padding: 30px;
width: 65%;
min-height: 400px;
margin: 25px;
float: right;
box-sizing: border-box;
box-sizing: border-box;
position: relative;
text-align: center;
}
@ -45,4 +45,12 @@
.text-content{
font-size: 18px;
}
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
min-width: 200px;
}

12
FrontEnd/src/app/shared/comments/comments.component.css
View File

@ -6,7 +6,7 @@
overflow: auto;
height: calc(100vh - 154px);
min-height: calc(100vh - 154px);
}
.wrapper{
@ -21,6 +21,14 @@
}
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
min-width: 200px;
}
@media screen and (max-width: 352px) {
.content{
margin-top: 170px;
@ -42,4 +50,4 @@ input {
border: 2px solid;
padding: 20px;
text-align: justify;
}
}

8
FrontEnd/src/app/shared/comments/comments.component.html
View File

@ -3,8 +3,8 @@
<br />
<hr>
<div>
<button class="btn btn-study-cave" (click)="toggle()" *ngIf="!display"><i class="far fa-comment-alt"></i> Komentarze</button>
<button class="btn btn-study-cave" (click)="toggle()" *ngIf="display"><i class="fas fa-angle-up"></i> ZWIŃ</button>
<button class="button" (click)="toggle()" *ngIf="!display"><i class="far fa-comment-alt"></i> Komentarze</button>
<button class="button" (click)="toggle()" *ngIf="display"><i class="fas fa-angle-up"></i> ZWIŃ</button>
</div>
<div>
@ -15,7 +15,7 @@
Dodaj komentarz: <br />
<textarea name="comment" class="form-control" rows="10" [(ngModel)]="comment"></textarea>
<br />
<button class="btn btn-study-cave" (click)="submitComment()"><i class="fas fa-plus"></i> Dodaj</button>
<button class="button" (click)="submitComment()"><i class="fas fa-plus"></i> Dodaj</button>
</div>
<div *ngFor="let comment of comments.slice().reverse(); let i = index">
<hr>
@ -29,4 +29,4 @@
</div>
</div>
</div>
</div>
</div>

10
FrontEnd/src/app/tests/gaps-question/gaps-question.component.css
View File

@ -4,7 +4,7 @@
.container {
background-color: #22272a;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 1rem;
text-align: center;
@ -18,6 +18,14 @@
align-content: center;
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
}
.wrapper {
width: 100%;
margin-bottom: 5rem;

23
FrontEnd/src/app/tests/gaps-question/gaps-question.component.html
View File

@ -36,13 +36,13 @@
<div class="col-md-2">
<b>Akcja</b>
<br />
<button class="btn btn-study-cave" type="button" (click)="removefromAnswers(i)"><i class="fas fa-trash-alt"></i> Usuń</button>
<button class="button" type="button" style="min-width: 150px;" (click)="removefromAnswers(i)"><i class="fas fa-trash-alt"></i> Usuń</button>
</div>
<div class="mobile col-md-2">
<b>Przesuń</b>
<br />
<button *ngIf="i != 0" class="mobile btn btn-study-cave" (click)="moveUp(i + 1)"><i class="fas fa-angle-up"></i> Góra</button>
<button *ngIf="i != answersCorrect.length - 1" class="mobile btn btn-study-cave" (click)="moveDown(i + 1)"><i class="fas fa-angle-down"></i> Dół</button>
<button *ngIf="i != 0" class="button" style="min-width: 150px;" (click)="moveUp(i + 1)"><i class="fas fa-angle-up"></i> Góra</button>
<button *ngIf="i != answersCorrect.length - 1" class="button" style="min-width: 150px;" (click)="moveDown(i + 1)"><i class="fas fa-angle-down"></i> Dół</button>
<span *ngIf="(i == 0) && (i == answersCorrect.length - 1)" >---</span>
</div>
</div>
@ -55,7 +55,7 @@
<div class="col-md-2">
<b>Akcja</b>
<br />
<button class="btn btn-study-cave" type="button" (click)="addToVisibleText()"><i class="fas fa-check-circle"></i> Zapisz</button>
<button class="button" style="min-width: 150px;" type="button" (click)="addToVisibleText()"><i class="fas fa-check-circle"></i> Zapisz</button>
</div>
</div>
<div *ngIf="gap" class="row">
@ -67,13 +67,13 @@
<div class="col-md-2">
<b>Akcja</b>
<br />
<button class="btn btn-study-cave" type="button" (click)="addToGaps()"><i class="fas fa-check-circle"></i> Zapisz</button>
<button class="button" style="min-width: 150px;" type="button" (click)="addToGaps()"><i class="fas fa-check-circle"></i> Zapisz</button>
</div>
</div>
<br />
<button class="btn btn-study-cave mb-2" (click)="showVisibleTextInput()">Dodaj tekst widoczny</button>
<button class="btn btn-study-cave mb-2" (click)="showGapInput()">Dodaj tekst luki</button>
<button class="btn btn-study-cave mb-2" (click)="addNewLine()">Wstaw nową linię</button>
<button class="button" (click)="showVisibleTextInput()">Dodaj tekst widoczny</button>
<button class="button" (click)="showGapInput()">Dodaj tekst luki</button>
<button class="button" (click)="addNewLine()">Wstaw nową linię</button>
<div *ngIf="answersCorrect.length != 0">
<br />
<h5>Podgląd: </h5>
@ -86,9 +86,10 @@
</div>
<br />
<br />
<button *ngIf='!edit' class="btn btn-study-cave" type="submit" (click)="addTable()"><i class="fas fa-check-circle"></i> Dodaj pytanie!</button>
<button *ngIf='edit' class="btn btn-study-cave" type="submit" (click)="addTable()"><i class="fas fa-edit"></i> Edytuj pytanie!</button>
<button class="btn btn-study-cave ml-2" (click)="empty()"><i class="fas fa-arrow-left"></i> Powrót</button>
<button *ngIf='!edit' class="button" style="font-size: x-large;" type="submit" (click)="addTable()"><i class="fas fa-check-circle"></i> Dodaj pytanie!</button>
<button *ngIf='edit' class="button" style="font-size: x-large;" type="submit" (click)="addTable()"><i class="fas fa-edit"></i> Edytuj pytanie!</button>
<br />
<button class="button" (click)="empty()"><i class="fas fa-arrow-left"></i> Powrót</button>
</div>
</div>
</div>

22
FrontEnd/src/app/tests/multiple-choice-question/multiple-choice-question.component.css
View File

@ -4,7 +4,7 @@
.container {
background-color: #22272a;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 1rem;
text-align: center;
@ -25,4 +25,22 @@
.align {
text-align: center;
}
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
}
.min
{
min-width: 150px;
}
.max
{
font-size: x-large;
}

12
FrontEnd/src/app/tests/multiple-choice-question/multiple-choice-question.component.html
View File

@ -31,7 +31,7 @@
<div class="col-md-3">
<b>Akcja</b>
<br />
<button class="btn btn-study-cave" type="button" (click)="deleteFieldValue(i)"><i class="fas fa-trash-alt"></i> Usuń</button>
<button class="button min" type="button" (click)="deleteFieldValue(i)"><i class="fas fa-trash-alt"></i> Usuń</button>
</div>
</div>
<br />
@ -47,17 +47,17 @@
<div class="col-md-3">
<b>Akcja</b>
<br />
<button class="btn btn-study-cave" type="button" (click)="addFieldValue()">Dodaj</button>
<button class="button min" type="button" (click)="addFieldValue()">Dodaj</button>
</div>
</div>
</div>
<br />
<br />
<button *ngIf='!edit' class="btn btn-study-cave" type="submit" (click)="addTable()"><i class="fas fa-check-circle"></i> Dodaj pytanie!</button>
<button *ngIf='edit' class="btn btn-study-cave" type="submit" (click)="addTable()"><i class="fas fa-edit"></i> Edytuj pytanie!</button>
<button class="btn btn-study-cave ml-2" (click)="empty()"><i class="fas fa-arrow-left"></i> Powrót</button>
<button *ngIf='!edit' class="button max" type="submit" (click)="addTable()"><i class="fas fa-check-circle"></i> Dodaj pytanie!</button>
<button *ngIf='edit' class="button max" type="submit" (click)="addTable()"><i class="fas fa-edit"></i> Edytuj pytanie!</button>
<br />
<button class="button" (click)="empty()"><i class="fas fa-arrow-left"></i> Powrót</button>
</div>
</div>
</div>
</div>

21
FrontEnd/src/app/tests/pairs-question/pairs-question.component.css
View File

@ -4,7 +4,7 @@
.container {
background-color: #22272a;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 1rem;
text-align: center;
@ -18,6 +18,23 @@
align-content: center;
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
}
.min
{
min-width: 150px;
}
.max
{
font-size: x-large;
}
.wrapper {
width: 100%;
margin-bottom: 5rem;
@ -25,4 +42,4 @@
.align {
text-align: center;
}
}

11
FrontEnd/src/app/tests/pairs-question/pairs-question.component.html
View File

@ -31,7 +31,7 @@
<div class="col-md-2">
<b>Akcja</b>
<br />
<button class="btn btn-study-cave" type="button" (click)="deleteFieldValue(i)"><i class="fas fa-trash-alt"></i> Usuń</button>
<button class="button min" type="button" (click)="deleteFieldValue(i)"><i class="fas fa-trash-alt"></i> Usuń</button>
</div>
</div>
<br />
@ -46,15 +46,16 @@
<div class="col-md-2">
<b>Akcja</b>
<br />
<button class="btn btn-study-cave" type="button" (click)="addFieldValue()"><i class="fas fa-check-circle"></i> Dodaj</button>
<button class="button min" type="button" (click)="addFieldValue()"><i class="fas fa-check-circle"></i> Dodaj</button>
</div>
</div>
</div>
<br />
<br />
<button *ngIf='!edit' class="btn btn-study-cave" type="submit" (click)="addTable()"><i class="fas fa-check-circle"></i> Dodaj pytanie!</button>
<button *ngIf='edit' class="btn btn-study-cave" type="submit" (click)="addTable()"><i class="fas fa-edit"></i> Edytuj pytanie!</button>
<button class="btn btn-study-cave ml-2" (click)="empty()"><i class="fas fa-arrow-left"></i> Powrót</button>
<button *ngIf='!edit' class="button max" type="submit" (click)="addTable()"><i class="fas fa-check-circle"></i> Dodaj pytanie!</button>
<button *ngIf='edit' class="button max" type="submit" (click)="addTable()"><i class="fas fa-edit"></i> Edytuj pytanie!</button>
<br />
<button class="button" (click)="empty()"><i class="fas fa-arrow-left"></i> Powrót</button>
</div>
</div>
</div>

19
FrontEnd/src/app/tests/puzzle-question/puzzle-question.component.css
View File

@ -4,7 +4,7 @@
.container {
background-color: #22272a;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 1rem;
text-align: center;
@ -18,6 +18,23 @@
align-content: center;
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
}
.min
{
min-width: 150px;
}
.max
{
font-size: x-large;
}
.wrapper {
width: 100%;
margin-bottom: 5rem;

16
FrontEnd/src/app/tests/puzzle-question/puzzle-question.component.html
View File

@ -27,13 +27,13 @@
<div class="col-md-2">
<b>Akcja</b>
<br />
<button class="btn btn-study-cave" type="button" (click)="deleteFieldValue(i)"><i class="fas fa-trash-alt"></i> Usuń</button>
<button class="button min" type="button" (click)="deleteFieldValue(i)"><i class="fas fa-trash-alt"></i> Usuń</button>
</div>
<div class="mobile col-md-2">
<b>Przesuń</b>
<br />
<button *ngIf="i != 0" class="btn btn-study-cave" (click)="moveUp(i + 1)"><i class="fas fa-angle-up"></i> Góra</button>
<button *ngIf="i != answersCorrect.length - 1" class="btn btn-study-cave" (click)="moveDown(i + 1)"><i class="fas fa-angle-down"></i> Dół</button>
<button *ngIf="i != 0" class="button min" (click)="moveUp(i + 1)"><i class="fas fa-angle-up"></i> Góra</button>
<button *ngIf="i != answersCorrect.length - 1" class="button min" (click)="moveDown(i + 1)"><i class="fas fa-angle-down"></i> Dół</button>
<span *ngIf="(i == 0) && (i == answersCorrect.length - 1)" >---</span>
</div>
</div>
@ -46,17 +46,17 @@
<div class="col-md-2">
<b>Akcja</b>
<br />
<button class="btn btn-study-cave" type="button" (click)="addFieldValue()"><i class="fas fa-check-circle"></i> Dodaj</button>
<button class="button min" type="button" (click)="addFieldValue()"><i class="fas fa-check-circle"></i> Dodaj</button>
</div>
</div>
</div>
<br />
<br />
<button *ngIf='!edit' class="btn btn-study-cave" type="submit" (click)="addTable()"><i class="fas fa-check-circle"></i> Dodaj pytanie!</button>
<button *ngIf='edit' class="btn btn-study-cave" type="submit" (click)="addTable()"><i class="fas fa-edit"></i> Edytuj pytanie!</button>
<button class="btn btn-study-cave ml-2" (click)="empty()"><i class="fas fa-arrow-left"></i> Powrót</button>
<button *ngIf='!edit' class="button max" type="submit" (click)="addTable()"><i class="fas fa-check-circle"></i> Dodaj pytanie!</button>
<button *ngIf='edit' class="button max" type="submit" (click)="addTable()"><i class="fas fa-edit"></i> Edytuj pytanie!</button>
<br />
<button class="button" (click)="empty()"><i class="fas fa-arrow-left"></i> Powrót</button>
</div>
</div>
</div>
</div>

21
FrontEnd/src/app/tests/single-choice-question/single-choice-question.component.css
View File

@ -4,7 +4,7 @@
.container {
background-color: #22272a;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 1rem;
text-align: center;
@ -18,6 +18,23 @@
align-content: center;
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
}
.min
{
min-width: 150px;
}
.max
{
font-size: x-large;
}
.wrapper {
width: 100%;
margin-bottom: 5rem;
@ -25,4 +42,4 @@
.align {
text-align: center;
}
}

11
FrontEnd/src/app/tests/single-choice-question/single-choice-question.component.html
View File

@ -31,7 +31,7 @@
<div class="col-md-3">
<b>Akcja</b>
<br />
<button class="btn btn-study-cave" type="button" (click)="deleteFieldValue(i)"><i class="fas fa-trash-alt"></i> Usuń</button>
<button class="button min" type="button" (click)="deleteFieldValue(i)"><i class="fas fa-trash-alt"></i> Usuń</button>
</div>
</div>
<br />
@ -47,15 +47,16 @@
<div class="col-md-3">
<b>Akcja</b>
<br />
<button class="btn btn-study-cave" type="button" (click)="addFieldValue()"><i class="fas fa-check-circle"></i> Dodaj</button>
<button class="button min" type="button" (click)="addFieldValue()"><i class="fas fa-check-circle"></i> Dodaj</button>
</div>
</div>
</div>
<br />
<br />
<button *ngIf='!edit' class="btn btn-study-cave" type="submit" (click)="addTable()"><i class="fas fa-check-circle"></i> Dodaj pytanie!</button>
<button *ngIf='edit' class="btn btn-study-cave" type="submit" (click)="addTable()"><i class="fas fa-edit"></i> Edytuj pytanie!</button>
<button class="btn btn-study-cave ml-2" (click)="empty()"><i class="fas fa-arrow-left"></i> Powrót</button>
<button *ngIf='!edit' class="button max" type="submit" (click)="addTable()"><i class="fas fa-check-circle"></i> Dodaj pytanie!</button>
<button *ngIf='edit' class="button max" type="submit" (click)="addTable()"><i class="fas fa-edit"></i> Edytuj pytanie!</button>
<br />
<button class="button" (click)="empty()"><i class="fas fa-arrow-left"></i> Powrót</button>
</div>
</div>
</div>

10
FrontEnd/src/app/tests/test-edit/test-edit.component.css
View File

@ -4,12 +4,13 @@ label {
.container {
background-color: #181616;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 1rem;
text-align: center;
}
.wrapper-add {
width: 100%;
display: flex;
@ -18,6 +19,13 @@ label {
margin-bottom: 4rem;
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
}
.wrapper {
width: 100%;
padding: 30px;

24
FrontEnd/src/app/tests/test-edit/test-edit.component.html
View File

@ -16,13 +16,13 @@
<div *ngIf="!trueFalse && !singleChoice && !multipleChoice && !puzzle && !gaps && !pairs">
<br />
<h4>Wybierz rodzaj pytania:</h4>
<button class="btn btn-study-cave" (click)='show("true-false")'>Prawda/fałsz</button>
<button class="btn btn-study-cave" (click)='show("single-choice")'>Jednokrotny wybór</button>
<button class="btn btn-study-cave" (click)='show("multiple-choice")'>Wielokrotny wybór</button>
<button class="button" (click)='show("true-false")'>Prawda/fałsz</button>
<button class="button" (click)='show("single-choice")'>Jednokrotny wybór</button>
<button class="button" (click)='show("multiple-choice")'>Wielokrotny wybór</button>
<br />
<button class="btn btn-study-cave" (click)='show("puzzle")'>Rozsypanka wyrazowa</button>
<button class="btn btn-study-cave" (click)='show("gaps")'>Uzupełnianie luk</button>
<button class="btn btn-study-cave" (click)='show("pairs")'>Łączenie w pary</button>
<button class="button" (click)='show("puzzle")'>Rozsypanka wyrazowa</button>
<button class="button" (click)='show("gaps")'>Uzupełnianie luk</button>
<button class="button" (click)='show("pairs")'>Łączenie w pary</button>
<br />
<br />
</div>
@ -77,10 +77,10 @@
class="mobile">{{ question.content.time }}</td>
<td (click)='showComponents(question.content.type, question.nr)'
class="mobile">{{ question.shortcut }}</td>
<td><button class="btn btn-study-cave" (click)="delete(question.nr)"><i class="fas fa-trash-alt"></i> Usuń</button></td>
<td><button class="button min" (click)="delete(question.nr)"><i class="fas fa-trash-alt"></i> Usuń</button></td>
<td class="mobile">
<button *ngIf="question.nr != 1" class="btn btn-study-cave" (click)="moveUp(question.nr)"><i class="fas fa-angle-up"></i> Góra</button>
<button *ngIf="question.nr != test.length" class="btn btn-study-cave" (click)="moveDown(question.nr)"><i class="fas fa-angle-down"></i> Dół</button>
<button *ngIf="question.nr != 1" class="button min" (click)="moveUp(question.nr)"><i class="fas fa-angle-up"></i> Góra</button>
<button *ngIf="question.nr != test.length" class="button min" (click)="moveDown(question.nr)"><i class="fas fa-angle-down"></i> Dół</button>
<span (click)='showComponents(question.content.type, question.nr)'
*ngIf="(question.nr == 1) && (question.nr == test.length)" >---</span>
</td>
@ -106,10 +106,10 @@
<br />
</div>
<div *ngIf="(test.length != 0) && (!componentVisible)" >
<button class="btn btn-study-cave" (click)="save()"><i class="fas fa-edit"></i> Edytuj test!</button>
<button class="btn btn-study-cave ml-2" routerLink="/tests/"><i class="fas fa-arrow-left"></i> Powrót</button>
<button class="button max" style=" font-size: x-large;" (click)="save()"><i class="fas fa-edit"></i> Edytuj test!</button><br />
<button class="button" routerLink="/tests/"><i class="fas fa-arrow-left"></i> Powrót</button>
</div>
<button *ngIf="!((test.length != 0) && (!componentVisible))" class="btn btn-study-cave" routerLink="/tests/"><i class="fas fa-arrow-left"></i> Powrót</button>
<button *ngIf="!((test.length != 0) && (!componentVisible))" class="button" routerLink="/tests/"><i class="fas fa-arrow-left"></i> Powrót</button>
</div>
</div>
</div>

9
FrontEnd/src/app/tests/test-maker/test-maker.component.css
View File

@ -4,7 +4,7 @@ label {
.container {
background-color: #181616;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 1rem;
text-align: center;
@ -18,6 +18,13 @@ label {
margin-bottom: 4rem;
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
}
.wrapper {
width: 100%;
padding: 30px;

24
FrontEnd/src/app/tests/test-maker/test-maker.component.html
View File

@ -16,13 +16,13 @@
<div *ngIf="!trueFalse && !singleChoice && !multipleChoice && !puzzle && !gaps && !pairs">
<br />
<h4>Wybierz rodzaj pytania:</h4>
<button class="btn btn-study-cave" (click)='show("true-false")'>Prawda/fałsz</button>
<button class="btn btn-study-cave" (click)='show("single-choice")'>Jednokrotny wybór</button>
<button class="btn btn-study-cave" (click)='show("multiple-choice")'>Wielokrotny wybór</button>
<button class="button" (click)='show("true-false")'>Prawda/fałsz</button>
<button class="button" (click)='show("single-choice")'>Jednokrotny wybór</button>
<button class="button" (click)='show("multiple-choice")'>Wielokrotny wybór</button>
<br />
<button class="btn btn-study-cave" (click)='show("puzzle")'>Rozsypanka wyrazowa</button>
<button class="btn btn-study-cave" (click)='show("gaps")'>Uzupełnianie luk</button>
<button class="btn btn-study-cave" (click)='show("pairs")'>Łączenie w pary</button>
<button class="button" (click)='show("puzzle")'>Rozsypanka wyrazowa</button>
<button class="button" (click)='show("gaps")'>Uzupełnianie luk</button>
<button class="button" (click)='show("pairs")'>Łączenie w pary</button>
<br />
<br />
</div>
@ -77,10 +77,10 @@
class="mobile">{{ question.content.time }}</td>
<td (click)='showComponents(question.content.type, question.nr)'
class="mobile">{{ question.shortcut }}</td>
<td><button class="btn btn-study-cave" (click)="delete(question.nr)"><i class="fas fa-trash-alt"></i> Usuń</button></td>
<td><button class="button" style="min-width: 150px;" (click)="delete(question.nr)"><i class="fas fa-trash-alt"></i> Usuń</button></td>
<td class="mobile">
<button *ngIf="question.nr != 1" class="btn btn-study-cave" (click)="moveUp(question.nr)"><i class="fas fa-angle-up"></i> Góra</button>
<button *ngIf="question.nr != test.length" class="btn btn-study-cave" (click)="moveDown(question.nr)"><i class="fas fa-angle-up"></i> Dół</button>
<button *ngIf="question.nr != 1" class="button" style="min-width: 150px;" (click)="moveUp(question.nr)"><i class="fas fa-angle-up"></i> Góra</button>
<button *ngIf="question.nr != test.length" class="button" style="min-width: 150px;" (click)="moveDown(question.nr)"><i class="fas fa-angle-up"></i> Dół</button>
<span (click)='showComponents(question.content.type, question.nr)'
*ngIf="(question.nr == 1) && (question.nr == test.length)" >---</span>
</td>
@ -106,10 +106,10 @@
<br />
</div>
<div *ngIf="(test.length != 0) && (!componentVisible)" >
<button class="btn btn-study-cave" (click)="save()"><i class="fas fa-check-circle"></i> Dodaj test!</button>
<button class="btn btn-study-cave ml-2" routerLink="/tests/"><i class="fas fa-arrow-left"></i> Powrót</button>
<button class="button" style="font-size: x-large;" (click)="save()"><i class="fas fa-check-circle"></i> Dodaj test!</button><br />
<button class="button" routerLink="/tests/"><i class="fas fa-arrow-left"></i> Powrót</button>
</div>
<button *ngIf="!((test.length != 0) && (!componentVisible))" class="btn btn-study-cave" routerLink="/tests/"><i class="fas fa-arrow-left"></i> Powrót</button>
<button *ngIf="!((test.length != 0) && (!componentVisible))" class="button" routerLink="/tests/"><i class="fas fa-arrow-left"></i> Powrót</button>
</div>
</div>
</div>

9
FrontEnd/src/app/tests/tests-list/tests-list.component.css
View File

@ -7,7 +7,7 @@
.content{
background-color: #181616;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 2rem;
text-align: center;
@ -22,3 +22,10 @@ ag-grid-angular{
.buttons-container > div{
margin: 10px;
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
}

6
FrontEnd/src/app/tests/tests-list/tests-list.component.html
View File

@ -4,7 +4,7 @@
<br />
<div class="buttons-container">
<div *ngIf="logged">
<button class="btn btn-study-cave" (click)="toTestMaker()"><i class="fas fa-plus"></i> Dodaj test</button>
<button class="button" (click)="toTestMaker()"><i class="fas fa-plus"></i> Dodaj test</button>
</div>
<div *ngIf="logged" class="btn-group btn-group-toggle" data-toggle="buttons">
<label class="btn btn-study-cave active" (click)="getPublicTestsData()">
@ -18,7 +18,7 @@
<br />
<ag-grid-angular style="width: 100%; height: 475px;" class="ag-theme-dark" [rowData]="tests" [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>
@ -30,4 +30,4 @@
<button type="button" pButton icon="pi pi-close" (click)="display=false" label="NIE" class="ui-button-secondary"></button>
</p-footer>
</p-dialog>
</div>
</div>

9
FrontEnd/src/app/tests/true-false-question/true-false-question.component.css
View File

@ -4,7 +4,7 @@
.container {
background-color: #22272a;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 1rem;
text-align: center;
@ -18,6 +18,13 @@
align-content: center;
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
}
.wrapper {
width: 100%;
margin-bottom: 5rem;

9
FrontEnd/src/app/tests/true-false-question/true-false-question.component.html
View File

@ -29,10 +29,11 @@
</label>
<br />
<br />
<button *ngIf='!edit' class="btn btn-study-cave" type="submit"><i class="fas fa-check-circle"></i>Dodaj pytanie!</button>
<button *ngIf='edit' class="btn btn-study-cave" type="submit"><i class="fas fa-edit"></i> Edytuj pytanie!</button>
<button class="btn btn-study-cave ml-2" (click)="empty()"><i class="fas fa-arrow-left"></i> Powrót</button>
<button *ngIf='!edit' class="button max" style="font-size: x-large;" type="submit"><i class="fas fa-check-circle"></i>Dodaj pytanie!</button>
<button *ngIf='edit' class="button max" style="font-size: x-large;" type="submit"><i class="fas fa-edit"></i> Edytuj pytanie!</button>
<br />
<button class="button" (click)="empty()"><i class="fas fa-arrow-left"></i> Powrót</button>
</form>
</div>
</div>
</div>
</div>

11
FrontEnd/src/app/user/bagdes/bagdes.component.css
View File

@ -12,12 +12,19 @@
.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;
}
.locked{
opacity: 0.3;
}
@ -59,4 +66,4 @@ p {
width: 60px;
height: 60px;
padding: 5px;
}
}

4
FrontEnd/src/app/user/bagdes/bagdes.component.html
View File

@ -1,7 +1,7 @@
<div class="wrapper">
<div class="content">
<h1>Twoje odznaki!</h1>
<button type="submit" class="btn btn-study-cave" (click)="goBack()"><i class="fas fa-arrow-left"></i> Wróć do profilu</button>
<button type="submit" class="button" (click)="goBack()"><i class="fas fa-arrow-left"></i> Wróć do profilu</button>
<br /><br />
<div class="badges">
<div *ngFor="let badge of badges">
@ -11,4 +11,4 @@
</div>
</div>
</div>
</div>
</div>

12
FrontEnd/src/app/user/edit-user/edit-user.component.css
View File

@ -14,6 +14,14 @@ input.ng-untouched {
border-color: rgb(206, 212, 218);
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
min-width: 200px;
}
.wrapper{
width: 100%;
padding: 30px;
@ -23,8 +31,8 @@ input.ng-untouched {
.content{
background-color: #181616;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 2rem;
text-align: center;
}
}

4
FrontEnd/src/app/user/edit-user/edit-user.component.html
View File

@ -62,11 +62,11 @@
<div class="col-xs-12 col-sm-6 col-md-6 centerMargin">
<div class="row">
<button type="submit" class="btn btn-study-cave centerMargin"><i class="fas fa-check-circle"></i> Potwierdź</button>
<button type="submit" class="button centerMargin"><i class="fas fa-check-circle"></i> Potwierdź</button>
</div>
</div>
</div>
</div>
</form>
</div>
</div>
</div>

12
FrontEnd/src/app/user/register/register.component.css
View File

@ -14,6 +14,14 @@ input.ng-untouched {
border-color: rgb(206, 212, 218);
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
min-width: 200px;
}
.wrapper{
width: 100%;
padding: 30px;
@ -23,8 +31,8 @@ input.ng-untouched {
.content{
background-color: #181616;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 2rem;
text-align: center;
}
}

4
FrontEnd/src/app/user/register/register.component.html
View File

@ -60,11 +60,11 @@
<div class="col-xs-12 col-sm-6 col-md-6 centerMargin">
<div class="row">
<button type="submit" class="btn btn-study-cave centerMargin"><i class="fas fa-check-circle"></i> Zarejestruj się</button>
<button type="submit" class="button centerMargin"><i class="fas fa-check-circle"></i> Zarejestruj się</button>
</div>
</div>
</div>
</div>
</form>
</div>
</div>
</div>

10
FrontEnd/src/app/user/user/user.component.css
View File

@ -7,7 +7,7 @@
.content{
background-color: #181616;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 2rem;
text-align: center;
@ -15,6 +15,14 @@
margin-right: auto;
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
min-width: 200px;
}
.profile{
display: flex;
flex-direction: row;

6
FrontEnd/src/app/user/user/user.component.html
View File

@ -1,8 +1,8 @@
<div class="wrapper">
<div class="content">
<h1>Twój profil</h1>
<button type="submit" class="btn btn-study-cave" (click)="edit()"><i class="fas fa-edit"></i> Edytuj</button>
<button type="submit" class="btn btn-study-cave" (click)="gotoBadges()"><i class="fas fa-book-open"></i> Odznaki</button>
<button type="submit" class="button" (click)="edit()"><i class="fas fa-edit"></i> Edytuj</button>
<button type="submit" class="button" (click)="gotoBadges()"><i class="fas fa-book-open"></i> Odznaki</button>
<div class="profile">
<div class="profile-headers">
@ -20,4 +20,4 @@
</div>
</div>
</div>
</div>
</div>

19
FrontEnd/src/styles.css
View File

@ -160,6 +160,17 @@ label.btn-study-cave {
outline: none;
}
.min
{
min-width: 150px;
}
.max
{
font-size: x-large;
}
.button:hover
{
background-color: orange;
@ -257,7 +268,7 @@ button:hover, a:hover {
.ag-theme-dark {
font-size: 16px !important;
}
.ag-header {
font-size: 16px !important;
}
@ -268,7 +279,7 @@ button:hover, a:hover {
.ag-theme-dark {
font-size: 14px !important;
}
.ag-header {
font-size: 14px !important;
@ -277,5 +288,5 @@ button:hover, a:hover {
.ag-paging-panel {
font-size: 12px !important;
}
}
}