Browse Source

Rearranged project so it could be packaged easily

doc_update
Joey Hines 3 years ago
parent
commit
c560aaf2f2
  1. 2
      .gitignore
  2. 0
      GeoffreyApp/LICENSE
  3. 2
      GeoffreyApp/__init__.py
  4. 0
      GeoffreyApp/admin.py
  5. 0
      GeoffreyApp/api/__init__.py
  6. 0
      GeoffreyApp/api/commands.py
  7. 0
      GeoffreyApp/api/models.py
  8. 0
      GeoffreyApp/api/urls.py
  9. 0
      GeoffreyApp/api/views.py
  10. 0
      GeoffreyApp/apps.py
  11. 0
      GeoffreyApp/background_tasks.py
  12. 0
      GeoffreyApp/docs/.gitignore
  13. 0
      GeoffreyApp/docs/Makefile
  14. 0
      GeoffreyApp/docs/__init__.py
  15. 0
      GeoffreyApp/docs/make.bat
  16. 0
      GeoffreyApp/docs/source/__init__.py
  17. 0
      GeoffreyApp/docs/source/bot_quickstart.rst
  18. 0
      GeoffreyApp/docs/source/commands.rst
  19. 0
      GeoffreyApp/docs/source/conf.py
  20. 0
      GeoffreyApp/docs/source/django_settings.rst
  21. 0
      GeoffreyApp/docs/source/getting_started.rst
  22. 0
      GeoffreyApp/docs/source/index.rst
  23. 0
      GeoffreyApp/docs/source/models.rst
  24. 0
      GeoffreyApp/errors.py
  25. 0
      GeoffreyApp/mcm_api.py
  26. 0
      GeoffreyApp/migrations/0001_initial.py
  27. 0
      GeoffreyApp/migrations/0002_auto_20181229_2216.py
  28. 3
      GeoffreyApp/migrations/0003_apitoken.py
  29. 0
      GeoffreyApp/migrations/0004_apitoken_commands_perm.py
  30. 0
      GeoffreyApp/migrations/0005_auto_20190113_2255.py
  31. 0
      GeoffreyApp/migrations/0006_auto_20190131_1822.py
  32. 0
      GeoffreyApp/migrations/0007_town.py
  33. 0
      GeoffreyApp/migrations/0008_publicfarm_resource.py
  34. 0
      GeoffreyApp/migrations/0009_market.py
  35. 0
      GeoffreyApp/migrations/0010_pointofinterest.py
  36. 0
      GeoffreyApp/minecraft_api.py
  37. 0
      GeoffreyApp/models.py
  38. 0
      GeoffreyApp/static/GeoffreyApp/css/bootstrap.css
  39. 0
      GeoffreyApp/static/GeoffreyApp/css/geoffrey.css
  40. 0
      GeoffreyApp/static/GeoffreyApp/img/icon.png
  41. 0
      GeoffreyApp/templates/GeoffreyApp/base.html
  42. 0
      GeoffreyApp/templates/GeoffreyApp/base_list.html
  43. 0
      GeoffreyApp/templates/GeoffreyApp/error.html
  44. 0
      GeoffreyApp/templates/GeoffreyApp/home.html
  45. 0
      GeoffreyApp/templates/GeoffreyApp/itemlisting_list.html
  46. 0
      GeoffreyApp/templates/GeoffreyApp/itemlisting_table.html
  47. 0
      GeoffreyApp/templates/GeoffreyApp/location.html
  48. 0
      GeoffreyApp/templates/GeoffreyApp/location_table.html
  49. 0
      GeoffreyApp/templates/GeoffreyApp/market.html
  50. 0
      GeoffreyApp/templates/GeoffreyApp/market_list.html
  51. 0
      GeoffreyApp/templates/GeoffreyApp/player.html
  52. 0
      GeoffreyApp/templates/GeoffreyApp/player_list.html
  53. 0
      GeoffreyApp/templates/GeoffreyApp/player_table.html
  54. 0
      GeoffreyApp/templates/GeoffreyApp/pointofinterest_list.html
  55. 0
      GeoffreyApp/templates/GeoffreyApp/publicfarm.html
  56. 0
      GeoffreyApp/templates/GeoffreyApp/publicfarm_list.html
  57. 0
      GeoffreyApp/templates/GeoffreyApp/resource_table.html
  58. 0
      GeoffreyApp/templates/GeoffreyApp/search.html
  59. 0
      GeoffreyApp/templates/GeoffreyApp/shop.html
  60. 0
      GeoffreyApp/templates/GeoffreyApp/shop_list.html
  61. 0
      GeoffreyApp/templates/GeoffreyApp/town.html
  62. 0
      GeoffreyApp/templates/GeoffreyApp/town_list.html
  63. 0
      GeoffreyApp/templatetags/__init__.py
  64. 1
      GeoffreyApp/templatetags/navbar.py
  65. 0
      GeoffreyApp/test/__init__.py
  66. 3
      GeoffreyApp/test/test_commands.py
  67. 2
      GeoffreyApp/test/test_key.py
  68. 2
      GeoffreyApp/test/test_mcm_api.py
  69. 2
      GeoffreyApp/test/test_minecraft_api.py
  70. 2
      GeoffreyApp/urls.py
  71. 0
      GeoffreyApp/util.py
  72. 0
      GeoffreyApp/views.py
  73. 4
      MANIFEST.in
  74. 1
      __init__.py
  75. 22
      setup.py

