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.

Sign up for GitHub

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

Hacker-news #5

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open

Hacker-news #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
125bce7
First commit hacker-news
CodeMaxx May 5, 2016
c143006
Added some static files and urlpatterns
CodeMaxx May 5, 2016
34977c3
Made Editors Front-end,front-end of /doc/
arunabh98 May 4, 2016
6e47f51
Make admin.py
arunabh98 May 5, 2016
74cea4f
Change FilePathField to FileField, Doc upload properly working
arunabh98 May 5, 2016
599a615
Dark theme for front end
arunabh98 May 5, 2016
4f89553
First commit hacker-news
CodeMaxx May 5, 2016
27a1fdd
Added some static files and urlpatterns
CodeMaxx May 5, 2016
ccbcd9e
Front End of Form for link upload
arunabh98 May 6, 2016
1ac5b6d
Register News model on admin
arunabh98 May 6, 2016
1991091
News.html is able to display uploaded links
arunabh98 May 6, 2016
ff7d686
Use local bootstrap,upvote, downvote for links
arunabh98 May 6, 2016
52de0fc
Add description field, Add comments class
arunabh98 May 7, 2016
2793e89
Add Comments Feature
arunabh98 May 7, 2016
b501917
Add Date Field to News Model
arunabh98 May 7, 2016
427a6e9
First sso login commit
CodeMaxx May 7, 2016
1b67b5e
Remove infinite merge conflicts
CodeMaxx May 7, 2016
1130383
Got rid of errors
CodeMaxx May 7, 2016
962b631
Add Reply to Comments Feature
arunabh98 May 7, 2016
2913309
Profile page added
CodeMaxx May 7, 2016
1550e22
Code quality improvements, display replies to comments
arunabh98 May 8, 2016
d319f4b
Remove useless migrations and merge conflicts
arunabh98 May 8, 2016
fde798d
Remove bug
CodeMaxx May 8, 2016
958bf8a
Merge branch 'hacker-news' of https://github.com/CodeMaxx/oksp into h…
CodeMaxx May 8, 2016
0f33115
Random;y arranged login code
CodeMaxx May 8, 2016
98b57b7
Login completely working
CodeMaxx May 12, 2016
aaec6f1
Remove some unnecessary stuff
CodeMaxx May 13, 2016
a1004c1
pep8 fixes
CodeMaxx May 13, 2016
7d06059
Some updates to upvotes
CodeMaxx Aug 1, 2016
ce4dd7a
Added some migrations
CodeMaxx Aug 2, 2016
0940232
Added login button
CodeMaxx Sep 12, 2016
9108790
start frontend for hacker news
arunabh98 Sep 12, 2016
0da22c2
Updated for tags. Trying to show tags in page
CodeMaxx Sep 13, 2016
7d8a8f9
further progress on frontend
arunabh98 Sep 14, 2016
be06eae
Merge with hackernews
CodeMaxx Oct 20, 2016
01d6ee7
Added vote images. Fixed backend and UI bugs
CodeMaxx Oct 20, 2016
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
8 changes: 4 additions & 4 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ Temporary Items

*.iml

## Directory-based project format:
../.idea/

