diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6d11c27 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.pyc +._* +db.sqlite3 \ No newline at end of file diff --git a/db.sqlite3 b/db.sqlite3 index e69de29..4a12dbf 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/home/views.py b/home/views.py index 4901d60..2e0c22f 100755 --- a/home/views.py +++ b/home/views.py @@ -1,4 +1,4 @@ -import socket +from main.views import * from django.shortcuts import render_to_response from django.http import HttpResponseRedirect @@ -15,3 +15,5 @@ def index(request): return HttpResponseRedirect('/login') else: return HttpResponseRedirect('/home') + + \ No newline at end of file diff --git a/home/views.pyc b/home/views.pyc index a323832..c6ee461 100644 Binary files a/home/views.pyc and b/home/views.pyc differ diff --git a/main/__init__.py b/main/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/main/views.py b/main/views.py new file mode 100755 index 0000000..c21ee72 --- /dev/null +++ b/main/views.py @@ -0,0 +1,28 @@ +from datetime import timedelta + +from django.shortcuts import render_to_response +from django.http import HttpResponseRedirect, HttpResponse +from django.template import RequestContext +from django.utils.translation import ugettext_lazy as _ +from django.utils import simplejson + +def getuptime(): + """ + Get uptime + """ + if not request.user.is_authenticated(): + return HttpResponseRedirect('/login') + try: + with open('/proc/uptime', 'r') as f: + uptime_seconds = float(f.readline().split()[0]) + uptime_time = str(timedelta(seconds = uptime_seconds)) + data = simplejson.dumps(uptime_time) + + except Exception,err: + data = simplejson.dumps(str(err)) + + response = HttpResponse() + response['Content-Type'] = "text/javascript" + response.write(data) + return response + diff --git a/manage.py b/manage.py old mode 100644 new mode 100755 diff --git a/pydash/settings.py b/pydash/settings.py index 58779fb..f63465c 100644 --- a/pydash/settings.py +++ b/pydash/settings.py @@ -12,6 +12,7 @@ https://docs.djangoproject.com/en/1.6/ref/settings/ import os BASE_DIR = os.path.dirname(os.path.dirname(__file__)) +#SITE_ID = 1 # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/ @@ -37,11 +38,12 @@ ALLOWED_HOSTS = ['*'] # Application definition INSTALLED_APPS = ( - 'django.contrib.admin', + #'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.messages', + #'django.contrib.sites', 'django.contrib.staticfiles', ) @@ -58,16 +60,7 @@ ROOT_URLCONF = 'pydash.urls' WSGI_APPLICATION = 'pydash.wsgi.application' -STATIC_URL = '/static/' - -STATICFILES_DIRS = ( -) -STATICFILES_FINDERS = ( - 'django.contrib.staticfiles.finders.FileSystemFinder', - 'django.contrib.staticfiles.finders.AppDirectoriesFinder', - # 'django.contrib.staticfiles.finders.DefaultStorageFinder', -) # Database # https://docs.djangoproject.com/en/1.6/ref/settings/#databases @@ -102,4 +95,40 @@ TEMPLATE_DIRS = (os.path.join(os.path.dirname(__file__), '..', 'templates'),) # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/1.6/howto/static-files/ +STATIC_ROOT = os.path.join(os.path.dirname(__file__), '..', 'static') +#STATIC_ROOT = os.path.join(BASE_DIR, 'static') + STATIC_URL = '/static/' + +STATICFILES_DIRS = ( +) + +STATICFILES_FINDERS = ( + 'django.contrib.staticfiles.finders.FileSystemFinder', + 'django.contrib.staticfiles.finders.AppDirectoriesFinder', + # 'django.contrib.staticfiles.finders.DefaultStorageFinder', +) + +LOGGING = { + 'version': 1, + 'disable_existing_loggers': False, + 'filters': { + 'require_debug_false': { + '()': 'django.utils.log.RequireDebugFalse' + } + }, + 'handlers': { + 'mail_admins': { + 'level': 'ERROR', + 'filters': ['require_debug_false'], + 'class': 'django.utils.log.AdminEmailHandler' + } + }, + 'loggers': { + 'django.request': { + 'handlers': ['mail_admins'], + 'level': 'ERROR', + 'propagate': True, + }, + } +} \ No newline at end of file diff --git a/pydash/settings.pyc b/pydash/settings.pyc index 3f8cb19..78ef2ad 100644 Binary files a/pydash/settings.pyc and b/pydash/settings.pyc differ diff --git a/pydash/urls.py b/pydash/urls.py index 69335f4..a0432ea 100644 --- a/pydash/urls.py +++ b/pydash/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import patterns, include, url +from django.conf.urls import patterns, url from django.conf import settings #from django.contrib import admin @@ -13,4 +13,9 @@ urlpatterns = patterns('', url(r'^$', 'home.views.index', name='index'), url(r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'login.html'}, name='login'), url(r'^logout/$', 'django.contrib.auth.views.logout', {'template_name': 'logout.html'}, name='logout'), + url(r'^home/$', 'home.views.devices_list', name='devices_list'), +) + +urlpatterns += patterns('', + (r'^static/(?P.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}), ) diff --git a/pydash/urls.pyc b/pydash/urls.pyc index bf92907..425b1dc 100644 Binary files a/pydash/urls.pyc and b/pydash/urls.pyc differ diff --git a/templates/home.html b/templates/home.html new file mode 100644 index 0000000..111d026 --- /dev/null +++ b/templates/home.html @@ -0,0 +1,49 @@ +{% load i18n %}{% load staticfiles %} + + + + + + {% block title %}{% endblock %} + + + {% block style %}{% endblock %} + + +
+
+
+ + pyDash +
+ +
+
+
+ {% block content %}{% endblock %} +
+ + +{% block script %}{% endblock %} + + diff --git a/templates/login.html b/templates/login.html index dc9f0bc..b8f559e 100644 --- a/templates/login.html +++ b/templates/login.html @@ -12,7 +12,7 @@

{% trans "Sign In" %}

- + {% endblock %}