Skip to content

Commit 8e73d9d

Browse files
author
Jon Myrick
authored
Merge pull request CodewarsClone#40 from CodewarsClone/Wednesday21.1
Wednesday21.1
2 parents 244d3e1 + 94e786a commit 8e73d9d

6 files changed

Lines changed: 27 additions & 28 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ config.js
44
test.js
55
dist/
66
.DS_Store/
7+
src/dist/

‎gulpfile.js‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ var cachebust = new CacheBuster();
2121
const paths = {
2222
jsSource: ['./src/components/**/*.js', './src/components/*.js'],
2323
cssFiles: './src/**/*.css',
24-
indexFiles: './src/index.html',
24+
// indexFiles: './src/index.html',
2525
scssFiles: './src/**/**/*.scss',
26-
index: './src/index.html',
27-
htmlFiles: './src/**/*.html',
28-
dist: './dist',
26+
// index: './src/index.html',
27+
// htmlFiles: './src/**/*.html',
28+
dist: './src/dist',
2929
};
3030

3131
gulp.task('build-css', function () {
@@ -38,15 +38,13 @@ gulp.task('build-css', function () {
3838
});
3939

4040
gulp.task('clean', function (cb) {
41-
del([
42-
'dist'
43-
], cb);
41+
del([paths.dist], cb);
4442
});
4543

46-
gulp.task('build-html', function () {
47-
return gulp.src([paths.htmlFiles, paths.indexFiles])
48-
.pipe(gulp.dest(paths.dist))
49-
});
44+
// gulp.task('build-html', function () {
45+
// return gulp.src([paths.htmlFiles, paths.indexFiles])
46+
// .pipe(gulp.dest(paths.dist))
47+
// });
5048

5149
gulp.task('build-js', function () {
5250
return gulp.src(paths.jsSource)
@@ -61,10 +59,10 @@ gulp.task('build-js', function () {
6159
.pipe(gulp.dest(paths.dist));
6260
});
6361

64-
gulp.task('build', ['clean', 'build-css', 'build-js', 'build-html']);
62+
gulp.task('build', ['clean', 'build-css', 'build-js']);
6563

6664
gulp.task('watch', function () {
67-
return gulp.watch([paths.jsSource, paths.cssFiles, paths.scssFiles, paths.indexFiles, paths.htmlFiles], ['clean', 'build-css', 'build-js', 'build-html']);
65+
return gulp.watch([paths.jsSource, paths.cssFiles, paths.scssFiles], ['clean', 'build-css', 'build-js']);
6866
});
6967

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

‎src/components/login/login.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<div class='main'>
22
<div class='middle'>
33
<div>
4-
<img src='../src/assets/imgs/ST-R.png' class='logo logo-padding'>
4+
<img src='./assets/imgs/ST-R.png' class='logo logo-padding'>
55
<p class='font16-reg logo-font logo'>clonewars</p><br><br>
66
</div>
77
<div>
88
<a href='/auth/github'>
99
<div class='button font12-reg'>
1010
<div>
11-
<!--<img src='../src/assets/imgs/ST.png' class='button-icon'>-->
11+
<!--<img src='./assets/imgs/ST.png' class='button-icon'>-->
1212
<span>GITHUB LOG IN</span>
1313
</div>
1414
</div>

‎src/components/menus/menu.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<div class='menu'>
44
<div class="side-menu font14-reg menu-items">
55
<ul class='center'>
6-
<li><img src='../src/assets/imgs/ST-R.png' class='side-menu-icon'></li>
7-
<li><img src='../src/assets/imgs/arrow_icon.png' class='side-menu-icon'></li>
8-
<li><img src='../src/assets/imgs/kumite_icon.png' class='side-menu-icon'></li>
9-
<li><img src='../src/assets/imgs/blurb_icon.png' class='side-menu-icon'></li>
10-
<li><img src='../src/assets/imgs/ST-R.png' class='side-menu-icon'></li>
6+
<li><img src='./assets/imgs/ST-R.png' class='side-menu-icon'></li>
7+
<li><img src='./assets/imgs/arrow_icon.png' class='side-menu-icon'></li>
8+
<li><img src='./assets/imgs/kumite_icon.png' class='side-menu-icon'></li>
9+
<li><img src='./assets/imgs/blurb_icon.png' class='side-menu-icon'></li>
10+
<li><img src='./assets/imgs/ST-R.png' class='side-menu-icon'></li>
1111
</ul>
1212
</div>
1313
<div class='side-menu-container font14-reg'>

‎src/components/training/training.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="kata-name-container">
88

99
<div class="kata-name-container-top">
10-
<img src="../src/assets/imgs/5_kyu_icon.png" alt="Difficulty" id="difficulty-icon">
10+
<img src="./assets/imgs/5_kyu_icon.png" alt="Difficulty" id="difficulty-icon">
1111
<h3 class="font16-reg" id="kata-name">
1212
Name of Kata
1313
</h3>

‎src/index.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<html ng-app='app'>
22
<header>
3-
<link rel="stylesheet" href="./styles.css">
3+
<link rel="stylesheet" href="./dist/styles.css">
44
<link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">
5-
<link rel="stylesheet" href="../src/assets/lib/codemirror.css">
6-
<link rel="stylesheet" href="../src/assets/lib/tomorrow-night-bright.css">
5+
<link rel="stylesheet" href="./assets/lib/codemirror.css">
6+
<link rel="stylesheet" href="./assets/lib/tomorrow-night-bright.css">
77
</header>
88

99
<body>
@@ -14,9 +14,9 @@
1414
crossorigin="anonymous"></script>
1515
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular.min.js"></script>
1616
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.15/angular-ui-router.js"></script>
17-
<script src="../src/assets/lib/codemirror.js"></script>
18-
<script src="../src/assets/lib/mode/javascript/javascript.js"></script>
17+
<script src="./assets/lib/codemirror.js"></script>
18+
<script src="./assets/lib/mode/javascript/javascript.js"></script>
1919
<script src="https://use.fontawesome.com/b3416c175c.js"></script>
20-
<script type='text/javascript' src='./bundle.js'></script>
20+
<script type='text/javascript' src='./dist/bundle.js'></script>
2121

2222
</html>

0 commit comments

Comments
 (0)