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

Address 2.0 website issues. #224

Merged
merged 39 commits into from
Feb 15, 2024
Merged

Address 2.0 website issues. #224

Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
ebbbd19
Addes styling to invalid_zip.html and already_submitted.html. made er…
mike-ferguson Jan 22, 2024
0403134
Added tutorial file checks and file, updated tutorial page
mike-ferguson Jan 24, 2024
021793b
Removed old separate vision form, base/brain model option, private op…
mike-ferguson Jan 26, 2024
c974b50
Merge branch 'master' into web_2.0_fixes
mike-ferguson Jan 26, 2024
f7415a7
first round of PR feedback changes
mike-ferguson Jan 29, 2024
4aa2dae
Merge branch 'web_2.0_fixes' of https://github.com/brain-score/brain-…
mike-ferguson Jan 31, 2024
a11da75
removed required model.py and setup.py in user.py
mike-ferguson Jan 31, 2024
962d2ca
removed boilerplate navbar code, use seb's line instead
mike-ferguson Jan 31, 2024
d655c12
removed boilerplate navbar code, use seb's line instead
mike-ferguson Jan 31, 2024
729275b
tutorial changes 1
mike-ferguson Jan 31, 2024
1bb21c0
Overhauled tutorial styling
mike-ferguson Jan 31, 2024
604b125
Overhauled quickstart styling, continued
mike-ferguson Jan 31, 2024
c69a179
Overhauled quickstart styling, continued
mike-ferguson Jan 31, 2024
461dd4c
Finished Quickstart styling
mike-ferguson Feb 2, 2024
13bfc10
fixes tutorial and quickstart minor things
mike-ferguson Feb 2, 2024
013e9a7
minor changes
mike-ferguson Feb 2, 2024
53d5901
Initial deepdive 1 page fix
mike-ferguson Feb 2, 2024
cabcc20
Second deepdive 1 page fix
mike-ferguson Feb 5, 2024
34f0b51
Second deepdive 1 page fix, 2
mike-ferguson Feb 5, 2024
a859441
fixes 1
mike-ferguson Feb 7, 2024
2f402cd
Finished DD1
mike-ferguson Feb 7, 2024
52c0cc0
Finished DD1 styling
mike-ferguson Feb 7, 2024
8d07dfc
added more styling
mike-ferguson Feb 7, 2024
07b7417
Finished DD2
mike-ferguson Feb 8, 2024
e5b0ec7
Finished DD3
mike-ferguson Feb 8, 2024
e4b3ea0
Finished community page
mike-ferguson Feb 8, 2024
34a476c
Merge branch 'master' into web_2.0_fixes
mschrimpf Feb 9, 2024
6d87221
Added public models back in, updated submission text
mike-ferguson Feb 12, 2024
9119625
Merge branch 'web_2.0_fixes' of https://github.com/brain-score/brain-…
mike-ferguson Feb 12, 2024
e81cfcf
small change to user.py
mike-ferguson Feb 12, 2024
4775111
Update benchmarks/templates/benchmarks/community.html
mike-ferguson Feb 12, 2024
5a98476
Merge branch 'master' into web_2.0_fixes
mike-ferguson Feb 12, 2024
69d24de
updates resubmission job to score_plugins
mike-ferguson Feb 12, 2024
a7df7a7
Merge branch 'web_2.0_fixes' of https://github.com/brain-score/brain-…
mike-ferguson Feb 12, 2024
1c08e7f
Katherine's PR feedback round 1
mike-ferguson Feb 14, 2024
d588fd9
Jim's requested changes to Footer
mike-ferguson Feb 14, 2024
30fe897
Initial Sponsor page and file size check
mike-ferguson Feb 14, 2024
562fbc8
Added size limit
mike-ferguson Feb 14, 2024
28cdadf
last comments of PR
mike-ferguson Feb 14, 2024
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
14 changes: 2 additions & 12 deletions benchmarks/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,26 +36,16 @@ class UploadPlaceHolder(forms.Form):


class UploadFileForm(forms.Form):
model_type = forms.ChoiceField(choices=[
("BaseModel", "Base model - to submit a standard machine learning model"),
("BrainModel", "Brain model - to change brain-transformation")])
zip_file = forms.FileField(label="", help_text='Required')
public = forms.BooleanField(label='Make model scores public (can be changed later):', required=False,
help_text='Check if you want the results of your submitted models included in the public ranking.')
help_text='Check if you want the results of your submitted models included in the '
'public ranking.')

class Meta:
model = UploadPlaceHolder
fields = ('zip_file', 'public', 'competition')


class UploadFileFormLanguage(forms.Form):
zip_file = forms.FileField(label="", help_text='Required')

