Update example project.

juanifioren · Mar 23, 2018 · b803f89 · b803f89
1 parent 8545ada
commit b803f89
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 16 deletions.
diff --git a/example_project/.gitignore → example/.gitignore b/example_project/.gitignore → example/.gitignore
diff --git a/example_project/Dockerfile → example/Dockerfile b/example_project/Dockerfile → example/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:2-onbuild
+FROM python:3-onbuild
 
 RUN [ "python", "manage.py", "migrate" ]
 RUN [ "python", "manage.py", "creatersakey" ]

diff --git a/example_project/README.md → example/README.md b/example_project/README.md → example/README.md
@@ -2,7 +2,7 @@
 
 ![Example Project](https://s17.postimg.org/4jjj8lavj/Screen_Shot_2016_09_07_at_15_58_43.png)
 
-Run your own OIDC provider in a second. This is a Django app with all the necessary things to work with `django-oidc-provider` package.
+On this example you'll be running your own OIDC provider in a second. This is a Django app with all the necessary things to work with `django-oidc-provider` package.
 
 ## Setup & Running
 
@@ -14,15 +14,12 @@ Run your own OIDC provider in a second. This is a Django app with all the necess
 Setup project environment with [virtualenv](https://virtualenv.pypa.io) and [pip](https://pip.pypa.io).
 
 ```bash
-# For Python 2.7.
-$ virtualenv project_env
-# Or Python 3.
-$ virtualenv -p /usr/bin/python3.4 project_env
+$ virtualenv -p /usr/bin/python3 project_env
 
 $ source project_env/bin/activate
 
 $ git clone https://github.com/juanifioren/django-oidc-provider.git
-$ cd django-oidc-provider/example_project
+$ cd django-oidc-provider/example
 $ pip install -r requirements.txt
 ```
 
@@ -53,7 +50,7 @@ After you run `pip install -r requirements.txt`.
 # Remove pypi package.
 $ pip uninstall django-oidc-provider
 
-# Go back and add the package again.
+# Go back to django-oidc-provider/ folder and add the package on editable mode.
 $ cd ..
 $ pip install -e .
 ```
diff --git a/example_project/myapp/__init__.py → example/app/__init__.py b/example_project/myapp/__init__.py → example/app/__init__.py
diff --git a/example_project/myapp/settings.py → example/app/settings.py b/example_project/myapp/settings.py → example/app/settings.py
@@ -20,7 +20,7 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'myapp',
+    'app',
     'oidc_provider',
 ]
 
@@ -51,9 +51,9 @@
     },
 ]
 
-ROOT_URLCONF = 'myapp.urls'
+ROOT_URLCONF = 'app.urls'
 
-WSGI_APPLICATION = 'myapp.wsgi.application'
+WSGI_APPLICATION = 'app.wsgi.application'
 
 # Database
 

diff --git a/example_project/myapp/templates/base.html → example/app/templates/base.html b/example_project/myapp/templates/base.html → example/app/templates/base.html
diff --git a/example_project/myapp/templates/home.html → example/app/templates/home.html b/example_project/myapp/templates/home.html → example/app/templates/home.html
@@ -3,7 +3,7 @@
 
 {% block content %}
 
-<section class="text-xs-center">
+<section>
     <div class="container">
         <h1 class="jumbotron-heading">{% trans 'Welcome' %}{% if user.is_authenticated %} {{ user.username }}{% endif %}!</h1>
         <p class="lead text-muted">{% trans 'This is an example of an OpenID Connect 1.0 Provider. Built with the <a href="https://www.djangoproject.com/" target="_BLANK"><u>Django Framework</u></a> and <a href="https://github.com/juanifioren/django-oidc-provider" target="_BLANK"><u>django-oidc-provider</u></a> package.' %}</p>

diff --git a/example_project/myapp/templates/login.html → example/app/templates/login.html b/example_project/myapp/templates/login.html → example/app/templates/login.html
diff --git a/...pp/templates/oidc_provider/authorize.html → ...pp/templates/oidc_provider/authorize.html b/...pp/templates/oidc_provider/authorize.html → ...pp/templates/oidc_provider/authorize.html
diff --git a/.../myapp/templates/oidc_provider/error.html → ...le/app/templates/oidc_provider/error.html b/.../myapp/templates/oidc_provider/error.html → ...le/app/templates/oidc_provider/error.html
diff --git a/example_project/myapp/urls.py → example/app/urls.py b/example_project/myapp/urls.py → example/app/urls.py
diff --git a/example_project/myapp/wsgi.py → example/app/wsgi.py b/example_project/myapp/wsgi.py → example/app/wsgi.py
@@ -1,6 +1,8 @@
 import os
+
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'myapp.settings')
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'app.settings')
 
 application = get_wsgi_application()
diff --git a/example_project/manage.py → example/manage.py b/example_project/manage.py → example/manage.py
@@ -3,7 +3,7 @@
 import sys
 
 if __name__ == '__main__':
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'myapp.settings')
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'app.settings')
 
     from django.core.management import execute_from_command_line
 

diff --git a/example/requirements.txt b/example/requirements.txt
@@ -0,0 +1,2 @@
+django
+https://github.com/juanifioren/django-oidc-provider/archive/master.zip
diff --git a/example_project/requirements.txt b/example_project/requirements.txt