From 0bd43c88aaed7b7d0a775bbb719f93d76cd84eb5 Mon Sep 17 00:00:00 2001 From: Dhiraj Subramanian B Date: Mon, 11 Sep 2017 23:13:27 +0530 Subject: [PATCH 1/5] Backend Structure --- .gitignore | 3 + OpenCabpool/OpenCabpool/__init__.py | 0 OpenCabpool/OpenCabpool/settings.py | 122 +++++++++++++++++++ OpenCabpool/OpenCabpool/urls.py | 21 ++++ OpenCabpool/OpenCabpool/wsgi.py | 16 +++ OpenCabpool/PoolMyCar/__init__.py | 0 OpenCabpool/PoolMyCar/admin.py | 6 + OpenCabpool/PoolMyCar/apps.py | 8 ++ OpenCabpool/PoolMyCar/migrations/__init__.py | 0 OpenCabpool/PoolMyCar/models.py | 6 + OpenCabpool/PoolMyCar/tests.py | 6 + OpenCabpool/PoolMyCar/views.py | 6 + OpenCabpool/db.sqlite3 | Bin 0 -> 12288 bytes OpenCabpool/manage.py | 22 ++++ README.md | 6 + requirements.txt | 3 + 16 files changed, 225 insertions(+) create mode 100644 .gitignore create mode 100644 OpenCabpool/OpenCabpool/__init__.py create mode 100644 OpenCabpool/OpenCabpool/settings.py create mode 100644 OpenCabpool/OpenCabpool/urls.py create mode 100644 OpenCabpool/OpenCabpool/wsgi.py create mode 100644 OpenCabpool/PoolMyCar/__init__.py create mode 100644 OpenCabpool/PoolMyCar/admin.py create mode 100644 OpenCabpool/PoolMyCar/apps.py create mode 100644 OpenCabpool/PoolMyCar/migrations/__init__.py create mode 100644 OpenCabpool/PoolMyCar/models.py create mode 100644 OpenCabpool/PoolMyCar/tests.py create mode 100644 OpenCabpool/PoolMyCar/views.py create mode 100644 OpenCabpool/db.sqlite3 create mode 100755 OpenCabpool/manage.py create mode 100644 requirements.txt diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..73cc46a --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.pyc +.idea +venv \ No newline at end of file diff --git a/OpenCabpool/OpenCabpool/__init__.py b/OpenCabpool/OpenCabpool/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/OpenCabpool/OpenCabpool/settings.py b/OpenCabpool/OpenCabpool/settings.py new file mode 100644 index 0000000..0cfea47 --- /dev/null +++ b/OpenCabpool/OpenCabpool/settings.py @@ -0,0 +1,122 @@ +""" +Django settings for OpenCabpool project. + +Generated by 'django-admin startproject' using Django 1.11.3. + +For more information on this file, see +https://docs.djangoproject.com/en/1.11/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/1.11/ref/settings/ +""" + +import os + +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = '6+_iw8&(oi=gcou9&@@0ibcgcl7ym8ay$rlq!2@903hvmq2s_m' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'rest_framework', + 'PoolMyCar', +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'OpenCabpool.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'OpenCabpool.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/1.11/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} + + +# Password validation +# https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/1.11/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/1.11/howto/static-files/ + +STATIC_URL = '/static/' diff --git a/OpenCabpool/OpenCabpool/urls.py b/OpenCabpool/OpenCabpool/urls.py new file mode 100644 index 0000000..8c78aba --- /dev/null +++ b/OpenCabpool/OpenCabpool/urls.py @@ -0,0 +1,21 @@ +"""OpenCabpool URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/1.11/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.conf.urls import url, include + 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) +""" +from django.conf.urls import url +from django.contrib import admin + +urlpatterns = [ + url(r'^admin/', admin.site.urls), +] diff --git a/OpenCabpool/OpenCabpool/wsgi.py b/OpenCabpool/OpenCabpool/wsgi.py new file mode 100644 index 0000000..e0038da --- /dev/null +++ b/OpenCabpool/OpenCabpool/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for OpenCabpool project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "OpenCabpool.settings") + +application = get_wsgi_application() diff --git a/OpenCabpool/PoolMyCar/__init__.py b/OpenCabpool/PoolMyCar/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/OpenCabpool/PoolMyCar/admin.py b/OpenCabpool/PoolMyCar/admin.py new file mode 100644 index 0000000..13be29d --- /dev/null +++ b/OpenCabpool/PoolMyCar/admin.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.contrib import admin + +# Register your models here. diff --git a/OpenCabpool/PoolMyCar/apps.py b/OpenCabpool/PoolMyCar/apps.py new file mode 100644 index 0000000..cf4a8a6 --- /dev/null +++ b/OpenCabpool/PoolMyCar/apps.py @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.apps import AppConfig + + +class PoolmycarConfig(AppConfig): + name = 'PoolMyCar' diff --git a/OpenCabpool/PoolMyCar/migrations/__init__.py b/OpenCabpool/PoolMyCar/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/OpenCabpool/PoolMyCar/models.py b/OpenCabpool/PoolMyCar/models.py new file mode 100644 index 0000000..1dfab76 --- /dev/null +++ b/OpenCabpool/PoolMyCar/models.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models + +# Create your models here. diff --git a/OpenCabpool/PoolMyCar/tests.py b/OpenCabpool/PoolMyCar/tests.py new file mode 100644 index 0000000..5982e6b --- /dev/null +++ b/OpenCabpool/PoolMyCar/tests.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.test import TestCase + +# Create your tests here. diff --git a/OpenCabpool/PoolMyCar/views.py b/OpenCabpool/PoolMyCar/views.py new file mode 100644 index 0000000..e784a0b --- /dev/null +++ b/OpenCabpool/PoolMyCar/views.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.shortcuts import render + +# Create your views here. diff --git a/OpenCabpool/db.sqlite3 b/OpenCabpool/db.sqlite3 new file mode 100644 index 0000000000000000000000000000000000000000..9b5d3a9da6a03e464ce5282ee032eb7c93d8d9cb GIT binary patch literal 12288 zcmeI#y-ve05C?EOMKJL(Aay-O42fD%3Dli{GE}5#Dd~`@GK~pF`Djy@9UhT4;7xE4 ztwbxt!c_fFa;%GePV&oi_jiHPk{-({7n&~F3FDky5i!QN84WX5QRjQB#LRX6S8#TI z`f+G>Sx4{e_{>}o5P$##AOHafKmY;|fB*y_0D*rI7+U+yR*T14JY;e)&rEweS;+ZP z7SqkNaWnG0$fwA=4t(0!>l7lFZByyK#{8h!>F_u4b!PG`inN^MDy@W8WwF@0Vf{GQ z-deZGu~lM|Dzr>xMd2W#a2y0Q9QFF%D5hIKCT|=KdZ9U~?}t&FY%!bJ^dhS1lc=1F zZr5FxnZ^2De_u7FnUdy#iO^E3T&_#qx;HmXKLP>}fB*y_009U<00Izz00bZafgKh= f|G&dO7oP?J2tWV=5P$##AOHafKmY;|_!jsC9LQ@~ literal 0 HcmV?d00001 diff --git a/OpenCabpool/manage.py b/OpenCabpool/manage.py new file mode 100755 index 0000000..7a1105d --- /dev/null +++ b/OpenCabpool/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "OpenCabpool.settings") + try: + from django.core.management import execute_from_command_line + except ImportError: + # The above import may fail for some other reason. Ensure that the + # issue is really that Django is missing to avoid masking other + # exceptions on Python 2. + try: + import django + except ImportError: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) + raise + execute_from_command_line(sys.argv) diff --git a/README.md b/README.md index ed50ccd..a5e0395 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,8 @@ # open-carpool Open source carpooling app using Google Maps, built for community activities + +# Features [ As we progress ] + + - Login / Signin / Logout / Forgot Password + - Register Vehicle [Signin / After Signin] + - Create a Pool [ Rider / Passenger ] diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..59e93cf --- /dev/null +++ b/requirements.txt @@ -0,0 +1,3 @@ +Django==1.11.3 +djangorestframework==3.6.4 +pytz==2017.2 \ No newline at end of file From 1b8d3e5c8beabc514c0294eb8bed9658da741c21 Mon Sep 17 00:00:00 2001 From: B Date: Sat, 28 Oct 2017 15:38:17 +0530 Subject: [PATCH 2/5] Removed requirements.txt --- requirements.txt | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 59e93cf..0000000 --- a/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -Django==1.11.3 -djangorestframework==3.6.4 -pytz==2017.2 \ No newline at end of file From 1e66b665ccf6b7d45030c1d380f79e22e5b668f5 Mon Sep 17 00:00:00 2001 From: B Date: Sat, 28 Oct 2017 16:12:53 +0530 Subject: [PATCH 3/5] Removed Empty Project --- OpenCabpool/OpenCabpool/__init__.py | 0 OpenCabpool/OpenCabpool/settings.py | 122 ------------------- OpenCabpool/OpenCabpool/urls.py | 21 ---- OpenCabpool/OpenCabpool/wsgi.py | 16 --- OpenCabpool/PoolMyCar/__init__.py | 0 OpenCabpool/PoolMyCar/admin.py | 6 - OpenCabpool/PoolMyCar/apps.py | 8 -- OpenCabpool/PoolMyCar/migrations/__init__.py | 0 OpenCabpool/PoolMyCar/models.py | 6 - OpenCabpool/PoolMyCar/tests.py | 6 - OpenCabpool/PoolMyCar/views.py | 6 - OpenCabpool/db.sqlite3 | Bin 12288 -> 0 bytes OpenCabpool/manage.py | 22 ---- 13 files changed, 213 deletions(-) delete mode 100644 OpenCabpool/OpenCabpool/__init__.py delete mode 100644 OpenCabpool/OpenCabpool/settings.py delete mode 100644 OpenCabpool/OpenCabpool/urls.py delete mode 100644 OpenCabpool/OpenCabpool/wsgi.py delete mode 100644 OpenCabpool/PoolMyCar/__init__.py delete mode 100644 OpenCabpool/PoolMyCar/admin.py delete mode 100644 OpenCabpool/PoolMyCar/apps.py delete mode 100644 OpenCabpool/PoolMyCar/migrations/__init__.py delete mode 100644 OpenCabpool/PoolMyCar/models.py delete mode 100644 OpenCabpool/PoolMyCar/tests.py delete mode 100644 OpenCabpool/PoolMyCar/views.py delete mode 100644 OpenCabpool/db.sqlite3 delete mode 100755 OpenCabpool/manage.py diff --git a/OpenCabpool/OpenCabpool/__init__.py b/OpenCabpool/OpenCabpool/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/OpenCabpool/OpenCabpool/settings.py b/OpenCabpool/OpenCabpool/settings.py deleted file mode 100644 index 0cfea47..0000000 --- a/OpenCabpool/OpenCabpool/settings.py +++ /dev/null @@ -1,122 +0,0 @@ -""" -Django settings for OpenCabpool project. - -Generated by 'django-admin startproject' using Django 1.11.3. - -For more information on this file, see -https://docs.djangoproject.com/en/1.11/topics/settings/ - -For the full list of settings and their values, see -https://docs.djangoproject.com/en/1.11/ref/settings/ -""" - -import os - -# Build paths inside the project like this: os.path.join(BASE_DIR, ...) -BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) - - -# Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/ - -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = '6+_iw8&(oi=gcou9&@@0ibcgcl7ym8ay$rlq!2@903hvmq2s_m' - -# SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True - -ALLOWED_HOSTS = [] - - -# Application definition - -INSTALLED_APPS = [ - 'django.contrib.admin', - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.messages', - 'django.contrib.staticfiles', - 'rest_framework', - 'PoolMyCar', -] - -MIDDLEWARE = [ - 'django.middleware.security.SecurityMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', -] - -ROOT_URLCONF = 'OpenCabpool.urls' - -TEMPLATES = [ - { - 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], - 'APP_DIRS': True, - 'OPTIONS': { - 'context_processors': [ - 'django.template.context_processors.debug', - 'django.template.context_processors.request', - 'django.contrib.auth.context_processors.auth', - 'django.contrib.messages.context_processors.messages', - ], - }, - }, -] - -WSGI_APPLICATION = 'OpenCabpool.wsgi.application' - - -# Database -# https://docs.djangoproject.com/en/1.11/ref/settings/#databases - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), - } -} - - -# Password validation -# https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators - -AUTH_PASSWORD_VALIDATORS = [ - { - 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', - }, -] - - -# Internationalization -# https://docs.djangoproject.com/en/1.11/topics/i18n/ - -LANGUAGE_CODE = 'en-us' - -TIME_ZONE = 'UTC' - -USE_I18N = True - -USE_L10N = True - -USE_TZ = True - - -# Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/1.11/howto/static-files/ - -STATIC_URL = '/static/' diff --git a/OpenCabpool/OpenCabpool/urls.py b/OpenCabpool/OpenCabpool/urls.py deleted file mode 100644 index 8c78aba..0000000 --- a/OpenCabpool/OpenCabpool/urls.py +++ /dev/null @@ -1,21 +0,0 @@ -"""OpenCabpool URL Configuration - -The `urlpatterns` list routes URLs to views. For more information please see: - https://docs.djangoproject.com/en/1.11/topics/http/urls/ -Examples: -Function views - 1. Add an import: from my_app import views - 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') -Class-based views - 1. Add an import: from other_app.views import Home - 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') -Including another URLconf - 1. Import the include() function: from django.conf.urls import url, include - 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) -""" -from django.conf.urls import url -from django.contrib import admin - -urlpatterns = [ - url(r'^admin/', admin.site.urls), -] diff --git a/OpenCabpool/OpenCabpool/wsgi.py b/OpenCabpool/OpenCabpool/wsgi.py deleted file mode 100644 index e0038da..0000000 --- a/OpenCabpool/OpenCabpool/wsgi.py +++ /dev/null @@ -1,16 +0,0 @@ -""" -WSGI config for OpenCabpool project. - -It exposes the WSGI callable as a module-level variable named ``application``. - -For more information on this file, see -https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/ -""" - -import os - -from django.core.wsgi import get_wsgi_application - -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "OpenCabpool.settings") - -application = get_wsgi_application() diff --git a/OpenCabpool/PoolMyCar/__init__.py b/OpenCabpool/PoolMyCar/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/OpenCabpool/PoolMyCar/admin.py b/OpenCabpool/PoolMyCar/admin.py deleted file mode 100644 index 13be29d..0000000 --- a/OpenCabpool/PoolMyCar/admin.py +++ /dev/null @@ -1,6 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.contrib import admin - -# Register your models here. diff --git a/OpenCabpool/PoolMyCar/apps.py b/OpenCabpool/PoolMyCar/apps.py deleted file mode 100644 index cf4a8a6..0000000 --- a/OpenCabpool/PoolMyCar/apps.py +++ /dev/null @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.apps import AppConfig - - -class PoolmycarConfig(AppConfig): - name = 'PoolMyCar' diff --git a/OpenCabpool/PoolMyCar/migrations/__init__.py b/OpenCabpool/PoolMyCar/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/OpenCabpool/PoolMyCar/models.py b/OpenCabpool/PoolMyCar/models.py deleted file mode 100644 index 1dfab76..0000000 --- a/OpenCabpool/PoolMyCar/models.py +++ /dev/null @@ -1,6 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models - -# Create your models here. diff --git a/OpenCabpool/PoolMyCar/tests.py b/OpenCabpool/PoolMyCar/tests.py deleted file mode 100644 index 5982e6b..0000000 --- a/OpenCabpool/PoolMyCar/tests.py +++ /dev/null @@ -1,6 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.test import TestCase - -# Create your tests here. diff --git a/OpenCabpool/PoolMyCar/views.py b/OpenCabpool/PoolMyCar/views.py deleted file mode 100644 index e784a0b..0000000 --- a/OpenCabpool/PoolMyCar/views.py +++ /dev/null @@ -1,6 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.shortcuts import render - -# Create your views here. diff --git a/OpenCabpool/db.sqlite3 b/OpenCabpool/db.sqlite3 deleted file mode 100644 index 9b5d3a9da6a03e464ce5282ee032eb7c93d8d9cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI#y-ve05C?EOMKJL(Aay-O42fD%3Dli{GE}5#Dd~`@GK~pF`Djy@9UhT4;7xE4 ztwbxt!c_fFa;%GePV&oi_jiHPk{-({7n&~F3FDky5i!QN84WX5QRjQB#LRX6S8#TI z`f+G>Sx4{e_{>}o5P$##AOHafKmY;|fB*y_0D*rI7+U+yR*T14JY;e)&rEweS;+ZP z7SqkNaWnG0$fwA=4t(0!>l7lFZByyK#{8h!>F_u4b!PG`inN^MDy@W8WwF@0Vf{GQ z-deZGu~lM|Dzr>xMd2W#a2y0Q9QFF%D5hIKCT|=KdZ9U~?}t&FY%!bJ^dhS1lc=1F zZr5FxnZ^2De_u7FnUdy#iO^E3T&_#qx;HmXKLP>}fB*y_009U<00Izz00bZafgKh= f|G&dO7oP?J2tWV=5P$##AOHafKmY;|_!jsC9LQ@~ diff --git a/OpenCabpool/manage.py b/OpenCabpool/manage.py deleted file mode 100755 index 7a1105d..0000000 --- a/OpenCabpool/manage.py +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env python -import os -import sys - -if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "OpenCabpool.settings") - try: - from django.core.management import execute_from_command_line - except ImportError: - # The above import may fail for some other reason. Ensure that the - # issue is really that Django is missing to avoid masking other - # exceptions on Python 2. - try: - import django - except ImportError: - raise ImportError( - "Couldn't import Django. Are you sure it's installed and " - "available on your PYTHONPATH environment variable? Did you " - "forget to activate a virtual environment?" - ) - raise - execute_from_command_line(sys.argv) From a52ef3cc877492f714798864bca53e439b73fbbd Mon Sep 17 00:00:00 2001 From: B Date: Sat, 28 Oct 2017 19:46:11 +0530 Subject: [PATCH 4/5] Project Structure --- .gitignore | 6 +- OpenCabpool/OpenCabpool/__init__.py | 0 OpenCabpool/OpenCabpool/settings.py | 121 +++++++++++++++++++ OpenCabpool/OpenCabpool/urls.py | 21 ++++ OpenCabpool/OpenCabpool/wsgi.py | 16 +++ OpenCabpool/PoolMyCar/__init__.py | 0 OpenCabpool/PoolMyCar/admin.py | 7 ++ OpenCabpool/PoolMyCar/apps.py | 5 + OpenCabpool/PoolMyCar/migrations/__init__.py | 0 OpenCabpool/PoolMyCar/models.py | 7 ++ OpenCabpool/PoolMyCar/tests.py | 3 + OpenCabpool/PoolMyCar/views.py | 3 + OpenCabpool/manage.py | 22 ++++ README.md | 3 +- requirements.txt | 3 + 15 files changed, 215 insertions(+), 2 deletions(-) create mode 100644 OpenCabpool/OpenCabpool/__init__.py create mode 100644 OpenCabpool/OpenCabpool/settings.py create mode 100644 OpenCabpool/OpenCabpool/urls.py create mode 100644 OpenCabpool/OpenCabpool/wsgi.py create mode 100644 OpenCabpool/PoolMyCar/__init__.py create mode 100644 OpenCabpool/PoolMyCar/admin.py create mode 100644 OpenCabpool/PoolMyCar/apps.py create mode 100644 OpenCabpool/PoolMyCar/migrations/__init__.py create mode 100644 OpenCabpool/PoolMyCar/models.py create mode 100644 OpenCabpool/PoolMyCar/tests.py create mode 100644 OpenCabpool/PoolMyCar/views.py create mode 100644 OpenCabpool/manage.py create mode 100644 requirements.txt diff --git a/.gitignore b/.gitignore index 73cc46a..3ee39c9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ *.pyc .idea -venv \ No newline at end of file +venv +Include +Lib +Scripts +tcl \ No newline at end of file diff --git a/OpenCabpool/OpenCabpool/__init__.py b/OpenCabpool/OpenCabpool/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/OpenCabpool/OpenCabpool/settings.py b/OpenCabpool/OpenCabpool/settings.py new file mode 100644 index 0000000..a88d315 --- /dev/null +++ b/OpenCabpool/OpenCabpool/settings.py @@ -0,0 +1,121 @@ +""" +Django settings for OpenCabpool project. + +Generated by 'django-admin startproject' using Django 1.11.3. + +For more information on this file, see +https://docs.djangoproject.com/en/1.11/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/1.11/ref/settings/ +""" + +import os + +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = '7$xdlxy*056=l@8#7!*scb#!3lwk*_xcy%^w8j5x*ot0*%8o)q' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'PoolMyCar', +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'OpenCabpool.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'OpenCabpool.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/1.11/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} + + +# Password validation +# https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/1.11/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/1.11/howto/static-files/ + +STATIC_URL = '/static/' diff --git a/OpenCabpool/OpenCabpool/urls.py b/OpenCabpool/OpenCabpool/urls.py new file mode 100644 index 0000000..8c78aba --- /dev/null +++ b/OpenCabpool/OpenCabpool/urls.py @@ -0,0 +1,21 @@ +"""OpenCabpool URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/1.11/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.conf.urls import url, include + 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) +""" +from django.conf.urls import url +from django.contrib import admin + +urlpatterns = [ + url(r'^admin/', admin.site.urls), +] diff --git a/OpenCabpool/OpenCabpool/wsgi.py b/OpenCabpool/OpenCabpool/wsgi.py new file mode 100644 index 0000000..e0038da --- /dev/null +++ b/OpenCabpool/OpenCabpool/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for OpenCabpool project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "OpenCabpool.settings") + +application = get_wsgi_application() diff --git a/OpenCabpool/PoolMyCar/__init__.py b/OpenCabpool/PoolMyCar/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/OpenCabpool/PoolMyCar/admin.py b/OpenCabpool/PoolMyCar/admin.py new file mode 100644 index 0000000..99abfc2 --- /dev/null +++ b/OpenCabpool/PoolMyCar/admin.py @@ -0,0 +1,7 @@ +from django.contrib import admin +from django.contrib.auth.admin import UserAdmin +from .models import User + + +# Register your models here. +admin.site.register(User, UserAdmin) diff --git a/OpenCabpool/PoolMyCar/apps.py b/OpenCabpool/PoolMyCar/apps.py new file mode 100644 index 0000000..a8b7004 --- /dev/null +++ b/OpenCabpool/PoolMyCar/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class PoolmycarConfig(AppConfig): + name = 'PoolMyCar' diff --git a/OpenCabpool/PoolMyCar/migrations/__init__.py b/OpenCabpool/PoolMyCar/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/OpenCabpool/PoolMyCar/models.py b/OpenCabpool/PoolMyCar/models.py new file mode 100644 index 0000000..7f367f6 --- /dev/null +++ b/OpenCabpool/PoolMyCar/models.py @@ -0,0 +1,7 @@ +from django.db import models +from django.contrib.auth.models import AbstractUser + + +# Create your models here. +class User(AbstractUser): + pass diff --git a/OpenCabpool/PoolMyCar/tests.py b/OpenCabpool/PoolMyCar/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/OpenCabpool/PoolMyCar/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/OpenCabpool/PoolMyCar/views.py b/OpenCabpool/PoolMyCar/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/OpenCabpool/PoolMyCar/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/OpenCabpool/manage.py b/OpenCabpool/manage.py new file mode 100644 index 0000000..7a1105d --- /dev/null +++ b/OpenCabpool/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "OpenCabpool.settings") + try: + from django.core.management import execute_from_command_line + except ImportError: + # The above import may fail for some other reason. Ensure that the + # issue is really that Django is missing to avoid masking other + # exceptions on Python 2. + try: + import django + except ImportError: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) + raise + execute_from_command_line(sys.argv) diff --git a/README.md b/README.md index a5e0395..0e649d7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# open-carpool +# OpenCarpool Open source carpooling app using Google Maps, built for community activities # Features [ As we progress ] @@ -6,3 +6,4 @@ Open source carpooling app using Google Maps, built for community activities - Login / Signin / Logout / Forgot Password - Register Vehicle [Signin / After Signin] - Create a Pool [ Rider / Passenger ] + diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..22d85ae --- /dev/null +++ b/requirements.txt @@ -0,0 +1,3 @@ +Django==1.11.3 +djangorestframework==3.5.3 +pytz==2017.2 From 77c1632f48cfa275e2f7a71df37ba4441e19f6d2 Mon Sep 17 00:00:00 2001 From: B Date: Sun, 29 Oct 2017 17:33:21 +0530 Subject: [PATCH 5/5] Created api called userdetails --- OpenCabpool/OpenCabpool/settings.py | 3 +- OpenCabpool/PoolMyCar/models.py | 7 --- .../{PoolMyCar => UserDetails}/__init__.py | 0 .../{PoolMyCar => UserDetails}/admin.py | 0 .../{PoolMyCar => UserDetails}/apps.py | 0 .../UserDetails/migrations/0001_initial.py | 52 ++++++++++++++++++ .../migrations/__init__.py | 0 OpenCabpool/UserDetails/models.py | 26 +++++++++ .../{PoolMyCar => UserDetails}/tests.py | 0 .../{PoolMyCar => UserDetails}/views.py | 0 OpenCabpool/db.sqlite3 | Bin 0 -> 135168 bytes 11 files changed, 80 insertions(+), 8 deletions(-) delete mode 100644 OpenCabpool/PoolMyCar/models.py rename OpenCabpool/{PoolMyCar => UserDetails}/__init__.py (100%) rename OpenCabpool/{PoolMyCar => UserDetails}/admin.py (100%) rename OpenCabpool/{PoolMyCar => UserDetails}/apps.py (100%) create mode 100644 OpenCabpool/UserDetails/migrations/0001_initial.py rename OpenCabpool/{PoolMyCar => UserDetails}/migrations/__init__.py (100%) create mode 100644 OpenCabpool/UserDetails/models.py rename OpenCabpool/{PoolMyCar => UserDetails}/tests.py (100%) rename OpenCabpool/{PoolMyCar => UserDetails}/views.py (100%) create mode 100644 OpenCabpool/db.sqlite3 diff --git a/OpenCabpool/OpenCabpool/settings.py b/OpenCabpool/OpenCabpool/settings.py index a88d315..8aa0a65 100644 --- a/OpenCabpool/OpenCabpool/settings.py +++ b/OpenCabpool/OpenCabpool/settings.py @@ -37,7 +37,7 @@ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'PoolMyCar', + 'UserDetails', ] MIDDLEWARE = [ @@ -119,3 +119,4 @@ # https://docs.djangoproject.com/en/1.11/howto/static-files/ STATIC_URL = '/static/' +AUTH_USER_MODEL = 'UserDetails.User' diff --git a/OpenCabpool/PoolMyCar/models.py b/OpenCabpool/PoolMyCar/models.py deleted file mode 100644 index 7f367f6..0000000 --- a/OpenCabpool/PoolMyCar/models.py +++ /dev/null @@ -1,7 +0,0 @@ -from django.db import models -from django.contrib.auth.models import AbstractUser - - -# Create your models here. -class User(AbstractUser): - pass diff --git a/OpenCabpool/PoolMyCar/__init__.py b/OpenCabpool/UserDetails/__init__.py similarity index 100% rename from OpenCabpool/PoolMyCar/__init__.py rename to OpenCabpool/UserDetails/__init__.py diff --git a/OpenCabpool/PoolMyCar/admin.py b/OpenCabpool/UserDetails/admin.py similarity index 100% rename from OpenCabpool/PoolMyCar/admin.py rename to OpenCabpool/UserDetails/admin.py diff --git a/OpenCabpool/PoolMyCar/apps.py b/OpenCabpool/UserDetails/apps.py similarity index 100% rename from OpenCabpool/PoolMyCar/apps.py rename to OpenCabpool/UserDetails/apps.py diff --git a/OpenCabpool/UserDetails/migrations/0001_initial.py b/OpenCabpool/UserDetails/migrations/0001_initial.py new file mode 100644 index 0000000..3922576 --- /dev/null +++ b/OpenCabpool/UserDetails/migrations/0001_initial.py @@ -0,0 +1,52 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.3 on 2017-10-29 11:57 +from __future__ import unicode_literals + +import django.contrib.auth.models +import django.contrib.auth.validators +from django.db import migrations, models +import django.utils.timezone + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('auth', '0008_alter_user_username_max_length'), + ] + + operations = [ + migrations.CreateModel( + name='Vehicle', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ], + ), + migrations.CreateModel( + name='User', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('password', models.CharField(max_length=128, verbose_name='password')), + ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), + ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), + ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')), + ('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')), + ('last_name', models.CharField(blank=True, max_length=30, verbose_name='last name')), + ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')), + ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), + ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), + ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), + ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')), + ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')), + ], + options={ + 'verbose_name': 'user', + 'verbose_name_plural': 'users', + 'abstract': False, + }, + managers=[ + ('objects', django.contrib.auth.models.UserManager()), + ], + ), + ] diff --git a/OpenCabpool/PoolMyCar/migrations/__init__.py b/OpenCabpool/UserDetails/migrations/__init__.py similarity index 100% rename from OpenCabpool/PoolMyCar/migrations/__init__.py rename to OpenCabpool/UserDetails/migrations/__init__.py diff --git a/OpenCabpool/UserDetails/models.py b/OpenCabpool/UserDetails/models.py new file mode 100644 index 0000000..66ab252 --- /dev/null +++ b/OpenCabpool/UserDetails/models.py @@ -0,0 +1,26 @@ +from django.db import models +from django.contrib.auth.models import AbstractUser + + +# Create your models here. +class User(AbstractUser): + """ + We can discuss and create the fields that are essential for User apart from existing fields + I can think of + - phone number + - driver / passenger + """ + pass + + +class Vehicle(models.Model): + """ + We can discuss the details that are to be stored for a vehicle. + I can think of + - number of extra seats + - vehicle number + - foreign key relation with user + - color + - brand + """ + pass diff --git a/OpenCabpool/PoolMyCar/tests.py b/OpenCabpool/UserDetails/tests.py similarity index 100% rename from OpenCabpool/PoolMyCar/tests.py rename to OpenCabpool/UserDetails/tests.py diff --git a/OpenCabpool/PoolMyCar/views.py b/OpenCabpool/UserDetails/views.py similarity index 100% rename from OpenCabpool/PoolMyCar/views.py rename to OpenCabpool/UserDetails/views.py diff --git a/OpenCabpool/db.sqlite3 b/OpenCabpool/db.sqlite3 new file mode 100644 index 0000000000000000000000000000000000000000..2149edf7fdf03b146071469d1b8661d9bcfa77ce GIT binary patch literal 135168 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