version 0.2.6

telebotter · Apr 8, 2017 · 5ca49c0 · 5ca49c0
1 parent dd0d41c
commit 5ca49c0
Show file tree

Hide file tree

Showing 8 changed files with 92 additions and 2 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -2,6 +2,11 @@
 
 History
 -------
+0.2.6 (2017-04-08)
+++++++++++++++++++
+* Improve module loading
+* Added sample project
+
 0.2.5 (2017-03-06)
 ++++++++++++++++++
 * Fix compatibility with python-telegram-bot 5.1

diff --git a/django_telegrambot/__init__.py b/django_telegrambot/__init__.py
@@ -1,2 +1,2 @@
-__version__ = '0.2.5'
+__version__ = '0.2.6'
 default_app_config = 'django_telegrambot.apps.DjangoTelegramBot'
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
-django>=1.8.0
+django>=1.8.18
 # Additional requirements go here
 python-telegram-bot>=5.1
diff --git a/sampleproject/bot/templates/base_generic.html b/sampleproject/bot/templates/base_generic.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  {% block title %}<title>Django-Telegrambot</title>{% endblock %}
+   <meta charset="utf-8">
+   <meta name="viewport" content="width=device-width, initial-scale=1">
+   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+   <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
+   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+
+   <!-- Add additional CSS in static file -->
+   {% load static %}
+   <!--link rel="stylesheet" href="{% static 'css/styles.css' %}" -->
+   <style>
+    .sidebar-nav {
+       margin-top: 20px;
+       padding: 0;
+       list-style: none;
+    }
+    .nolist {
+      list-style: none;
+      font-size: 1.5em;
+      color: #337ab7;
+    }
+    .nolist a:hover{
+        text-decoration: none;
+    }
+   </style>
+</head>
+
+<body>
+   <div class="container-fluid">
+
+        <div class="row">
+            <div class="col-sm-2">
+                {% block sidebar %}
+                <ul class="sidebar-nav">
+                     <li><a href="{% url 'index' %}">Home</a></li>
+                </ul>
+                {% endblock %}
+            </div>
+            <div class="col-sm-10 ">
+            {% block content %}{% endblock %}
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+
diff --git a/sampleproject/bot/templates/bot/index.html b/sampleproject/bot/templates/bot/index.html
@@ -0,0 +1,23 @@
+{% extends "base_generic.html" %}
+
+{% block content %}
+<h1><a href="https://github.com/JungDev/django-telegrambot#django-telegrambot">Django-TelegramBot</a></h1>
+<p>
+Welcome in the sample project of Django-Telegrambot, aka how add Telegram bots to your Django app!
+<br>
+The full documentation is at <a href="https://django-telegrambot.readthedocs.org">https://django-telegrambot.readthedocs.org</a>.
+</p>
+
+{% if bot_list %}
+<h3>Bot's List:</h3>
+    <ul class="nolist">
+        {% for bot in bot_list %}
+        <li><a href="https://t.me/{{ bot.username }}/">
+                <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAOxAAADsQBlSsOGwAABNJJREFUWIXFlm2IVFUYx3/PuTO7M7OrbqlISparGxWVRYuSSbokRlmmVkKC+IIRRF+qbyVoH4wgqU9+EIQ+WClKQUGSpIGmELm+YPZC26qkrOm6677P7Mw9z9OH2dmZ2Zl9M8MDh3vvOc/9///nf57z3Au3ucnNvLTwR6sVRx3GFCc4MzoJuSDG70caJPxfBCw8ak8KbBRYhjCtXIwZvcBhET6XkK/GImZUAQuOWb3z+omILByrWABDLuD9e8caIntuTsAWcwsadCvCu4IE4yEvZpCvu7rY8MvzcmPMAh48ZxWTWnUvIitvmrigGfZHKG5p4yK5NLqALebmLdb9AqtuBXleBE0et+Bkg1wvHHdDA+sX+c1mrFKDW9nNqBPVvWyxIs4iB+Ye7H80Egl+BoneytUXNjN789SSyI6yAh47FH6PseQ/ElCFp6ZCaMmU5q4JbT3poPav56QLCrbg4YPpx73a095g/N2wMGT+hAzb7lcONVTwzhzwaiWxqkyOBX5TjjeSu1GCdaIqYGNfrRqzYp4VM4Tld0eYGs+v+HxnBm+ViJXiGbIe+LhIgFe/TMZSGM2I43l2Grw8M2Du5EpEBDOjLa3URIVAhN86PGpG+ZOuD9V+0zfz/PLE3xGAOQdsqmpm1oirV+O+hGfNPY4XZlZQHc0nc29otPQrM2KOQLKEv3Zm7R8GU5wL5gNZARZm5nhXLFUAwwhUeWaqsbY2Qv3UGCL5MG9GS8roDo3ZVY5Kl51LZpSmHnCJEZYkMgcGtkBNJqNaEjM96tm/uIK7qkqzuTNjXEopEYG6KkfU5YWda+3HR6KYDu+o4SbDwCkIzbty2X25V/ngp3YOne8mk/WTUI2LSaU5qVS6UnKAM20hKm7EkxOayqADoekNZ0GRPhCQgH1XAvZc7KHG2ln3QIIXH7mT0KAmItwbF5yUJtmZdkUR0CF4RQzWMehAWuLN3ox8B2+KF3CJBNFJk+iuvoOdTZ5kqKgZ0yvLkwOcbvcDNaAQz/CWfdebESLNgwLaVkiL99aiamQ7qEr2aoJKANEK+mPVnP0nRXcGDreGtKVL86Yz5WnqddlvgFKAZ6gKXgfGU9Y4KABAzb7zCtlu+SqWu1cwF3C8JU2oRke/surLy+w63Y4VFJtTV1NoJJrFMSvAI++K6vnrr8b+LBIQiuz2Q79iOuQZOHJFae8L+ejoNU6nErx1Is3Gb6/Qk/YANLZmE1BtwM0izKwbocnuHG/RJk7YmzwhWH3Zjc0lTyYDXR1YohoXi4EZPpmkLkiyed5Etp1N02zVI/1r9Xr1s3vXTLhaIqBqT3KxmP4A5bJrIJPNMO+RIMiHmaHpfqw/hYsnkGiUXCkrVaJbe9ZUv1/WAYDEF307MN4oLiFDgcoBD/jspEzsINWZZDQ+n9WSzs2W/BH1tcbf9qrH1Yx8h5GfB8ZEhokFNbumyEuF5GUdAODTGzXRSMUB4InSybG4MWTcuIrq0sz6CWeHRg2fKvssHqT6dgq2drTQkZphjd4Hr7AhfrHc/Oiou3tXOrXtQO04mbtwfKjJqu28Lpnhwsa2rJ0WJd6zGpWNgj0FEsmxDNkOAzlnxmeE4S5eq2kfDXr8vu6+PpFMZT3O1WE2BXBgnZi7gHKSTVUt48a8ne1frXIrn7AjhjAAAAAASUVORK5CYII=">
+             {{ bot.first_name}} <small>(@{{ bot.username}})</small></a></li>
+        {% endfor %}
+    </ul>
+{% else %}
+<p>No bots are available. Please <a href="https://github.com/JungDev/django-telegrambot#configure-your-installation">configure it</a> in settings.py</p>
+{% endif %}
+{% endblock %}
diff --git a/sampleproject/bot/urls.py b/sampleproject/bot/urls.py
@@ -0,0 +1,7 @@
+from django.conf.urls import url
+
+from . import views
+
+urlpatterns = [                                                                                                                      
+    url(r'^$', views.index, name='index'),
+]
diff --git a/sampleproject/bot/views.py b/sampleproject/bot/views.py
@@ -1,3 +1,8 @@
 from django.shortcuts import render
+from django_telegrambot.apps import DjangoTelegramBot
 
 # Create your views here.
+def index(request):
+    bot_list = DjangoTelegramBot.bots
+    context = {'bot_list': bot_list}
+    return render(request, 'bot/index.html', context)
diff --git a/sampleproject/sampleproject/urls.py b/sampleproject/sampleproject/urls.py
@@ -19,4 +19,5 @@
 urlpatterns = [
     url(r'^admin/', admin.site.urls),
     url(r'^baseurl/', include('django_telegrambot.urls')),
+    url(r'^$', include('bot.urls')),
 ]