Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
fc1232a
Initial Commit with new Bulma system
mike-ferguson Jun 12, 2023
9eda2bb
Code cleanup
mike-ferguson Jun 12, 2023
9458db8
Cleaned code
mike-ferguson Jun 13, 2023
b986216
users and urls.py commit
mike-ferguson Jun 13, 2023
c626c86
JS navbar functionality works
mike-ferguson Jun 13, 2023
d55f85b
Mobile styling is complete (<768px)
mike-ferguson Jun 13, 2023
df5d04f
Rest of styling is done
mike-ferguson Jun 13, 2023
7995dd7
Updated links to make sense
mike-ferguson Jun 13, 2023
dac5c66
Updated test to account for landing page redesign
mike-ferguson Jun 14, 2023
b23ebab
Vision link in test
mike-ferguson Jun 14, 2023
b8f9ee5
Added quest logo
mike-ferguson Jun 14, 2023
a2f893f
Removed quest logo, updated text on main sections
mike-ferguson Jun 15, 2023
c8b29ad
Merge branch 'master' into ui_landing_page
mike-ferguson Jun 15, 2023
e3ec9ce
Updated main texts and finalized links
mike-ferguson Jun 15, 2023
ad76e02
fixed minor spacing
mike-ferguson Jun 15, 2023
f3d498d
added css to commit
mike-ferguson Jun 15, 2023
baf1032
PR comments round 1
mike-ferguson Jun 15, 2023
e1bc390
Merge branch 'ui_landing_page' of https://github.com/brain-score/brai…
mike-ferguson Jun 15, 2023
5cba0cc
Now extends base.html
mike-ferguson Jun 30, 2023
59112ac
font issue fixed
mike-ferguson Jul 5, 2023
2dfa003
removed 'static' from css into inline html (from PR request)
mike-ferguson Jul 7, 2023
f9fcd99
resizing changes
mike-ferguson Jul 10, 2023
1c9cc77
navbar and container fixes, permanent gap
mike-ferguson Jul 14, 2023
84d8925
mobile styling done
mike-ferguson Jul 14, 2023
ea7dc89
in between mobile and tablet styling done
mike-ferguson Jul 17, 2023
1d712e4
Final styling, in between sizes done
mike-ferguson Jul 17, 2023
0b36a84
Preliminary Login page restyling
mike-ferguson Aug 9, 2023
34e7b86
Login page finished
mike-ferguson Aug 14, 2023
7e03d47
Change password page redesigned to fit new UI
mike-ferguson Aug 14, 2023
d74ae8a
Change password-confirm page to new UI
mike-ferguson Aug 14, 2023
222b083
Merge branch 'master' into ui_landing_page
mschrimpf Aug 21, 2023
d80dcbe
Sign-Up page redesign done. Css-map removed
mike-ferguson Aug 21, 2023
aeac9cc
Merge branch 'ui_landing_page' of https://github.com/brain-score/brai…
mike-ferguson Aug 21, 2023
478ffad
Added new account creation message fix
mike-ferguson Aug 21, 2023
9aeada2
Added wrong password banner fade effect
mike-ferguson Aug 21, 2023
91234b9
App view layout (#194)
fairchildseb Nov 7, 2023
afe0125
App view component layout
fairchildseb Aug 6, 2023
ebe3335
minor updates
Aug 7, 2023
ced457b
add dev-requirements.txt
fairchildseb Aug 7, 2023
212b3d8
Updated leaderboard view
fairchildseb Oct 11, 2023
e0965c2
update
fairchildseb Nov 7, 2023
86be15d
nits
fairchildseb Nov 7, 2023
063d298
missing import
fairchildseb Nov 7, 2023
90e3ba6
nit rm extra newlines
fairchildseb Nov 8, 2023
e82d8ea
moar nits
fairchildseb Nov 8, 2023
9f77e7b
fix column widths
fairchildseb Nov 28, 2023
224cfd5
address feedback
fairchildseb Nov 29, 2023
20205a9
Update benchmarks/views/index.py
fairchildseb Dec 4, 2023
85568b5
fix table expansion
fairchildseb Dec 5, 2023
d09407b
fix url
fairchildseb Dec 9, 2023
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
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
.sass-cache/
__pycache__
brain_score.web.egg-info/
build/
db.sqlite3
dist/
django.log
node_modules/
static/admin/
static/CACHE/
venv
39 changes: 37 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,46 @@
[![Build Status](https://travis-ci.com/brain-score/brain-score.web.svg?branch=master)](https://travis-ci.com/brain-score/brain-score.web)

## Setup
Install dependencies: `pip install .`

Ensure you are using `[email protected]`

Create and activate a virtual environment

```
python3 -m venv <env_name>
source <env_name>/bin/activate
```

Install dependencies:

```
python3 -m pip install --upgrade pip
pip3 install -r requirements.txt
```

Install node dependencies: `npm install --no-optional`

Run server: `python manage.py runserver &`
Run server in dev: `DEBUG=True python manage.py runserver &`


### Setup Errors - troubleshooting

Error installing sass with pip:

```
ERROR: Failed building wheel for sass
```

Install `cython` and try again

```
pip3 install cython
pip3 install -r requirements.txt
```

Error installing `psycopg2` Error: pg_config executable not found. - Install postgresql `brew install postgresql`

Error running the server - `/bin/sh: command not found: sass` - `npm install -g sass`


## Update data
Expand Down
59 changes: 18 additions & 41 deletions benchmarks/templates/benchmarks/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,37 +23,48 @@
</script>

<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:400,600,300,800,700,400italic" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/css/bulma.min.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/select2.min.css" />

<meta http-equiv="X-UA-Compatible" content="IE=edge">

<meta name="viewport" content="width=device-width, initial-scale=1.0">

{% compress css %}
<link type="text/x-sass" rel="stylesheet" href="{% static "/benchmarks/css/main.sass" %}" charset="utf-8">
<link type="text/x-sass" rel="stylesheet" href="{% static "/benchmarks/css/main.sass" %}?{% now "U" %}" charset="utf-8">
{% endcompress %}

{# libraries #}
<script defer src="https://code.jquery.com/jquery-3.3.1.min.js" type="text/javascript" charset="utf-8"></script>
<script defer src="https://kit.fontawesome.com/2180d98b9d.js" crossorigin="anonymous"></script>
<script defer src="https://code.jquery.com/jquery-3.7.1.min.js" integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script>
<script defer src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script>
<script defer src="http://labratrevenge.com/d3-tip/javascripts/d3.tip.v0.6.3.js"></script>
<script defer src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/select2.min.js"></script>
<script defer src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/4.4.0/chart.umd.js" integrity="sha512-6HrPqAvK+lZElIZ4mZ64fyxIBTsaX5zAFZg2V/2WT+iKPrFzTzvx6QAsLW2OaLwobhMYBog/+bvmIEEGXi0p1w==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>

{# data #}
<script type="text/javascript">
comparison_data = {{ comparison_data|safe }};
</script>
<script type="text/javascript">
score_accuracy_chart = {{ graph_data|safe }};
</script>

{# own sources #}
{% compress js %}
<script defer src="{% static "/benchmarks/js/navbar.js" %}" type="text/javascript" charset="utf-8"></script>
<script defer src="{% static "/benchmarks/js/scrolling-active.js" %}" charset="utf-8"></script>
<script defer src="{% static "/benchmarks/js/jquery.tablesorter.min.js" %}" type="text/javascript" charset="utf-8"></script>
<script defer src="{% static "/benchmarks/js/table.js" %}" type="text/javascript" charset="utf-8"></script>
<script defer src="{% static "/benchmarks/js/score-accuracy-graph.js" %}" type="text/javascript" charset="utf-8"></script>
<script defer src="{% static "/benchmarks/js/compare.js" %}" charset="utf-8"></script>
<script defer src="{% static "/benchmarks/js/table-expansion.js" %}"></script>
<script defer src="{% static "/benchmarks/js/table-public.js" %}"></script>
<script defer src="{% static "/benchmarks/js/collapsible.js" %}"></script>
<script defer src="{% static "/benchmarks/js/tab.js" %}"></script>
<script defer src="{% static "/benchmarks/js/tab-competition.js" %}"></script>
<script defer src="{% static "/benchmarks/js/password_effect.js" %}"></script>
{% endcompress %}

<script type="application/ld+json">
Expand Down Expand Up @@ -90,47 +101,13 @@

<title>{{title}}</title>
</head>
<body class="page-main">

{% block navbar %}
<nav class="navbar is-fixed-top is-transparent" role="navigation" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<div class="container">
<div class="navbar-brand">
<a href="{{url}}" class="navbar-item">
<img src="{{logo_url}}" />
</a>

<a role="button" class="navbar-burger" data-target="navMenu" aria-label="menu" aria-expanded="false">
<span aria-hidden="true"></span>
<span aria-hidden="true"></span>
<span aria-hidden="true"></span>
</a>
</div>
<div id="navMenu" class="navbar-menu">
<div class="navbar-end">
<a class="navbar-item" href="http://{{ request.get_host }}/{{ domain }}/#leaderboard">Leaderboard</a>
<a class="navbar-item" href="http://{{ request.get_host }}/{{ domain }}/#about">About</a>
<a class="navbar-item" href="http://{{ request.get_host }}/{{ domain }}/#compare">Compare</a>
<a class="navbar-item" href="http://{{ request.get_host }}/{{ domain }}/#participate">Participate</a>
</div>
</div>
</div>
</nav>
{% endblock %}


<main class="content">
{% block content %}{% endblock %}
</main>

<footer>
<br />
<div class="content has-text-centered">
<p><a href="https://github.com/brain-score">Brain-Score team</a></p>
</div>
</footer>

<body>
<main>
{% block main %}{% endblock %}
</main>
</body>

</html>

{% endwith %}
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/templates/benchmarks/central_profile.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% extends 'benchmarks/base.html' %}
{% load static %}
{% block content %}
{% block main %}

{% if user %}
<section id="profile" class="container center">
Expand Down Expand Up @@ -45,4 +45,4 @@ <h1>{{ user.email }}</h1>

{% else %}
{% endif %}
{% endblock %}
{% endblock %}
5 changes: 1 addition & 4 deletions benchmarks/templates/benchmarks/competition.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% load static %}

{# site navigation #}
{% block navbar %}
{% block main %}
<nav class="navbar is-fixed-top is-transparent" role="navigation"
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<div class="container">
Expand Down Expand Up @@ -31,9 +31,6 @@
</div>
</div>
</nav>
{% endblock %}

{% block content %}
<section class="hero competition-hero">
<div class="hero-body container">
<p class="title">
Expand Down
36 changes: 36 additions & 0 deletions benchmarks/templates/benchmarks/components/app-view.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{% extends "benchmarks/base.html" %}

{% load static %}

{% block main %}
<div class="left-sidebar">
{% include "benchmarks/components/left-sidebar.html" %}
</div>

<div class="content-container">
<div class="social-icons">
<a href="https://github.com/brain-score" target="_blank" rel="noopener noreferrer">
<i class="fa-brands fa-square-github"></i>
</a>
<a href="https://twitter.com/brain_score" target="_blank" rel="noopener noreferrer">
<i class="fa-brands fa-square-twitter"></i>
</a>
</div>
<div class="banner box gradient">
{% block banner %}
<h1>Welcome to Brain-Score!</h1>
<p>Navigate our dashboard to view key submission data.</p>
{% endblock %}
</div>

<div class="columns main-content">
<div class="column is-three-quarters">
{% block content %}{% endblock %}
</div>

<div class="info-section column">
{% block info_section %}{% endblock %}
</div>
</div>
</div>
{% endblock %}
18 changes: 18 additions & 0 deletions benchmarks/templates/benchmarks/components/left-sidebar.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{% load static %}
<a class="brainscore-logo" href="http{% if request.is_secure %}s{% endif %}://{{ request.get_host }}/2023"><img src="{% static "/benchmarks/img/b-w_logo.png" %}" alt="Brain-Score Logo"></a>
<a class="selected" href="http{% if request.is_secure %}s{% endif %}://{{ request.get_host }}/{{ domain }}/">
<img src="{% static "/benchmarks/img/leaderboard_icon.png" %}" alt="Brain-Score Logo">
<span>Leaderboard</span>
</a>
<a href="http{% if request.is_secure %}s{% endif %}://{{ request.get_host }}/{{ domain }}/#compare">
<img src="{% static "/benchmarks/img/compare_icon.png" %}" alt="Brain-Score Logo">
<span>Compare</span>
</a>
<a href="http{% if request.is_secure %}s{% endif %}://{{ request.get_host }}/tutorial ">
<img src="{% static "/benchmarks/img/tutorial_icon.png" %}" alt="Brain-Score Logo">
<span>Tutorials</span>
</a>
<a href="http{% if request.is_secure %}s{% endif %}://{{ request.get_host }}/profile/{{ domain }}">
<img src="{% static "/benchmarks/img/profile_icon.png" %}" alt="Brain-Score Logo">
<span>Profile</span>
</a>
2 changes: 1 addition & 1 deletion benchmarks/templates/benchmarks/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% extends "benchmarks/base.html" %}

{% block content %}
{% block main %}

<section id="leaderboard" class="container tablecenter is-centered">
{% include "benchmarks/table.html" %}
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/templates/benchmarks/invalid_zip.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% extends 'benchmarks/base.html' %}

{% block content %}
{% block main %}
<section id="success" class="container center">

<article class="message">
Expand Down
Loading