martin/Sykkelaksjon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Created grid container to make standard activities appear on top of registered activities

Browse Source
This commit is contained in:
Martin Asprusten 2026-05-22 10:38:13 +02:00
parent 1b662ed4ea
commit eb87a831ef
2 changed files with 83 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
client/index.html
View File

@ -13,74 +13,45 @@
<div x-data="{ unitType: $store.state.data.activityTypes[0]?.unit ?? 'km' }" id="content-div" style="display: none;"> <div x-data="{ unitType: $store.state.data.activityTypes[0]?.unit ?? 'km' }" id="content-div" style="display: none;">
<h1>Velkommen, <span x-text="$store.state.data.name"></span></h1> <h1>Velkommen, <span x-text="$store.state.data.name"></span></h1>
<div class="outer-vertical-flex"> <div class="outer-vertical-flex">
<div class="flex-container"> <div class="grid-container">
<div class="vertical-flex"> <div class="register-activity-div">
<div class="register-activity-div"> <h3>Registrer ny aktivitet:</h3>
<h3>Registrer ny aktivitet:</h3> <form id="activity-form">
<form id="activity-form"> <div class="activity-type-div">
<div class="activity-type-div"> <label for="activity-type">Type aktivitet: </label>
<label for="activity-type">Type aktivitet: </label> <template x-if="$store.state.data.activityTypes.length > 1">
<template x-if="$store.state.data.activityTypes.length > 1"> <select name="activity-type" id="activity-type" x-on:change="unitType = event.target[event.target.selectedIndex].dataset.unit;">
<select name="activity-type" id="activity-type" x-on:change="unitType = event.target[event.target.selectedIndex].dataset.unit;"> <template x-for="activityType in $store.state.data.activityTypes" :key="activityType.id">
<template x-for="activityType in $store.state.data.activityTypes" :key="activityType.id"> <option x-text="activityType.name" x-bind:value="activityType.id" x-bind:data-unit="activityType.unit"></option>
<option x-text="activityType.name" x-bind:value="activityType.id" x-bind:data-unit="activityType.unit"></option>
</template>
</select>
</template>
<template x-if="$store.state.data.activityTypes.length == 1">
<span><span x-text="$store.state.data.activityTypes[0].name"></span><input type="hidden" name="activity-type" x-bind:value="$store.state.data.activityTypes[0].id" /></span>
</template>
</div>
<div class="distance-div">
<label for="activity-distance">Avstand: </label>
<input id="activity-distance" name="activity-distance" type="number" min="0" step="0.1" />
<span x-text="unitType"></span>
</div>
<div class="description-div">
<label for="activity-description">Beskrivelse:</label>
<input type="text" id="activity-description" name="activity-description" />
</div>
<div class="date-div">
<label for="activity-date">Dato:</label>
<input type="date" id="activity-date" name="activity-date" />
</div>
<div class="submit-buttons-container">
<button id="submit-activity-button">Registrer aktivitet</button>
<button id="submit-activity-template-button">Legg til som standardaktivitet</button>
</div>
</form>
</div>
<div class="registered-activities-div">
<h3>Registrerte aktiviteter:</h3>
<p>Til sammen: <span x-text="$store.state.data.activities.reduce((p, a) => p + a.numberOfUnits * a.activityType.conversionFactor, 0).toFixed(1)"></span> km</p>
<table>
<tr>
<th>Dato</th>
<th>Beskrivelse</th>
<th>Avstand</th>
<template x-if="$store.state.data.unitConversionNecessary">
<th>Ekvivalent</th>
</template>
<th>Fjern registrert aktivitet</th>
</tr>
<template x-for="activity in $store.state.data.activities">
<tr>
<td x-text="activity.date"></td>
<td x-text="activity.description"></td>
<td x-text="`${activity.numberOfUnits} ${activity.activityType.unit}`"></td>
<template x-if="$store.state.data.unitConversionNecessary">
<td x-text="`${activity.numberOfUnits * activity.activityType.conversionFactor} km`"></td>
</template> </template>
<td><button x-on:click="$store.state.deleteActivity(activity)">Fjern</button></td> </select>
</tr>
</template> </template>
</table> <template x-if="$store.state.data.activityTypes.length == 1">
</div> <span><span x-text="$store.state.data.activityTypes[0].name"></span><input type="hidden" name="activity-type" x-bind:value="$store.state.data.activityTypes[0].id" /></span>
</div> </template>
</div>
<div class="distance-div">
<label for="activity-distance">Avstand: </label>
<input id="activity-distance" name="activity-distance" type="number" min="0" step="0.1" />
<span x-text="unitType"></span>
</div>
<div class="description-div">
<label for="activity-description">Beskrivelse:</label>
<input type="text" id="activity-description" name="activity-description" />
</div>
<div class="date-div">
<label for="activity-date">Dato:</label>
<input type="date" id="activity-date" name="activity-date" />
</div>
<div class="submit-buttons-container">
<button id="submit-activity-button">Registrer aktivitet</button>
<button id="submit-activity-template-button">Legg til som standardaktivitet</button>
</div>
</form>
</div>
<div class="standard-activities-div"> <div class="standard-activities-div">
<h3>Standardaktiviteter:</h3> <h3>Standardaktiviteter:</h3>
<template x-for="activityTemplate in $store.state.data.activityTemplates" :key="activityTemplate.id"> <template x-for="activityTemplate in $store.state.data.activityTemplates" :key="activityTemplate.id">
@ -91,6 +62,32 @@
</p> </p>
</template> </template>
</div> </div>
<div class="registered-activities-div">
<h3>Registrerte aktiviteter:</h3>
<p>Til sammen: <span x-text="$store.state.data.activities.reduce((p, a) => p + a.numberOfUnits * a.activityType.conversionFactor, 0).toFixed(1)"></span> km</p>
<table>
<tr>
<th>Dato</th>
<th>Beskrivelse</th>
<th>Avstand</th>
<template x-if="$store.state.data.unitConversionNecessary">
<th>Ekvivalent</th>
</template>
<th>Fjern registrert aktivitet</th>
</tr>
<template x-for="activity in $store.state.data.activities">
<tr>
<td x-text="activity.date"></td>
<td x-text="activity.description"></td>
<td x-text="`${activity.numberOfUnits} ${activity.activityType.unit}`"></td>
<template x-if="$store.state.data.unitConversionNecessary">
<td x-text="`${activity.numberOfUnits * activity.activityType.conversionFactor} km`"></td>
</template>
<td><button x-on:click="$store.state.deleteActivity(activity)">Fjern</button></td>
</tr>
</template>
</table>
</div>
</div> </div>
<div class="other-users-div"> <div class="other-users-div">
<h3>Andre aktive:</h3> <h3>Andre aktive:</h3>

33
client/src/style.css
View File

@ -13,20 +13,29 @@ body {
text-align: left; text-align: left;
} }
.flex-container { .grid-container {
display: flex; display: grid;
flex-direction: row; column-gap: 20px;
flex-wrap: wrap; row-gap: 20px;
gap: 20px;
justify-content: center;
flex: auto;
} }
.vertical-flex { @media (min-width: 1000px) {
display: flex; .grid-container {
flex-direction: column; grid-template-columns: auto auto;
flex-wrap: wrap; grid-template-rows: auto auto;
gap: 20px; }
.standard-activities-div {
grid-column: 2;
grid-row: 1 / -1;
}
}
@media (max-width: 999px) {
.grid-container {
grid-template-columns: auto;
grid-template-rows: auto auto auto;
}
} }
.register-activity-div { .register-activity-div {