Mirrors/pokeapi
2
0
Fork 0
mirror of https://github.com/PokeAPI/pokeapi synced 2024-11-10 06:04:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

had a stash mistake on the last push. this should be a complete push

Browse source
This commit is contained in:
Zane Adickes 2016-01-26 21:09:44 -05:00
parent 6dba85c32a
commit d6ca4a3f60
5 changed files with 6 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/v2/__init__.py
View file

@ -1 +1,5 @@
<<<<<<< Updated upstream
from .build import *
=======
from build import *
>>>>>>> Stashed changes

2
data/v2/build.py
View file

@ -2355,4 +2355,4 @@ def build_all():
build_pal_parks()
if __name__ == '__main__':
build_all()
build_all()

3
pokemon_v2/models.py
View file

@ -1,7 +1,6 @@
from __future__ import unicode_literals
from django.db import models
#####################
# ABSTRACT MODELS #
#####################
@ -1390,4 +1389,4 @@ class PokemonStat(HasPokemon, HasStat):
class PokemonType(HasPokemon, HasType):
slot = models.IntegerField()
slot = models.IntegerField()

49
pokemon_v2/templates/base.html
View file

@ -1,49 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<!-- A project by Paul Hallett - http://phalt.co - https://github.com/phalt/pokeapi -->
<!-- Collaborators: -->
<!-- Zane Adickes - https://github.com/zaneadix/ -->
<head>
<meta charset="utf-8">
<title> Pokéapi - The Pokemon RESTful API </title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="Pokeapi The Pokemon RESTful API">
<meta name="author" content="Paul Hallett">
<meta name="author" content="Zane Adickes">
<base href="/">
<link href="/static/pokemon_v2/css/bootstrap.min.css" rel="stylesheet">
<link href="/static/pokemon_v2/css/json-formatter.min.css" rel="stylesheet">
<link href="/static/pokemon_v2/css/app.min.css" rel="stylesheet">
<link rel="shortcut icon" href="/static/favicon.ico">
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
</head>
<body ng-app="pokeapi_v2">
{% block mainbody %}
{% endblock mainbody %}
<script src="/static/pokemon_v2/js/marked.min.js"></script>
<script src="/static/pokemon_v2/js/angular.min.js"></script>
<script src="/static/pokemon_v2/js/angular-ui-router.min.js"></script>
<script src="/static/pokemon_v2/js/angular-sanitize.min.js"></script>
<script src="/static/pokemon_v2/js/json-formatter.min.js"></script>
<script src="/static/pokemon_v2/js/app.min.js"></script>
</body>
</html>

24
pokemon_v2/templates/home.html
View file

@ -1,24 +0,0 @@
{% extends "base.html" %}
{% block mainbody %}
<!-- <div pokeapi-header></div> -->
<!-- <div class="container"> -->
<!-- <div class="row"> -->
<div pokeapi-header></div>
<div class="content">
<ui-view></ui-view>
</div>
<!-- </div> -->
<!-- </div> -->
{% endblock %}