Skip to content
This repository was archived by the owner on Oct 26, 2021. It is now read-only.

Commit f3d53c5

Browse files
tistotisto
committedFeb 11, 2016
Mv myserver -> server.
1 parent 251d259 commit f3d53c5

17 files changed

+22
-22
lines changed
 

‎test.robot

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ ${HOSTNAME} 127.0.0.1
44
${PORT} 55001
55
${SERVER} http://${HOSTNAME}:${PORT}/
66
${BROWSER} firefox
7-
${DJANGO_PATH} demo/myserver
8-
${DJANGO_MANAGE_PY} demo/manage.py
9-
${DJANGO_SETTINGS} myserver.settings
10-
${DJANGO_DB} demo/db.sqlite3
7+
${DJANGO_PATH} testing/server
8+
${DJANGO_MANAGE_PY} testing/manage.py
9+
${DJANGO_SETTINGS} server.settings
10+
${DJANGO_DB} testing/db.sqlite3
1111

1212

1313
*** Settings ***

‎testing/manage.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import sys
44

55
if __name__ == "__main__":
6-
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "myserver.settings")
6+
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "server.settings")
77

88
from django.core.management import execute_from_command_line
99

‎testing/myserver/__init__.py ‎testing/server/__init__.py

File renamed without changes.

‎testing/myserver/migrations/0002_auto_20151126_1040.py ‎testing/server/migrations/0002_auto_20151126_1040.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
class Migration(migrations.Migration):
88

99
dependencies = [
10-
('myserver', '0001_initial'),
10+
('server', '0001_initial'),
1111
]
1212

1313
operations = [

‎testing/myserver/migrations/0003_auto_20160204_1323.py ‎testing/server/migrations/0003_auto_20160204_1323.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class Migration(migrations.Migration):
1111

1212
dependencies = [
1313
('rest_framework_schemaform', '__first__'),
14-
('myserver', '0002_auto_20151126_1040'),
14+
('server', '0002_auto_20151126_1040'),
1515
]
1616

1717
operations = [

‎testing/myserver/migrations/0004_auto_20160204_1552.py ‎testing/server/migrations/0004_auto_20160204_1552.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
class Migration(migrations.Migration):
99

1010
dependencies = [
11-
('myserver', '0003_auto_20160204_1323'),
11+
('server', '0003_auto_20160204_1323'),
1212
]
1313

1414
operations = [

‎testing/myserver/migrations/__init__.py ‎testing/server/migrations/__init__.py

File renamed without changes.

‎testing/myserver/models.py ‎testing/server/models.py

File renamed without changes.

‎testing/myserver/settings.py ‎testing/server/settings.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
Django settings for myserver project.
2+
Django settings for server project.
33
44
Generated by 'django-admin startproject' using Django 1.9c1.
55
@@ -39,7 +39,7 @@
3939
'django.contrib.staticfiles',
4040
'rest_framework',
4141
'rest_framework_schemaform',
42-
'myserver',
42+
'server',
4343
]
4444

4545
MIDDLEWARE_CLASSES = [
@@ -66,7 +66,7 @@
6666
),
6767
}
6868

69-
ROOT_URLCONF = 'myserver.urls'
69+
ROOT_URLCONF = 'server.urls'
7070

7171
TEMPLATES = [
7272
{
@@ -84,7 +84,7 @@
8484
},
8585
]
8686

87-
WSGI_APPLICATION = 'myserver.wsgi.application'
87+
WSGI_APPLICATION = 'server.wsgi.application'
8888

8989

9090
# Database

‎testing/myserver/templates/myserver/index.html ‎testing/server/templates/server/index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="utf-8" />
55
{% load staticfiles %}
6-
<link rel="stylesheet" type="text/css" href="{% static 'myserver/styles.css' %}" />
6+
<link rel="stylesheet" type="text/css" href="{% static 'server/styles.css' %}" />
77
</head>
88
<body>
99
<div class="container-fluid">
@@ -13,6 +13,6 @@
1313
</app>
1414
</div>
1515
</div>
16-
<script src="{% static 'myserver/bundle.js' %}"></script>
16+
<script src="{% static 'server/bundle.js' %}"></script>
1717
</body>
1818
</html>

‎testing/myserver/urls.py ‎testing/server/urls.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
"""myserver URL Configuration
1+
"""server URL Configuration
22
33
The `urlpatterns` list routes URLs to views. For more information please see:
44
https://docs.djangoproject.com/en/dev/topics/http/urls/
@@ -17,7 +17,7 @@
1717
from django.conf.urls import url, include
1818
from django.contrib import admin
1919
from rest_framework import routers
20-
from myserver import views
20+
from server import views
2121

2222
router = routers.DefaultRouter()
2323
router.register(r'application', views.ApplicationViewSet)

‎testing/myserver/views.py ‎testing/server/views.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
from django.shortcuts import get_object_or_404
33
from rest_framework import viewsets
44
from rest_framework.response import Response
5-
from myserver.models import Application
6-
from myserver.models import User
5+
from server.models import Application
6+
from server.models import User
77
from rest_framework_schemaform.serializers import JsonSchemaSerializer
88

99
from django.shortcuts import render_to_response
1010

1111

1212
def index(request):
1313
return render_to_response(
14-
'myserver/index.html'
14+
'server/index.html'
1515
)
1616

1717

‎testing/myserver/wsgi.py ‎testing/server/wsgi.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
WSGI config for myserver project.
2+
WSGI config for server project.
33
44
It exposes the WSGI callable as a module-level variable named ``application``.
55
@@ -11,6 +11,6 @@
1111

1212
from django.core.wsgi import get_wsgi_application
1313

14-
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "myserver.settings")
14+
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "server.settings")
1515

1616
application = get_wsgi_application()

‎testing/webpack.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var webpack = require('webpack');
44
module.exports = {
55
entry: './src/app.js',
66
output: {
7-
path: path.join(__dirname, 'myserver/static/myserver'),
7+
path: path.join(__dirname, 'server/static/server'),
88
filename: 'bundle.js'
99
},
1010
module: {

0 commit comments

Comments
 (0)
This repository has been archived.