Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding latest changes #5

Open
wants to merge 61 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
6961c52
Update app.js
nitya2602 Dec 30, 2019
fd028e0
Update README.md
SinghCoder Dec 31, 2019
aba9b5b
Fixed timer issues.
dmahajan980 Dec 31, 2019
6bb1c62
Merge branch 'master' of https://github.com/dmahajan980/BlindCoding
dmahajan980 Dec 31, 2019
a95897a
Leaderboard Backend
aarjavjain1 Dec 31, 2019
c064a32
Resolved merge conflicts and merged PR.
dmahajan980 Dec 31, 2019
8781037
Merge pull request #2 from dmahajan980/master
dmahajan980 Dec 31, 2019
7d55f08
Merge pull request #3 from aarjavjain1/master
dmahajan980 Dec 31, 2019
3761906
Fixed leaderboard code
Nikhil-Vats Jan 1, 2020
4519246
Added gitignore
Nikhil-Vats Jan 1, 2020
e4470a0
Fixed automatic question updation, correct score management, ensured …
SinghCoder Jan 2, 2020
b714bce
Merge branch 'nitya2602-master' =>
SinghCoder Jan 2, 2020
6931a03
Merge branch 'master' into Paritosh29-master
SinghCoder Jan 2, 2020
ca08434
Merge branch 'Paritosh29-master'
SinghCoder Jan 3, 2020
c76fa08
Added details of extra features to be implemented
SinghCoder Jan 3, 2020
dcb136e
Updated models for score logic
coderjedi Jan 3, 2020
7c622ec
Updated views
coderjedi Jan 3, 2020
94270f1
Added db.sqlite3 back
SinghCoder Jan 3, 2020
6b9ea48
Merge branch 'master' of https://github.com/HarpinderJotSingh/BlindCo…
SinghCoder Jan 3, 2020
e893d97
Update .gitignore
SinghCoder Jan 3, 2020
d5fc386
Merge pull request #1 from HarpinderJotSingh/master
aarjavjain1 Jan 3, 2020
332ebd7
API key to Backend
aarjavjain1 Jan 3, 2020
c85eccf
Resolved Merge Conflicts
aarjavjain1 Jan 3, 2020
08b9f8d
Fixed app.js
aarjavjain1 Jan 3, 2020
ab7e726
Replaced : by = in blind_coding/settings.py for clientId and clientSe…
SinghCoder Jan 4, 2020
97cd8d5
Merge branch 'aarjavjain1-master'
SinghCoder Jan 4, 2020
890151b
Changes made in leaderboard and runCode
coderjedi Jan 4, 2020
1856c03
Updated models
coderjedi Jan 4, 2020
77675a6
Scoring logic updated
SinghCoder Jan 4, 2020
d63de7d
Tested leaderboard logic, fixed minor bugs
SinghCoder Jan 4, 2020
c1ad73b
Merge branch 'coderjedi-master'
SinghCoder Jan 4, 2020
1a009bb
Changed compiler api from jdoodle to judge0
SinghCoder Jan 4, 2020
d3046aa
Leaderboard Animation
Paritosh29 Jan 6, 2020
cc592a9
Saving changes.
dmahajan980 Jan 7, 2020
8d0a4b5
Saving changes.
dmahajan980 Jan 7, 2020
6e48b46
Added functionality to show code.
dmahajan980 Jan 7, 2020
04de859
Code editor was disabled after two attempts of show code, enabled it …
SinghCoder Jan 7, 2020
babe8b9
Merge branch 'dmahajan980-master'
SinghCoder Jan 7, 2020
fdb6cea
Changed alerts to sweet alerts - alert msgs with css applied
SinghCoder Jan 7, 2020
a2b9281
Added instructions, cleared editor after correct answer and logged us…
SinghCoder Jan 7, 2020
97ae086
Resolved conflicts - Logging user out on all correct responses
SinghCoder Jan 7, 2020
a0023f2
Merge pull request #2 from HarpinderJotSingh/master
aarjavjain1 Jan 7, 2020
cc286ba
Removed bugs after testing =>
SinghCoder Jan 11, 2020
21ac1a6
Disabled run button for the time the run result does not comes
SinghCoder Jan 11, 2020
5b64fdd
Merge pull request #3 from HarpinderJotSingh/master
aarjavjain1 Jan 11, 2020
08cc372
Disabled run button for the time the run result does not comes
SinghCoder Jan 11, 2020
e26d01c
LeaderBoard Rank Back
aarjavjain1 Jan 11, 2020
c6099c5
Merge branch 'master' of https://github.com/aarjavjain1/BlindCoding i…
SinghCoder Jan 11, 2020
31a92e9
Rank functionality done
SinghCoder Jan 11, 2020
8b3838e
Merge branch 'aarjavjain1-master'
SinghCoder Jan 11, 2020
10ee674
Added Commit History Visualizer
SinghCoder Feb 12, 2021
41a903d
Disabled code view on selection
TejasTiwari Mar 12, 2021
f5fc3db
Text highlight and devtools issue resolved
Mar 18, 2021
276495a
Merge pull request #15 from TejasTiwari/master
dmahajan980 Mar 18, 2021
2c5f295
Code mapping for each question implemented
TejasTiwari Mar 18, 2021
6da3a91
Merge pull request #16 from TejasTiwari/master
dmahajan980 Mar 19, 2021
beca1b0
Improved leaderboard CSS
TejasTiwari Mar 19, 2021
786abca
Updated apogee logo
TejasTiwari Mar 19, 2021
043155b
Merge pull request #18 from TejasTiwari/master
dmahajan980 Mar 19, 2021
6ea452f
Changed scoring scheme
TejasTiwari Mar 20, 2021
fa53674
Merge pull request #19 from TejasTiwari/master
dmahajan980 Mar 20, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 128 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
pip-wheel-metadata/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
.python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# PEP 582; used by e.g. github.com/David-OConnor/pyflow
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/
Binary file added CommitHistoryVisualizer/BlindCoding.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added CommitHistoryVisualizer/BlindCoding.mp4
Binary file not shown.
23 changes: 17 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
# Blind Coding

