Skip to content

Commit af083c6

Browse files
committed
fblogin
1 parent ec5f09d commit af083c6

File tree

8 files changed

+100
-65
lines changed

8 files changed

+100
-65
lines changed

.env

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
DATABASE_NAME=screencast
2-
DATABASE_USER=screencastadmin@screencast2020
3-
DATABASE_PASSWORD=screencast2020!
4-
DATABASE_HOST=screencast2020.postgres.database.azure.com
1+
DATABASE_NAME=screencast
2+
DATABASE_USER=screencastadmin@screencast2020
3+
DATABASE_PASSWORD=screencast2020!
4+
DATABASE_HOST=screencast2020.postgres.database.azure.com
55
DATABASE_PORT=5432

Dockerfile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
FROM python:3
2+
ENV PYTHONUNBUFFERED 1
3+
RUN python -m pip install --upgrade pip
4+
RUN mkdir /code
5+
WORKDIR /code
6+
COPY requirements.txt /code/
7+
RUN pip install -r requirements.txt
8+
COPY . /code/
9+

Procfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
web: gunicorn screencast.wsgi
1+
web: gunicorn screencast.wsgi

api/serializers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def validate(self,data):
3535
"result":result
3636
}
3737

38-
38+
3939
class SocialSerializer(serializers.Serializer):
4040
"""
4141
Serializer which accepts an OAuth2 access token and provider.

api/views.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
from social_django.utils import load_strategy, load_backend
2020
from social_core.backends.oauth import BaseOAuth2
2121
from social_core.exceptions import MissingBackend, AuthTokenError, AuthForbidden
22+
import time
2223
# Create your views here.
2324

2425

@@ -120,8 +121,10 @@ def post(self, request):
120121
class facebooklogin(APIView):
121122

122123
def post(self,request):
124+
print(request.data)
123125
accesstoken=request.data.get('accesstoken')
124126
expiration_time=request.data.get('expiration_time')
127+
print(expiration_time)
125128
userID=request.data.get('userID')
126129
if(int(expiration_time) < int(time.time())):
127130
content= {"status": 404}

docker-compose.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
version: '3'
2+
3+
services:
4+
db:
5+
image: postgres
6+
environment:
7+
- POSTGRES_DB=postgres
8+
- POSTGRES_USER=postgres
9+
- POSTGRES_PASSWORD=postgres
10+
web:
11+
build: .
12+
command: gunicorn screencast.wsgi:application --bind 0.0.0.0:8000
13+
ports:
14+
- "8000:8000"
15+
depends_on:
16+
- db
17+
- migration
18+
19+
migration:
20+
build: .
21+
command: python manage.py migrate --noinput
22+
depends_on:
23+
- db

quiz/migrations/0001_initial.py

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,58 @@
1-
# Generated by Django 3.0.5 on 2020-06-19 07:29
2-
3-
from django.conf import settings
4-
from django.db import migrations, models
5-
import django.db.models.deletion
6-
7-
8-
class Migration(migrations.Migration):
9-
10-
initial = True
11-
12-
dependencies = [
13-
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
14-
]
15-
16-
operations = [
17-
migrations.CreateModel(
18-
name='config',
19-
fields=[
20-
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
21-
('current_day', models.IntegerField()),
22-
('q_no', models.IntegerField()),
23-
('quiz_start', models.DateTimeField()),
24-
('quiz_endtime', models.DateTimeField()),
25-
],
26-
),
27-
migrations.CreateModel(
28-
name='Question',
29-
fields=[
30-
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
31-
('question', models.CharField(max_length=550)),
32-
('day', models.IntegerField()),
33-
('question_no', models.IntegerField()),
34-
('answer', models.CharField(max_length=100)),
35-
('audio', models.FileField(blank=True, upload_to='media/audios')),
36-
('image', models.ImageField(blank=True, upload_to='media/images')),
37-
('hint', models.CharField(default='na', max_length=555)),
38-
],
39-
options={
40-
'ordering': ['day', 'question_no'],
41-
},
42-
),
43-
migrations.CreateModel(
44-
name='UserScore',
45-
fields=[
46-
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
47-
('name', models.CharField(max_length=55, null=True)),
48-
('score', models.IntegerField(default=0)),
49-
('rank', models.IntegerField(null=True)),
50-
('current_question', models.IntegerField()),
51-
('last_modified', models.DateTimeField(auto_now=True)),
52-
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
53-
],
54-
options={
55-
'ordering': ['-score', 'last_modified'],
56-
},
57-
),
58-
]
1+
# Generated by Django 3.0.5 on 2020-06-19 07:29
2+
3+
from django.conf import settings
4+
from django.db import migrations, models
5+
import django.db.models.deletion
6+
7+
8+
class Migration(migrations.Migration):
9+
10+
initial = True
11+
12+
dependencies = [
13+
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
14+
]
15+
16+
operations = [
17+
migrations.CreateModel(
18+
name='config',
19+
fields=[
20+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
21+
('current_day', models.IntegerField()),
22+
('q_no', models.IntegerField()),
23+
('quiz_start', models.DateTimeField()),
24+
('quiz_endtime', models.DateTimeField()),
25+
],
26+
),
27+
migrations.CreateModel(
28+
name='Question',
29+
fields=[
30+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
31+
('question', models.CharField(max_length=550)),
32+
('day', models.IntegerField()),
33+
('question_no', models.IntegerField()),
34+
('answer', models.CharField(max_length=100)),
35+
('audio', models.FileField(blank=True, upload_to='media/audios')),
36+
('image', models.ImageField(blank=True, upload_to='media/images')),
37+
('hint', models.CharField(default='na', max_length=555)),
38+
],
39+
options={
40+
'ordering': ['day', 'question_no'],
41+
},
42+
),
43+
migrations.CreateModel(
44+
name='UserScore',
45+
fields=[
46+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
47+
('name', models.CharField(max_length=55, null=True)),
48+
('score', models.IntegerField(default=0)),
49+
('rank', models.IntegerField(null=True)),
50+
('current_question', models.IntegerField()),
51+
('last_modified', models.DateTimeField(auto_now=True)),
52+
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
53+
],
54+
options={
55+
'ordering': ['-score', 'last_modified'],
56+
},
57+
),
58+
]

screencast/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
DATABASES = { # GALAXYZPJ'S LOCAL INSTANCE
110110
'default': {
111111
'ENGINE': 'django.db.backends.postgresql',
112-
'NAME': 'screencast',
112+
'NAME': 'postgres',
113113
'USER': 'postgres',
114114
'PASSWORD': 'ramiz',
115115
'HOST': 'localhost',

0 commit comments

Comments
 (0)