Skip to content

Some minor UI improvements #147

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

Merged
merged 1 commit into from
Mar 18, 2025
Merged

Some minor UI improvements #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions gitjobs-server/static/js/dashboard/jobseeker/education.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ export class EducationSection extends LitWrapper {
}

render() {
return html`<div class="text-xl lg:text-2xl font-medium text-gray-900">Education</div>
<div class="mt-2 text-sm/6 text-gray-500">
return html`
<div class="text-sm/6 text-gray-500">
Indicate your education. You can add additional entries by clicking on the
<span class="font-semibold">+</span> buttons on the left of the card (
<div class="inline-block svg-icon size-4 icon-plus_top bg-gray-600 relative -bottom-[2px]"></div>
Expand Down
36 changes: 23 additions & 13 deletions gitjobs-server/templates/dashboard/employer/jobs/preview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,15 @@

{# Right column #}
<div class="w-1/4 pt-6">
{# Apply url #}
{% if let Some(apply_url) = job.apply_url %}
<a href="{{ apply_url }}"
class="btn-primary-outline w-full block mt-4"
target="_blank"
rel="noopener noreferrer">Apply</a>
{% endif %}
{# End apply url #}

{# Published date #}
{% call job_details_subheading(content = "Published") %}
{% call job_details_content(text = job.published_at|display_some_datetime_or(DATE_FORMAT, "-")) %}
Expand Down Expand Up @@ -161,14 +170,14 @@
{% if let Some(salary) = job.salary %}
<div class="flex items-baseline font-medium text-gray-900 text-sm">
{% call currency(value = job.salary_currency) %}
{{ salary }}
{{ salary|humanize_number }}
</div>
{% else %}
-
{% endif %}
{% if let Some(salary_period) = job.salary_period %}
<div class="text-gray-900 text-xs ms-1">({{ salary_period }})</div>
{% endif %}
{%- if let Some(salary_period) = job.salary_period -%}
<div class="text-gray-900 text-xs ms-1">/ year</div>
{%- endif -%}
</div>
{# End fixed salary #}
{% when SalaryKind::Range %}
Expand All @@ -177,7 +186,7 @@
{% if let Some(salary_min) = job.salary_min %}
<div class="flex items-baseline font-medium text-gray-900 text-sm">
{% call currency(value = job.salary_currency) %}
{{ salary_min }}
{{ salary_min|humanize_number }}
</div>
{% else %}
-
Expand All @@ -186,14 +195,13 @@
{% if let Some(salary_max) = job.salary_max %}
<div class="flex items-baseline text-gray-900 text-sm">
<span class="mx-1">-</span>
{% call currency(value = job.salary_currency) %}
{{ salary_max }}
{{ salary_max|humanize_number }}
</div>
{% endif %}

{% if let Some(salary_period) = job.salary_period %}
<div class="text-gray-900 text-xs ms-1">({{ salary_period }})</div>
{% endif %}
{%- if let Some(salary_period) = job.salary_period -%}
<div class="text-gray-900 text-xs ms-1">/ year</div>
{%- endif -%}
</div>
{# End range salary #}
{% endmatch %}
Expand Down Expand Up @@ -225,8 +233,8 @@

{# Projects #}
{% if let Some(projects) = job.projects %}
{% call job_details_subheading(content = "CNCF projects you'd work on") %}
<div class="flex flex-col space-y-3">
{% call job_details_subheading(content = "Projects you'd like to work on") %}
<div class="flex flex-col space-y-3 mt-2">
{% for p in projects %}
<div class="border rounded-lg p-2 text-sm/5 bg-white w-full">
{% let label = &format!("CNCF {}", p.maturity) %}
Expand Down Expand Up @@ -282,7 +290,9 @@
{# Job details content #}
{% macro job_details_content(text, icon = "", extra_styles = "") %}
<div class="flex items-center text-xs">
{% if !icon.is_empty() %}<div class="svg-icon size-3 icon-{{ icon }} bg-gray-500 me-2"></div>{% endif %}
{% if !icon.is_empty() %}
<div class="svg-icon size-3 icon-{{ icon }} bg-gray-500 me-2 shrink-0"></div>
{% endif %}
<div class="truncate {{ extra_styles }}">{{ text }}</div>
</div>
{% endmacro job_details_content %}
Expand Down
1 change: 1 addition & 0 deletions gitjobs-server/templates/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<img src="/static/images/gitjobs.png"
height="33px"
width="162px"
class="ms-[2px]"
alt="GitJobs Logo">
</a>
</div>
Expand Down
31 changes: 19 additions & 12 deletions gitjobs-server/templates/jobboard/jobs/job.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="min-w-[56px]">
{% if let Some(logo_id) = job.employer.logo_id %}
{% let logo = &self::build_jobboard_image_url(logo_id, "small") %}
<img class="size-14 rounded-lg"
<img class="size-14"
height="56"
width="56"
src="{{ logo }}"
Expand Down Expand Up @@ -135,10 +135,17 @@
<div class="border-t md:border-0 mt-10 md:mt-0 md:border md:w-1/4 pt-6">
{# Apply url #}
{% if let Some(apply_url) = job.apply_url %}
<a href="{{ apply_url }}"
class="btn-primary-outline w-full block"
target="_blank"
rel="noopener noreferrer">Apply</a>
{% if logged_in %}
<a href="{{ apply_url }}"
class="btn-primary-outline w-full block mt-4"
target="_blank"
rel="noopener noreferrer">Apply</a>
{% else %}
<button type="button"
class="btn-primary-outline w-full cursor-not-allowed mt-4"
title="You need to be logged in to apply"
disabled>Apply</button>
{% endif %}
{% endif %}
{# End apply url #}

Expand Down Expand Up @@ -173,13 +180,13 @@
{% if let Some(salary) = job.salary %}
<div class="flex items-baseline font-medium text-gray-900 text-sm">
{% call macros_preview::currency(value = job.salary_currency) %}
{{ salary }}
{{ salary|humanize_number }}
</div>
{% else %}
-
{% endif %}
{% if let Some(salary_period) = job.salary_period %}
<div class="text-gray-900 text-xs ms-1">({{ salary_period }})</div>
<div class="text-gray-900 text-xs ms-1">/ year</div>
{% endif %}
</div>
{# End fixed salary #}
Expand All @@ -189,7 +196,7 @@
{% if let Some(salary_min) = job.salary_min %}
<div class="flex items-baseline font-medium text-gray-900 text-sm">
{% call macros_preview::currency(value = job.salary_currency) %}
{{ salary_min }}
{{ salary_min|humanize_number }}
</div>
{% else %}
-
Expand All @@ -199,12 +206,12 @@
<div class="flex items-baseline text-gray-900 text-sm">
<span class="mx-1">-</span>
{% call macros_preview::currency(value = job.salary_currency) %}
{{ salary_max }}
{{ salary_max|humanize_number }}
</div>
{% endif %}

{% if let Some(salary_period) = job.salary_period %}
<div class="text-gray-900 text-xs ms-1">({{ salary_period }})</div>
<div class="text-gray-900 text-xs ms-1">/ year</div>
{% endif %}
</div>
{# End range salary #}
Expand Down Expand Up @@ -237,8 +244,8 @@

{# Projects #}
{% if let Some(projects) = job.projects %}
{% call macros_preview::job_details_subheading(content = "CNCF projects you'd work on") %}
<div class="flex md:flex-col gap-3">
{% call macros_preview::job_details_subheading(content = "Projects you'd like to work on") %}
<div class="flex md:flex-col gap-3 mt-2">
{% for p in projects %}
<div class="border rounded-lg p-2 text-sm/5 bg-white md:w-full">
{% let label = &format!("CNCF {}", p.maturity) %}
Expand Down
6 changes: 6 additions & 0 deletions gitjobs-server/templates/jobboard/jobs/jobs_macros.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,12 @@
{# Projects #}
<div>
{% call filters_subtitle(text = "Projects you'd like to work on") %}
<div class="mt-2 relative">
<select name="date_range"
class="select-primary py-0.5 text-[0.8rem]/6 text-gray-500">
<option value="cncf" selected="">CNCF</option>
</select>
</div>
<searchable-filter name="projects" options="{{ filters_options.projects|json }}" form="{{ device }}-jobs-form" {%- if let Some(filters_projects) = filters.projects %}selected="{{ filters_projects|json }}"{%- endif -%}></searchable-filter>
</div>
{# End projects #}
Expand Down
14 changes: 5 additions & 9 deletions gitjobs-server/templates/jobboard/jobs/results_section.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@
hx-boost="true">
<div class="flex flex-1 flex-row items-stretch space-x-4 w-full">
{# Company logo #}
<div class="shrink-0 rounded-lg bg-white border">
<div class="shrink-0 bg-white">
{% if let Some(logo_id) = job.employer.logo_id %}
{% let logo = &self::build_jobboard_image_url(logo_id, "medium") %}
{% let logo_small = &self::build_jobboard_image_url(logo_id, "small") %}
<img class="size-12 flex rounded-lg"
<img class="size-12 flex"
height="48"
width="48"
srcset="{{ logo_small }}, {{ logo }} 2x"
src="{{ logo }}"
alt="{{ job.employer.company }} image">
{% else %}
<div class="rounded-lg size-12 bg-gray-200 p-1 flex">
<div class="size-12 bg-gray-200 p-1 flex">
<div class="svg-icon size-8 icon-company bg-gray-600 m-auto"></div>
</div>
{% endif %}
Expand Down Expand Up @@ -167,9 +167,7 @@
{% endif %}
<div class="capitalize">{{ salary|humanize_number }}</div>
{%- if let Some(salary_period) = job.salary_period -%}
{# djlint:off #}
<div class="text-[0.7rem] text-nowrap">/ {{ salary_period.replace("ly", "") -}}</div>
{# djlint:on #}
<div class="text-[0.7rem] text-nowrap">/ year</div>
{%- endif -%}
</div>
{# End salary #}
Expand All @@ -184,9 +182,7 @@
{%- if let Some(salary_max) = job.salary_max -%}-{{ salary_max|humanize_number }}{% endif %}
</div>
{%- if let Some(salary_period) = job.salary_period -%}
{# djlint:off #}
<div class="text-[0.7rem] text-nowrap">/ {{ salary_period.replace("ly", "") -}}</div>
{# djlint:on #}
<div class="text-[0.7rem] text-nowrap">/ year</div>
{%- endif -%}
</div>
{# End salary range #}
Expand Down
2 changes: 1 addition & 1 deletion gitjobs-server/templates/navigation_links.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{# Pagination -#}
<div id="pagination" class="flex items-end justify-center py-8">
<div id="pagination" class="flex items-end justify-center pt-12 pb-8">
<div hx-boost="true" class="inline-flex" role="group">
{# First button -#}
{% if let Some(first) = first %}
Expand Down
Loading