Skip to content

Commit

Permalink
Merge branch 'master' into #2
Browse files Browse the repository at this point in the history
  • Loading branch information
barnabytprowe committed Nov 7, 2013
2 parents ebf8264 + 2a79d2b commit d962e96
Show file tree
Hide file tree
Showing 231 changed files with 17,902 additions and 0 deletions.
60 changes: 60 additions & 0 deletions README
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
Pre-requisites

Django 1.4 (available in pip)
NumPy for scoring

Running on a local machine
--------------------------
To run on a local machine:
cd great3
./reset

You will be prompted to set a password for a super-user called jaz. Pick
anything.

You can then open the homepage on
http://127.0.0.1:8000/

If you want you can log in as "jaz" with the password you just created, or one of
the other pre-created users : "mike", "barney", or "rachel". In each case the
password is just the username.

You can then explore the site and submit entries to exising leaderboards!

New Users
---------
From the login tab you have the option of creating new users. The email that
would be sent to the new user on creation is stored as a text file in
server/emails, until we connect to a real SMTP server. We can customize new
user creation easily if, for example, we wanted to ask for full names,
institutions, etc.

Admin
-----

The admin site (which only the super user jaz can access) is at
http://127.0.0.1:8000/admin. This is where we will create new leaderboards.

Scoring
-------

The scoring of entries will be done using a cron job every few minutes which checks
for new entries and then computes their scores. This is an external process so
that the site does not hang when processing. The command to be run (from the
server/great3 dir) is:

python manage.py great3_scores

Initially the scores were random, until the metric code was ready.