class Meta:
model = UploadPlaceHolder
fields = ('zip_file', 'competition')


class ChangePasswordForm(PasswordChangeForm):
def __init__(self, *args, **kwargs):
super(ChangePasswordForm, self).__init__(*args, **kwargs)
Expand Down
44 changes: 29 additions & 15 deletions benchmarks/templates/benchmarks/already_submitted.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,31 @@
{% extends 'benchmarks/base.html' %}
{% load static %}
{% load compress %}

{% block main %}
<section id="success" class="container center">
<article class="message">
<div class="message-header">
<p>Error: {{ identifier }} already exists. </p>
</div>
<div class="message-body">
There already is a {{ plugin }} plugin '{{ identifier }}' in the Brain-Score system, and you are not the owner.
Brain-Score does not allow plugins with duplicate identifiers. Please resubmit your {{ plugin }} with
a different identifier.
To resubmit, click <a href="http://{{ request.get_host }}/profile/{{ domain }}/submit">here</a>.
</div>
</article>
</section>
{% endblock %}
{% block main %}
{% include 'benchmarks/components/nav-bar.html' %}
<div class="container login" style="background-image: url({% static '/benchmarks/img/login_brain.png' %});">
<div class="column is-half has-text-centered-mobile">
<div class="container login-left">
<section id="success" class="container center">
<article class="message">
<div class="message-header">
<p>Error: {{ identifier }} already exists. </p>
</div>
<div class="message-body">
There already is a {{ plugin }} plugin '{{ identifier }}' in the Brain-Score system.
As you are not the original submitter of this plugin, you do not have permission to modify it.
<br>
<br>
Brain-Score does not allow plugins with duplicate identifiers. Please resubmit your {{ plugin }} with
a different identifier.
<br>
<br>
To resubmit, click <a href="https://{{ request.get_host }}/profile/{{ domain }}/submit">here</a>.
</div>
</article>
</section>
</div>
</div>
</div>
{% endblock %}
28 changes: 1 addition & 27 deletions benchmarks/templates/benchmarks/central_profile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,7 @@
{% load compress %}

{% block main %}
<nav class="navbar updated is-fixed-top is-transparent">
<div class= "container my_container nav-container">
<div class="navbar-brand">
<a class="navbar-item" href="https://www.brain-score.org">
<img class="navbar_element image" id="navbar-logo-colored" src="/static/benchmarks/img/colored_logo.png"/>
</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">
<div class="navbar-item">
<a class="social_icon navbar-item " href="https://www.github.com/brain-score">
<img class="navbar_element image" id="github_icon" src="/static/benchmarks/img/github_icon.png" />
</a>
<a class="social_icon navbar-item" href="https://www.twitter.com/brain_score">
<img class="navbar_element image" id="twitter_icon" src="/static/benchmarks/img/twitter_icon.png"/>
</a>
</div>
</div>
</div>
</div>
</nav>

{% include 'benchmarks/components/nav-bar.html' %}

<div class="container login" style="background-image: url({% static '/benchmarks/img/login_brain.png' %});">
<div class="column is-half has-text-centered-mobile">
Expand Down
147 changes: 95 additions & 52 deletions benchmarks/templates/benchmarks/community.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,64 +1,107 @@
{% extends 'benchmarks/base.html' %}
{% extends "benchmarks/components/app-view.html" %}
{% load static %}
{% load compress %}

{% block main %}
{% include 'benchmarks/components/nav-bar.html' %}
{% block banner %}
<h1>Community</h1>
<p>Come join a growing group of scientists, engineers, and researchers alike.</p>
mike-ferguson marked this conversation as resolved.
Show resolved Hide resolved
{% endblock %}


{% block content %}

