tisto · tisto · Feb 11, 2016 · Feb 11, 2016 · Feb 11, 2016 · Feb 11, 2016
diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,7 @@ before_script:
 #   - psql -c "CREATE DATABASE mydb;" -U postgres
   - nvm install 4.3
   - nvm use 4.3
-  - cd demo
+  - cd testing
   - npm install
   - webpack --bail
   - cd ..

diff --git a/demo/myserver/static/myserver/README.rst b/demo/myserver/static/myserver/README.rst
diff --git a/demo/myserver/static/myserver/styles.css b/demo/myserver/static/myserver/styles.css
diff --git a/demo/src/common/user/user.factory.js b/demo/src/common/user/user.factory.js
diff --git a/demo/src/common/user/user.js b/demo/src/common/user/user.js
diff --git a/demo/src/common/user/user.spec.js b/demo/src/common/user/user.spec.js
diff --git a/test.robot b/test.robot
@@ -4,10 +4,10 @@ ${HOSTNAME}             127.0.0.1
 ${PORT}                 55001
 ${SERVER}               http://${HOSTNAME}:${PORT}/
 ${BROWSER}              firefox
-${DJANGO_PATH}          demo/myserver
-${DJANGO_MANAGE_PY}     demo/manage.py
-${DJANGO_SETTINGS}      myserver.settings
-${DJANGO_DB}            demo/db.sqlite3
+${DJANGO_PATH}          testing/server
+${DJANGO_MANAGE_PY}     testing/manage.py
+${DJANGO_SETTINGS}      server.settings
+${DJANGO_DB}            testing/db.sqlite3
 
 
 *** Settings ***

diff --git a/demo/README.rst → testing/README.rst b/demo/README.rst → testing/README.rst
diff --git a/demo/manage.py → testing/manage.py b/demo/manage.py → testing/manage.py
@@ -3,7 +3,7 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "myserver.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "server.settings")
 
     from django.core.management import execute_from_command_line
 

diff --git a/demo/package.json → testing/package.json b/demo/package.json → testing/package.json
@@ -15,11 +15,19 @@
     "webpack",
     "npm"
   ],