Deployment
----------
Things that were done before deploying:
- remove the initial yaml data
- https://docs.djangoproject.com/en/1.4/howto/deployment/wsgi/modwsgi/
- change the secret key (settings.py)
- set the admin user (settings.py)
- set the database settings in great3/settings.py to correct (e.g. MySQL)
values (settings.py)
- change the email backend (settings.py)
- update the site settings in the admin controls
1 change: 1 addition & 0 deletions collected_static/README
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This directory is where the static files get collected.
303 changes: 303 additions & 0 deletions data/initial.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,303 @@
- fields: {app_label: leaderboard, model: board, name: board}
model: contenttypes.contenttype
pk: 10
- fields: {app_label: contenttypes, model: contenttype, name: content type}
model: contenttypes.contenttype
pk: 4
- fields: {app_label: leaderboard, model: entry, name: entry}
model: contenttypes.contenttype
pk: 11
- fields: {app_label: auth, model: group, name: group}
model: contenttypes.contenttype
pk: 2
- fields: {app_label: admin, model: logentry, name: log entry}
model: contenttypes.contenttype
pk: 7
- fields: {app_label: leaderboard, model: membershiprequest, name: noteship request}
model: contenttypes.contenttype
pk: 12
- fields: {app_label: auth, model: permission, name: permission}
model: contenttypes.contenttype
pk: 1
- fields: {app_label: registration, model: registrationprofile, name: registration
profile}
model: contenttypes.contenttype
pk: 13
- fields: {app_label: sessions, model: session, name: session}
model: contenttypes.contenttype
pk: 5
- fields: {app_label: sites, model: site, name: site}
model: contenttypes.contenttype
pk: 6
- fields: {app_label: leaderboard, model: team, name: team}
model: contenttypes.contenttype
pk: 9
- fields: {app_label: auth, model: user, name: user}
model: contenttypes.contenttype
pk: 3
- fields: {app_label: leaderboard, model: userprofile, name: user profile}
model: contenttypes.contenttype
pk: 8
- fields: {domain: "127.0.0.1:8000", name: "127.0.0.1:8000"}
model: sites.site
pk: 1
- fields: {notes: Lance et al, name: Lensfit, rank: 4, score: 0}
model: leaderboard.team
pk: 1
- fields: {notes: Sarah et al, name: UCL-Manchester-Alliance, rank: 1, score: 5}
model: leaderboard.team
pk: 2
- fields: {notes: Mike et al, name: RonPaul4Eva, rank: 3, score: 3}
model: leaderboard.team
pk: 3
- fields: {notes: Jason et al, name: NASA, rank: 2, score: 5}
model: leaderboard.team
pk: 4
- fields: {name: Vanilla, space: false, varying: false}
model: leaderboard.board
pk: 1
- fields: {name: Space, space: true, varying: false}
model: leaderboard.board
pk: 2
- fields: {name: DES, space: false, varying: true}
model: leaderboard.board
pk: 3
- fields: {name: Euclid, space: true, varying: true}
model: leaderboard.board
pk: 4
- fields: {name: WFIRST, space: true, varying: false}
model: leaderboard.board
pk: 5
- fields: {codename: add_logentry, content_type: 7, name: Can add log entry}
model: auth.permission
pk: 19
- fields: {codename: change_logentry, content_type: 7, name: Can change log entry}
model: auth.permission
pk: 20
- fields: {codename: delete_logentry, content_type: 7, name: Can delete log entry}
model: auth.permission
pk: 21
- fields: {codename: add_group, content_type: 2, name: Can add group}
model: auth.permission
pk: 1
- fields: {codename: change_group, content_type: 2, name: Can change group}
model: auth.permission
pk: 4
- fields: {codename: delete_group, content_type: 2, name: Can delete group}
model: auth.permission
pk: 7
- fields: {codename: add_permission, content_type: 1, name: Can add permission}
model: auth.permission
pk: 2
- fields: {codename: change_permission, content_type: 1, name: Can change permission}
model: auth.permission
pk: 5
- fields: {codename: delete_permission, content_type: 1, name: Can delete permission}
model: auth.permission
pk: 8
- fields: {codename: add_user, content_type: 3, name: Can add user}
model: auth.permission
pk: 3
- fields: {codename: change_user, content_type: 3, name: Can change user}
model: auth.permission
pk: 6
- fields: {codename: delete_user, content_type: 3, name: Can delete user}
model: auth.permission
pk: 9
- fields: {codename: add_contenttype, content_type: 4, name: Can add content type}
model: auth.permission
pk: 10
- fields: {codename: change_contenttype, content_type: 4, name: Can change content
type}
model: auth.permission
pk: 11
- fields: {codename: delete_contenttype, content_type: 4, name: Can delete content
type}
model: auth.permission
pk: 12
- fields: {codename: add_board, content_type: 10, name: Can add board}
model: auth.permission
pk: 22
- fields: {codename: change_board, content_type: 10, name: Can change board}
model: auth.permission
pk: 27
- fields: {codename: delete_board, content_type: 10, name: Can delete board}
model: auth.permission
pk: 32
- fields: {codename: add_entry, content_type: 11, name: Can add entry}
model: auth.permission
pk: 23
- fields: {codename: change_entry, content_type: 11, name: Can change entry}
model: auth.permission
pk: 28
- fields: {codename: delete_entry, content_type: 11, name: Can delete entry}
model: auth.permission
pk: 33
- fields: {codename: add_membershiprequest, content_type: 12, name: Can add noteship
request}
model: auth.permission
pk: 24
- fields: {codename: change_membershiprequest, content_type: 12, name: Can change
noteship request}
model: auth.permission
pk: 29
- fields: {codename: delete_membershiprequest, content_type: 12, name: Can delete
noteship request}
model: auth.permission
pk: 34
- fields: {codename: add_team, content_type: 9, name: Can add team}
model: auth.permission
pk: 25
- fields: {codename: change_team, content_type: 9, name: Can change team}
model: auth.permission
pk: 30
- fields: {codename: delete_team, content_type: 9, name: Can delete team}
model: auth.permission
pk: 35
- fields: {codename: add_userprofile, content_type: 8, name: Can add user profile}
model: auth.permission
pk: 26
- fields: {codename: change_userprofile, content_type: 8, name: Can change user profile}
model: auth.permission
pk: 31
- fields: {codename: delete_userprofile, content_type: 8, name: Can delete user profile}
model: auth.permission
pk: 36
- fields: {codename: add_registrationprofile, content_type: 13, name: Can add registration
profile}
model: auth.permission
pk: 37
- fields: {codename: change_registrationprofile, content_type: 13, name: Can change
registration profile}
model: auth.permission
pk: 38
- fields: {codename: delete_registrationprofile, content_type: 13, name: Can delete
registration profile}
model: auth.permission
pk: 39
- fields: {codename: add_session, content_type: 5, name: Can add session}
model: auth.permission
pk: 13
- fields: {codename: change_session, content_type: 5, name: Can change session}
model: auth.permission
pk: 14
- fields: {codename: delete_session, content_type: 5, name: Can delete session}
model: auth.permission
pk: 15
- fields: {codename: add_site, content_type: 6, name: Can add site}
model: auth.permission
pk: 16
- fields: {codename: change_site, content_type: 6, name: Can change site}
model: auth.permission
pk: 17
- fields: {codename: delete_site, content_type: 6, name: Can delete site}
model: auth.permission
pk: 18
- fields:
date_joined: 2013-01-25 18:12:31.153833+00:00
email: jaz@example.com
first_name: ''
groups: []
is_active: true
is_staff: true
is_superuser: true
last_login: 2013-01-25 18:12:31.153833+00:00
last_name: ''
password: pbkdf2_sha256$10000$e5pBordRZu0G$hJgUNy6UIFw8XZjQXiSERab9M1J6KV+akudsDIQiwA8=
user_permissions: []
username: jaz
model: auth.user
pk: 1
- fields:
date_joined: 2013-01-25 18:12:33.445279+00:00
email: barney@example.com
first_name: ''
groups: []
is_active: true
is_staff: false
is_superuser: false
last_login: 2013-01-25 18:12:33.445257+00:00
last_name: ''
password: pbkdf2_sha256$10000$LX0dV9KdlMQE$3YhUpiNa1uA85PBvARogeiLheZHEj9mWduHO9leOFn0=
user_permissions: []
username: barney
model: auth.user
pk: 2
- fields:
date_joined: 2013-01-25 18:12:33.445340+00:00
email: rachel@example.com
first_name: ''
groups: []
is_active: true
is_staff: false
is_superuser: false
last_login: 2013-01-25 18:12:33.445332+00:00
last_name: ''
password: pbkdf2_sha256$10000$DQZ0WSduoUyw$HTtFm1Ilu1GYy0gR7rW/oXtCvZF9GQKxxTYLj0sYk7Y=
user_permissions: []
username: rachel
model: auth.user
pk: 3
- fields:
date_joined: 2013-01-25 18:12:33.445396+00:00
email: mike@example.com
first_name: ''
groups: []
is_active: true
is_staff: false
is_superuser: false
last_login: 2013-01-25 18:12:33.445388+00:00
last_name: ''
password: pbkdf2_sha256$10000$1HurmIoKoEhy$jQ41ncVICZZsfwVJXSxtcxxUvmwY0qMXPjBjhamQq3c=
user_permissions: []
username: mike
model: auth.user
pk: 4
- fields:
teams: [2]
user: 1
model: leaderboard.userprofile
pk: 1
- fields:
teams: [1, 2]
user: 2
model: leaderboard.userprofile
pk: 2
- fields:
teams: [4]
user: 3
model: leaderboard.userprofile
pk: 3
- fields:
teams: [3, 4]
user: 4
model: leaderboard.userprofile
pk: 4
- fields: {board: 1, date: !!timestamp '2013-01-25 18:12:33.847083+00:00', name: nbc1,
rank: 1000, score: 14.5, team: 2, user: 2}
model: leaderboard.entry
pk: 1
- fields: {board: 1, date: !!timestamp '2013-01-25 18:12:33.849233+00:00', name: nbc2,
rank: 1000, score: 20.4, team: 2, user: 1}
model: leaderboard.entry
pk: 2
- fields: {board: 1, date: !!timestamp '2013-01-25 18:12:33.850951+00:00', name: nbc3,
rank: 1, score: 884.4, team: 2, user: 2}
model: leaderboard.entry
pk: 3
- fields: {board: 1, date: !!timestamp '2013-01-25 18:12:33.853250+00:00', name: shapelets1,
rank: 2, score: 510.2, team: 3, user: 4}
model: leaderboard.entry
pk: 4
- fields: {board: 1, date: !!timestamp '2013-01-25 18:12:33.855387+00:00', name: shapelets2,
rank: 1000, score: 456.4, team: 3, user: 4}
model: leaderboard.entry
pk: 5
- fields: {board: 2, date: !!timestamp '2013-01-25 18:12:33.857512+00:00', name: deimos1,
rank: 1000, score: 101.2, team: 4, user: 4}
model: leaderboard.entry
pk: 6
- fields: {board: 2, date: !!timestamp '2013-01-25 18:12:33.860133+00:00', name: deimos2,
rank: 1, score: 141.4, team: 4, user: 4}
model: leaderboard.entry
pk: 7
1 change: 1 addition & 0 deletions emails/README
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This directory will contain, during testing and setup, mock emails sent to test users.
Loading

0 comments on commit d962e96

Please sign in to comment.