Change manager view

johnwatson484 · Aug 16, 2022 · b7357d6 · b7357d6
1 parent cb65b0e
commit b7357d6
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 41 deletions.
diff --git a/app/views/manager.njk b/app/views/manager.njk
@@ -3,58 +3,56 @@
 {% block content %}
   <h2>{{ manager.name }}</h2>
 
-  <div class="row" style="padding-bottom: 20px;">
-    <div class="col-md-6">
-      <div class="card border-dark">
-        <div class="card-header bg-dark text-light">
-        Team
-      </div>
-        <div class="card-body small">
-          <div style="padding-bottom:20px;">
-            <h6>Goalkeepers</h6>
-            <div class="row">
-              <div class="col-md-2 font-weight-bold no-mobile">Position</div>
-              <div class="col-md-4 font-weight-bold no-mobile">Team</div>
-              <div class="col-md-4 font-weight-bold no-mobile">Conceded</div>
-            </div>
-            {% for keeper in team.keepers %}
-              <div class="row">
-                <div class="col-md-2">GK {% if keeper.substitute %}(sub){% endif %}
-                </div>
-                <div class="col-md-4">{{ keeper.name}}</div>
-                <div class="col-md-4 no-mobile">{{ keeper.conceded}} ({{ keeper.cupConceded }})</div>
-              </div>
-            {% endfor %}
-          </div>
-          <h6>Players</h6>
+  <div class="col-md-6">
+    <div class="card border-dark">
+      <div class="card-header bg-dark text-light">
+      Team
+    </div>
+      <div class="card-body small">
+        <div style="padding-bottom:20px;">
+          <h6>Goalkeepers</h6>
           <div class="row">
             <div class="col-md-2 font-weight-bold no-mobile">Position</div>
-            <div class="col-md-4 font-weight-bold no-mobile">Name</div>
             <div class="col-md-4 font-weight-bold no-mobile">Team</div>
-            <div class="col-md-2 font-weight-bold no-mobile">Goals</div>
+            <div class="col-md-4 font-weight-bold no-mobile">Conceded</div>
           </div>
-          {% for player in team.players %}
+          {% for keeper in team.keepers %}
             <div class="row">
-              <div class="col-md-2">{{ player.position[0] }}
-                {% if player.substitute %}(sub){% endif %}
+              <div class="col-md-2">GK {% if keeper.substitute %}(sub){% endif %}
               </div>
-              <div class="col-md-4">{{ player.fullName}}</div>
-              <div class="col-md-4">{{ player.team}}</div>
-              <div class="col-md-2 no-mobile">{{ player.goals}} ({{ player.cupGoals }})</div>
+              <div class="col-md-4">{{ keeper.name}}</div>
+              <div class="col-md-4 no-mobile">{{ keeper.conceded}} ({{ keeper.cupConceded }})</div>
             </div>
           {% endfor %}
         </div>
+        <h6>Players</h6>
+        <div class="row">
+          <div class="col-md-2 font-weight-bold no-mobile">Position</div>
+          <div class="col-md-4 font-weight-bold no-mobile">Name</div>
+          <div class="col-md-4 font-weight-bold no-mobile">Team</div>
+          <div class="col-md-2 font-weight-bold no-mobile">Goals</div>
+        </div>
+        {% for player in team.players %}
+          <div class="row">
+            <div class="col-md-2">{{ player.position[0] }}
+              {% if player.substitute %}(sub){% endif %}
+            </div>
+            <div class="col-md-4">{{ player.fullName}}</div>
+            <div class="col-md-4">{{ player.team}}</div>
+            <div class="col-md-2 no-mobile">{{ player.goals}} ({{ player.cupGoals }})</div>
+          </div>
+        {% endfor %}
       </div>
     </div>
+  </div>
 
-    <div class="col-md-6">
-      <div class="card border-dark">
-        <div class="card-header bg-dark text-light">
-        Table
-      </div>
-        <div class="card-body">
-          {% include "./_table.njk" %}
-        </div>
+  <div class="col-md-6">
+    <div class="card border-dark">
+      <div class="card-header bg-dark text-light">
+      Table
+    </div>
+      <div class="card-body">
+        {% include "./_table.njk" %}
       </div>
     </div>
   </div>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dream-league-web",
-  "version": "1.3.17",
+  "version": "1.3.18",
   "description": "Dream League web frontend",
   "main": "app/index.js",
   "scripts": {