admin done

.gitignore

@@ -0,0 +1 @@
+*.pyc

content_manage/views.py

@@ -56,8 +56,11 @@ def content_edit(request,offset):
         obj.save()
         res = {"code":0, "msg":"sucess",}
     else:
-        res = {"code":-1, "msg":"编辑失败"}
-    print(res)
+        obj,flag = Article.objects.get_or_create(title = title,type=int(offset))
+        obj.img_url = img_url
+        obj.content = content
+        obj.save()
+        res = {"code":0,"msg":"success",}
     return JsonResponse(res)
 
 
@@ -313,4 +316,4 @@ def news_delete(request):
     else:
         res={"code": -1, "msg": u"参数不完整"}
 
-    return JsonResponse(res)
+    return JsonResponse(res)

serv.py

@@ -0,0 +1,32 @@
+__author__ = 'alexander'
+import os
+import sys 
+
+from tornado.options import options, define, parse_command_line
+import django.core.handlers.wsgi
+import tornado.httpserver
+import tornado.ioloop
+import tornado.web
+import tornado.wsgi
+from django.core.wsgi import get_wsgi_application
+
+_HERE = os.path.abspath(os.path.dirname(__file__))
+sys.path.append(_HERE)
+sys.path.append(os.path.join(_HERE,'common'))
+os.environ['DJANGO_SETTINGS_MODULE'] = "xdcjing.settings"
+
+def main(port):
+    wsgi_app = tornado.wsgi.WSGIContainer(
+            #django.core.handlers.wsgi.WSGIHandler()
+                    get_wsgi_application()
+                            )   
+    tornado_app = tornado.web.Application(
+            [('.*', tornado.web.FallbackHandler, dict(fallback=wsgi_app)),
+                    ],debug=False)
+    server = tornado.httpserver.HTTPServer(tornado_app)
+    server.listen(port)
+    tornado.ioloop.IOLoop.instance().start()
+
+if __name__ == '__main__':
+    main(int(sys.argv[1]))
+

templates/www/static/particles/app.js

@@ -0,0 +1,3 @@
+// window.particlesJS.load('particles-js', 'static/particles/particles.json', function() {
+//   console.log('callback - particles.js config loaded')
+// })

templates/www/static/particles/particles.json

@@ -0,0 +1,110 @@
+{
+  "particles": {
+    "number": {
+      "value": 10,
+      "density": {
+        "enable": true,
+        "value_area": 800
+      }
+    },
+    "color": {
+      "value": "#eee"
+    },
+    "shape": {
+      "type": "circle",
+      "stroke": {
+        "width": 0,
+        "color": "#000000"
+      },
+      "polygon": {
+        "nb_sides": 5
+      },
+      "image": {
+        "src": "img/github.svg",
+        "width": 100,
+        "height": 100
+      }
+    },
+    "opacity": {
+      "value": 0.5,
+      "random": false,
+      "anim": {
+        "enable": false,
+        "speed": 1,
+        "opacity_min": 0.1,
+        "sync": false
+      }
+    },
+    "size": {
+      "value": 10,
+      "random": true,
+      "anim": {
+        "enable": false,
+        "speed": 80,
+        "size_min": 0.1,
+        "sync": false
+      }
+    },
+    "line_linked": {
+      "enable": true,
+      "distance": 300,
+      "color": "#eee",
+      "opacity": 0.4,
+      "width": 2
+    },
+    "move": {
+      "enable": true,
+      "speed": 3,
+      "direction": "none",
+      "random": false,
+      "straight": false,
+      "out_mode": "out",
+      "bounce": false,
+      "attract": {
+        "enable": false,
+        "rotateX": 600,
+        "rotateY": 1200
+      }
+    }
+  },
+  "interactivity": {
+    "detect_on": "canvas",
+    "events": {
+      "onhover": {
+        "enable": false,
+        "mode": "repulse"
+      },
+      "onclick": {
+        "enable": true,
+        "mode": "push"
+      },
+      "resize": true
+    },
+    "modes": {
+      "grab": {
+        "distance": 800,
+        "line_linked": {
+          "opacity": 1
+        }
+      },
+      "bubble": {
+        "distance": 800,
+        "size": 80,
+        "duration": 2,
+        "opacity": 0.8,
+        "speed": 0.2
+      },
+      "repulse": {
+        "distance": 400,
+        "duration": 0.4
+      },
+      "push": {
+        "particles_nb": 4
+      },
+      "remove": {
+        "particles_nb": 2
+      }
+    }
+  },
+  "retina_detect": true
+}

users/views.py

@@ -8,6 +8,7 @@ import traceback
 from django.contrib.auth.hashers import make_password, check_password
 from django.views.decorators.csrf import csrf_exempt
 from django.core.exceptions import ObjectDoesNotExist
+from django.shortcuts import render
 from models import *
 
 from common.common import (get_user_from_request, login_required,
@@ -334,3 +335,9 @@ def fb_question(request):
 
     else:
         return JsonResponse({"code":-1, "msg":"参数不完整"})
+
+
+def home(request):
+    """
+    """
+    return render(request,"www/index.html",{})

xdcjing/gen_root.py

@@ -0,0 +1,21 @@
+#-*-coding:utf-8 -*-
+import os
+os.environ["DJANGO_SETTINGS_MODULE"] = "xdcjing.settings"
+import django
+django.setup()
+
+
+from django.contrib.auth.hashers import make_password, check_password
+from users.models import Users
+
+
+def gen_root_user():
+    """
+    """
+    password = make_password("xdcjadmin")
+    Users.objects.filter(username="xdcjadmin").delete()
+    obj,flag = Users.objects.get_or_create(username="xdcjadmin",password=password)
+    print obj,flag
+
+if __name__ == "__main__":
+    gen_root_user()

xdcjing/settings.py

@@ -102,7 +102,7 @@ ROOT_URLCONF = 'xdcjing.urls'
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
+        'DIRS': ["/root/xdcjing/templates"],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -126,7 +126,7 @@ DATABASES = {
         'ENGINE': 'django.db.backends.mysql',
         'NAME': 'xdcjing_db',
         'USER': 'root',
-        'PASSWORD': 'root',
+        'PASSWORD': '123456',
         'HOST': '127.0.0.1',
         'PORT': 3306,
     }

xdcjing/urls.py

@@ -6,10 +6,10 @@ import common.views
 
 urlpatterns = [
     # Examples:
-    # url(r'^$', 'xdcjing.views.home', name='home'),
     # url(r'^blog/', include('blog.urls')),
 
     # url(r'^admin/$', include(admin.site.urls)),
+    url(r'^$',users.views.home),
     url(r'^login/$', users.views.login),
     url(r'^logout/$', users.views.logout),
     url(r'^adduser/$', users.views.adduser),

xdcjing/views.py

@@ -0,0 +1,19 @@
+# -*-coding:utf-8 -*-
+import json
+import time
+import traceback
+# from django.shortcuts import render
+# from django.http import HttpResponse
+# from django.core.serializers.json import DjangoJSONEncoder
+from django.contrib.auth.hashers import make_password, check_password
+from django.views.decorators.csrf import csrf_exempt
+from django.core.exceptions import ObjectDoesNotExist
+from django.shortcuts import render
+from models import *
+
+
+def home(request):
+    """
+    """
+    return render(request,"www/index.html",{})
+