This is the codeAbility Sharing Platform! Learn more about the codeAbility Sharing Platform.

Skip to content
Snippets Groups Projects
Commit 632b8f10 authored by Eduard Frankford's avatar Eduard Frankford
Browse files

like button now below rating

parent 3460e1f7
Branches
2 merge requests!188Merging Peer Reviewing et. al to Master,!164211 peer reviewing functionality
Expand all Hide whitespace changes
Inline Side-by-side
.classpath
+ 7
− 5
View file @ 632b8f10
......@@ -26,7 +26,6 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
......@@ -35,17 +34,20 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="target/generated-sources/annotations">
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<classpathentry combineaccessrules="false" kind="src" path="/SharingPluginPlattform"/>
<classpathentry kind="src" path="target/generated-sources/annotations">
<attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/SharingPluginPlattform"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
package-lock.json
+ 1236
− 32533
View file @ 632b8f10
This diff is collapsed.
src/main/webapp/app/exercise/exercise-details/exercise-details.component.html
+ 55
− 32
View file @ 632b8f10
......@@ -37,6 +37,49 @@
</div>
</div> <!-- modal rating end-->
<div *ngIf="!exercise.userHasLiked"
style="float: left; width: 100%; margin-bottom: 5px; padding-top: 15px;">
<div style="float: left;">
<div>
<button style="padding: 0%; font-size: 1.2;" *ngIf="!exercise.userHasLiked"
type="button" class="btn" (click)="likeAction()"
[disabled]="!isAuthenticated()">
<!-- <fa-icon icon="heart"></fa-icon> -->
<fa-icon [icon]="['far', 'heart']"></fa-icon>
</button>
</div>
<!-- <div class="onhoverIconDisplay"><p class="card-text" jhiTranslate="exercise.details.views"></p></div> -->
</div>
<div class="star-container">
<span>
{{exercise.numberOfLikes}}
</span>
</div>
</div> <!-- modal views end-->
<div *ngIf="exercise.userHasLiked"
style="float: left; width: 100%; margin-bottom: 5px; padding-top: 15px;">
<div style="float: left;">
<div>
<button style="padding: 0%; font-size: 1.2;" *ngIf="exercise.userHasLiked"
type="button" class="btn" (click)="unlikeAction()"
[disabled]="!isAuthenticated()">
<!-- <fa-icon icon="heart"></fa-icon> -->
<fa-icon class="rediconcolor" icon='heart'></fa-icon>
</button>
</div>
</div>
<div class="star-container">
<span>
{{exercise.numberOfLikes}}
</span>
</div>
</div>
<div *ngIf="exercise.rating"
style="float: left; width: 100%; margin-bottom: 5px; padding-top: 15px;">
<div style="float: left;">
......@@ -92,41 +135,21 @@
>
</button>
</div>
<div *ngIf="exercise.originalResult.file.parentId" style="float: left; width: 100%; padding-top: 15px; margin-bottom: 25px;">
<ng-template #helpToParent data-container="body"> {{ 'exercise.help.toParent' | translate}}</ng-template>
<fa-icon style="padding: 5px 0px 0px 5px;float:left;" [ngbTooltip]="helpToParent" container="body" [icon]="treeIcon" (click)="toParent(exercise.originalResult.file.parentId)"></fa-icon>
</div>
<div *ngIf="exercise.originalResult.file.parentId"
style="float: left; width: 100%; padding-top: 15px; margin-bottom: 25px;">
<ng-template #helpToParent data-container="body"> {{ 'exercise.help.toParent' |
translate}}</ng-template>
<fa-icon style="padding: 5px 0px 0px 5px;float:left;" [ngbTooltip]="helpToParent"
container="body" [icon]="treeIcon"
(click)="toParent(exercise.originalResult.file.parentId)"></fa-icon>
</div>
<button *ngIf="exercise.type == exerciseType.COLLECTION" type="button" class="btn btn-outline-secondary"
(click)="searchChildren(exercise.originalResult.exerciseId)" data-dismiss="modal"
<button *ngIf="exercise.type == exerciseType.COLLECTION" type="button"
class="btn btn-outline-secondary"
(click)="searchChildren(exercise.originalResult.exerciseId)" data-dismiss="modal"
style="display: block; margin-bottom: 5px;"
jhiTranslate="exercise.details.allExercises"
>
jhiTranslate="exercise.details.allExercises">
</button>
<div>
<div>
<button type="button" class="btn-block btn btn-outline-secondary"
style="display: block;" (click)="openLink(exercise.gitlabURL)"
jhiTranslate="exercise.details.git">
</button>
</div>
<div> <button type="button" class="btn-block btn btn-outline-secondary"
style="margin-top: 20px;" data-toggle="modal" data-target="#mdModal"
(click)="selectREADME()">README
</button>
</div>
<div style="width: 100%;"><button *ngIf="!exercise.userHasLiked" type="button" class="btn like"
(click)="likeAction()" [disabled]="!isAuthenticated()">
<!-- <fa-icon icon="heart"></fa-icon> -->
<fa-icon [icon]="['far', 'heart']"></fa-icon>{{exercise.numberOfLikes}}
</button>
<button *ngIf="exercise.userHasLiked" type="button" class="btn like"
(click)="unlikeAction()" [disabled]="!isAuthenticated()">
<!-- <fa-icon icon="heart"></fa-icon> -->
<fa-icon class="rediconcolor" icon='heart'></fa-icon>{{exercise.numberOfLikes}}
</button>
</div>
</div>
</div>
<jhi-exercise-metadata class="col-12 col-md-8" [exercise]="exercise">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment