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

feat: Modernizing the exercises page #388

Merged
merged 2 commits into from
Apr 5, 2024
Merged

feat: Modernizing the exercises page #388

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3713ea1
feat: Modernizing the exercises page
yammesicka Apr 5, 2024
1424387
Merge branch 'master' into exercises-are-now-buttons
yammesicka Apr 5, 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
17 changes: 11 additions & 6 deletions lms/lmsweb/translations/he/LC_MESSAGES/messages.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-03-29 21:14+0300\n"
"POT-Creation-Date: 2024-04-05 05:39+0300\n"
"PO-Revision-Date: 2024-03-23 18:59+0300\n"
"Last-Translator: Yam Mesicka\n"
"Language: he\n"
Expand Down Expand Up @@ -184,19 +184,23 @@ msgstr "אימות סיסמה"
msgid "Exercises"
msgstr "תרגילים"

#: lms/templates/exercises.html:26
#: lms/templates/exercises.html:13
msgid "Upload Solutions"
msgstr "העלו פתרונות"

#: lms/templates/exercises.html:32
msgid "Send"
msgstr "שלח"

#: lms/templates/exercises.html:28
#: lms/templates/exercises.html:34
msgid "View"
msgstr "הצצה"

#: lms/templates/exercises.html:30
#: lms/templates/exercises.html:36
msgid "Check"
msgstr "לבדיקה"

#: lms/templates/exercises.html:44
#: lms/templates/exercises.html:50
msgid "All Exercises"
msgstr "לכל התרגילים"

Expand Down Expand Up @@ -489,7 +493,7 @@ msgstr "סיום בדיקה"
msgid "Automatic Checking"
msgstr "בדיקות אוטומטיות"

#: lms/templates/view.html:93
#: lms/templates/view.html:94
msgid "Test failed"
msgstr "בדיקה נכשלה"

Expand Down Expand Up @@ -549,3 +553,4 @@ msgstr ""
"שלום %(fullname)s. הסיסמה שלך באתר %(site_name)s שונתה.\n"
"אם לא אתה שינית את הסיסמה, צור קשר עם הנהלת האתר.\n"
"כתובת המייל שלך לפי רישומינו: %(site_mail)s"

70 changes: 66 additions & 4 deletions lms/static/my.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,15 @@ a {
margin: 3rem 0;
}

#exercises-page-container {
display: flex;
justify-content: center;
}
Comment on lines +96 to +99
Copy link

Choose a reason for hiding this comment

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

suggestion (code_refinement): Consider using responsive units for width in #exercises-page.

Using a fixed width (720px) may not be responsive across all devices. Consider using percentages or viewport width (vw) for better responsiveness.

Suggested change
#exercises-page-container {
display: flex;
justify-content: center;
}
#exercises-page-container {
display: flex;
justify-content: center;
width: 80vw; /* Adjust the width to use viewport width for better responsiveness */
}


#exercises-page {
display: flex;
flex-direction: column;
width: 720px;
}

#exercises-header {
Expand Down Expand Up @@ -136,6 +142,30 @@ a {
text-align: center;
border-right: #00000000 8px solid;
border-left: #00000000 8px solid;
transition: box-shadow 0.3s ease, border-color 0.3s ease;
}

.exercise-status-icon {
margin-inline: 0.5rem;
align-self: center;
}

.exercise:hover {
box-shadow: 0 5px 8px rgba(0, 0, 0, 0.2);
text-decoration: none;
}

.exercise-link {
text-decoration: none;
color: inherit;
display: block;
transition: all 0.3s ease;
}

.exercise-link:hover, .exercise-link:focus {
text-decoration: none;
color: inherit;
border-radius: 10px;
}

.centered {
Expand Down Expand Up @@ -163,12 +193,10 @@ a {
overflow: hidden;
text-align: center;
font-size: 1.2rem;
margin-right: 1rem;
color: #495057;
padding: 0.25rem 0.75rem;
border-radius: 15px;
min-width: 4rem;
justify-content: start;
min-width: 4rem;
}

.exercise-name {
Expand Down Expand Up @@ -296,6 +324,40 @@ button.our-button-narrow, a.our-button-narrow {
justify-content: center;
}

#upload-solutions-button, #upload-solutions-button > a {
margin-inline-end: 0;
}

.our-cta-button {
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
font-size: 1rem;
justify-content: center;
width: auto;
padding: 0.6rem 1rem;
}

.our-cta-button:hover {
box-shadow: 0 5px 7px rgba(0, 0, 0, 0.1);
transform: scale(1.05);
}

.our-cta-button:active {
background-color: #269abc;
animation: none;
}

.our-cta-button.active, .our-cta-button:checked {
background-color: #1e90ff;
}

.our-cta-button.active:hover, .our-cta-button:checked:hover {
background-color: #187adf;
}

.our-cta-button > .fa {
margin-inline-end: 0.5rem;
}

#filetree {
display: flex;
flex-basis: auto;
Expand Down Expand Up @@ -970,7 +1032,7 @@ code .grader-add .fa {
align-items: center;
align-self: center;
display: flex;
margin-inline-end: 1rem;
margin-inline-end: 2rem;
}

.fa-book {
Expand Down
65 changes: 35 additions & 30 deletions lms/templates/exercises.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,54 @@
{%- extends 'base.html' -%}

{%- block page_content -%}
<div class="container">
<div id="exercises-page-container" class="container">
<div id="exercises-page" class="page {{ direction }}">
<div id="exercises-header">
<div id="main-title">
<h1 id="exercises-head">{{ _('Exercises') }}</h1>
</div>
<div id="upload-solutions-button">
<a href="{{ url_for('send_', course_id=current_user.last_course_viewed.id) }}" class="our-button our-cta-button">
<i class="fa fa-upload" aria-hidden="true"></i>
{{ _('Upload Solutions') }}
</a>
</div>
</div>
<div id="exercises">
{%- for exercise in exercises %}
<div class="exercise" {%- if exercise.grade_color %} style="border-right: 8px solid {{ exercise.grade_color }};" {%- endif -%}>
<div class="right-side {{ direction }}-language">
<div class="exercise-number me-3">{{ exercise['exercise_number'] }}</div>
<div class="exercise-name"><div class="ex-title">{{ exercise['exercise_name'] | e }}</div></div>
</div>
<div class="left-side">
{%- if exercise['notebook'] %}
<div class="which-notebook">
<i class="fa fa-book" aria-hidden="true"></i>
{{ exercise['notebook'] }}
{%- if exercise.get('is_checked') is none %}
{% set details = {'page': 'send', 'icon': 'upload', 'text': _('Send'), 'css': 'send', 'page_id': exercise['course_id'] ~ '/' ~ exercise['exercise_id']} %}
{% elif not exercise.get('is_checked') %}
{% set details = {'page': 'view', 'icon': 'eye', 'text': _('View'), 'css': 'view', 'page_id': exercise['solution_id']} %}
{% else %}
{% set details = {'page': 'view', 'icon': 'check-circle-o', 'text': _('Check'), 'css': 'checked', 'page_id': exercise['solution_id']} %}
{% endif -%}
<a href="{{ details['page'] }}/{{ details['page_id'] }}" class="exercise-link">
<div class="exercise" {%- if exercise.grade_color %} style="border-right: 8px solid {{ exercise.grade_color }};" {%- endif -%}>
<div class="right-side {{ direction }}-language">
<i class="fa fa-{{ details['icon'] }} exercise-status-icon" aria-hidden="true"></i>
<div class="exercise-number me-3">{{ exercise['exercise_number'] }}</div>
{%- if exercise['notebook'] %}
{%- endif %}
<div class="exercise-name"><div class="ex-title">{{ exercise['exercise_name'] | e }}</div></div>
</div>
<div class="left-side">
<div class="which-notebook">
<i class="fa fa-book" aria-hidden="true"></i>
{{ exercise['notebook'] }}
</div>
</div>
{%- endif %}
{%- if exercise.get('is_checked') is none %}
{% set details = {'page': 'send', 'icon': 'upload', 'text': _('Send'), 'css': 'send', 'page_id': exercise['course_id'] ~ '/' ~ exercise['exercise_id']} %}
{% elif not exercise.get('is_checked') %}
{% set details = {'page': 'view', 'icon': 'eye', 'text': _('View'), 'css': 'view', 'page_id': exercise['solution_id']} %}
{% else %}
{% set details = {'page': 'view', 'icon': 'check-circle-o', 'text': _('Check'), 'css': 'checked', 'page_id': exercise['solution_id']} %}
{% endif -%}
{%- if not exercise.get('is_archived') or exercise.get('is_checked') is not none %}
<a class="our-button go-{{ details['css'] }}" href="{{ details['page'] }}/{{ details['page_id'] }}">
{{ details['text'] | e }}
<i class="fa fa-{{ details['icon'] }}" aria-hidden="true"></i>
</a>
{% endif -%}
</div>
</div>
</a>
{% endfor -%}
{%- if not fetch_archived %}
<div class="exercise centered">
<div id="show-all-exercises-action" class="right-side">
<a href="?archived=1">{{ _('All Exercises') }}</a>
<a href="?archived=1">
<div class="exercise centered">
<div id="show-all-exercises-action" class="right-side">
{{ _('All Exercises') }}
</div>
</div>
</div>
</a>
{% endif -%}
</div>
</div>
Expand Down
8 changes: 0 additions & 8 deletions lms/templates/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,6 @@
{% endfor -%}
</ul>
</li>
{%- if current_user.last_course_viewed %}
<li class="nav-item">
<a href="{{ url_for('send_', course_id=current_user.last_course_viewed.id) }}" class="nav-link">
<i class="fa fa-upload" aria-hidden="true"></i>
{{ _('Upload Exercises') }}
</a>
</li>
{% endif -%}
{%- if not exercises or fetch_archived %}
<li class="nav-item">
<a href="/exercises" class="nav-link">
Expand Down
Loading