Merge pull request #6 from deadlycoder07/deploy

Deploy

Author: deadlycoder07

.env

@@ -1,5 +1,5 @@
-DATABASE_NAME=screencast
-DATABASE_USER=screencastadmin@screencast2020
-DATABASE_PASSWORD=screencast2020!
-DATABASE_HOST=screencast2020.postgres.database.azure.com
+DATABASE_NAME=screencast
+DATABASE_USER=screencastadmin@screencast2020
+DATABASE_PASSWORD=screencast2020!
+DATABASE_HOST=screencast2020.postgres.database.azure.com
 DATABASE_PORT=5432

.gitignore

@@ -5,4 +5,8 @@ __pycache__
 myvenv
 db.sqlite3
 /static
-.DS_Store
+.DS_Store
+# Elastic Beanstalk Files
+.elasticbeanstalk/*
+!.elasticbeanstalk/*.cfg.yml
+!.elasticbeanstalk/*.global.yml

Dockerfile

@@ -0,0 +1,12 @@
+FROM amazon/aws-eb-python:3.4.2-onbuild-3.5.1
+
+# Expose port
+EXPOSE 8080
+ENV PYTHONUNBUFFERED 1
+RUN python -m pip install --upgrade pip
+RUN mkdir /var/app
+WORKDIR /var/app    
+COPY requirements.txt /code/
+RUN pip install -r requirements.txt
+COPY . /var/app/. 
+ EXPOSE 8000

Dockerrun.aws.json

@@ -0,0 +1,11 @@
+{
+    "AWSEBDockerrunVersion": "5",
+    "Volumes": [
+      {
+        "ContainerDirectory": "/var/app",
+        "HostDirectory": "/var/app",
+        "ContainerPort": "8080"
+      }
+    ],
+    "Logging": "/var/app/eb_log"
+  }

Procfile

@@ -35,7 +35,7 @@ def validate(self,data):
                 "result":result
             }
 
-
+    
 class SocialSerializer(serializers.Serializer):
     """
     Serializer which accepts an OAuth2 access token and provider.

api/serializers.py

@@ -18,4 +18,5 @@
     path('refresh',TokenRefreshView.as_view(),name='token_refresh'),
     path('question',views.getquestion.as_view(),name='question api'),
     path('facebooklogin',views.facebooklogin.as_view(),name='facebooklogin'),
+    path('status',views.configstatus,name='quiz_status'),
 ]

api/urls.py

@@ -19,8 +19,9 @@
 from social_django.utils import load_strategy, load_backend
 from social_core.backends.oauth import BaseOAuth2
 from social_core.exceptions import MissingBackend, AuthTokenError, AuthForbidden
+import time
 # Create your views here.
-
+import requests as r
 
 
 @api_view(['GET'])
@@ -52,6 +53,23 @@ def get(self,request):
             }
             return Response(response)
 
+import pytz
+utc=pytz.UTC
+@api_view(['GET'])
+def configstatus(request):
+    configs=config.objects.all()
+    if configs:
+       response={
+       "current_day":configs[0].current_day,
+       "start_time":configs[0].quiz_start.replace(tzinfo=utc),
+       "end_time":configs[0].quiz_endtime.replace(tzinfo=utc)  
+       }
+       return Response(response)
+    response={
+        "status":404,
+        "message":"no confings founnd"
+    }
+    return Response(response)
 class Answer(APIView):
     permission_classes=(IsAuthenticated,)
 
@@ -120,8 +138,10 @@ def post(self, request):
 class facebooklogin(APIView):
 
     def post(self,request):
+        print(request.data)
         accesstoken=request.data.get('accesstoken')
         expiration_time=request.data.get('expiration_time')
+        print(expiration_time)
         userID=request.data.get('userID')
         if(int(expiration_time) < int(time.time())):
             content= {"status": 404}
@@ -138,7 +158,7 @@ def post(self,request):
             username= idInfo['name'],
             image= idInfo['picture']['data']['url'],
             try:
-                user = User.objects.get(email=data['email'])
+                user = User.objects.get(email=email)
             except User.DoesNotExist:
                 user = User()
                 user.username = username

api/views.py

@@ -0,0 +1,28 @@
+version: '3'
+    
+services:
+  db:
+    image: postgres
+    environment:
+      - DJANGO_SETTINGS_MODULE=settings.production
+      - RDS_DB_NAME=postgres
+      - RDS_USERNAME=postgres
+      - RDS_PASSWORD='postgres'
+      - RDS_HOSTNAME=db
+      - RDS_PORT=5432
+  web:
+    build: .
+    command: gunicorn screencast.wsgi:application --bind 0.0.0.0:8000
+    volumes:
+      - .:/var/app
+    ports:
+      - "8000:8000"
+    depends_on:
+      - db
+      - migration
+
+  migration:
+    build: .
+    command: python manage.py migrate --noinput
+    depends_on: 
+      - db

docker-compose.yml

@@ -1,58 +1,58 @@
-# Generated by Django 3.0.5 on 2020-06-19 07:29
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='config',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('current_day', models.IntegerField()),
-                ('q_no', models.IntegerField()),
-                ('quiz_start', models.DateTimeField()),
-                ('quiz_endtime', models.DateTimeField()),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Question',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('question', models.CharField(max_length=550)),
-                ('day', models.IntegerField()),
-                ('question_no', models.IntegerField()),
-                ('answer', models.CharField(max_length=100)),
-                ('audio', models.FileField(blank=True, upload_to='media/audios')),
-                ('image', models.ImageField(blank=True, upload_to='media/images')),
-                ('hint', models.CharField(default='na', max_length=555)),
-            ],
-            options={
-                'ordering': ['day', 'question_no'],
-            },
-        ),
-        migrations.CreateModel(
-            name='UserScore',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=55, null=True)),
-                ('score', models.IntegerField(default=0)),
-                ('rank', models.IntegerField(null=True)),
-                ('current_question', models.IntegerField()),
-                ('last_modified', models.DateTimeField(auto_now=True)),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'ordering': ['-score', 'last_modified'],
-            },
-        ),
-    ]
+# Generated by Django 3.0.5 on 2020-06-19 07:29
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='config',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('current_day', models.IntegerField()),
+                ('q_no', models.IntegerField()),
+                ('quiz_start', models.DateTimeField()),
+                ('quiz_endtime', models.DateTimeField()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Question',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('question', models.CharField(max_length=550)),
+                ('day', models.IntegerField()),
+                ('question_no', models.IntegerField()),
+                ('answer', models.CharField(max_length=100)),
+                ('audio', models.FileField(blank=True, upload_to='media/audios')),
+                ('image', models.ImageField(blank=True, upload_to='media/images')),
+                ('hint', models.CharField(default='na', max_length=555)),
+            ],
+            options={
+                'ordering': ['day', 'question_no'],
+            },
+        ),
+        migrations.CreateModel(
+            name='UserScore',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=55, null=True)),
+                ('score', models.IntegerField(default=0)),
+                ('rank', models.IntegerField(null=True)),
+                ('current_question', models.IntegerField()),
+                ('last_modified', models.DateTimeField(auto_now=True)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'ordering': ['-score', 'last_modified'],
+            },
+        ),
+    ]