<div class="container my_container landing">
<section class="section">
<div class="container">
<div class="columns is-centered">
<div class="column is-half has-text-centered">
<h3 class="benefits_heading is-size-3-mobile">Get involved!</h3>
Whether you just want to stay on top of news and events or you're looking to roll up your sleeves and contribute to our GitHub repositories, there are many ways to participate in the active and growing Brain-Score community.
<div class="box leaderboard-table-component full">
<div class="columns is-tablet is-variable is-1-tablet">
<div class="column is-one-half">
<img class="collab_graphic_image_2" src="{% static "/benchmarks/img/collaboration.png" %}" />
</div>
<div class="column is-one-half tutorial_text">
<h3 class="benefits_heading is-size-3-mobile">Get Involved!</h3>
<p class="benefits_info is-size-5-mobile">
Brain-Score started initially out of a research lab in Cambridge, MA in 2017, and since has grown to incorporate
hundreds of users across dozens of institutions.
</p>
<p class="benefits_info is-size-5-mobile">
We also have an active support and development team that is dedicated to making Brain-Score a seamless
and fun experience. We constantly try to get community feedback on what is important, quality of life changes, and
where the platform should head. If you have thoughts about any of these points, please do not hesitate
to reach out.
</p>
<p class="benefits_info is-size-5-mobile">
So, whether you just want to stay on top of news and events or you're looking to roll up your sleeves and
mike-ferguson marked this conversation as resolved.
Show resolved Hide resolved
contribute to our GitHub repositories, there are many ways to participate in the active and growing Brain-Score community.
</p>
</div>
</div>
</div>
<div class="box leaderboard-table-component full">
<div class="columns is-tablet is-variable is-1-tablet">
<div class="column is-one-third">
<div class="box">
<div class="content">
<div class="column has-text-centered">
<h3 class="benefits_heading is-size-3-mobile">Join Our Slack!</h3>
<p class="benefits_info is-size-5-mobile">
Join the conversation in the Brain-Score Slack workspace. Whether you're interested in planning
features or just want to hang out, you're invited.
</p>
{% if request.GET.join_slack %}
<br/>
<p class="benefits_info is-size-5-mobile">
<b>Thanks for joining!</b>
mike-ferguson marked this conversation as resolved.
Show resolved Hide resolved
</p>
{% else %}
<form action="{% url 'join_slack' %}" method="post" class="join-slack-form">
{% csrf_token %}
<input class="input user-email" type="email" name="email" placeholder="email">
<button type="submit" class="submit button new_design tutorial benefit_button is-size-7
is-size-6-widescreen" >Join Slack</button>
</form>
{% endif %}
</div>
</div>
</div>
</div>
</section>

<section class="section">
<div class="container">
<div class="columns">
<div class="column has-text-centered">
<h3 class="benefits_heading is-size-3-mobile">Mailing list signup</h3>
<p>Be the first to know about new features and keep up with news and events by joining our mailing list.
You can opt out anytme.</p>
{% if request.GET.join_mailing_list %}
<br/>
<p><b>Thanks for joining!</b></p>
{%else%}
<form action="{% url 'join_mailing_list' %}" method="post" class="join-mailing-form">
{% csrf_token %}
<input class="input user-email" type="email" name="email" placeholder="email">
<button type="submit" class="submit button new_design tutorial benefit_button is-size-7
is-size-6-widescreen" >Sign me up</button>
</form>
{% endif %}
</div>
<div class="column has-text-centered">
<h3 class="benefits_heading is-size-3-mobile">Join our Slack</h3>
<p>Join the conversation in the Brain-Score Slack workspace. Whether you're interested in planning features or just want to hang out, you're invited.</p>
{% if request.GET.join_slack %}
<br/>
<p><b>Thanks for joining!</b></p>
{%else%}
<form action="{% url 'join_slack' %}" method="post" class="join-slack-form">
{% csrf_token %}
<input class="input user-email" type="email" name="email" placeholder="email">
<button type="submit" class="submit button new_design tutorial benefit_button is-size-7
is-size-6-widescreen" >Join Slack</button>
</form>
{% endif %}
<div class="column is-one-third">
<div class="box">
<div class="content">
<div class="column has-text-centered">
<h3 class="benefits_heading is-size-3-mobile">Join Our Mailing List</h3>
<p class="benefits_info is-size-5-mobile">
Be the first to know about new features and keep up with news and events by joining our mailing list.
You can opt out anytme.
</p>
{% if request.GET.join_mailing_list %}
<br/>
<p class="benefits_info is-size-5-mobile">
<b>Thanks for joining!</b>
</p>
{%else%}
<form action="{% url 'join_mailing_list' %}" method="post" class="join-mailing-form">
{% csrf_token %}
<input class="input user-email" type="email" name="email" placeholder="email">
<button type="submit" class="submit button new_design tutorial benefit_button is-size-7
is-size-6-widescreen" >Sign me up</button>
</form>
{% endif %}
</div>
</div>
<div class="column has-text-centered">
<h3 class="benefits_heading is-size-3-mobile">GitHub</h3>
<p>Want to jump right in? Brain-Score's codebase is entirely open source and we welcome user contributions.</p>
<a href="https://github.com/brain-score" target="_blank" rel="noopener noreferrer"><button type="button" class="button new_design tutorial benefit_button is-size-7
is-size-6-widescreen" >Go to GitHub</button></a>
</div>
</div>
<div class="column is-one-third">
<div class="box">
<div class="content">
<div class="column has-text-centered">
<h3 class="benefits_heading is-size-3-mobile">GitHub</h3>
<p class="benefits_info is-size-5-mobile">
Want to jump right in? Brain-Score's codebase is entirely open source and we welcome user contributions.
Feel free to open an Issue if you find an issue, or to request a new feature.
mike-ferguson marked this conversation as resolved.
Show resolved Hide resolved
</p>
<a href="https://github.com/brain-score" target="_blank" rel="noopener noreferrer"><button type="button" class="button new_design tutorial benefit_button is-size-7
is-size-6-widescreen" >Go to GitHub</button></a>
</div>
</div>
</div>
</div>
</section>
</div>
</div>
{% endblock %}
1 change: 0 additions & 1 deletion benchmarks/templates/benchmarks/compare.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{% extends "benchmarks/components/app-view.html" %}

