Skip to content

Commit 6b4e4f9

Browse files
author
Jon Myrick
authored
Merge pull request CodewarsClone#105 from CodewarsClone/MenuEtc
Added creator to Katas
2 parents fa7ef93 + 9faaaa9 commit 6b4e4f9

15 files changed

Lines changed: 131 additions & 99 deletions

File tree

‎controllers/kataCtrl.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ const db = app.get('db');
33

44
module.exports = {
55
getUser: (req, res, next) => {
6-
return res.status(200).json(req.user);
6+
db.read.user_by_id([req.user.id], (err, user) => {
7+
if (err) return next(err);
8+
return res.status(200).json(user[0]);
9+
});
710
},
811

912
getKatasByKataId: (req, res, next) => {
@@ -17,10 +20,8 @@ module.exports = {
1720
let kataLevel = parseInt(req.params.userkyu);
1821
let bottomRange = kataLevel - 1;
1922
let topRange = kataLevel + 1;
20-
console.log(topRange);
2123
db.read.random_kata([bottomRange, topRange], (err, katas) => {
2224
if (err) return next(err);
23-
console.log(katas);
2425
return res.status(200).json(katas[Math.floor(Math.random() * katas.length)]);
2526
})
2627
},
@@ -140,9 +141,9 @@ module.exports = {
140141
},
141142

142143
addPointsToUser: (req, res, next) => {
143-
db.update.user_points([req.body.points, req.body.id], (err, user) => {
144+
db.update.user_points([req.body.points, req.user.id], (err) => {
144145
if (err) return next(err);
145-
return res.status(200).json(user);
146+
return res.sendStatus(200)
146147
})
147148
},
148149

‎db/read/user_by_id.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
select * from users
2+
where id = $1

‎db/start/katas.sql‎

Lines changed: 9 additions & 9 deletions
Large diffs are not rendered by default.

‎db/start/tables.sql‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ CREATE TABLE users (
1212

1313
CREATE TABLE katas (
1414
id serial primary key,
15+
creator varchar(80),
1516
kyu integer not null,
1617
test_script json not null,
1718
description text,
@@ -44,4 +45,4 @@ CREATE TABLE kata_ratings (
4445
);
4546

4647
INSERT INTO users (github_id, name, email, username, picture_url, points)
47-
VALUES ('12', 'Bob Smith', 'bob@smith.com', 'bobIScool', null, 25);
48+
VALUES ('22752236', 'Joshua Baert', 'developer@baert.io', 'JoshuaBaert', 'https://avatars.githubusercontent.com/u/22752236?v=3', 49);

‎server.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ passport.use(new GithubStrategy({
2525
db.read.user_by_github_id([profile.id], (err, user) => {
2626
if (err) {
2727
console.log(err);
28-
} else if (user [0]) {
28+
} else if (user[0]) {
2929
done(null, user[0]);
3030
} else {
3131

‎src/assets/scss/styles.scss‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,14 @@ a {
187187
font-weight: 100;
188188
}
189189

190+
.font12-lit-white {
191+
color: #FFFFFF;
192+
font-family: $font;
193+
font-size: 12px;
194+
line-height: 12px;
195+
font-weight: 100;
196+
}
197+
190198
.font12-reg-black {
191199
color: #131414;
192200
font-family: $font;

‎src/components/app.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ angular.module('app', ['ui.router'])
44
.config(function($stateProvider, $urlRouterProvider){
55
$stateProvider
66

7-
// import Rx from 'rxjs/Rx';
8-
// Rx.Observable.of(1,2,3);
7+
98

109
//~~~~~~~~~~~~~Parent States~~~~~~~~~~~~~
1110

‎src/components/home/homeCtrl.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ angular.module('app').controller('homeCtrl', function($scope, $state, mainServic
1616
$scope.getUserKatas(mainService.user.id);
1717
$scope.getRandomKata();
1818
})
19-
}
19+
};
2020

2121
$scope.getRandomKata = () => {
2222
let oldId;
@@ -38,8 +38,7 @@ angular.module('app').controller('homeCtrl', function($scope, $state, mainServic
3838

3939
$scope.getUserKatas = (userid) => {
4040
mainService.getUserKatas(userid).then(response => {
41-
// $scope.userKatas = response.data;
42-
console.log($scope.userKatas);
41+
$scope.userKatas = response.data;
4342
})
4443
}
4544

‎src/components/mainService.js‎

Lines changed: 37 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -76,19 +76,18 @@ angular.module('app').service('mainService', function($http, $q, $sce, $state) {
7676
vote: vote
7777
}
7878
})
79-
}
79+
};
8080

8181
// GET
8282
this.getUser = () => {
8383
return $http({
8484
method: 'GET',
8585
url: `/api/me`
8686
})
87-
}
87+
};
8888

8989
// trainingCtrl
9090
this.getKataById = (kataid) => {
91-
console.log('getting kata SVC', kataid);
9291
return $http({
9392
method: 'GET',
9493
url: `/api/kata/` + kataid
@@ -109,7 +108,7 @@ angular.module('app').service('mainService', function($http, $q, $sce, $state) {
109108
method: 'GET',
110109
url: `/api/random-kata-list/${userkyu}`
111110
});
112-
}
111+
};
113112

114113
// kata_listCtrl
115114
this.getKatasByKyu = (kyu) => {
@@ -136,14 +135,18 @@ angular.module('app').service('mainService', function($http, $q, $sce, $state) {
136135
};
137136

138137
// PUT
139-
this.addPointsToUser = (points, userid) => {
138+
this.addPointsToUser = (points) => {
140139
return $http({
141140
method: 'PUT',
142141
url: `/api/points`,
143142
data: {
144143
points: points,
145-
id: userid
146144
}
145+
}).then( () => {
146+
this.getUser().then(res => {
147+
this.user = res.data;
148+
$state.reload();
149+
})
147150
})
148151
};
149152

@@ -177,33 +180,33 @@ angular.module('app').service('mainService', function($http, $q, $sce, $state) {
177180
}
178181
};
179182

180-
this.pointsCalculator = (kyu, user) => {
181-
switch (true) {
182-
case kyu = 8:
183-
return user.points += 1;
184-
break;
185-
case kyu = 7:
186-
return user.points += 2;
187-
break;
188-
case kyu = 6:
189-
return user.points += 4;
190-
break;
191-
case kyu = 5:
192-
return user.points += 8;
193-
break;
194-
case kyu = 4:
195-
return user.points += 16;
196-
break;
197-
case kyu = 3:
198-
return user.points += 32;
199-
break;
200-
case kyu = 2:
201-
return user.points += 64;
202-
break;
203-
case kyu = 1:
204-
return user.points += 128;
205-
break;
206-
}
183+
this.pointsCalculator = (kyu) => {
184+
185+
if (kyu === 8) {
186+
this.user.points += 1;
187+
return this.user.points
188+
}else if (kyu === 7) {
189+
this.user.points += 2;
190+
return this.user.points
191+
}else if (kyu === 6) {
192+
this.user.points += 4;
193+
return this.user.points
194+
}else if (kyu === 5) {
195+
this.user.points += 8;
196+
return this.user.points
197+
}else if (kyu === 4) {
198+
this.user.points += 16;
199+
return this.user.points
200+
}else if (kyu === 3) {
201+
this.user.points += 32;
202+
return this.user.points
203+
}else if (kyu === 2) {
204+
this.user.points += 64;
205+
return this.user.points
206+
}else if (kyu === 1) {
207+
this.user.points += 128;
208+
return this.user.points
209+
}
207210
};
208211

209212
this.checkAuth = () => {
@@ -212,7 +215,7 @@ angular.module('app').service('mainService', function($http, $q, $sce, $state) {
212215
url: `/api/check-auth`
213216
}).then(response => {
214217
}, response => {
215-
// $state.go('login');
218+
$state.go('login');
216219
})
217220
};
218221

‎src/components/menus/menu.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
<div class='li65'><img src='./assets/imgs/asset_30.png' class='li65-img'></div>
4444
<div class='li65'><img src='./assets/imgs/asset_31.png' class='li65-img'></div>
4545
<div class='li170'>
46-
<img src='{{getUser.userPic}}' class='li170-img'>
47-
<div>{{getUser.userKyu}}</div>
48-
<div>{{getUser.userPoints}}</div>
46+
<img src='{{user.picture_url}}' class='li170-img'>
47+
<div><img id="difficulty-icon" src="./assets/imgs/{{user.kyu_level}}_kyu_icon.png"></div>
48+
<div class="font12-lit-white">{{user.points}}</div>
4949
</div>
5050
</div>
5151
</div>

0 commit comments

Comments
 (0)