Skip to content

Commit 097d685

Browse files
minor style change
1 parent 698aa21 commit 097d685

File tree

3 files changed

+26
-27
lines changed

3 files changed

+26
-27
lines changed

public/css/main.css

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ main {
8585
.logo {
8686
justify-content: flex-start;
8787
width: 50%;
88-
font-size: 2rem;
88+
font-size: 3rem;
8989
padding-left: 40px;
9090
line-height: 40px;
9191
}
@@ -112,12 +112,12 @@ main {
112112
justify-content: flex-end;
113113
text-align: right;
114114
padding-right: 40px;
115-
font-size: 2rem;
115+
/* font-size: 3rem; */
116116
}
117117

118118
.login {
119119
padding-right: 20px;
120-
font-size: 1.5em;
120+
font-size: 3rem;
121121
}
122122

123123
.login {
@@ -842,11 +842,14 @@ input[type=number]::-webkit-outer-spin-button {
842842
display: flex;
843843
justify-content: center;
844844
}
845-
845+
.highlight{
846+
color: #Cdf3
847+
}
846848
.devices {
847849
background-color: rgba(106, 17, 203);
848850
display: flex;
849851
flex-direction: row;
852+
justify-content: center;
850853
height: 400px;
851854
width: 100%;
852855
align-items: center;
@@ -856,8 +859,8 @@ input[type=number]::-webkit-outer-spin-button {
856859
.device-text {
857860
display: flex;
858861
flex-wrap: wrap;
859-
justify-content: flex-start;
860-
width: 50%;
862+
863+
width: 75%;
861864
padding-left: 40px;
862865
color: #fff;
863866
flex-direction: column;

public/index.html

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,12 @@ <h1 class="introduction">FIT-JOURNAL</h1>
3535

3636
</section>
3737
<section class="devices">
38-
<div class="device-text">
39-
<p>Track workouts from your PC, Phone or Tablet</p>
38+
<article class="device-text">
39+
<p> The most important step towards your goals is writing down where you've been. Keeping a detailed history of workouts can show you how far you've come, and give you the encouragement
40+
to keep going. Track workouts from your PC, Phone or Tablet with <span class="highlight">Fit-Journal</span>.
41+
</p>
42+
</article>
4043

41-
42-
</div>
43-
<div class="device-imgs">
44-
<img class="mobile-img" src="./img/devices.png" alt="Mobile devices">
45-
</div>
4644
</section>
4745
<section class="bg-info">
4846
<div class="activites1">

test/workout.test.js

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
const mongoose = require('mongoose');
2-
// https://www.npmjs.com/package/chai
32
const chai = require('chai');
4-
// http://www.chaijs.com/plugins/chai-http/
53
const chaiHttp = require('chai-http');
64
const jsonwebtoken = require('jsonwebtoken');
75
const faker = require('faker');
@@ -85,7 +83,7 @@ describe('Integration tests for: /api/home', function() {
8583
afterEach(function() {
8684

8785
return new Promise((resolve, reject) => {
88-
86+
8987
// Deletes the entire database.
9088
mongoose.connection.dropDatabase()
9189
.then(result => {
@@ -109,27 +107,27 @@ describe('Integration tests for: /api/home', function() {
109107
.get('/api/home')
110108
.set('Authorization', `Bearer ${jwtToken}`)
111109
.then(res => {
112-
console.log("The body:",res.body[0].sets);
110+
console.log("The body:", res.body[0].sets);
113111
expect(res).to.have.status(HTTP_STATUS_CODES.OK);
114112
expect(res).to.be.json;
115113
expect(res.body).to.be.a('array');
116114
expect(res.body).to.have.lengthOf.at.least(1);
117-
115+
118116
const workout = res.body[0];
119117
console.log("User workout:", workout)
120-
121-
expect(workout).to.include.keys('user','sets');
122-
expect(workout.sets).to.include.keys( 'exercise', 'set', 'reps')
118+
119+
expect(workout).to.include.keys('user', 'sets');
120+
expect(workout.sets).to.include.keys('exercise', 'set', 'reps')
123121
expect(workout.user).to.be.a('string');
124-
122+
125123
});
126124
});
127125

128126
it('Should return a specific workout', function() {
129127
let foundWorkout;
130128
return Workout.find()
131129
.then(workouts => {
132-
130+
133131
expect(workouts).to.be.a('array');
134132
expect(workouts).to.have.lengthOf.at.least(1);
135133
foundWorkout = workouts[0];
@@ -139,11 +137,11 @@ describe('Integration tests for: /api/home', function() {
139137
.set('Authorization', `Bearer ${jwtToken}`);
140138
})
141139
.then(res => {
142-
140+
143141
expect(res).to.have.status(HTTP_STATUS_CODES.OK);
144142
expect(res).to.be.json;
145143
// expect(res.body).to.be.a('object');
146-
expect(res.body).to.include.keys('user','sets');
144+
expect(res.body).to.include.keys('user', 'sets');
147145
expect(res.body.sets).to.include.keys('exercise', 'set', 'reps');
148146

149147
});
@@ -183,6 +181,6 @@ describe('Integration tests for: /api/home', function() {
183181
}
184182

185183
function createFakerWorkout() {
186-
return {sets:{exercise: faker.lorem.word(),set: faker.random.number(),reps: faker.random.number()}};
184+
return { sets: { exercise: faker.lorem.word(), set: faker.random.number(), reps: faker.random.number() } };
187185
}
188-
});
186+
});

0 commit comments

Comments
 (0)