Fixed slider and initial db conection

Author: carlochess

README.md

@@ -21,7 +21,7 @@ Assuming you're on debian like OS
 
 ```bash
 sudo apt-get update && sudo apt-get upgrade
-sudo apt-get install python-dev python-pip
+sudo apt-get install python-dev python-pip libpq-dev
 sudo pip install virtualenv virtualenvwrapper requests[security]
 
 source /usr/local/bin/virtualenvwrapper.sh
@@ -32,7 +32,8 @@ now, go to project folder and then run
 
 ```bash
 cd webpage
-pip install -r requirements-dev.txt
+pip install -r requirements.txt
+source /usr/local/bin/virtualenvwrapper.sh
 workon network_lab
 ./manage.py runserver
 ```
@@ -56,8 +57,15 @@ If you're not familiar with django model system, take a look
 
 If you want to make changes to models, and reflex in database, please do
 ```
-./manage.py makemigrations appname
-./manage.py migrate
+rm db.sqlite3
+python manage.py makemigrations
+python manage.py migrate
+```
+
+### Loading data
+
+```
+./manage.py loaddata db2.json
 ```
 
 Enjoy Coding!

webpage/applications/index/templates/index/index.html

@@ -127,7 +127,7 @@ <h3>Events</h3>
         <div class="container" data-animation="true" data-animation-type="fadeInUp">
             <h2 class="content-title">Team</h2>
             <!-- begin carousel -->
-            <div class="carousel testimonials slide" data-ride="carousel" id="testimonials">
+            <div class="carousel testimonials slide" data-ride="carousel" id="testimonials2">
                 <!-- begin carousel-inner -->
                 <div class="carousel-inner text-center">
                     {% for paired in paired_members %}
@@ -186,9 +186,9 @@ <h3 class="name">{{ member.name }}</h3>
                 <ol class="carousel-indicators">
                     {% for paired in paired_members %}
                     {% if forloop.first %}
-                    <li data-target="#testimonials" data-slide-to="0" class="active"></li>
+                    <li data-target="#testimonials2" data-slide-to="0" class="active"></li>
                     {% else %}
-                    <li data-target="#testimonials" data-slide-to="{{ forloop.counter0 }}" class=""></li>
+                    <li data-target="#testimonials2" data-slide-to="{{ forloop.counter0 }}"></li>
                     {% endif %}
                     {% endfor %}
                 </ol>

webpage/page/settings.py

@@ -92,39 +92,28 @@
 # Database
 # https://docs.djangoproject.com/en/1.10/ref/settings/#databases
 
-# SQLITE = {
-#     'default': {
-#         'ENGINE': 'django.db.backends.sqlite3',
-#         'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
-#     }
-# }
-
-# try:
-#     POSTGRES = {
-#             'default': {
-#                 'ENGINE': 'django.db.backends.postgresql_psycopg2',
-#                 'NAME': os.environ['DB_NAME'],
-#                 'USER': os.environ['DB_USER'],
-#                 'PASSWORD': os.environ['DB_PASS'],
-#                 'HOST': os.environ['DB_SERVICE'],
-#                 'PORT': os.environ['DB_PORT']
-#             }
-#         }
-# except KeyError:
-#     POSTGRES = None
-    
-# DATABASES = POSTGRES if PRODUCTION else SQLITE
-
-DATABASES =  {
+SQLITE = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+    }
+}
+
+try:
+    POSTGRES = {
             'default': {
                 'ENGINE': 'django.db.backends.postgresql_psycopg2',
-                'NAME': 'lascilab',
-                'USER': 'lascilab',
-                'PASSWORD': 'lascilab',
-                'HOST': '172.18.02',
-                'PORT': '5432'
+                'NAME': os.environ['DB_NAME'],
+                'USER': os.environ['DB_USER'],
+                'PASSWORD': os.environ['DB_PASS'],
+                'HOST': os.environ['DB_SERVICE'],
+                'PORT': os.environ['DB_PORT']
             }
         }
+except KeyError:
+    POSTGRES = None
+    
+DATABASES = SQLITE #POSTGRES if PRODUCTION else SQLITE
 
 
 # Password validation