JoeKung/Progetto-m152-Angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
grata
2023-05-07 10:14:57 +02:00
parent 88703b5110 520ce5ac99
commit dc81f889e5
4 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/app/component/list/list.component.css
View File

@@ -15,8 +15,9 @@ h4 {
.distance { .distance {
font-size: 20px; font-size: 20px;
border-bottom: 2px solid #E9E92D; border-bottom: 2px solid #E9E92D;
width: 35%; width: 100%;
padding-bottom: 20px; padding-top: 20px;
padding-bottom: 10px;
height: 60px; height: 60px;
} }
@@ -37,3 +38,17 @@ h4 {
position: absolute; position: absolute;
right: 0; right: 0;
} }
.left {
width: 40%;
margin-right: 20px;
}
.right {
width: 60%;
display: flex;
justify-items: center;
}
.container2 {
display: flex;
flex-direction: row;
}

26
src/app/component/list/list.component.html
View File

@@ -17,17 +17,21 @@
<h1> <h1>
{{location.location}} {{location.location}}
</h1> </h1>
<div *ngFor="let waypoint of waypoints, let i = index" class="row"> <div class="container2">
<h3> <div class="left">
<a class="link link-primary" href="location/{{location.location}}/{{waypoint.id}}"> {{waypoint.name}}</a> <div *ngFor="let waypoint of waypoints, let i = index" class="row">
</h3> <h3>
<div class="distance"> <a class="link link-primary" href="location/{{location.location}}/{{waypoint.id}}"> {{waypoint.name}}</a>
<h4 *ngIf="waypoint.distance && !positionNotFound">{{translations.distance}}{{waypoint.distance}} km</h4> </h3>
<h4 *ngIf="positionNotFound">{{translations.positionNotFoundErrorMessage}}</h4> <div class="distance">
<h4 *ngIf="waypoint.distance && !positionNotFound">{{translations.distance}}{{waypoint.distance}} km</h4>
<h4 *ngIf="positionNotFound">{{translations.positionNotFoundErrorMessage}}</h4>
</div>
</div>
</div>
<div class="right">
<div class="radial-progress text-primary" style="--value:70; --size:12rem; --thickness: 1.5rem;"><span style="font-size: 20pt">70%</span></div>
</div> </div>
</div> </div>
<div class="radial-progress text-primary" style="--value:70; --size:12rem; --thickness: 1.5rem;"><span style="font-size: 20pt">70%</span></div>
</div> </div>

2
src/app/component/management/management.component.css
View File

@@ -37,7 +37,7 @@ th {
background-color: rgba(0, 0, 0, 0.4); background-color: rgba(0, 0, 0, 0.4);
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; margin-bottom: 30px;
} }
.form-container { .form-container {

4
src/app/component/management/management.component.html
View File

@@ -123,7 +123,7 @@
</tbody> </tbody>
</table> </table>
<div class="button-container"> <div class="button-container" style="margin-bottom: 30px">
<button (click)="openWaypointForm()" <button (click)="openWaypointForm()"
class="btn gap-2 border-primary bg-primary text-secondary hover:bg-secondary hover:text-primary hover:border-primary" class="btn gap-2 border-primary bg-primary text-secondary hover:bg-secondary hover:text-primary hover:border-primary"
style="margin: 10px 10% 0 0;">{{translations.add}} style="margin: 10px 10% 0 0;">{{translations.add}}
@@ -169,7 +169,7 @@
<button type="submit">{{translations.addWaypointButton}}</button> <button type="submit">{{translations.addWaypointButton}}</button>
</form> </form>
<button (click)="closeWaypointForm()">{{translations.close}}</button> <button (click)="closeWaypointForm()" >{{translations.close}}</button>
</div> </div>
</div> </div>