2
.gitignore vendored

@ -1,2 +1,4 @@ @@ -1,2 +1,4 @@
*.pyc
__pycache__/*
/dist/*
/GeoffreyApp.egg-info/*

0
LICENSE → GeoffreyApp/LICENSE

2
GeoffreyApp/__init__.py

@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
default_app_config = 'GeoffreyApp.apps.GeoffreyAppConfig'
__version__ = '2.0'

0
admin.py → GeoffreyApp/admin.py

0
api/__init__.py → GeoffreyApp/api/__init__.py

0
api/commands.py → GeoffreyApp/api/commands.py

0
api/models.py → GeoffreyApp/api/models.py

0
api/urls.py → GeoffreyApp/api/urls.py

0
api/views.py → GeoffreyApp/api/views.py

0
apps.py → GeoffreyApp/apps.py

0
background_tasks.py → GeoffreyApp/background_tasks.py

0
docs/.gitignore → GeoffreyApp/docs/.gitignore vendored

0
docs/Makefile → GeoffreyApp/docs/Makefile

0
migrations/__init__.py → GeoffreyApp/docs/__init__.py

0
docs/make.bat → GeoffreyApp/docs/make.bat

0
templatetags/__init__.py → GeoffreyApp/docs/source/__init__.py

0
docs/source/bot_quickstart.rst → GeoffreyApp/docs/source/bot_quickstart.rst

0
docs/source/commands.rst → GeoffreyApp/docs/source/commands.rst

0
docs/source/conf.py → GeoffreyApp/docs/source/conf.py

0
docs/source/django_settings.rst → GeoffreyApp/docs/source/django_settings.rst

0
docs/source/getting_started.rst → GeoffreyApp/docs/source/getting_started.rst

0
docs/source/index.rst → GeoffreyApp/docs/source/index.rst

0
docs/source/models.rst → GeoffreyApp/docs/source/models.rst

0
errors.py → GeoffreyApp/errors.py

0
mcm_api.py → GeoffreyApp/mcm_api.py

0
migrations/0001_initial.py → GeoffreyApp/migrations/0001_initial.py

0
migrations/0002_auto_20181229_2216.py → GeoffreyApp/migrations/0002_auto_20181229_2216.py

3
migrations/0003_apitoken.py → GeoffreyApp/migrations/0003_apitoken.py

@ -14,7 +14,8 @@ class Migration(migrations.Migration): @@ -14,7 +14,8 @@ class Migration(migrations.Migration):
name='APIToken',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('key', models.CharField(default=GeoffreyApp.util.create_token, max_length=25, unique=True)),
(
'key', models.CharField(default=GeoffreyApp.GeoffreyApp.util.create_token, max_length=25, unique=True)),
('name', models.CharField(blank=True, max_length=50)),
],
),

0
migrations/0004_apitoken_commands_perm.py → GeoffreyApp/migrations/0004_apitoken_commands_perm.py

0
migrations/0005_auto_20190113_2255.py → GeoffreyApp/migrations/0005_auto_20190113_2255.py

0
migrations/0006_auto_20190131_1822.py → GeoffreyApp/migrations/0006_auto_20190131_1822.py

0
migrations/0007_town.py → GeoffreyApp/migrations/0007_town.py

0
migrations/0008_publicfarm_resource.py → GeoffreyApp/migrations/0008_publicfarm_resource.py

0
migrations/0009_market.py → GeoffreyApp/migrations/0009_market.py

0
migrations/0010_pointofinterest.py → GeoffreyApp/migrations/0010_pointofinterest.py

0
minecraft_api.py → GeoffreyApp/minecraft_api.py

0
models.py → GeoffreyApp/models.py

0
static/GeoffreyApp/css/bootstrap.css → GeoffreyApp/static/GeoffreyApp/css/bootstrap.css vendored

0
static/GeoffreyApp/css/geoffrey.css → GeoffreyApp/static/GeoffreyApp/css/geoffrey.css

0
static/GeoffreyApp/img/icon.png → GeoffreyApp/static/GeoffreyApp/img/icon.png

Before

Width:  |  Height:  |  Size: 294 KiB

After

Width:  |  Height:  |  Size: 294 KiB

0
templates/GeoffreyApp/base.html → GeoffreyApp/templates/GeoffreyApp/base.html

0
templates/GeoffreyApp/base_list.html → GeoffreyApp/templates/GeoffreyApp/base_list.html

0
templates/GeoffreyApp/error.html → GeoffreyApp/templates/GeoffreyApp/error.html

0
templates/GeoffreyApp/home.html → GeoffreyApp/templates/GeoffreyApp/home.html

0
templates/GeoffreyApp/itemlisting_list.html → GeoffreyApp/templates/GeoffreyApp/itemlisting_list.html

0
templates/GeoffreyApp/itemlisting_table.html → GeoffreyApp/templates/GeoffreyApp/itemlisting_table.html

0
templates/GeoffreyApp/location.html → GeoffreyApp/templates/GeoffreyApp/location.html

0
templates/GeoffreyApp/location_table.html → GeoffreyApp/templates/GeoffreyApp/location_table.html

0
templates/GeoffreyApp/market.html → GeoffreyApp/templates/GeoffreyApp/market.html

0
templates/GeoffreyApp/market_list.html → GeoffreyApp/templates/GeoffreyApp/market_list.html

0
templates/GeoffreyApp/player.html → GeoffreyApp/templates/GeoffreyApp/player.html

0
templates/GeoffreyApp/player_list.html → GeoffreyApp/templates/GeoffreyApp/player_list.html

0
templates/GeoffreyApp/player_table.html → GeoffreyApp/templates/GeoffreyApp/player_table.html

0
templates/GeoffreyApp/pointofinterest_list.html → GeoffreyApp/templates/GeoffreyApp/pointofinterest_list.html

0
templates/GeoffreyApp/publicfarm.html → GeoffreyApp/templates/GeoffreyApp/publicfarm.html

0
templates/GeoffreyApp/publicfarm_list.html → GeoffreyApp/templates/GeoffreyApp/publicfarm_list.html

0
templates/GeoffreyApp/resource_table.html → GeoffreyApp/templates/GeoffreyApp/resource_table.html

0
templates/GeoffreyApp/search.html → GeoffreyApp/templates/GeoffreyApp/search.html

0
templates/GeoffreyApp/shop.html → GeoffreyApp/templates/GeoffreyApp/shop.html

0
templates/GeoffreyApp/shop_list.html → GeoffreyApp/templates/GeoffreyApp/shop_list.html

0
templates/GeoffreyApp/town.html → GeoffreyApp/templates/GeoffreyApp/town.html

0
templates/GeoffreyApp/town_list.html → GeoffreyApp/templates/GeoffreyApp/town_list.html

0
test/__init__.py → GeoffreyApp/templatetags/__init__.py

1
templatetags/navbar.py → GeoffreyApp/templatetags/navbar.py

@ -1,6 +1,5 @@ @@ -1,6 +1,5 @@
from django import template
from django.urls import reverse
from GeoffreyApp.models import Player, Shop, Base, Town, ItemListing, PublicFarm, Market, PointOfInterest
register = template.Library()

0
GeoffreyApp/test/__init__.py

3
test/test_commands.py → GeoffreyApp/test/test_commands.py

@ -1,6 +1,5 @@ @@ -1,6 +1,5 @@
from django.test import TestCase
from GeoffreyApp.api.commands import *
from GeoffreyApp.models import *
from GeoffreyApp.GeoffreyApp.models import *
from time import sleep
# Create your tests here.

2
test/test_key.py → GeoffreyApp/test/test_key.py

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
from django.test import TestCase
from GeoffreyApp.util import create_token
from GeoffreyApp.GeoffreyApp.util import create_token
class TokenAPITestCase(TestCase):

2
test/test_mcm_api.py → GeoffreyApp/test/test_mcm_api.py

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
from django.test import TestCase
from GeoffreyApp.mcm_api import get_player
from GeoffreyApp.GeoffreyApp.mcm_api import get_player
# Create your tests here.
UUID = "fe7e84132570458892032b69ff188bc3"

2
test/test_minecraft_api.py → GeoffreyApp/test/test_minecraft_api.py

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
from django.test import TestCase
from GeoffreyApp.minecraft_api import grab_playername, grab_UUID
from GeoffreyApp.GeoffreyApp.minecraft_api import grab_playername, grab_UUID
# Create your tests here.
UUID = "fe7e84132570458892032b69ff188bc3"

2
urls.py → GeoffreyApp/urls.py

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
from django.conf.urls import url
from django.urls import path, include
from . import views
from GeoffreyApp import views
urlpatterns = [
url(r'^home/$', views.Home.as_view(), name='GeoffreyHome'),

0
util.py → GeoffreyApp/util.py

0
views.py → GeoffreyApp/views.py

4
MANIFEST.in

@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
include LICENSE
include README.md
recursive-include GeoffreyApp/static *
recursive-include GeoffreyApp/templates *

1
__init__.py

@ -1 +0,0 @@ @@ -1 +0,0 @@
default_app_config = 'GeoffreyApp.apps.GeoffreyAppConfig'

22
setup.py

@ -0,0 +1,22 @@ @@ -0,0 +1,22 @@
import os
from setuptools import find_packages, setup
with open(os.path.join(os.path.dirname(__file__), 'README.md')) as readme:
README = readme.read()
# allow setup.py to be run from any path
os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
setup(
name='GeoffreyApp',
version='2.0',
packages=find_packages(),
include_package_data=True,
license='MIT License',
description='Geoffrey: The Minecraft Information Database',
long_description=README,
url='https:/geoffrey.zerohighdef.com/',
author='ZeroHD',
author_email='zero@zerohighdef.com',
install_requires=['django', 'requests', 'simplejson']
)
Loading…
Cancel
Save