Skip to content

Commit 5bb770b

Browse files
committed
Training views
1 parent 24c1c9a commit 5bb770b

5 files changed

Lines changed: 83 additions & 55 deletions

File tree

gulpfile.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,11 @@ gulp.task('build-css', function () {
3838
});
3939

4040
gulp.task('clean', function (cb) {
41-
del([paths.dist], cb);
41+
return del([
42+
'src/dist/**'
43+
], cb).then(() => {
44+
gulp.start(['build-css', 'build-js']);
45+
});
4246
});
4347

4448
// gulp.task('build-html', function () {
@@ -62,7 +66,7 @@ gulp.task('build-js', function () {
6266
gulp.task('build', ['clean', 'build-css', 'build-js']);
6367

6468
gulp.task('watch', function () {
65-
return gulp.watch([paths.jsSource, paths.cssFiles, paths.scssFiles], ['clean', 'build-css', 'build-js']);
69+
return gulp.watch([paths.jsSource, paths.cssFiles, paths.scssFiles], ['clean']);
6670
});
6771

68-
gulp.task('default', ['clean', 'build-css', 'build-js', 'watch']);
72+
gulp.task('default', ['clean', 'watch']);

src/components/directive.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,17 @@ angular.module('app').directive('animateDir', function () {
1313
$('.side-menu-container').on('mouseleave', function () {
1414
console.log("it's all gone");
1515
$('.side-menu-container').css('width', '0px');
16-
})
17-
$('.top-menu').on('mouseenter', function(){
18-
console.log('You have entered the twilight zone');
19-
})
16+
});
17+
$('.top-menu').on('mouseenter', function () {
18+
console.log('You have entered the twilight zone');
19+
});
20+
21+
$('.solutions-icon').on('mouseclick', function () {
22+
console.log("This is working");
23+
});
24+
25+
26+
2027
})
2128
}
2229
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
angular.module('app').directive('trainingAnimateDir', function () {
2+
return {
3+
scope: {
4+
trainingAnimate: "="
5+
},
6+
restrict: 'EA',
7+
link: function (scope, elems, attrs) {
8+
$(document).ready(function () {
9+
$('.solutions-icon').on('mouseclick', function () {
10+
console.log("This is working");
11+
});
12+
})
13+
}
14+
}
15+
});
Lines changed: 27 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,37 @@
11
<section class="training-main">
2-
32
<div class="training-body">
4-
5-
<div class="training-top">
6-
3+
<div class="training-top" ng-style='allGone'>
74
<div class="kata-name-container">
8-
95
<div class="kata-name-container-top">
106
<img src="./assets/imgs/5_kyu_icon.png" alt="Difficulty" id="difficulty-icon">
117
<h3 class="font16-reg" id="kata-name">
128
Name of Kata
139
</h3>
1410
</div>
15-
16-
1711
<div class="kata-stats">
1812
<p>Here's where stats go</p>
1913
<p>Here's where stats go</p>
2014
<p>Here's where stats go</p>
2115
</div>
22-
23-
</div> <!--End kata-name-container div-->
24-
16+
</div>
17+
<!--End kata-name-container div-->
2518
<div class="selection-div">
26-
<select class="language-select-dropdown select-dropdown" ng-init="selectedLanguage = languages[0]" ng-model="selectedLanguage" ng-options="x for x in languages">
19+
<select class="language-select-dropdown select-dropdown" ng-init="selectedLanguage = languages[0]" ng-model="selectedLanguage"
20+
ng-options="x for x in languages">
2721

2822
</select>
29-
<select class="language-version-select-dropdown select-dropdown" ng-init="selectedVersion = versions[0]" ng-model="selectedVersion" ng-options="x for x in versions">
23+
<select class="language-version-select-dropdown select-dropdown" ng-init="selectedVersion = versions[0]" ng-model="selectedVersion"
24+
ng-options="x for x in versions">
3025

