Skip to content

Instantly share code, notes, and snippets.

@hoorayimhelping

hoorayimhelping/foo.diff

Created September 16, 2015 20:22
Show Gist options
  • Save hoorayimhelping/0f192afa04afd4363e3f to your computer and use it in GitHub Desktop.
Save hoorayimhelping/0f192afa04afd4363e3f to your computer and use it in GitHub Desktop.
Download ZIP
Raw
foo.diff
diff --git a/gulpfile.js b/gulpfile.js
index 84d0253..8dcc89b 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -60,6 +60,6 @@ gulp.task('build', function() {
.pipe(gulp.dest(paths.js_dist));
});
-gulp.task('default', ['env-dev', 'lint', 'test', 'build']);
-gulp.task('production', ['env-prod', 'lint', 'test', 'build']);
+gulp.task('default', ['env-dev', 'lint', 'test', 'transform', 'build']);
+gulp.task('production', ['env-prod', 'lint', 'test', 'transform', 'build']);
gulp.task('pre-commit', ['production']);
diff --git a/index.html b/index.html
index 6f81718..ff3ee1c 100644
--- a/index.html
+++ b/index.html
@@ -5,7 +5,7 @@
<title>Delta-V Maps</title>
</head>
<body>
- <canvas width="600" height="600"></canvas>
+ <canvas id="canvas"></canvas>
<script type="text/javascript" src="js/app.js"></script>
</body>
diff --git a/js/app.js b/js/app.js
index 4c18c61..a72bcb0 100644
--- a/js/app.js
+++ b/js/app.js
@@ -3,6 +3,15 @@ var react = require('react');
console.log('sup');
+var canvas = document.getElementById('canvas');
+canvas.width = 1200;
+canvas.height = 1200;
+
+var context = canvas.getContext('2d');
+context.scale(2, 2);
+context.fillStyle = "#000";
+context.fillText('Hello!', 300, 300);
+
},{"react":156}],2:[function(require,module,exports){
/**
* Copyright 2013-2015, Facebook, Inc.
diff --git a/js/views/main.js b/js/views/main.js
index 74571b1..da9b253 100644
--- a/js/views/main.js
+++ b/js/views/main.js
@@ -1,3 +1,12 @@
var react = require('react');
-console.log('sup');
\ No newline at end of file
+console.log('sup');
+
+var canvas = document.getElementById('canvas');
+canvas.width = 1200;
+canvas.height = 1200;
+
+var context = canvas.getContext('2d');
+context.scale(2, 2);
+context.fillStyle = "#000";
+context.fillText('Hello!', 300, 300);
\ No newline at end of file
diff --git a/js/views/main.jsx b/js/views/main.jsx
index 74571b1..da9b253 100644
--- a/js/views/main.jsx
+++ b/js/views/main.jsx
@@ -1,3 +1,12 @@
var react = require('react');
-console.log('sup');
\ No newline at end of file
+console.log('sup');
+
+var canvas = document.getElementById('canvas');
+canvas.width = 1200;
+canvas.height = 1200;
+
+var context = canvas.getContext('2d');
+context.scale(2, 2);
+context.fillStyle = "#000";
+context.fillText('Hello!', 300, 300);
\ No newline at end of file
diff --git a/styles/main.css b/styles/main.css
index 110ed35..d6df7a2 100644
--- a/styles/main.css
+++ b/styles/main.css
@@ -1,3 +1,5 @@
canvas {
border: 1px red solid;
+ height: 600px;
+ width: 600px;
}
\ No newline at end of file
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment