Skip to content

Commit

Permalink
splitting about page into macros
Browse files Browse the repository at this point in the history
  • Loading branch information
@mohamedeliwa
mohamedeliwa committed Dec 15, 2024
1 parent a4bd16b commit c3a3580
Show file tree
Hide file tree
Showing 5 changed files with 95 additions and 59 deletions.
102 changes: 43 additions & 59 deletions templates/about.html
View file
Original file line number Diff line number Diff line change
@@ -1,62 +1,46 @@
{% import "partials/experience_card.html" as experience_card %}
{% import "partials/education_card.html" as education_card %}
{% import "partials/skills_card.html" as skills_card %}
{% import "partials/activities_card.html" as activities_card %}
{% extends "base.html" %}

{% block main_content %}
<link href="{{ config.base_url }}about.css" rel="stylesheet" />
{{ post_macros::home_page(section=section) }}
<main>

<section class="experience_section">
<h2 class="title">Professional Experience</h2>
{%- for page in section.pages | filter(attribute="extra.type", value="Professional Experience") %}
<div class="experience_item">
<p class="header"><span class="company">{{page.extra.company}}</span> / <span class="role">{{page.extra.role}}</span></p>
<p class="sub_header">
<span class="time">{{page.extra.from}} - {{page.extra.to}},</span>
<span class="place">{{page.extra.place}}</span>
</p>
<span class="content">{{page.content | safe}}</span>
</div>
{% endfor -%}
</section>
<hr />
<section class="education_section">
<h2 class="title">Education</h2>
{%- for page in section.pages | filter(attribute="extra.type", value="Education") | reverse %}
<div class="education_item">
<p class="header"><span class="certificate">{{page.extra.certificate}}</span> / <span class="school">{{page.extra.school}}</span></p>
<p class="sub_header">
<span class="time">{{page.extra.from}} - {{page.extra.to}},</span>
<span class="place">{{page.extra.place}}</span>
</p>
<!-- <span class="content">{{page.content | safe}}</span> -->
</div>
{% endfor -%}
</section>
<hr />
<section class="skills_section">
<h2 class="title">Skills</h2>
{%- for page in section.pages | filter(attribute="extra.type", value="Skills") %}
<div class="skills_item">
<span class="content">{{page.content | safe}}</span>
</div>
{% endfor -%}
</section>
<hr />
<section class="activities_section">
<h2 class="title">Activities</h2>
{%- for page in section.pages | filter(attribute="extra.type", value="Activities") %}
<div class="activities_item">
<p class="header"><span class="org">{{page.extra.org}}</span> / <span class="role">{{page.extra.role}}</span></p>
<p class="sub_header">
<!-- <span class="time">{{page.extra.from}} - {{page.extra.to}},</span> -->
<span class="place">{{page.extra.place}}</span>
</p>
<span class="content">{{page.content | safe}}</span>
</div>
{% endfor -%}
</section>
<br />
<br />
<br />
</main>
{% endblock main_content %}
<link href="{{ config.base_url }}about.css" rel="stylesheet" />
{{ post_macros::home_page(section=section) }}
<main>
<section class="experience_section">
<h2 class="title">Professional Experience</h2>
{%- for page in section.pages | filter(attribute="extra.type",
value="Professional Experience") %}
{{ experience_card::render(card=page)}}
{% endfor -%}
</section>
<hr />
<section class="education_section">
<h2 class="title">Education</h2>
{%- for page in section.pages | filter(attribute="extra.type",
value="Education") | reverse %}
{{ education_card::render(card=page)}}
{% endfor -%}
</section>
<hr />
<section class="skills_section">
<h2 class="title">Skills</h2>
{%- for page in section.pages | filter(attribute="extra.type",
value="Skills") %}
{{ skills_card::render(card=page)}}
{% endfor -%}
</section>
<hr />
<section class="activities_section">
<h2 class="title">Activities</h2>
{%- for page in section.pages | filter(attribute="extra.type",
value="Activities") %}
{{ activities_card::render(card=page)}}
{% endfor -%}
</section>
<br />
<br />
<br />
</main>
{% endblock main_content %}
15 changes: 15 additions & 0 deletions templates/partials/activities_card.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{% macro render(card) %}

<div class="activities_item">
<p class="header">
<span class="org">{{card.extra.org}}</span> /
<span class="role">{{card.extra.role}}</span>
</p>
<p class="sub_header">
<!-- <span class="time">{{card.extra.from}} - {{card.extra.to}},</span> -->
<span class="place">{{card.extra.place}}</span>
</p>
<span class="content">{{card.content | safe}}</span>
</div>

{% endmacro render %}
15 changes: 15 additions & 0 deletions templates/partials/education_card.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{% macro render(card) %}

<div class="education_item">
<p class="header">
<span class="certificate">{{card.extra.certificate}}</span> /
<span class="school">{{card.extra.school}}</span>
</p>
<p class="sub_header">
<span class="time">{{card.extra.from}} - {{card.extra.to}},</span>
<span class="place">{{card.extra.place}}</span>
</p>
<!-- <span class="content">{{card.content | safe}}</span> -->
</div>

{% endmacro render %}
15 changes: 15 additions & 0 deletions templates/partials/experience_card.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{% macro render(card) %}

<div class="experience_item">
<p class="header">
<span class="company">{{card.extra.company}}</span> /
<span class="role">{{card.extra.role}}</span>
</p>
<p class="sub_header">
<span class="time">{{card.extra.from}} - {{card.extra.to}},</span>
<span class="place">{{card.extra.place}}</span>
</p>
<span class="content">{{card.content | safe}}</span>
</div>

{% endmacro render %}
7 changes: 7 additions & 0 deletions templates/partials/skills_card.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{% macro render(card) %}

<div class="skills_item">
<span class="content">{{card.content | safe}}</span>
</div>

{% endmacro render %}

0 comments on commit c3a3580

Please sign in to comment.