weight layout wip

RossDScott · Aug 30, 2024 · 2b715eb · 2b715eb
1 parent f5b84ed
commit 2b715eb
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 26 deletions.
diff --git a/...ent/Features/Workout/Perform/Components/Main/ExerciseDetail/Components/ExerciseSets.razor b/...ent/Features/Workout/Perform/Components/Main/ExerciseDetail/Components/ExerciseSets.razor
@@ -12,12 +12,14 @@
 <div class="d-flex flex-column fullWidth">
     <MudGrid Class="fullWidth ma-0" Style="font-weight: bold">
         <MudItem xs="2"></MudItem>
-        <MudItem xs="3" Class="ps-12 py-0 mr-6 textCenter">Target</MudItem>
-        <MudItem xs="3" Class="ps-12 py-0 mr-6 textCenter">Actual</MudItem>
+        <MudItem xs="3" Class="ps-0 py-0 mr-0 textCenter">Target</MudItem>
+        <MudItem xs="3" Class="ps-12 py-0 textCenter">Actual</MudItem>
         <MudItem xs="1" Class=""></MudItem>
         <MudItem xs="1" Class=""></MudItem>
     </MudGrid>
 
+    @Header(State.Value.MetricType)
+
     @foreach (var set in State.Value.Sets)
     {
         <ExerciseSet 

diff --git a/...s/Workout/Perform/Components/Main/ExerciseDetail/Components/WeightSet/EditWeightSet.razor b/...s/Workout/Perform/Components/Main/ExerciseDetail/Components/WeightSet/EditWeightSet.razor
@@ -3,26 +3,24 @@
 
 @inject IDispatcher Dispatcher
 
-<MudItem xs="2" Class="d-flex py-0 textCenter flex-column">
-    <UpDownDecimalEditor 
-        @bind-Value="EditSet.TargetWeight" 
-        @bind-Value:after="handleRowDataChange"
-        Increment="WeightIncrement"
-        AdornmentText="Kg"></UpDownDecimalEditor>
-</MudItem>
-<MudItem xs="1" class="textCenter py-0 mr-6">
+<MudItem xs="1" Class="d-flex py-0 textCenter flex-column">
     <UpDownIntegerEditor @bind-Value="EditSet.TargetReps" @bind-Value:after="handleRowDataChange"></UpDownIntegerEditor>
 </MudItem>
-<MudItem xs="2" class="textCenter py-0">
-    <UpDownDecimalEditor 
-        @bind-Value="EditSet.ActualWeight" 
-        @bind-Value:after="handleRowDataChange"
-        Increment="WeightIncrement"
-        AdornmentText="Kg"></UpDownDecimalEditor>
+<MudItem xs="2" class="textCenter py-0 mr-6">
+    <UpDownDecimalEditor @bind-Value="EditSet.TargetWeight"
+                         @bind-Value:after="handleRowDataChange"
+                         Increment="WeightIncrement"
+                         AdornmentText="Kg"></UpDownDecimalEditor>
 </MudItem>
-<MudItem xs="1" class="textCenter mr-4 py-0">
+<MudItem xs="1" class="textCenter py-0">
     <UpDownIntegerEditor @bind-Value="EditSet.ActualReps" @bind-Value:after="handleRowDataChange"></UpDownIntegerEditor>
 </MudItem>
+<MudItem xs="2" class="textCenter mr-4 py-0">
+    <UpDownDecimalEditor @bind-Value="EditSet.ActualWeight"
+                         @bind-Value:after="handleRowDataChange"
+                         Increment="WeightIncrement"
+                         AdornmentText="Kg"></UpDownDecimalEditor>
+</MudItem>
 
 @code {
     [Parameter, EditorRequired]

diff --git a/...Workout/Perform/Components/Main/ExerciseDetail/Components/WeightSet/HeaderWeightSet.razor b/...Workout/Perform/Components/Main/ExerciseDetail/Components/WeightSet/HeaderWeightSet.razor
@@ -1,9 +1,9 @@
 <MudGrid Class="fullWidth ma-0" Style="font-weight: bold">
     <MudItem xs="2"></MudItem>
-    <MudItem xs="2" Class="pa-0 textCenter">Weight</MudItem>
-    <MudItem xs="1" Class="pa-0 mr-6 textCenter">Reps</MudItem>
-    <MudItem xs="2" Class="pa-0 textCenter">Weight</MudItem>
-    <MudItem xs="1" Class="pa-0 mr-6 textCenter">Reps</MudItem>
+    <MudItem xs="1" Class="pa-0 textCenter">Reps</MudItem>
+    <MudItem xs="2" Class="pa-0 mr-6 textCenter">Weight</MudItem>
+    <MudItem xs="1" Class="pa-0 textCenter">Reps</MudItem>
+    <MudItem xs="2" Class="pa-0 mr-6 textCenter">Weight</MudItem>
     <MudItem xs="1" Class=""></MudItem>
     <MudItem xs="1" Class=""></MudItem>
 </MudGrid>

diff --git a/...s/Workout/Perform/Components/Main/ExerciseDetail/Components/WeightSet/ViewWeightSet.razor b/...s/Workout/Perform/Components/Main/ExerciseDetail/Components/WeightSet/ViewWeightSet.razor
@@ -1,9 +1,24 @@
 @using GymTracker.BlazorClient.Features.Workout.Perform.Components.Main.ExerciseDetail.Store
 
-<MudItem xs="2" Class="textCenter"><MudText Typo="Typo.subtitle1">@Set.TargetWeight Kg</MudText></MudItem>
-<MudItem xs="1" Class="textCenter mr-5"><MudText Typo="Typo.subtitle1">@Set.TargetReps</MudText></MudItem>
-<MudItem xs="2" Class="textCenter"><MudText Typo="Typo.subtitle1">@Set.ActualWeight Kg</MudText></MudItem>
-<MudItem xs="1" Class="textCenter mr-5"><MudText Typo="Typo.subtitle1">@Set.ActualReps</MudText></MudItem>
+<MudItem xs="1" Class="textCenter relative">
+    <MudText Typo="Typo.subtitle1">@Set.TargetReps</MudText>
+    <span class="x">x</span>
+</MudItem>
+<MudItem xs="2" Class="textCenter mr-5"><MudText Typo="Typo.subtitle1">@Set.TargetWeight Kg</MudText></MudItem>
+<MudItem xs="1" Class="textCenter relative">
+    <MudText Typo="Typo.subtitle1">@Set.ActualReps</MudText>
+    <span class="x">x</span>
+</MudItem>
+<MudItem xs="2" Class="textCenter mr-5"><MudText Typo="Typo.subtitle1">@Set.ActualWeight Kg</MudText></MudItem>
+
+<style>
+    .x {
+        position: absolute;
+        float: left;
+        top: 18px;
+        left: 72px;
+    }
+</style>
 
 @code {
     [Parameter, EditorRequired]

diff --git a/src/GymTrackerBlazorClient/GymTracker.BlazorClient.csproj b/src/GymTrackerBlazorClient/GymTracker.BlazorClient.csproj
@@ -5,7 +5,7 @@
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
-		<Version>1.3.9.4</Version>
+		<Version>1.4.0.0</Version>
 	</PropertyGroup>
 
 	<ItemGroup>