Merge pull request #2 from p0psicles/develop

Merge develop into master with version 0.2

.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory": "server/public/static/js"
+}

bower.json

@@ -0,0 +1,16 @@
+{
+  "name": "pokesistant",
+  "description": "Application for viewing IV score of Pokemon",
+  "version": "0.0.1",
+  "homepage": "https://github.com/p0psicles/pokesistant",
+  "license": "MIT",
+  "private": true,
+  "dependencies": {
+    "angular": "~1.5.0",
+    "angular-route": "~1.5.0",
+    "angular-bootstrap": "~2.0.1",
+    "requirejs": "^2.2.0",
+    "domReady": "requirejs-domready#^2.0.1",
+    "angular-animate": "^1.5.8"
+  }
+}

server/public/static/css/app.css

@@ -1,5 +1,30 @@
 /* app css stylesheet */
 
+/* Main container */
+div.main {
+	margin-left: 10px;
+	margin-right: 10px;
+}
+
+.navbar-brand img {
+	position: relative;
+	top: -7px;
+}
+
+.top5 { margin-top:5px; }
+.top7 { margin-top:7px; }
+.top10 { margin-top:10px; }
+.top15 { margin-top:15px; }
+.top17 { margin-top:17px; }
+.top20 { margin-top:20px; }
+.top30 { margin-top:30px; }
+
+.col-centered {
+    float: none;
+    margin: 0 auto;
+    display: center;
+}
+
 .menu {
     list-style: none;
     border-bottom: 0.1em solid black;
@@ -29,33 +54,77 @@
     padding: 0;
 }
 
-.form-control {
-    margin-top: 10px;
-    margin-left: 50px;
-}
-
 #version {
     margin: auto;
     width: 120px;
 }
 
 #pokemonList {
     margin-top: 10px;
-    margin-left: 50px;
-    margin-right: 50px;
+    margin-left: auto;
+    margin-right: auto;
 }
 
 .pokemonTile {
     width: 300px;
-    /*height: 100px;*/
+    height: 250px;
     outline: 1px solid;
     float: left;
+    margin-bottom: 2px;
+    padding-left: 15px;
+    padding-bottom: 5px;
+    padding-right: 15px;
+}
+
+.pokemonTile .score-iv, .pokemonTile .score-cp {
+	font-size: 1.5em;
+	font-family: fantasy;
+	letter-spacing: 2px;
+} 
+
+div.bottom-tile {
+	display: inline-block;
 }
 
 .pokemonTile > div {
     margin-left: 5px;
 }
 
+.pokemonTile img {
+	height: 100px;
+	float: left;
+}
+
 .error {
     color: red;
+}
+
+.nav, .pagination, .carousel, .panel-title a {
+    cursor: pointer;
+}
+
+/* Test */
+.left-inner-addon {
+    position: relative;
+}
+.left-inner-addon input {
+    padding-left: 30px;    
+}
+.left-inner-addon i {
+    position: absolute;
+    padding: 10px 12px;
+    pointer-events: none;
+}
+
+.right-inner-addon {
+    position: relative;
+}
+.right-inner-addon input {
+    padding-right: 30px;    
+}
+.right-inner-addon i {
+    position: absolute;
+    right: 0px;
+    padding: 10px 12px;
+    pointer-events: none;
 }

server/public/static/js/angular-animate/.bower.json

@@ -0,0 +1,21 @@
+{
+  "name": "angular-animate",
+  "version": "1.5.8",
+  "license": "MIT",
+  "main": "./angular-animate.js",
+  "ignore": [],
+  "dependencies": {
+    "angular": "1.5.8"
+  },
+  "homepage": "https://github.com/angular/bower-angular-animate",
+  "_release": "1.5.8",
+  "_resolution": {
+    "type": "version",
+    "tag": "v1.5.8",
+    "commit": "688b68844cf95420e1793327f69d0c25589c23d1"
+  },
+  "_source": "https://github.com/angular/bower-angular-animate.git",
+  "_target": "^1.5.8",
+  "_originalSource": "angular-animate",
+  "_direct": true
+}

server/public/static/js/angular-animate/LICENSE.md

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Angular
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

server/public/static/js/angular-animate/README.md

@@ -0,0 +1,68 @@
+# packaged angular-animate
+
+This repo is for distribution on `npm` and `bower`. The source for this module is in the
+[main AngularJS repo](https://github.com/angular/angular.js/tree/master/src/ngAnimate).
+Please file issues and pull requests against that repo.
+
+## Install
+
+You can install this package either with `npm` or with `bower`.
+
+### npm
+
+```shell
+npm install angular-animate
+```
+
+Then add `ngAnimate` as a dependency for your app:
+
+```javascript
+angular.module('myApp', [require('angular-animate')]);
+```
+
+### bower
+
+```shell
+bower install angular-animate
+```
+
+Then add a `<script>` to your `index.html`:
+
+```html
+<script src="/bower_components/angular-animate/angular-animate.js"></script>
+```
+
+Then add `ngAnimate` as a dependency for your app:
+
+```javascript
+angular.module('myApp', ['ngAnimate']);
+```
+
+## Documentation
+
+Documentation is available on the
+[AngularJS docs site](http://docs.angularjs.org/api/ngAnimate).
+
+## License
+
+The MIT License
+
+Copyright (c) 2010-2015 Google, Inc. http://angularjs.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.