updates

OldLauraKrash · Jun 10, 2015 · e0d7644 · e0d7644
1 parent 505d8e2
commit e0d7644
Show file tree

Hide file tree

Showing 14 changed files with 50 additions and 19 deletions.
diff --git a/Project/__init__.pyc b/Project/__init__.pyc
diff --git a/Project/settings.pyc b/Project/settings.pyc
diff --git a/Project/urls.pyc b/Project/urls.pyc
diff --git a/core/management/__init__.py b/core/management/__init__.py
@@ -0,0 +1 @@
+__author__ = 'rajiv'
diff --git a/core/management/commands/__init__.py b/core/management/commands/__init__.py
@@ -0,0 +1 @@
+__author__ = 'rajiv'
diff --git a/core/management/commands/stream.py b/core/management/commands/stream.py
@@ -0,0 +1 @@
+__author__ = 'rajiv'
diff --git a/Project/__init__.py → geogekko/__init__.py b/Project/__init__.py → geogekko/__init__.py
diff --git a/geogekko/__init__.pyc b/geogekko/__init__.pyc
diff --git a/Project/settings.py → geogekko/settings.py b/Project/settings.py → geogekko/settings.py
@@ -36,6 +36,7 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'core'
 )
 
 MIDDLEWARE_CLASSES = (
@@ -50,30 +51,46 @@
 
 ROOT_URLCONF = 'Project.urls'
 
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': ['/Users/rajiv/8qlabs/geogekko/templates'],
+        '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 = 'Project.wsgi.application'
 
 
 # Database
 # https://docs.djangoproject.com/en/1.7/ref/settings/#databases
 
 
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'djangostack',
-        'HOST': '/opt/bitnami/postgresql',
-        'PORT': '5432',
-        'USER': 'bitnami',
-        'PASSWORD': '78f22aeb2b'
-    }
-}
-
-EXAMPLE_DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
-    }
-}
+# DATABASES = {
+#     'default': {
+#         'ENGINE': 'django.db.backends.postgresql_psycopg2',
+#         'NAME': 'djangostack',
+#         'HOST': '/opt/bitnami/postgresql',
+#         'PORT': '5432',
+#         'USER': 'bitnami',
+#         'PASSWORD': '78f22aeb2b'
+#     }
+# }
+#
+# EXAMPLE_DATABASES = {
+#     'default': {
+#         'ENGINE': 'django.db.backends.sqlite3',
+#         'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+#     }
+# }
 
 # Internationalization
 # https://docs.djangoproject.com/en/1.7/topics/i18n/
@@ -92,4 +109,8 @@
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.7/howto/static-files/
 
-STATIC_URL = '/Project/static/'
+STATIC_URL = '/static/'
+
+STATICFILES_DIRS = (
+    os.path.join(BASE_DIR, "static"),
+)
diff --git a/geogekko/settings.pyc b/geogekko/settings.pyc
diff --git a/Project/urls.py → geogekko/urls.py b/Project/urls.py → geogekko/urls.py
@@ -2,11 +2,18 @@
 from django.contrib import admin
 from django.views.debug import default_urlconf
 
-urlpatterns = patterns('',
+
+urlpatterns = patterns('core.views',
+    url(r'^map$', 'map'),
+)
+
+urlpatterns += patterns('',
     # Examples:
     # url(r'^$', 'Project.views.home', name='home'),
     # url(r'^blog/', include('blog.urls')),
 
+    url(r'^map', 'map'),
+
     url(r'^admin/', include(admin.site.urls)),
     url(r'^$', default_urlconf),
 )
diff --git a/geogekko/urls.pyc b/geogekko/urls.pyc
diff --git a/Project/wsgi.py → geogekko/wsgi.py b/Project/wsgi.py → geogekko/wsgi.py
diff --git a/geogekko/wsgi.pyc b/geogekko/wsgi.pyc