From e768bae5af0ea33e0053bfbda65bc06cb4aadea9 Mon Sep 17 00:00:00 2001 From: anishTP Date: Fri, 19 Apr 2024 16:41:22 +0530 Subject: [PATCH 01/28] Moved the register-block to the project header section on desktop --- funnel/assets/sass/pages/project.scss | 10 +-- funnel/templates/project.html.jinja2 | 22 +----- funnel/templates/project_layout.html.jinja2 | 82 +++++++++++---------- 3 files changed, 49 insertions(+), 65 deletions(-) diff --git a/funnel/assets/sass/pages/project.scss b/funnel/assets/sass/pages/project.scss index ed55ef20c..6bc937333 100644 --- a/funnel/assets/sass/pages/project.scss +++ b/funnel/assets/sass/pages/project.scss @@ -63,7 +63,7 @@ display: none; } .register-block__content__txt { - font-size: 9px; + font-size: 12px; line-height: 16px; width: 100%; display: block; @@ -111,7 +111,7 @@ .register-block { .register-block__content { .register-block__content__txt { - font-size: 10px; + font-size: 12px; } } } @@ -152,6 +152,7 @@ @media (min-width: 768px) { .project-footer { + padding: 0 !important; .register-block { display: block; .register-block__content { @@ -419,7 +420,7 @@ } .project-banner__left { width: 67%; - margin: 0 $mui-grid-padding 0 0; + margin: 0 $mui-grid-padding * 2 0 0; .embed-video-wrapper--shaped { border-radius: 16px; } @@ -543,10 +544,9 @@ } .project-section__map { - height: 400px; + height: 300px; width: 100%; z-index: 0; - margin: 0 0 $mui-grid-padding; position: relative; outline: none; } diff --git a/funnel/templates/project.html.jinja2 b/funnel/templates/project.html.jinja2 index 6b39612b0..50586dd6b 100644 --- a/funnel/templates/project.html.jinja2 +++ b/funnel/templates/project.html.jinja2 @@ -65,7 +65,7 @@ {% endblock baseheadline %} {% block left_col %} -
+
{{ pinned_update(project) }} {{ project_about(project) }}
@@ -157,26 +157,6 @@
{%- endif %} - {%- if project.primary_venue -%} -
-
-

{% trans %}Venue{% endtrans %}

-
-

{{ project.primary_venue.title }}

-

{{ project.primary_venue.address1 }}

-

{{ project.primary_venue.address2 }}

-

{{ project.primary_venue.city }}{% if project.primary_venue.city and project.primary_venue.postcode %} - {{ project.primary_venue.postcode }}{%- endif %}

- {%- if project.primary_venue.state and project.primary_venue.country -%} -

{{ project.primary_venue.state }}, {{ project.primary_venue.country }}

- {%- endif %} -
- {%- if project.primary_venue.has_coordinates -%} -

{% trans %}Loading…{% endtrans %}

- {%- endif %} -
-
- {%- endif %} - {%- if project.subprojects or project.parent_project %}

{% trans %}Related events{% endtrans %}

diff --git a/funnel/templates/project_layout.html.jinja2 b/funnel/templates/project_layout.html.jinja2 index 391cffce3..b7630b76f 100644 --- a/funnel/templates/project_layout.html.jinja2 +++ b/funnel/templates/project_layout.html.jinja2 @@ -122,7 +122,7 @@
{%- endif %}
-
+
{%- if project.account.logo_url.url %} @@ -137,7 +137,22 @@ {% endif %}

{{ project.title }}

-

{{ project.tagline }}

+

{{ project.tagline }}

+
+
+ {% if project.start_at and project.calendar_weeks_full.weeks and project.calendar_weeks_full.weeks|length > 0 %} +
+
+ {{ calendarwidget(project.calendar_weeks_full, compact=false) }} +
+
+ {% endif %} +
+ {{ registerblock(project) }} +
+
+ {{ project_details(project) }} +
{% endmacro %} @@ -202,8 +217,7 @@
{% elif project.features.rsvp_for_members -%}
- -
+ {% endif %} {% if project.current_roles.account_member %}
@@ -303,9 +317,9 @@ {% if project.view_for('edit_schedule').is_available() and not project.start_at %}

{% trans %}Add schedule{% endtrans %}

{%- endif %} - {{ add_submission_btn(project) }} +{# {{ add_submission_btn(project) }} #} {%- if project.primary_venue %} -

{{ faicon(icon='map-marker-alt') }} {{ project.primary_venue.title }}{%- if project.primary_venue.city %}, {{ project.primary_venue.city }}{%- endif %}

+

{{ faicon(icon='map-pin') }} {{ project.primary_venue.title }}{%- if project.primary_venue.city %}, {{ project.primary_venue.city }}{%- endif %}

{%- endif %} {% endmacro %} @@ -388,6 +402,26 @@ {% endmacro %} +{% macro primary_venue(project) %} +
+
+

{% trans %}Venue{% endtrans %}

+
+

{{ project.primary_venue.title }}

+

{{ project.primary_venue.address1 }}

+

{{ project.primary_venue.address2 }}

+

{{ project.primary_venue.city }}{% if project.primary_venue.city and project.primary_venue.postcode %} - {{ project.primary_venue.postcode }}{%- endif %}

+ {%- if project.primary_venue.state and project.primary_venue.country -%} +

{{ project.primary_venue.state }}, {{ project.primary_venue.country }}

+ {%- endif %} +
+ {%- if project.primary_venue.has_coordinates -%} +

{% trans %}Loading…{% endtrans %}

+ {%- endif %} +
+
+{% endmacro %} + {% block basecontent %} {% block project_banner %}
@@ -433,20 +467,6 @@ {%- endif %} {% endblock project_banner %} - {% block before_navbar %} -
-
-
- {{ pinned_update(project) }} - {{ project_about(project) }} -
- {{ project_host_sponsor(project) }} -
-
-
-
- {%- endblock before_navbar %} - {% block project_navbar %}
@@ -485,26 +505,10 @@ {% block right_col %}
-
-
-
- {% if project.start_at and project.calendar_weeks_full.weeks and project.calendar_weeks_full.weeks|length > 0 %} -
-
- {{ calendarwidget(project.calendar_weeks_full, compact=false) }} -
-
- {% endif %} -
- {{ registerblock(project) }} -
-
- {{ project_details(project) }} -
-
-
-
+ {%- if project.primary_venue -%} + {{ primary_venue(project) }} + {% endif %} {{ project_host_sponsor(project) }}
From 88e869f00ed9995708af28b56f64e3e025adc774 Mon Sep 17 00:00:00 2001 From: anishTP Date: Mon, 22 Apr 2024 21:32:52 +0530 Subject: [PATCH 02/28] Added spacing between the registerblock and project title and moved the registerblock to a separate card when the current_page is !=project --- devserver.py | 2 +- funnel/assets/sass/pages/project.scss | 11 ++++ funnel/templates/project_layout.html.jinja2 | 56 +++++++++++++-------- 3 files changed, 48 insertions(+), 21 deletions(-) diff --git a/devserver.py b/devserver.py index a8ce61ecf..55800a1c0 100755 --- a/devserver.py +++ b/devserver.py @@ -35,7 +35,7 @@ def rq_background_worker(*args: Any, **kwargs: Any) -> Any: # Only start RQ worker within the reloader environment background_rq = BackgroundWorker( rq_background_worker, - mock_transports=bool(getbool(os.environ.get('MOCK_TRANSPORTS', False))), + mock_transports=bool(getbool(os.environ.get('MOCK_TRANSPORTS', True))), ) background_rq.start() diff --git a/funnel/assets/sass/pages/project.scss b/funnel/assets/sass/pages/project.scss index 6bc937333..74d047454 100644 --- a/funnel/assets/sass/pages/project.scss +++ b/funnel/assets/sass/pages/project.scss @@ -180,6 +180,14 @@ } } } + .flex-content { + display: flex; + flex-direction: row; + justify-content: space-between; + } + .fifty-width { + width: 48% !important; + } } } @@ -378,6 +386,9 @@ } } } + .project-banner__right--flex-direction { + flex-direction: column; + } } .project-banner__left, diff --git a/funnel/templates/project_layout.html.jinja2 b/funnel/templates/project_layout.html.jinja2 index b7630b76f..7fec0aeb3 100644 --- a/funnel/templates/project_layout.html.jinja2 +++ b/funnel/templates/project_layout.html.jinja2 @@ -121,7 +121,7 @@
{%- endif %} -
+
{%- if project.account.logo_url.url %} @@ -140,19 +140,21 @@

{{ project.tagline }}

- {% if project.start_at and project.calendar_weeks_full.weeks and project.calendar_weeks_full.weeks|length > 0 %} -
-
- {{ calendarwidget(project.calendar_weeks_full, compact=false) }} + {% if current_page == 'project' %} + {% if project.start_at and project.calendar_weeks_full.weeks and project.calendar_weeks_full.weeks|length > 0 %} +
+
+ {{ calendarwidget(project.calendar_weeks_full, compact=false) }} +
+ {% endif %} +
+ {{ registerblock(project) }} +
+
+ {{ project_details(project) }}
{% endif %} -
- {{ registerblock(project) }} -
-
- {{ project_details(project) }} -
{% endmacro %} @@ -162,7 +164,7 @@ {% if include_eyebrow_text %} {{ project.views.buy_button_eyebrow_text() }} {% endif %} -
{% endif %} {% if project.current_roles.account_member %} -
+
{% elif project.features.show_tickets %} {{ buy_button(project) }} {%- endif %} @@ -319,7 +321,7 @@ {%- endif %} {# {{ add_submission_btn(project) }} #} {%- if project.primary_venue %} -

{{ faicon(icon='map-pin') }} {{ project.primary_venue.title }}{%- if project.primary_venue.city %}, {{ project.primary_venue.city }}{%- endif %}

+ {{ faicon(icon='map-pin') }} {{ project.primary_venue.title }}{%- if project.primary_venue.city %}, {{ project.primary_venue.city }}{%- endif %} {%- endif %}
{% endmacro %} @@ -506,7 +508,21 @@
- {%- if project.primary_venue -%} + {% if current_page != 'project' %} +
+
+ {% if project.start_at and project.calendar_weeks_full.weeks and project.calendar_weeks_full.weeks|length > 0 %} +
+
+ {{ calendarwidget(project.calendar_weeks_full, compact=false) }} +
+
+ {% endif %} + {{ registerblock(project) }} +
+
+ {% endif %} + {%- if project.primary_venue and current_page == 'project' -%} {{ primary_venue(project) }} {% endif %} {{ project_host_sponsor(project) }} From 0705cd23f9832b228afdb9cd511a59b1aba1b51e Mon Sep 17 00:00:00 2001 From: anishTP Date: Thu, 25 Apr 2024 18:21:27 +0530 Subject: [PATCH 03/28] Improve responsiveness of register block for project subpages and improve styling on calendar widget --- funnel/assets/sass/components/_card.scss | 12 ++++++++++++ funnel/assets/sass/pages/project.scss | 2 ++ funnel/templates/macros.html.jinja2 | 8 ++++---- funnel/templates/project_layout.html.jinja2 | 14 +++++++------- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/funnel/assets/sass/components/_card.scss b/funnel/assets/sass/components/_card.scss index 879bf8f80..f2f1ea61c 100644 --- a/funnel/assets/sass/components/_card.scss +++ b/funnel/assets/sass/components/_card.scss @@ -124,6 +124,7 @@ margin: 0; width: 100%; display: none; + font-weight: 600; justify-content: space-between; .calendar__month__counting { @@ -185,6 +186,10 @@ } } + .calendar__weekdays__dates__date--flex { + width: auto !important; + } + .calendar__weekdays__dates__date--today { .calendar__weekdays__dates__date__day { color: $mui-text-dark; @@ -220,6 +225,9 @@ z-index: 1; border: 1px solid $mui-primary-color-lighter; } + .calendar__weekdays__dates__date--flex:after { + margin: 0 -8px !important; + } .calendar__weekdays__dates__date--active:before { content: ''; border-left: 5px solid transparent; @@ -295,6 +303,10 @@ .calendar__weekdays__dates--latest { display: flex; } + + .calendar__weekdays__dates--justify { + justify-content: space-between; + } } } } diff --git a/funnel/assets/sass/pages/project.scss b/funnel/assets/sass/pages/project.scss index 74d047454..b6bc9a414 100644 --- a/funnel/assets/sass/pages/project.scss +++ b/funnel/assets/sass/pages/project.scss @@ -68,6 +68,7 @@ width: 100%; display: block; font-style: italic; + font-weight: 600; margin-bottom: $mui-grid-padding * 0.25; } .register-block__btn { @@ -365,6 +366,7 @@ .calendar__weekdays .calendar__weekdays__dates--latest { display: flex; margin-bottom: $mui-grid-padding * 0.5; + font-weight: 600; } .calendar__weekdays .calendar__weekdays__dates:last-child { diff --git a/funnel/templates/macros.html.jinja2 b/funnel/templates/macros.html.jinja2 index b72b55b91..3b970155e 100644 --- a/funnel/templates/macros.html.jinja2 +++ b/funnel/templates/macros.html.jinja2 @@ -25,7 +25,7 @@ {%- endmacro %} -{% macro calendarwidget(calendar, compact=true) %} +{% macro calendarwidget(calendar, compact=true, flex=false) %}