3126
</select>
3227
</div>
33-
3428
<div class="assorted-options">
3529
<div class="view-options">Here's where view options go</div>
3630
<div class="view-options">Here's where view options go</div>
3731
<div class="view-options">Here's where view options go</div>
3832
</div>
39-
4033
</div>
41-
4234
<div class="kata">
43-
4435
<!-- <div class="instructions">
4536
<div class="instructions-head">
4637
<button class="instructions-selector font13-reg-gray">Instructions</button>
@@ -56,39 +47,36 @@ <h2 class="font20-reg">Name of Kata</h2>
5647
</div>
5748
</div>
5849
</div> -->
59-
60-
<div class="instructions">
61-
<div class="instructions-head">
62-
<button class="instructions-selector font13-reg-gray" ng-click="showInstructions()">Instructions</button>
63-
<button class="instructions-selector font13-reg-gray" ng-click="showOutput()">Output</button>
64-
</div>
65-
<hr>
66-
<show-output ng-hide="showOutputShow"></show-output>
67-
<show-instructions ng-hide="showInstructionsShow"></show-instructions>
50+
<div class="instructions" ng-style="instructionStyle">
51+
<div class="instructions-head">
52+
<button class="instructions-selector font13-reg-gray" ng-click="showInstructions()">Instructions</button>
53+
<button class="instructions-selector font13-reg-gray" ng-click="showOutput()">Output</button>
54+
</div>
55+
<hr>
56+
<show-output ng-hide="showOutputShow"></show-output>
57+
<show-instructions ng-hide="showInstructionsShow"></show-instructions>
6858
</div>
69-
70-
<div class="kata-right">
71-
<div>
59+
<div class="kata-right" ng-style='kataStyle'>
7260
<div class="solution-div font14-lit-gray">
73-
<p>Solution:</p>
61+
<div class="solutions-header">
62+
<p>Solution:</p>
63+
<button value='small' ng-click="kataStyle={'width':'40vw'}; instructionStyle={'width':'60vw'}">small</button>
64+
<button value='medium' ng-click="kataStyle={'width':'60vw'}; instructionStyle={'width':'40vw'}">medium</button>
65+
<button value='large' ng-click="kataStyle={'width':'100vw'}; instructionStyle={'width':'0vw','margin':'0px'}">large</button>
66+
<button value='full-screen' ng-click="kataStyle={'width':'100vw'}; instructionStyle={'width':'0vw','margin':'0px'}; allGone={'display':'none'}">full screen</button>
67+
</div>
7468
<div>
75-
<textarea name="solution" id="solution-input" ng-init="solutionInput = 'var a = 1;'"ng-model="solutionInput"></textarea>
69+
<textarea name="solution" id="solution-input" ng-init="solutionInput = 'var a = 1;'" ng-model="solutionInput"></textarea>
7670
</div>
7771
</div>
78-
7972
<div class="example-tests-div font14-lit-gray">
8073
<p>Example Tests:</p>
81-
<form>
82-
<textarea name="examples" id="example-input" ng-init="examplesInput = 'Test.assertEquals(a, 1);'" id="example-tests-input" ng-model="examplesInput"></textarea>
83-
</form>
74+
<textarea name="examples" id="example-input" ng-init="examplesInput = 'Test.assertEquals(a, 1);'" id="example-tests-input"
75+
ng-model="examplesInput"></textarea>
8476
<button ng-click="testExamples()" class="test-examples-button font12-reg-blue">RUN EXAMPLES</button>
85-
<button ng-click="testSuite()" class="test-suite-button font12-reg-black" style=""><i class="fa fa-caret-right fa-lg" style="margin-right: 2px" aria-hidden="true"></i>ATTEMPT</button>
86-
</div>
77+
<button ng-click="testSuite()" class="test-suite-button font12-reg-black"><i class="fa fa-caret-right fa-lg" style="margin-right: 2px" aria-hidden="true"></i>ATTEMPT</button>
8778
</div>
8879
</div>
89-
9080
</div>
91-
9281
</div>
93-
9482
</section>

src/components/training/training.scss

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,17 @@ $grey-color: #C0C0C0;
7474
display: flex;
7575
flex-direction: column;
7676
padding-top: 2vh;
77-
height: calc(100vh - 150px);
78-
width: 50vw;
77+
height: calc(100vh);
78+
width: 60vw;
7979
background-color: $container1;
80-
margin: 15px 15px 15px 0px;
80+
margin: 15px;
8181
}
8282

8383
.instructions {
8484
// height: calc(100vh - 150px);
85-
width: 50vw;
85+
width: 40vw;
8686
overflow: scroll;
87-
margin: 15px;
87+
margin: 15px 0 15px 15px;
8888
background-color: $container1;
8989
}
9090

@@ -132,10 +132,24 @@ hr {
132132
background-color: #91b2e7;
133133
}
134134

135-
.training-body {
136-
// background-color: red;
137-
}
135+
// .training-body {
136+
// // background-color: red;
137+
// }
138+
139+
// #text-input {
138140

139-
#text-input {
141+
// }
140142

143+
.solutions-header {
144+
145+
}
146+
147+
.solutions-icon {
148+
height: 10px;
149+
width: 10px;
150+
background-color: red;
141151
}
152+
153+
// .examples-icon {
154+
155+
// }

0 commit comments

Comments
 (0)