## Bugs to be fixed/ Features to be added

- [X] Timer is not working properly, fix it
- [ ] When user gets a question correct, automatically redirect to next question
- [ ] Add a live leaderboard
- [ ] Change frontend
- [ ] Add details in about section
- [ ] Cursor does not goes up in the editor, fix it
- [ ] Do Backend stuff - do not put keys as it is within the files
- [X] When user gets a question correct, automatically redirect to next question
- [X] Add a live leaderboard
- [X] Change frontend - Leaderboard opening animation is inserted, might require to change other background colors and stuff later.
- [X] Add details in about section
- [X] Cursor does not goes up in the editor, fix it
- [X] Do Backend stuff - do not put keys as it is within the files
- [X] Add feature to show code for sometime, say 5-10 seconds once per question
- [X] Disable run button for the time compiler runs the code and returns the result to prevent multiple compiler runs
- [X] Limit number of runs per question per user - feature not needed anymore
- [X] Add Rank of the player to the leaderboard

## Commit History Visualizer

![GIF](CommitHistoryVisualizer/BlindCoding.gif)

[video](CommitHistoryVisualizer/BlindCoding.mp4)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 3 additions & 1 deletion blind_coding/blind_coding/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
'django.contrib.staticfiles',
'allauth.socialaccount.providers.google',
'main_app.apps.MainAppConfig',

]

