From 41d17b79e36bdb40d86d13bc48e45bcd56666e10 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 28 Jan 2014 23:03:52 -0500 Subject: [PATCH] add login, home --- .gitignore | 3 +++ db.sqlite3 | Bin 0 -> 30720 bytes home/views.py | 4 +++- home/views.pyc | Bin 693 -> 844 bytes main/__init__.py | 0 main/views.py | 28 +++++++++++++++++++++++++ manage.py | 0 pydash/settings.py | 49 ++++++++++++++++++++++++++++++++++--------- pydash/settings.pyc | Bin 2723 -> 3170 bytes pydash/urls.py | 7 ++++++- pydash/urls.pyc | Bin 616 -> 799 bytes templates/home.html | 49 +++++++++++++++++++++++++++++++++++++++++++ templates/login.html | 2 +- 13 files changed, 129 insertions(+), 13 deletions(-) create mode 100644 .gitignore create mode 100644 main/__init__.py create mode 100755 main/views.py mode change 100644 => 100755 manage.py create mode 100644 templates/home.html 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..4a12dbf34f32ce71b0f59a13240e58ebe9c299b4 100644 GIT binary patch literal 30720 zcmeHPOKcm*8Q$61B`sN^{G!*1Eo((dwpm#=mlP$@juA5wZ7Y_j>J>eJc0rL#krE#= zNy)O{3nes{9(v6s*TU%IQUraVKyz?=DVjb|pa_r_McPY&1_cTfL7Nt6XJ&`HOLA%1 zFwo@#=VzzVB~4D|3)xsn4sZeo0C!WCIgUGt{#mbMr~oV# z*1V;2C!U!0qq4$rN~cOxs8b+%kA zt9j&|SRtN@6)uhWye9KvbaHkv((Vm79MbJxz@>8uZMS$YgJ4mSz&t7A9Mw)$%)E2I z8#<*>2plZdj6vPf3fXkAn9k>lCcm{-Xf!q})3c6~;HTPwLV+;VvgMNJBDW%Qk?442 zp2BT5K)PVKy?ReNY^cf*d0F6VA?~|?QyLru2lFP_ zW;=qiS>$ctHL1^vYxVpITILVMHJ(S4FjrDb54JR0WDUNAR^6H6tLx3cwzgLUaXe2u zKoha=B-{ati@EhC2|Vzj>mFxLd$4q2QO-5vk~>8N{bg<1|Qn_a_c6aUaauR zogy~~`fz`-M8fC{| z>h-j#xzc%pL(TFB`1y}s`q{-0UycLP>qmGSxcOD!MJ{MYm&gU}^&<{xe&~rVXr!e+ zIO^JGscCy@rj!k~=HdEN0&F%o9A%T2`clrfJEZmS;ZPHF&DIrvN>W`*>tz4`x8Lbl zEkmFc5MclRZ-u+e#>fz`M*u(n0i5U1AG;U=41woIp!@~oRa?Fo22y8d5P&@y}{d=&`uzH!|zjuhkVMAKP3B~0DFp)HV4T>(5*sMyERVt?4&FTKlzMu=+m={gY>ObKXq<61 zu!>d8Vb9&c(?$w!#fruI`2q?nu0#tf{xLILm|E2`v0_QhQ8!TJw1!};gQwlAbU36)&*7FVJ<=MZ)YWKWnNhdK zTr;bVS5GP%j>`0U+SyT!tWD^yC$_bvW@2la1ztP0EDGa&GK&!eZ1#w3uX;OVc#XIm z(n_EahBiZ06`RTv#QqNp9Q+vm46XjJp)9)?0t|uw8Uklg-0<1%vo!3m@Ovn95$XvrT(!NYF18*h&IA&P%bq6lHhEs>)ZTt_n9C=j^U-D{o)V2WA7@Bbov zmxI4U-{klO{0_>piy^=eco7gdC3K$!H9LfOP8jF|mW{x=DF~f{+YKuF0dxs&^qybY z3HXzOyO$KrhPQ^(JNdC}YIi*m+f0oH z{3A&vx1Jr__D%22Dl2=7574h~W+JZ4EG-77m*%po8xaN5Rwt(SRyJmLqZ65p760^b zbRxAmy|6VpnF*y5%X9hVz*~E(%Wo!EvbQ#3{Xsf6y1t zX3|sHTT0^g`nJJ$XL@^KDYUt|v^&1C6fLYS1ve+t_tVRM%$G_gmZOuf_z}DH3;~9~{}BTHa2g!8fsyCG2*x-t2L8>z#y^HC z{}1@^2`H2&x}1{N3-+rleDo!SS{P{Qq^EvuW_1JfckY_)^cf6lMc2HBQk z9=W9LmTFCF+U{1mpsCpSWNU)De#{}wcn>k3RK!#)C$xO3EF5PrBb-^50P&q z;ulSe52zX#)sn;7+Hg(%X*w$=qZ5(kx{nMRtvvEfw2q3s=IE=h@ufX)`IQq+>23&= zubXPX?i^EV|V(VHNdC`~}4F`IEYCktgXk7D$XH zLt|_9x}A9{-70+?rkjb0?pBDFdKdgU2S0;339mF#uBKhBN;(-ULNp{NZosXp&{u;Q?W*b= zkhIbXuO6a8rCnncNI&FIt$gXUe%~f*bRhCf%7bmo5`&|n0zNqyP~kLpB3L6a&LV4KF@MhF}elg3SLw z;J0uxqdp^$rvV~LK;lKIg{7&*B^p2`1DGgQ0J8Km@^e%56H{_C^Cs_S)U(mx0t%L} z0g2-L2q?x-!i|v0C@CojVw}8=NrI7S@^K~= e4Q8NR5Xe@9b-3&lo2<<&$Op2Phe?1D44D9sWHk5y 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 3f8cb195ac00adcf0ad26923595db7d3b9f60c3f..78ef2ad92028e0f9c023b574c5abeeb936478b8f 100644 GIT binary patch delta 884 zcmaJ-J8u&~5dQYgzKflg^KfEt5=aP%1Hrsa#Up~m1Q3>-RNGjW%-TM5v6I_#L;+Y3 zdW5c`rlI#wK>Pp-Bx)*ZegSi53mU|(c6MgIZ)d-mkJ%r&{MTQj=}*<4)qM<>#rHiv z`osJDR`)7o8Y&Gr3`#(bfRbnk$WhQW$T84$$Z=2xG6R}`oIq2cX@Dj{Qz$6`*MK_- zl>|-Wgn=wdG=q|y0?k5BgL05rC>wGnwzIL#fo?#a>f&#Oekl_wffE7BgXVBzqRwhg z|Ccr&(IoR1Am>0gA?HCQ$OSZ6)gow#g`NSOLn#u^wU_64iB|hr6I1}L#aSLe zl%@-yi+ru~x%7v%9?d6;2Yl{~iX2_$bA|gp3o@`%xYb(`cSP@{@kNB66W@k|Xzn_2 z0(U>$NWAX4g5$tubF6&rwp&4teR8$4=c$@{?&`p8HELeF(O_IJMc^~1)o2$xf$Qla z1I4O3>bSmop!PbAEyvSJ8%!yg+aeXvFmTB}EJ{9WDk0_AsgkYv(kwOXmho~MqL z_wR2u=)i4l9yqS|&}osU{P@AX=V%=abCC$CIT1+*LmW5zEFGjcIP}|xPQwY59^+`x zg0J#N9i@X<(4fTv!ze_e!WYK7-Xkj`!tZuHl=dsJ*td^~8eL6AK}VAc zDER^!K7fjvFW_Q`Qn0IiXlFFq`K&&aqWABtkM`H$3I4)0bKlfR-9_E2RgjOw2W7xE zC;&S+6QC@34U_|~gBHPg&=R-+%7a5t0lWbU!JD8W1_A>KE`uxRBmzT;VF`%?u3~I} z8aiA@hYTSCRlp5U6^RR~b<{5.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}), ) diff --git a/pydash/urls.pyc b/pydash/urls.pyc index bf92907ca437bf88644061fe75fc447c3c4ae22d..425b1dc058c9871b4a1e1224ded2be34acad6ae2 100644 GIT binary patch delta 476 zcmYjMyH3L}6g|!hTBuZ@Eg&H#gaSh{rhL7{OW(SLQG%xmCvZ6Yj0WYECwl}S46k%}*)?XJ+Q(Km%_P^D%m-3CgDbSNL+ zzV77=0hhgGAetL;nQC2nStN4lagjx#kli?vO6kx42V`A0N)@OmY`TZ%`{dd?@V2)$ zq)0QNDw<8gyMY+0u9+su_=Rm=sJUrVm<+F4#k3l{OXI(R3sJjs s+&Mkzw$9EvF434KxlYe!7NpHQ&&NB4TdNY#U{%|37TFrD6|=;C01W zAxsFe1lF(`9DqY`1dg#+WOcI`k#1hD@AmUN&0_Ub}_*O`ARCwb`~(;sU~?zZmFoydxRsBUDPF3ZABGcH#C@TrnP OSGX} + + + + + + {% block title %}{% endblock %} + + + {% block style %}{% endblock %} + + + +
+ {% 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 @@ - + {% endblock %}