+  "babel": {
+     "presets": [
+       "es2015"
+     ]
+  },
   "author": "Timo Stollenwerk",
   "license": "MIT",
   "devDependencies": {
     "angular-mocks": "^1.4.7",
-    "babel-loader": "^5.3.2",
+    "babel-core": "^6.3.26",
+    "babel-loader": "^6.1.0",
+    "babel-polyfill": "^6.3.14",
+    "babel-preset-es2015": "^6.1.18",
     "css-loader": "^0.21.0",
     "eslint": "^1.7.3",
     "eslint-config-angular": "^0.4.0",

diff --git a/demo/requirements.txt → testing/requirements.txt b/demo/requirements.txt → testing/requirements.txt
diff --git a/demo/myserver/__init__.py → testing/server/__init__.py b/demo/myserver/__init__.py → testing/server/__init__.py
diff --git a/demo/myserver/migrations/0001_initial.py → testing/server/migrations/0001_initial.py b/demo/myserver/migrations/0001_initial.py → testing/server/migrations/0001_initial.py
diff --git a/...ver/migrations/0002_auto_20151126_1040.py → ...ver/migrations/0002_auto_20151126_1040.py b/...ver/migrations/0002_auto_20151126_1040.py → ...ver/migrations/0002_auto_20151126_1040.py
@@ -7,7 +7,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('myserver', '0001_initial'),
+        ('server', '0001_initial'),
     ]
 
     operations = [

diff --git a/...ver/migrations/0003_auto_20160204_1323.py → ...ver/migrations/0003_auto_20160204_1323.py b/...ver/migrations/0003_auto_20160204_1323.py → ...ver/migrations/0003_auto_20160204_1323.py
@@ -11,7 +11,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('rest_framework_schemaform', '__first__'),
-        ('myserver', '0002_auto_20151126_1040'),
+        ('server', '0002_auto_20151126_1040'),
     ]
 
     operations = [

diff --git a/...ver/migrations/0004_auto_20160204_1552.py → ...ver/migrations/0004_auto_20160204_1552.py b/...ver/migrations/0004_auto_20160204_1552.py → ...ver/migrations/0004_auto_20160204_1552.py
@@ -8,7 +8,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('myserver', '0003_auto_20160204_1323'),
+        ('server', '0003_auto_20160204_1323'),
     ]
 
     operations = [

diff --git a/demo/myserver/migrations/__init__.py → testing/server/migrations/__init__.py b/demo/myserver/migrations/__init__.py → testing/server/migrations/__init__.py
diff --git a/demo/myserver/models.py → testing/server/models.py b/demo/myserver/models.py → testing/server/models.py
diff --git a/demo/myserver/settings.py → testing/server/settings.py b/demo/myserver/settings.py → testing/server/settings.py
@@ -1,5 +1,5 @@
 """
-Django settings for myserver project.
+Django settings for server project.
 
 Generated by 'django-admin startproject' using Django 1.9c1.
 
@@ -39,7 +39,7 @@
     'django.contrib.staticfiles',
     'rest_framework',
     'rest_framework_schemaform',
-    'myserver',
+    'server',
 ]
 
 MIDDLEWARE_CLASSES = [
@@ -66,7 +66,7 @@
     ),
 }
 
-ROOT_URLCONF = 'myserver.urls'
+ROOT_URLCONF = 'server.urls'
 
 TEMPLATES = [
     {
@@ -84,7 +84,7 @@
     },
 ]
 
-WSGI_APPLICATION = 'myserver.wsgi.application'
+WSGI_APPLICATION = 'server.wsgi.application'
 
 
 # Database

diff --git a/demo/myserver/templates/myserver/index.html → testing/server/templates/server/index.html b/demo/myserver/templates/myserver/index.html → testing/server/templates/server/index.html
@@ -3,7 +3,6 @@
 <head>
   <meta charset="utf-8" />
   {% load staticfiles %}
-  <link rel="stylesheet" type="text/css" href="{% static 'myserver/styles.css' %}" />
 </head>
 <body>
   <div class="container-fluid">
@@ -13,6 +12,6 @@
       </app>
     </div>
   </div>
-  <script src="{% static 'myserver/bundle.js' %}"></script>
+  <script src="{% static 'server/bundle.js' %}"></script>
 </body>
 </html>
diff --git a/demo/myserver/urls.py → testing/server/urls.py b/demo/myserver/urls.py → testing/server/urls.py
@@ -1,4 +1,4 @@
-"""myserver URL Configuration
+"""server URL Configuration
 
 The `urlpatterns` list routes URLs to views. For more information please see:
     https://docs.djangoproject.com/en/dev/topics/http/urls/
@@ -17,7 +17,7 @@
 from django.conf.urls import url, include
 from django.contrib import admin
 from rest_framework import routers
-from myserver import views
+from server import views
 
 router = routers.DefaultRouter()
 router.register(r'application', views.ApplicationViewSet)

diff --git a/demo/myserver/views.py → testing/server/views.py b/demo/myserver/views.py → testing/server/views.py
@@ -2,16 +2,16 @@
 from django.shortcuts import get_object_or_404
 from rest_framework import viewsets
 from rest_framework.response import Response
-from myserver.models import Application
-from myserver.models import User
+from server.models import Application
+from server.models import User
 from rest_framework_schemaform.serializers import JsonSchemaSerializer
 
 from django.shortcuts import render_to_response
 
 
 def index(request):
     return render_to_response(
-        'myserver/index.html'
+        'server/index.html'
     )
 
 

diff --git a/demo/myserver/wsgi.py → testing/server/wsgi.py b/demo/myserver/wsgi.py → testing/server/wsgi.py
@@ -1,5 +1,5 @@
 """
-WSGI config for myserver project.
+WSGI config for server project.
 
 It exposes the WSGI callable as a module-level variable named ``application``.
 
@@ -11,6 +11,6 @@
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "myserver.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "server.settings")
 
 application = get_wsgi_application()
diff --git a/demo/src/app.component.js → testing/src/app.component.js b/demo/src/app.component.js → testing/src/app.component.js
diff --git a/demo/src/app.html → testing/src/app.html b/demo/src/app.html → testing/src/app.html
diff --git a/demo/src/app.js → testing/src/app.js b/demo/src/app.js → testing/src/app.js
diff --git a/demo/src/common/common.js → testing/src/common/common.js b/demo/src/common/common.js → testing/src/common/common.js
@@ -1,12 +1,10 @@
 import angular from 'angular';
 import Navbar from './navbar/navbar';
 import Hero from './hero/hero';
-import User from './user/user';
 
 let commonModule = angular.module('app.common', [
   Navbar.name,
-  Hero.name,
-  User.name
+  Hero.name
 ]);
 
 export default commonModule;
diff --git a/demo/src/common/hero/hero.component.js → testing/src/common/hero/hero.component.js b/demo/src/common/hero/hero.component.js → testing/src/common/hero/hero.component.js
diff --git a/demo/src/common/hero/hero.controller.js → testing/src/common/hero/hero.controller.js b/demo/src/common/hero/hero.controller.js → testing/src/common/hero/hero.controller.js
diff --git a/demo/src/common/hero/hero.jade → testing/src/common/hero/hero.jade b/demo/src/common/hero/hero.jade → testing/src/common/hero/hero.jade
diff --git a/demo/src/common/hero/hero.js → testing/src/common/hero/hero.js b/demo/src/common/hero/hero.js → testing/src/common/hero/hero.js
diff --git a/demo/src/common/hero/hero.spec.js → testing/src/common/hero/hero.spec.js b/demo/src/common/hero/hero.spec.js → testing/src/common/hero/hero.spec.js
diff --git a/demo/src/common/hero/hero.styl → testing/src/common/hero/hero.styl b/demo/src/common/hero/hero.styl → testing/src/common/hero/hero.styl
diff --git a/demo/src/common/navbar/navbar.component.js → ...ing/src/common/navbar/navbar.component.js b/demo/src/common/navbar/navbar.component.js → ...ing/src/common/navbar/navbar.component.js
diff --git a/demo/src/common/navbar/navbar.controller.js → ...ng/src/common/navbar/navbar.controller.js b/demo/src/common/navbar/navbar.controller.js → ...ng/src/common/navbar/navbar.controller.js
diff --git a/demo/src/common/navbar/navbar.html → testing/src/common/navbar/navbar.html b/demo/src/common/navbar/navbar.html → testing/src/common/navbar/navbar.html
diff --git a/demo/src/common/navbar/navbar.js → testing/src/common/navbar/navbar.js b/demo/src/common/navbar/navbar.js → testing/src/common/navbar/navbar.js
diff --git a/demo/src/common/navbar/navbar.spec.js → testing/src/common/navbar/navbar.spec.js b/demo/src/common/navbar/navbar.spec.js → testing/src/common/navbar/navbar.spec.js
diff --git a/demo/src/common/navbar/navbar.styl → testing/src/common/navbar/navbar.styl b/demo/src/common/navbar/navbar.styl → testing/src/common/navbar/navbar.styl
diff --git a/...ents/application/application.component.js → ...ents/application/application.component.js b/...ents/application/application.component.js → ...ents/application/application.component.js
diff --git a/...nts/application/application.controller.js → ...nts/application/application.controller.js b/...nts/application/application.controller.js → ...nts/application/application.controller.js
diff --git a/...c/components/application/application.html → ...c/components/application/application.html b/...c/components/application/application.html → ...c/components/application/application.html
diff --git a/...src/components/application/application.js → ...src/components/application/application.js b/...src/components/application/application.js → ...src/components/application/application.js
diff --git a/...onents/application/application.service.js → ...onents/application/application.service.js b/...onents/application/application.service.js → ...onents/application/application.service.js
diff --git a/demo/src/components/components.js → testing/src/components/components.js b/demo/src/components/components.js → testing/src/components/components.js
diff --git a/demo/src/components/home/home.component.js → ...ing/src/components/home/home.component.js b/demo/src/components/home/home.component.js → ...ing/src/components/home/home.component.js
diff --git a/demo/src/components/home/home.controller.js → ...ng/src/components/home/home.controller.js b/demo/src/components/home/home.controller.js → ...ng/src/components/home/home.controller.js
diff --git a/demo/src/components/home/home.html → testing/src/components/home/home.html b/demo/src/components/home/home.html → testing/src/components/home/home.html
diff --git a/demo/src/components/home/home.js → testing/src/components/home/home.js b/demo/src/components/home/home.js → testing/src/components/home/home.js
diff --git a/demo/src/components/user/user.component.js → ...ing/src/components/user/user.component.js b/demo/src/components/user/user.component.js → ...ing/src/components/user/user.component.js
diff --git a/demo/src/components/user/user.controller.js → ...ng/src/components/user/user.controller.js b/demo/src/components/user/user.controller.js → ...ng/src/components/user/user.controller.js
diff --git a/demo/src/components/user/user.html → testing/src/components/user/user.html b/demo/src/components/user/user.html → testing/src/components/user/user.html
diff --git a/demo/src/components/user/user.js → testing/src/components/user/user.js b/demo/src/components/user/user.js → testing/src/components/user/user.js
diff --git a/demo/src/components/user/user.service.js → testing/src/components/user/user.service.js b/demo/src/components/user/user.service.js → testing/src/components/user/user.service.js
diff --git a/demo/src/styles.scss → testing/src/styles.scss b/demo/src/styles.scss → testing/src/styles.scss
diff --git a/demo/webpack.config.js → testing/webpack.config.js b/demo/webpack.config.js → testing/webpack.config.js
@@ -4,7 +4,7 @@ var webpack = require('webpack');
 module.exports = {
   entry: './src/app.js',
   output: {
-    path: path.join(__dirname, 'myserver/static/myserver'),
+    path: path.join(__dirname, 'server/static/server'),
     filename: 'bundle.js'
   },
   module: {