{% load static %}

{% block banner %}
Expand Down
47 changes: 31 additions & 16 deletions benchmarks/templates/benchmarks/invalid_zip.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,35 @@
{% extends 'benchmarks/base.html' %}
{% load static %}
{% load compress %}

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

<article class="message">
<div class="message-header">
<p>Error: your submission package was not in the correct format.</p>
</div>
<div class="message-body">
{{ error }}. The submission packaging rules can be found
<a href="https://brain-score.readthedocs.io/en/latest/">here</a>.
To resubmit, click <a href="http://{{ request.get_host }}/profile/{{ domain }}/submit">here</a>.
</div>
</article>



</section>
{% include 'benchmarks/components/nav-bar.html' %}
<div class="container login" style="background-image: url({% static '/benchmarks/img/login_brain.png' %});">
<div class="column is-half has-text-centered-mobile">
<div class="container login-left">
<section id="success" class="container center">
<article class="message">
<div class="message-header">
<p>Error: Incorrect submission package format</p>
</div>
<div class="message-body">
<div class="error">
{{ error }}
</div>
<br>
<div class="explanation">
Please refer to the correct submission package structure below.
To resubmit, click <a href="https://{{ request.get_host }}/profile/{{ domain }}/submit">here</a>.
</div>
<br>
<br>
<div class="submission_image">
<img class="submission example" width="500" height="auto" src="{% static "/benchmarks/img/submission_structure.png" %}" />
</div>
</div>
</article>
</section>
</div>
</div>
</div>
{% endblock %}
11 changes: 9 additions & 2 deletions benchmarks/templates/benchmarks/leaderboard/info-section.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
<div class="box">
<h3 class="title">How to Interpret</h3>
<div class="content">
The leaderboard is the heart of Brain-Score. It displays scores, all ranging from 0-1, on every benchmark available. Benchmarks are arranged hierarchically, with scores for each child benchmark averaged together to create the overall score for the parent.
<p class="benefits_info is-size-5-mobile">
The leaderboard is the heart of Brain-Score. It displays scores, all ranging from 0-1, on every benchmark available.
mike-ferguson marked this conversation as resolved.
Show resolved Hide resolved
Benchmarks are arranged hierarchically, with scores for each child benchmark averaged together to create the overall score for the parent.
</p>
</div>
</div>

<div class="box">
<div class="title">Ready to Submit</div>
<div class="content">
If you would like to submit your own model to Brain-Score, we highly recommend you complete our tutorial series <a href="http{% if request.is_secure %}s{% endif %}://{{ request.get_host }}/tutorial">here</a>. It covers how to score a model on a single benchmark locally, as well as how to submit both predefined models and custom ones as well.
<p class="benefits_info is-size-5-mobile">
If you would like to submit your own model to Brain-Score, we highly recommend you complete our tutorial series
<a href="http{% if request.is_secure %}s{% endif %}://{{ request.get_host }}/tutorial">here</a>. It covers how
to score a model on a single benchmark locally, as well as how to submit both predefined models and custom ones as well.
mike-ferguson marked this conversation as resolved.
Show resolved Hide resolved
</p>
</div>
<a href="http{% if request.is_secure %}s{% endif %}://{{ request.get_host }}/tutorial"><button class="button button-primary">Tutorials</button></a>
<a href="http{% if request.is_secure %}s{% endif %}://{{ request.get_host }}/profile"><button class="button button-ghost">Submit</button></a>
Expand Down
4 changes: 3 additions & 1 deletion benchmarks/templates/benchmarks/leaderboard/leaderboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{% extends "benchmarks/components/app-view.html" %}

{% load static %}

{% block navbar %}
{% endblock %}

{% block content %}
<div class="box leaderboard-table-component">
{% include "benchmarks/leaderboard/leaderboard-table.html" %}
Expand Down
Loading