Skip to content

Commit fa7ef93

Browse files
author
Jon Myrick
authored
Merge pull request CodewarsClone#104 from CodewarsClone/voting
Voting
2 parents 57dfd6e + 8cd4722 commit fa7ef93

13 files changed

Lines changed: 53 additions & 34 deletions

File tree

‎db/read/kata_solutions.sql‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
SELECT * FROM solutions
1+
SELECT script, username FROM solutions
2+
JOIN users ON solutions.user_id = users.id
23
WHERE kata_id = $1;

‎db/read/user_katas.sql‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
SELECT script, kyu, description, name FROM katas
2-
WHERE user_id = $1;
1+
SELECT script, kyu, description, name, katas.id, s.id FROM katas
2+
JOIN solutions s ON katas.id = s.kata_id
3+
WHERE s.user_id = $1;

‎src/components/app.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ angular.module('app', ['ui.router'])
55
$stateProvider
66

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

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

‎src/components/codemirrorDirective.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ angular.module('app').directive('codemirrorDirective', function() {
77
lineNumbers: true,
88
theme: 'seti',
99
readOnly: true,
10-
lineSeparator: '\\n'
10+
lineSeparator: '\\n',
11+
viewportMargin: Infinity
1112
});
12-
codemirror.setSize(null, 100);
13+
//Keeping this here for reference. This is how to adjust codemirror size.
14+
// codemirror.setSize("calc(60vw - 20px)", null);
1315
if (attr.class.includes('home')) {
1416
codemirror.setValue(scope.userKatas[ident].script);
1517
codemirror.getWrapperElement().style.display="none";

‎src/components/home/home.html‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,10 @@ <h6 class="font16-reg-efefef">Upgrade To Clonewars Red!</h6>
6969
</div>
7070
<div class='home-solutions-div'>
7171
<p class="font16-reg-efefef show-solutions">Your solutions:</p>
72-
<textarea class="solution-text repeated-completed-solutions-home" id="{{$index}}" codemirror-directive>
73-
</textarea>
72+
<div class="home-repeated-solutions-div">
73+
<textarea class="solution-text repeated-completed-solutions-home" id="{{$index}}" codemirror-directive>
74+
</textarea>
75+
</div>
7476
</div>
7577
<hr class="home-bottom-border-hr">
7678
</div> <!--END REPEATED COMPLETED-->

‎src/components/home/home.scss‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,11 @@ $grey-color: #C0C0C0;
190190
cursor: pointer;
191191
}
192192