MIDDLEWARE = [
Expand Down Expand Up @@ -137,3 +136,6 @@

MEDIA_URL = '/media/'
MEDIA_ROOT = os.path.join(REPOSITORY_ROOT, 'media/')

clientId = "222a2ef84f6881409d32ae21369d1a32"
clientSecret = "67872757630a355db890ee74b6b20926cb9e025dbb444182df2bd2700fc64af1"
Binary file modified blind_coding/db.sqlite3
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed blind_coding/main_app/__pycache__/admin.cpython-34.pyc
Binary file not shown.
Binary file removed blind_coding/main_app/__pycache__/admin.cpython-36.pyc
Binary file not shown.
Binary file removed blind_coding/main_app/__pycache__/apps.cpython-34.pyc
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed blind_coding/main_app/__pycache__/urls.cpython-34.pyc
Binary file not shown.
Binary file modified blind_coding/main_app/__pycache__/urls.cpython-36.pyc
Binary file not shown.
Binary file not shown.
Binary file modified blind_coding/main_app/__pycache__/views.cpython-36.pyc
Binary file not shown.
3 changes: 2 additions & 1 deletion blind_coding/main_app/admin.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from __future__ import unicode_literals
from django.contrib import admin
from .models import Question,Userdata
from .models import Question,Userdata,Time_Penalty

# Register your models here.
admin.site.register(Question)
admin.site.register(Userdata)
admin.site.register(Time_Penalty)
8 changes: 7 additions & 1 deletion blind_coding/main_app/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 2.0.13 on 2019-03-21 14:30
# Generated by Django 2.2.7 on 2020-01-03 18:07

from django.conf import settings
from django.db import migrations, models
Expand All @@ -20,6 +20,9 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('qno', models.IntegerField(default=0)),
('text', models.CharField(max_length=45000)),
('testcaseno', models.IntegerField(default=0)),
('samplein', models.CharField(default='', max_length=45000)),
('sampleout', models.CharField(default='', max_length=45000)),
('test_case1', models.CharField(max_length=1000)),
('test_case2', models.CharField(max_length=1000)),
('test_case3', models.CharField(max_length=1000)),
Expand All @@ -33,6 +36,9 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=100)),
('score', models.IntegerField(default=0)),
('answerGiven', models.CharField(default='00000', max_length=10)),
('timeElapsed', models.IntegerField(default=0)),
('user_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
Expand Down
43 changes: 43 additions & 0 deletions blind_coding/main_app/migrations/0002_auto_20200104_1324.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Generated by Django 2.2.7 on 2020-01-04 07:54

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('main_app', '0001_initial'),
]

operations = [
migrations.AddField(
model_name='question',
name='weight',
field=models.IntegerField(default=10),
preserve_default=False,
),
migrations.AddField(
model_name='userdata',
name='total_penalty',
field=models.IntegerField(default=0),
),
migrations.CreateModel(
name='Time_Penalty',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('time_penalty', models.IntegerField(default=0)),
('no_wa', models.IntegerField(default=0)),
('player', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='main_app.Userdata')),
('question', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='questions', to='main_app.Question')),
],
options={
'unique_together': {('player', 'question')},
},
),
migrations.AddField(
model_name='question',
name='time_penalty',
field=models.ManyToManyField(blank=True, null=True, through='main_app.Time_Penalty', to='main_app.Userdata'),
),
]
18 changes: 0 additions & 18 deletions blind_coding/main_app/migrations/0002_question_qno.py

This file was deleted.

23 changes: 0 additions & 23 deletions blind_coding/main_app/migrations/0003_auto_20190328_2312.py

This file was deleted.

18 changes: 18 additions & 0 deletions blind_coding/main_app/migrations/0003_auto_20200104_1332.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 2.2.7 on 2020-01-04 08:02

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('main_app', '0002_auto_20200104_1324'),
]

operations = [
migrations.AlterField(
model_name='question',
name='weight',
field=models.IntegerField(default=20),
),
]
18 changes: 0 additions & 18 deletions blind_coding/main_app/migrations/0004_question_testcaseno.py

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# Generated by Django 2.0.13 on 2019-03-28 20:52
# Generated by Django 2.2.7 on 2020-01-11 10:40

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('main_app', '0004_question_testcaseno'),
('main_app', '0003_auto_20200104_1332'),
]

operations = [
migrations.AddField(
model_name='userdata',
name='score',
name='chancesUsed',
field=models.IntegerField(default=0),
),
]
18 changes: 0 additions & 18 deletions blind_coding/main_app/migrations/0006_question_correctanswered.py

This file was deleted.

Loading