Skip to content

Commit

Permalink
Clean pull request for human snipe user interface.
Browse files Browse the repository at this point in the history
  • Loading branch information
jjskuld committed Sep 3, 2016
1 parent c614150 commit 8c93453
Show file tree
Hide file tree
Showing 32 changed files with 1,117 additions and 12 deletions.
21 changes: 19 additions & 2 deletions Gruntfile.js
Expand Up @@ -18,10 +18,27 @@ module.exports = function (grunt) {
'src/style/style.css': 'src/style/style.scss'
}
}
}
},
watch: {
sass: {
files: ['**/*.scss'],
tasks: ['sass'],
options: {
spawn: false,
},
},
ts: {
files: ['**/*.ts','**/**/*.ts','**/**/**/*.ts','**/**/**/**/*.ts'],
tasks: ['ts'],
options: {
spawn: false,
},
}
},
});

grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-ts');
grunt.loadNpmTasks('grunt-sass');
grunt.registerTask('default', ['ts', 'sass']);
grunt.registerTask('default', ['ts', 'sass','watch']);
};
1 change: 1 addition & 0 deletions Procfile
@@ -0,0 +1 @@
web: node app.js
5 changes: 5 additions & 0 deletions app.js
@@ -0,0 +1,5 @@
var express = require('express');
var port = process.env.PORT || 3000;
var app = express();
app.use(express.static(__dirname + '/src'));
app.listen(port);
6 changes: 5 additions & 1 deletion package.json
Expand Up @@ -4,6 +4,7 @@
"devDependencies": {
"grunt": "~0.4.5",
"grunt-contrib-uglify": "^2.0.0",
"grunt-contrib-watch": "^1.0.0",
"grunt-sass": "^1.2.0",
"grunt-ts": "^6.0.0-beta.3",
"load-grunt-tasks": "^3.5.2",
Expand All @@ -13,5 +14,8 @@
"type": "git",
"url": "https://github.com/GediminasMasaitis/PokeEase.git"
},
"license": "GPL-3.0"
"license": "GPL-3.0",
"dependencies": {
"express": "^4.14.0"
}
}
54 changes: 54 additions & 0 deletions src/images/clock.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 41 additions & 0 deletions src/images/delete.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions src/images/distance.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/snipes.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 38 additions & 0 deletions src/images/target-white.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 38 additions & 0 deletions src/images/target.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/index-design.html
Expand Up @@ -41,6 +41,12 @@
<span>8</span>/9
</div>
</div>
<div class="item" id="snipes">
<div class="counter">
<span>142</span>/151
</div>
</div>

<div class="item" id="settings">
</div>
<div class="help">
Expand Down
8 changes: 7 additions & 1 deletion src/index.html
Expand Up @@ -5,6 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
<link href="external/leaflet.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="style/style.css">
<link rel="stylesheet" type="text/css" href="style/animation.css">
<link rel="stylesheet" type="text/css" href="external/jquery.qtip.min.css">
<meta charset="utf-8" />
<link rel="icon" sizes="16x16" href="images/favicon.png">
Expand Down Expand Up @@ -88,6 +89,11 @@
<span class="current">0</span>/<span class="total">9</span>
</div>
</div>
<div class="item" id="snipes" title="Snipable Pokemons">
<div class="counter">
<span class="current">00</span>
</div>
</div>
<div class="item" id="settings">
</div>

Expand Down Expand Up @@ -752,7 +758,7 @@ <h6 class="setting-name"> Foo </h6>

</div>
</div>

<div class="content" data-category="snipes"></div>
</div>

<div id="settings-buttons" class="disabled">
Expand Down
2 changes: 1 addition & 1 deletion src/script/interface-scripts.js
Expand Up @@ -15,7 +15,7 @@ $(document).ready(function () {
$("#menu .item").click(function() {
var PopupTitle = $(this).attr('id');
$("#popup").stop().fadeIn(300);
$("#popup .title span").text($(this).attr('id'));
$("#popup .title span").text($(this).attr('title') || $(this).attr('id'));
$("#popup .title").css('background-color', $(this).css('background-color'));
$("#popup .content").each(function() {
$(this).hide();
Expand Down

0 comments on commit 8c93453

Please sign in to comment.