## File-based project format:
*.ipr
*.iws
Expand Down Expand Up @@ -139,10 +136,13 @@ target/
# Django stuff:
logs/*
media/*
staticfiles/*

.phutil_module_cache

!.gitkeep
oksp/settings/conf.py

docupload/docs/*

#PyCharm local config
.idea/*
Empty file added account/__init__.py
View file
Open in desktop
Empty file.
3 changes: 3 additions & 0 deletions account/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.contrib import admin

# Register your models here.
5 changes: 5 additions & 0 deletions account/apps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
from django.apps import AppConfig


class AccountConfig(AppConfig):
name = 'account'
250 changes: 250 additions & 0 deletions account/migrations/0001_initial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,250 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2016-05-12 20:48
from __future__ import unicode_literals

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


class Migration(migrations.Migration):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Put migration files in gitignore.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right


initial = True

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]

operations = [
migrations.CreateModel(
name='Log',
fields=[
('id', models.AutoField(auto_created=True,
primary_key=True,
serialize=False,
verbose_name='ID')),
('intime', models.DateTimeField(blank=True,
null=True)),
('outtime', models.DateTimeField(blank=True,
null=True)),
('user',
models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
to=settings.AUTH_USER_MODEL)),
], ),
migrations.CreateModel(
name='Member',
fields=[
('id', models.AutoField(auto_created=True,
primary_key=True,
serialize=False,
verbose_name='ID')),
('roll', models.CharField(blank=True,
max_length=9,
null=True)),
('sex', models.CharField(blank=True,
choices=[('male', 'Male'),
('female', 'Female'),
('other', 'Other')],
max_length=10,
null=True)),
('password', models.CharField(blank=True,
max_length=50,
null=True)),
('contact', models.CharField(blank=True,
max_length=12,
null=True)),
('hostel', models.CharField(
blank=True,
choices=[
('Hostel 1', 'Hostel 1'), ('Hostel 2', 'Hostel 2'),
('Hostel 3', 'Hostel 3'), ('Hostel 4', 'Hostel 4'),
('Hostel 5', 'Hostel 5'), ('Hostel 6', 'Hostel 6'),
('Hostel 7', 'Hostel 7'), ('Hostel 8', 'Hostel 8'),
('Hostel 9', 'Hostel 9'), ('Hostel 10', 'Hostel 10'),
('Hostel 11', 'Hostel 11'), ('Hostel 12', 'Hostel 12'),
('Hostel 13', 'Hostel 13'), ('Hostel 14', 'Hostel 14'),
('Hostel 15', 'Hostel 15'), ('Tansa', 'Tansa'),
('QIP', 'QIP')
],
max_length=20,
null=True)),
('room', models.CharField(blank=True,
max_length=5,
null=True)),
('discipline', models.CharField(
blank=True,
choices=[
('Aerospace Engineering', 'Aerospace Engineering'),
('Animation', 'Animation'), (
'Application Software Centre',
'Application Software Centre'),
('Applied Geophysics', 'Applied Geophysics'), (
'Applied Statistics and Informatics',
'Applied Statistics and Informatics'),
('Biomedical Engineering', 'Biomedical Engineering'), (
'Biosciences and Bioengineering',
'Biosciences and Bioengineering'),
('Biotechnology', 'Biotechnology'),
('Centre for Aerospace Systems Design and Engineering',
'Centre for Aerospace Systems Design and Engineering'
),
('Centre for Distance Engineering Education Programme',
'Centre for Distance Engineering Education Programme'
),
('Centre for Environmental Science and Engineering',
'Centre for Environmental Science and Engineering'),
('Centre for Formal Design and Verification of Software',
'Centre for Formal Design and Verification of Software'
),
('Centre for Research in Nanotechnology and Science',
'Centre for Research in Nanotechnology and Science'),
('Centre for Technology Alternatives for Rural Areas',
'Centre for Technology Alternatives for Rural Areas'),
('Centre for Urban Science and Engineering',
'Centre for Urban Science and Engineering'), (
'Centre of Studies in Resources Engineering',
'Centre of Studies in Resources Engineering'),
('Chemical Engineering',
'Chemical Engineering'), ('Chemistry', 'Chemistry'), (
'Civil Engineering', 'Civil Engineering'), (
'Climate Studies', 'Climate Studies'), (
'Computer Centre', 'Computer Centre'), (
'Computer Science & Engineering',
'Computer Science & Engineering'),
('Continuing Education Programme',
'Continuing Education Programme'), (
'Corrosion Science and Engineering',
'Corrosion Science and Engineering'), (
'Desai Sethi Centre for Entrepreneurship',
'Desai Sethi Centre for Entrepreneurship'), (
'Earth Sciences', 'Earth Sciences'),
('Educational Technology', 'Educational Technology'),
('Electrical Engineering', 'Electrical Engineering'), (
'Energy Science and Engineering',
'Energy Science and Engineering'), (
'Humanities & Social Science',
'Humanities & Social Science'), (
'IITB-Monash Research Academy',
'IITB-Monash Research Academy'), (
'Industrial Design Centre',
'Industrial Design Centre'),
('Industrial Design Centre',
'Industrial Design Centre'), (
'Industrial Engineering and Operations Research',
'Industrial Engineering and Operations Research'),
('Industrial Management', 'Industrial Management'), (
'Interaction Design', 'Interaction Design'),
('Kanwal Rekhi School of Information Technology',
'Kanwal Rekhi School of Information Technology'), (
'Material Science', 'Material Science'), (
'Materials, Manufacturing and Modelling',
'Materials, Manufacturing and Modelling'), (
'Mathematics', 'Mathematics'),
('Mechanical Engineering', 'Mechanical Engineering'), (
'Metallurgical Engineering & Materials Science',
'Metallurgical Engineering & Materials Science'), (
'Mobility and Vehicle Design',
'Mobility and Vehicle Design'),
('National Centre for Aerospace Innovation and Research',
'National Centre for Aerospace Innovation and Research'
), ('National Centre for Mathematics',
'National Centre for Mathematics'), (
'Physical Education',
'Physical Education'), ('Physics', 'Physics'),
('Physics, Material Science',
'Physics, Material Science'), ('Preparatory Course',
'Preparatory Course'),
('Reliability Engineering', 'Reliability Engineering'),
('Shailesh J. Mehta School of Management',
'Shailesh J. Mehta School of Management'), (
'Sophisticated Analytical Instrument Facility',
'Sophisticated Analytical Instrument Facility'), (
'Systems and Control Engineering',
'Systems and Control Engineering'),
('Tata Center for Technology and Design',
'Tata Center for Technology and Design'), (
'Visual Communication', 'Visual Communication'), (
'Wadhwani Research Centre for Bioengineering',
'Wadhwani Research Centre for Bioengineering')
],
max_length=100,
null=True)),
('join_year',
models.CharField(blank=True,
choices=[('2010', '2010'), ('2011', '2011'),
('2012', '2012'), ('2013', '2013'),
('2014', '2014'), ('2015', '2015'),
('2016', '2016')],
max_length=4,
null=True)),
('graduation_year',
models.CharField(blank=True,
choices=[('2015', '2015'), ('2016', '2016'),
('2017', '2017'), ('2018', '2018'),
('2019', '2019'), ('2020', '2020'),
('2021', '2021')],
max_length=4,
null=True)),
('degree', models.CharField(
blank=True,
choices=[('Bachelor of Technology',
'Bachelor of Technology'),
('Master of Technology', 'Master of Technology'),
('B.Tech. + M.Tech. Dual Degree',
'B.Tech. + M.Tech. Dual Degree'),
('Master of Science', 'Master of Science'),
('Doctor of Philosophy', 'Doctor of Philosophy'),
('Bachelor of Design', 'Bachelor of Design'),
('Master of Design', 'Master of Design'),
('Master of Philosophy', 'Master of Philosophy'),
('Master of Management', 'Master of Management'),
('M.S. (Exit Degree)', 'M.S. (Exit Degree)'), (
'Master of Technology (Exit Degree)',
'Master of Technology (Exit Degree)'), (
'M.Tech. + Ph.D. Dual Degree',
'M.Tech. + Ph.D. Dual Degree'),
('Preparatory Course', 'Preparatory Course'),
('Visiting Student', 'Visiting Student'), (
'Master of Philosophy (Exit Degree)',
'Master of Philosophy (Exit Degree)'), (
'Master of Science (Exit Degree)',
'Master of Science (Exit Degree)'), (
'M.Sc. + Ph.D. Dual Degree',
'M.Sc. + Ph.D. Dual Degree'), (
'M.Phil. + Ph.D. Dual Degree',
'M.Phil. + Ph.D. Dual Degree'), (
'Executive MBA',
'Executive MBA'), (
'Four Year BS',
'Four Year BS'),
('Integrated M.Tech.', 'Integrated M.Tech.'), (
'Master of Science By Research',
'Master of Science By Research'), (
'Two Year M.Sc.', 'Two Year M.Sc.'), (
'Five Year Integrated M.Sc.',
'Five Year Integrated M.Sc.'), (
'D.I.I.T.', 'D.I.I.T.'), (
'D.I.T.T. (Exit Degree)',
'D.I.T.T. (Exit Degree)')],
max_length=50,
null=True)),
('current_status', models.CharField(blank=True,
choices=[('IN', 'IN'),
('OUT', 'OUT')],
max_length=5,
null=True)),
('secondary_email', models.CharField(blank=True,
max_length=50,
null=True)),
('profile_picture', models.ImageField(upload_to='')),
('access_token', models.TextField()),
('current_log', models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
to='account.Log')),
('user', models.OneToOneField(
on_delete=django.db.models.deletion.CASCADE,
to=settings.AUTH_USER_MODEL)),
], ),
]
16 changes: 16 additions & 0 deletions account/migrations/0002_auto_20160513_0220.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2016-05-12 20:50
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

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

operations = [
migrations.AlterField(model_name='member',
name='profile_picture',
field=models.ImageField(upload_to='/static'), ),
]
19 changes: 19 additions & 0 deletions account/migrations/0003_remove_member_current_status.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2016-05-13 21:04
from __future__ import unicode_literals

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('account', '0002_auto_20160513_0220'),
]

operations = [
migrations.RemoveField(
model_name='member',
name='current_status',
),
]
Empty file added account/migrations/__init__.py
View file
Open in desktop
Empty file.
Loading