193+
.home-repeated-solutions-div {
194+
height: 0px;
195+
width: calc(60vw - 20px);
196+
}
197+
193198
.vote-button {
194199
background-color: rgba(0, 0, 0, 0);
195200
display: flex;

‎src/components/home/homeJquery.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ $(document).ready(function() {
44
var showButton = document.getElementsByClassName('show-solutions-1')
55
$(document).on('click', '.home-solutions-div', function() {
66
if (!flag) {
7+
$(this).find('.home-repeated-solutions-div').css('height', '100px');
78
$(this).find('.CodeMirror').css('display', 'block');
89
flag = true;
910
} else {
1011
$(this).find('.CodeMirror').css('display', 'none');
12+
$(this).find('.home-repeated-solutions-div').css('height', '0px');
1113
flag = false;
1214
}
1315
})

‎src/components/kata_list/kata_left.scss‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,27 @@ $grey-color: #C0C0C0;
113113
width: calc(25vw * .85);
114114
}
115115

116+
#difficulty-header-text {
117+
margin-left: -15px;
118+
}
119+
116120
.assorted-difficulty-icons {
117-
// width: calc(25vw * .75);
118-
padding: 30px;
121+
max-width: 250px;
122+
width: 25vw;
123+
padding: 5px;
119124
align-self: flex-start;
125+
display: flex;
126+
flex-direction: row-reverse;
127+
flex-wrap: wrap-reverse;
128+
justify-content: flex-end;
129+
margin-left: -25px;
130+
margin-top: 10px;
131+
}
132+
133+
@media (max-width: 950px) {
134+
.assorted-difficulty-icons {
135+
width: 15vw;
136+
}
120137
}
121138

122139
.difficulty-top {

‎src/components/kata_list/kata_list.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ $grey-color: #C0C0C0;
4545
/************ KATA_LIST TOP BAR **********/
4646

4747
.kata-list-top {
48-
width: calc(100vw - 55px);
48+
width: calc(100vw - 70px);
4949
height: 10vh;
5050
display: flex;
5151
align-items: flex-end;

‎src/components/kata_list/library.html‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,11 @@
2727

2828
<!-- PRETTY CODE BUT ROUGH JS -->
2929
<!-- *********** DIFFICULTY SORT STUFF *********** -->
30-
<!-- <div class="kata-left-div" id="kata-sort-difficulty">
31-
<p class="font15-reg" ng-click="getRandomKataList()">Difficulty:</p>
32-
<div class="assorted-difficulty-icons">
33-
<img id="difficulty-icon" class="difficulty-top" ng-src={{icon}} alt="{{$index}}kyu" ng-click="getKatasByKyu($index+1)" ng-mouseover="icon=colorIcons[$index]" ng-mouseout="icon = iconFlags[$index] ? colorIcons[$index] : kyuIcons[$index]" ng-repeat="icon in iconDisplay | orderBy: '-$index' : true track by $index"/>
34-
35-
</div>
36-
</div> <!--end of kata-sort-difficulty -->
37-
38-
<!-- UGLY CODE BUT BETTER PRODUCT -->
39-
<!-- *********** DIFFICULTY SORT STUFF *********** -->
4030
<div class="kata-left-div" id="kata-sort-difficulty">
41-
<p class="font15-reg" ng-click="getRandomKataList()">Difficulty:</p>
31+
<p class="font15-reg" ng-click="getRandomKataList()" id="difficulty-header-text">Difficulty:</p>
4232
<div class="assorted-difficulty-icons">
43-
<img id="difficulty-icon" class="difficulty-top" ng-src={{iconDisplay[7]}} alt="8kyu" ng-click="getKatasByKyu(8)" ng-mouseover="iconDisplay[7]=colorIcons[7]" ng-mouseout="iconDisplay[7] = iconFlags[7] ? colorIcons[7] : kyuIcons[7]"/>
44-
<img id="difficulty-icon" class="difficulty-top" ng-src={{iconDisplay[6]}} alt="7kyu" ng-click="getKatasByKyu(7)" ng-mouseover="iconDisplay[6]=colorIcons[6]" ng-mouseout="iconDisplay[6] = iconFlags[6] ? colorIcons[6] : kyuIcons[6]"/>
45-
<img id="difficulty-icon" class="difficulty-top" ng-src={{iconDisplay[5]}} alt="6kyu" ng-click="getKatasByKyu(6)" ng-mouseover="iconDisplay[5]=colorIcons[5]" ng-mouseout="iconDisplay[5] = iconFlags[5] ? colorIcons[5] : kyuIcons[5]"/>
46-
<img id="difficulty-icon" class="difficulty-top" ng-src={{iconDisplay[4]}} alt="5kyu" ng-click="getKatasByKyu(5)" ng-mouseover="iconDisplay[4]=colorIcons[4]" ng-mouseout="iconDisplay[4] = iconFlags[4] ? colorIcons[4] : kyuIcons[4]"/>
47-
<img id="difficulty-icon" class="difficulty-top" ng-src={{iconDisplay[3]}} alt="4kyu" ng-click="getKatasByKyu(4)" ng-mouseover="iconDisplay[3]=colorIcons[3]" ng-mouseout="iconDisplay[3] = iconFlags[3] ? colorIcons[3] : kyuIcons[3]"/>
48-
<img id="difficulty-icon" class="difficulty-top" ng-src={{iconDisplay[2]}} alt="3kyu" ng-click="getKatasByKyu(3)" ng-mouseover="iconDisplay[2]=colorIcons[2]" ng-mouseout="iconDisplay[2] = iconFlags[2] ? colorIcons[2] : kyuIcons[2]"/>
49-
<img id="difficulty-icon" class="difficulty-top" ng-src={{iconDisplay[1]}} alt="2kyu" ng-click="getKatasByKyu(2)" ng-mouseover="iconDisplay[1]=colorIcons[1]" ng-mouseout="iconDisplay[1] = iconFlags[1] ? colorIcons[1] : kyuIcons[1]"/>
50-
<img id="difficulty-icon" class="difficulty-top" ng-src={{iconDisplay[0]}} alt="1kyu" ng-click="getKatasByKyu(1)" ng-mouseover="iconDisplay[0]=colorIcons[0]" ng-mouseout="iconDisplay[0] = iconFlags[0] ? colorIcons[0] : kyuIcons[0]"/>
33+
<img id="difficulty-icon" class="difficulty-top" ng-src={{icon}} alt="{{$index}}kyu" ng-click="getKatasByKyu($index+1)" ng-mouseover="icon=colorIcons[$index]" ng-mouseout="icon = iconFlags[$index] ? colorIcons[$index] : kyuIcons[$index]" ng-repeat="icon in iconDisplay track by $index"/>
34+
5135
</div>
5236
</div> <!--end of kata-sort-difficulty-->
5337

0 commit comments

Comments
 (0)