Parcourir la source

Merge branch 'master' of https://git.slurm.ch/tomi/u-fit

Tomi Cvetic il y a 5 ans
Parent
commit
6b1cce90a1
2 fichiers modifiés avec 11 ajouts et 5 suppressions
  1. 5 3
      frontend/components/training.js
  2. 6 2
      frontend/pages/index.js

+ 5 - 3
frontend/components/training.js

@@ -1,4 +1,4 @@
-function calculateRating (ratings) {
+function calculateRating(ratings) {
   const numberOfRatings = ratings.length
   const sumOfRatings = ratings.reduce(
     (accumulator, rating) => accumulator + rating.value,
@@ -82,7 +82,6 @@ const Training = props => (
         article {
           display: grid;
           grid-template-columns: 1fr 3fr;
-          padding: 5px 20px;
           background-color: rgba(127, 127, 127, 0.5);
         }
 
@@ -92,9 +91,12 @@ const Training = props => (
         }
 
         aside {
+          padding: 1em 2em;
+          background: rgba(0,127,0,0.5);
         }
 
         section {
+          padding: 1em 2em;
           background: rgba(127, 0, 0, 0.5);
         }
       `}
@@ -215,7 +217,7 @@ const Exercise = props => {
   )
 }
 class TrainingCreateForm extends React.Component {
-  render () {
+  render() {
     return (
       <form>
         <label htmlFor='title'>

+ 6 - 2
frontend/pages/index.js

@@ -22,8 +22,12 @@ const Home = () => (
     </section>
 
     <section id='nextTraining'>
-      <h1>Your Next Training</h1>
-      <Training {...data.trainings[data.trainings.length - 1]} />
+      <Training {
+        ... {
+          ...data.trainings[data.trainings.length - 1],
+          title: `Your Next Training: ${data.trainings[data.trainings.length - 1].title}`,
+        }
+      } />
     </section>
 
     <style jsx>