From 488c25b5bf1a4f213c1154c51a01d8f66aae3ba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Piku=C5=82a?= Date: Sun, 2 Jun 2024 15:09:40 +0200 Subject: [PATCH] Add generic home page section generation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change enables theme user to specify arbitrary order of sections, and add multiple sections of the same type (more generic approach than in #105, which is applicable only to experience blocks). - All sections are specified in config as a list, with order of items directly reflecting order on the main page (including navbar). - Type of a section is specified with a new `type` field. - If there are multiple sections of the same type, in order to distinguish them for navbar navigation, you need to specify unique `id` field. - Navbar and main page generation is more generic, allowing to add custom section types – the only requirement is a custom partial named after the section type. Styling can be provided in a custom CSS (enabled with `customCSS` site param). Signed-off-by: Marek Pikuła --- exampleSite/config.yaml | 527 +++++++++++--------- layouts/index.html | 27 +- layouts/partials/sections/about.html | 32 +- layouts/partials/sections/achievements.html | 8 +- layouts/partials/sections/contact.html | 34 +- layouts/partials/sections/education.html | 14 +- layouts/partials/sections/experience.html | 64 ++- layouts/partials/sections/header.html | 64 +-- layouts/partials/sections/hero/index.html | 40 +- layouts/partials/sections/hero/social.html | 4 +- layouts/partials/sections/projects.html | 10 +- layouts/projects/list.html | 4 +- static/css/index.css | 174 +++---- static/css/projects.css | 24 +- 14 files changed, 510 insertions(+), 516 deletions(-) diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml index abfb0e0f..40e10889 100644 --- a/exampleSite/config.yaml +++ b/exampleSite/config.yaml @@ -67,7 +67,7 @@ params: # This requires your images to be uploaded + hosted on Cloudinary # Uncomment and change YOUR_CLOUD_NAME to the Cloud Name in your Cloudinary console # cloudinary_cloud_name: "YOUR_CLOUD_NAME" - + # Whether to add mathjax support on all pages. Alternatively, you can opt-in per page by adding `mathjax: true` in the frontmatter. mathjax: false @@ -112,253 +112,296 @@ params: stickyNavBar: enable : true showOnScrollUp : true - menus: - disableAbout: false - disableExperience: false - disableEducation: false - disableProjects: false - disableAchievements: false - disableContact: false - - # Hero - hero: - enable: true - intro: "Hi, my name is" - title: "Isabella." - subtitle: "I build things for the web" - content: "A passionate web app developer. I tend to make use of modern web technologies to build websites that looks great, feels fantastic, and functions correctly." - image: /images/hero.svg - bottomImage: + + sections: + # Hero + - type: hero + enable: true + intro: "Hi, my name is" + title: "Isabella." + subtitle: "I build things for the web" + content: | + A passionate web app developer. I tend to make use of modern web + technologies to build websites that looks great, feels fantastic, and + functions correctly. + image: /images/hero.svg + bottomImage: + enable: true + # roundImage: true # Make hero image circular | default false + button: + enable: true + name: "Resume" + url: "#" + download: true + newPage: false + socialLinks: + fontAwesomeIcons: + - icon: fab fa-github + url: https://example.com + - icon: fab fa-x-twitter + url: https://example.com + customIcons: + - icon: /fav.png + url: "https://example.com" + + # About + - type: about + enable: true + showInNavbar: true + title: "About Me" + # id: about-me # Custom ID (used for navbar) + image: "/images/me.png" + content: | + I am a software developer with a passion for web development. I have a + background in computer science and mathematics, and I have a strong + interest in the intersection of technology and art. I am currently + working as a software developer at [example org.](https://example.com) + in San Francisco, CA. + + I am currently working on a project that will be used to help people + find the best way to get around the city. + skills: + enable: true + title: "Here are a few technologies I've been working with recently:" + items: + - "HTML" + - "CSS" + - "JavaScript" + - "React" + - "Node" + - "Express" + + # Experience + - type: experience + enable: true + showInNavbar: true + # title: "Custom Name" + items: + - job: "Senior Software Developer" + company: "Facebook" + companyUrl: "https://example.com" + date: "Jan 2022 - present" + featuredLink: + enable: true + name: "View the project" + url: "https://example.com" + content: | + I am currently working as a software developer at [example + org.](https://example.com) in San Francisco, CA. I am currently + working on a project that will be used to help people find the best + way to get around the city." + + - job: "Software Developer" + company: "Amazon" + companyUrl: "https://example.com" + date: "Sep 2020 - Dec 2021" + featuredLink: + enable: true + url: "https://example.com" + info: + enable: true + content: | + I worked as a software developer for more than one year in Amazon. + content: | + I am currently working as a software developer at [example + org.](https://example.com) in San Francisco, CA. I am currently + working on a project that will be used to help people find the best + way to get around the city. + + - Lead backend developer for a product. + - Created a frontend design for a product. + + - job: "Junior Software Developer" + company: "Apple" + companyUrl: "https://example.com" + date: "Jan 2020 - Aug 2020" + info: + enable: false + featuredLink: + enable: true + url: "https://example.com" + content: | + I am currently working as a software developer at [example + org.](https://example.com) in San Francisco, CA. I am currently + working on a project that will be used to help people find the best + way to get around the city. + + - Lead backend developer for a product. + - Created a frontend design for a product. + + - job: "UI/UX Designer" + company: "Netflix" + companyUrl: "https://example.com" + date: "June 2017 - Nov 2019" + featuredLink: + enable: true + url: "https://example.com" + content: | + I am currently working as a software developer at [example + org.](https://example.com) in San Francisco, CA. I am currently + working on a project that will be used to help people find the best + way to get around the city. + + - Lead backend developer for a product. + - Created a frontend design for a product. + + - job: "Product Designer" + company: "Google" + companyUrl: "https://example.com" + date: "Feb 2016 - Mar 2017" + content: | + I am currently working as a software developer at [example + org.](https://example.com) in San Francisco, CA. I am currently + working on a project that will be used to help people find the best + way to get around the city. + + # Education + - type: education enable: true - # roundImage: true # Make hero image circular | default false - button: + showInNavbar: true + # title: "Custom Name" + index: false + items: + - title: "Master of Business Administration" + school: + name: "University of California, Berkeley" + url: "https://example.org" + date: "2013 - 2015" + GPA: "3.8 out of 5.0" + content: |- + Extracurricular Activities: + + - Lorem ipsum dolor sit amet consectetur adipisicing elit. + - Tempora esse, eaque delectus nulla quo doloribus itaque expedita + alias natus optio totam maxime nihil excepturi velit a animi + laborum hic similique. + - title: "Bachelor of Science in Computer Science" + school: + name: "Massachusetts Institute of Technology" + url: "https://example.org" + date: "2009 - 2013" + GPA: "3.9 out of 5.0" + content: |- + I Publiced two papers in the ACM SIGCHI Conference on Artificial + Intelligence: + + - [Fast and Accurate Object Detection with a Single Convolutional + Neural Network](https://example.com) + - Face mask detection using a single convolutional neural network. + + Extracurricular Activities: + + - Lorem ipsum dolor sit amet consectetur adipisicing elit. + - Tempora esse, eaque delectus nulla quo doloribus itaque expedita + alias natus optio totam maxime nihil excepturi velit a animi + laborum hic similique. + featuredLink: + enable: true + name: "My academic record" + url: "https://example.com" + - title: "High School" + school: + name: "Thomas Jefferson High School for Science and Technology." + url: "https://example.org" + GPA: "4.2 out of 5.0" + featuredLink: + enable: true + url: "https://example.com" + + # Achievements + - type: achievements enable: true - name: "Resume" - url: "#" - download: true - newPage: false - socialLinks: - fontAwesomeIcons: - - icon: fab fa-github + showInNavbar: true + # title: "Custom Name" + items: + - title: Google kickstart runner + content: I solved all problems with optimal solution. url: https://example.com - - icon: fab fa-x-twitter + image: /images/achievment.jpg + - title: Facebook Hackathon Winner + content: Developed a product using Artificial Intelligence. + image: /images/achievment.jpg + - title: Hugo Profile + content: Developed a theme and getting 1K+ downloads per month. + url: "https://github.com/gurusabarish/hugo-profile" + image: /images/achievment.jpg + - title: Microsoft Imagine Runner + content: We are developed a product which can help others. + - title: Google Summer of Code + content: Contributed to a open source project. url: https://example.com - customIcons: - - icon: /fav.png - url: "https://example.com" - - # About - about: - enable: true - title: "About Me" - image: "/images/me.png" - content: |- - I am a software developer with a passion for web development. I have a background in computer science and mathematics, and I have a strong interest in the intersection of technology and art. I am currently working as a software developer at [example org.](https://example.com) in San Francisco, CA. - - I am currently working on a project that will be used to help people find the best way to get around the city. - skills: + + # Projects + - type: projects enable: true - title: "Here are a few technologies I've been working with recently:" + showInNavbar: true + # title: "Custom Name" items: - - "HTML" - - "CSS" - - "JavaScript" - - "React" - - "Node" - - "Express" - - # Experience - experience: - enable: true - # title: "Custom Name" - items: - - job: "Senior Software Developer" - company: "Facebook" - companyUrl: "https://example.com" - date: "Jan 2022 - present" - featuredLink: - enable: true - name: "View the project" - url: "https://example.com" - content: "I am currently working as a software developer at [example org.](https://example.com) in San Francisco, CA. I am currently working on a project that will be used to help people find the best way to get around the city." - - - job: "Software Developer" - company: "Amazon" - companyUrl: "https://example.com" - date: "Sep 2020 - Dec 2021" - featuredLink: - enable: true - url: "https://example.com" - info: - enable: true - content: I worked as a software developer for more than one year in Amazon. - content: | - I am currently working as a software developer at [example org.](https://example.com) in San Francisco, CA. I am currently working on a project that will be used to help people find the best way to get around the city. - - - Lead backend developer for a product. - - Created a frontend design for a product. - - - job: "Junior Software Developer" - company: "Apple" - companyUrl: "https://example.com" - date: "Jan 2020 - Aug 2020" - info: - enable: false - featuredLink: - enable: true - url: "https://example.com" - content: | - I am currently working as a software developer at [example org.](https://example.com) in San Francisco, CA. I am currently working on a project that will be used to help people find the best way to get around the city. - - - Lead backend developer for a product. - - Created a frontend design for a product. - - - job: "UI/UX Designer" - company: "Netflix" - companyUrl: "https://example.com" - date: "June 2017 - Nov 2019" - featuredLink: - enable: true - url: "https://example.com" - content: | - I am currently working as a software developer at [example org.](https://example.com) in San Francisco, CA. I am currently working on a project that will be used to help people find the best way to get around the city. - - - Lead backend developer for a product. - - Created a frontend design for a product. - - - job: "Product Designer" - company: "Google" - companyUrl: "https://example.com" - date: "Feb 2016 - Mar 2017" - content: "I am currently working as a software developer at [example org.](https://example.com) in San Francisco, CA. I am currently working on a project that will be used to help people find the best way to get around the city." - - # Education - education: - enable: true - # title: "Custom Name" - index: false - items: - - title: "Master of Business Administration" - school: - name: "University of California, Berkeley" - url: "https://example.org" - date: "2013 - 2015" - GPA: "3.8 out of 5.0" - content: |- - Extracurricular Activities - - Lorem ipsum dolor sit amet consectetur adipisicing elit. - - Tempora esse, eaque delectus nulla quo doloribus itaque expedita alias natus optio totam maxime nihil excepturi velit a animi laborum hic similique. - - title: "Bachelor of Science in Computer Science" - school: - name: "Massachusetts Institute of Technology" - url: "https://example.org" - date: "2009 - 2013" - GPA: "3.9 out of 5.0" - content: |- - I Publiced two papers in the ACM SIGCHI Conference on Artificial Intelligence. - - [Fast and Accurate Object Detection with a Single Convolutional Neural Network](https://example.com) - - Face mask detection using a single convolutional neural network. - - Extracurricular Activities - - Lorem ipsum dolor sit amet consectetur adipisicing elit. - - Tempora esse, eaque delectus nulla quo doloribus itaque expedita alias natus optio totam maxime nihil excepturi velit a animi laborum hic similique. - featuredLink: - enable: true - name: "My academic record" - url: "https://example.com" - - title: "High School" - school: - name: "Thomas Jefferson High School for Science and Technology." - url: "https://example.org" - GPA: "4.2 out of 5.0" - featuredLink: - enable: true - url: "https://example.com" - - # Achievements - achievements: - enable: true - # title: "Custom Name" - items: - - title: Google kickstart runner - content: I solved all problems with optimal solution. - url: https://example.com - image: /images/achievment.jpg - - title: Facebook Hackathon Winner - content: Developed a product using Artificial Intelligence. - image: /images/achievment.jpg - - title: Hugo Profile - content: Developed a theme and getting 1K+ downloads per month. - url: "https://github.com/gurusabarish/hugo-profile" - image: /images/achievment.jpg - - title: Microsoft Imagine Runner - content: We are developed a product which can help others. - - title: Google Summer of Code - content: Contributed to a open source project. - url: https://example.com - - # projects - projects: - enable: true - # title: "Custom Name" - items: - - title: Hugo Profile - content: A highly customizable and mobile first Hugo template for personal portfolio and blog. - image: /images/projects/profile.png - featured: - name: Demo - link: https://hugo-profile.netlify.app - badges: - - "Hugo" - - "Bootstrap" - - "Javascript" - links: - - icon: fa fa-envelope - url: mailto:?subject=Hugo%20Profile%20Template&body=Check%20it%20out:%20https%3a%2f%2fhugo-profile.netlify.app%2fblog%2fmarkdown-syntax%2f - - icon: fab fa-github - url: https://github.com/gurusabarish/hugo-profile - - icon: fab fa-twitter - url: https://twitter.com/intent/tweet?text=Check+it+out:&url=https%3A%2F%2Fgithub.com%2Fgurusabarish%2Fhugo-profile - - - title: Image Converter - content: A web app to convert image to pdf, png to jpg, png to jpg and png to webp without database using django. - image: /images/projects/converter.jpg - featured: - name: Demo - link: https://django-converter.herokuapp.com - badges: - - "Django" - - "Bootstrap" - links: - - icon: fab fa-github - url: https://github.com/gurusabarish/converter - - - title: Hugo Profile V2 - content: A clean and simple Hugo template for personal portfolio and blog. - image: /images/projects/profile2.jpg - featured: - name: Demo V2 - link: https://hugo-profile-2.netlify.app - badges: - - "Hugo" - - "Bootstrap" - - "Javascript" - links: - - icon: fab fa-github - url: https://github.com/gurusabarish/HugoProfileV2 - - #Contact - contact: - enable: true - # title: "Custom Name" - content: My inbox is always open. Whether you have a question or just want to say hi, I’ll try my best to get back to you! - btnName: Mail me - btnLink: mailto:gurusabarisha@gmail.com - # formspree: - # enable: true # `contact.email` value will be ignored - # formId: abcdefgh # Take it from your form's endpoint, like 'https://formspree.io/f/abcdefgh' - # emailCaption: "Enter your email address" - # messageCaption: "Enter your message here" + - title: Hugo Profile + content: | + A highly customizable and mobile first Hugo template for personal + portfolio and blog. + image: /images/projects/profile.png + featured: + name: Demo + link: https://hugo-profile.netlify.app + badges: + - "Hugo" + - "Bootstrap" + - "Javascript" + links: + - icon: fa fa-envelope + url: mailto:?subject=Hugo%20Profile%20Template&body=Check%20it%20out:%20https%3a%2f%2fhugo-profile.netlify.app%2fblog%2fmarkdown-syntax%2f + - icon: fab fa-github + url: https://github.com/gurusabarish/hugo-profile + - icon: fab fa-twitter + url: https://twitter.com/intent/tweet?text=Check+it+out:&url=https%3A%2F%2Fgithub.com%2Fgurusabarish%2Fhugo-profile + + - title: Image Converter + content: | + A web app to convert image to pdf, png to jpg, png to jpg and png to + webp without database using django. + image: /images/projects/converter.jpg + featured: + name: Demo + link: https://django-converter.herokuapp.com + badges: + - "Django" + - "Bootstrap" + links: + - icon: fab fa-github + url: https://github.com/gurusabarish/converter + + - title: Hugo Profile V2 + content: | + A clean and simple Hugo template for personal portfolio and blog. + image: /images/projects/profile2.jpg + featured: + name: Demo V2 + link: https://hugo-profile-2.netlify.app + badges: + - "Hugo" + - "Bootstrap" + - "Javascript" + links: + - icon: fab fa-github + url: https://github.com/gurusabarish/HugoProfileV2 + + # Contact + - type: contact + enable: true + showInNavbar: true + # title: "Custom Name" + content: | + My inbox is always open. Whether you have a question or just want to say + hi, I’ll try my best to get back to you! + btnName: Mail me + btnLink: mailto:gurusabarisha@gmail.com + # formspree: + # enable: true # `contact.email` value will be ignored + # formId: abcdefgh # Take it from your form's endpoint, like 'https://formspree.io/f/abcdefgh' + # emailCaption: "Enter your email address" + # messageCaption: "Enter your message here" footer: recentPosts: diff --git a/layouts/index.html b/layouts/index.html index c0fecbeb..f8286c7c 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -12,11 +12,22 @@ {{ end }} {{ define "main" }} -{{- partial "sections/hero/index.html" . -}} -{{- partial "sections/about.html" . -}} -{{- partial "sections/experience.html" . -}} -{{- partial "sections/education.html" . -}} -{{- partial "sections/projects.html" . -}} -{{- partial "sections/achievements.html" . -}} -{{- partial "sections/contact.html" . -}} -{{ end }} \ No newline at end of file + {{ range $index, $element := (where .Site.Params.sections "enable" true) }} + {{ if not .type }} + {{ errorf "Type property needs to be set for section with index %d." $index }} + {{ else }} + {{ with $element }} + {{ $partialPathIndex := printf "sections/%s/index.html" .type }} + {{ $partialPathStandalone := printf "sections/%s.html" .type }} + + {{ if templates.Exists (printf "partials/%s" $partialPathIndex) }} + {{- partial $partialPathIndex . -}} + {{ else if templates.Exists (printf "partials/%s" $partialPathStandalone) }} + {{- partial $partialPathStandalone . -}} + {{ else }} + {{ errorf "Cannot find partial for section type: %s" .type }} + {{ end }} + {{ end }} + {{ end }} + {{ end }} +{{ end }} diff --git a/layouts/partials/sections/about.html b/layouts/partials/sections/about.html index 58df5510..f25ffafd 100644 --- a/layouts/partials/sections/about.html +++ b/layouts/partials/sections/about.html @@ -1,28 +1,26 @@ -{{ if .Site.Params.about.enable | default false }} -
+
-

{{ .Site.Params.about.title }}

+

{{ .title | default (strings.FirstUpper .type) }}

- {{ if .Site.Params.about.image }} -
-
- + {{ if .image }} +
+
+ +
-
{{ end }}
- {{ .Site.Params.about.content | markdownify }} + {{ .content | markdownify }} - {{ if .Site.Params.about.skills.enable }} - {{ .Site.Params.about.skills.title }} -
    - {{ range .Site.Params.about.skills.items }} -
  • {{ . | markdownify }}
    • - {{ end }} -
+ {{ if .skills.enable }} + {{ .skills.title }} +
    + {{ range .skills.items }} +
  • {{ . | markdownify }}
    • + {{ end }} +
{{ end }}
-{{ end }} \ No newline at end of file diff --git a/layouts/partials/sections/achievements.html b/layouts/partials/sections/achievements.html index 6f680dd9..105668ba 100644 --- a/layouts/partials/sections/achievements.html +++ b/layouts/partials/sections/achievements.html @@ -1,10 +1,9 @@ -{{ if .Site.Params.achievements.enable | default false }} -
+
-

{{ .Site.Params.achievements.title | default "Achievements" }}

+

{{ .title | default (strings.FirstUpper .type) }}

- {{ range .Site.Params.achievements.items }} + {{ range .items }} {{ if .url }}
@@ -43,4 +42,3 @@
{{ .title }}
-{{ end }} \ No newline at end of file diff --git a/layouts/partials/sections/contact.html b/layouts/partials/sections/contact.html index 195da377..da325919 100644 --- a/layouts/partials/sections/contact.html +++ b/layouts/partials/sections/contact.html @@ -1,39 +1,38 @@ -{{ if .Site.Params.contact.enable | default false }} -
+
-

{{ .Site.Params.contact.title | default "Get in Touch" }}

+

{{ .title | default (strings.FirstUpper .type) }}

- {{ .Site.Params.contact.content | emojify | markdownify }} + {{ .content | emojify | markdownify }}
- {{ if .Site.Params.contact.formspree.enable | default false }} + {{ if .formspree.enable | default false }}
-
+
- +
- +
- +
- {{ else if or (.Site.Params.contact.email) (.Site.Params.contact.btnLink) }} + {{ else if or .email .btnLink }}
- - {{ .Site.Params.contact.btnName | default "Get in Touch" }} + {{ .btnName | default "Get in Touch" }}
{{ end }} @@ -43,7 +42,6 @@

{{ .Site.Params.contact.title | default "Get in Touch" }

-{{ end }} diff --git a/layouts/partials/sections/education.html b/layouts/partials/sections/education.html index 3141b1ee..3e5f36a8 100644 --- a/layouts/partials/sections/education.html +++ b/layouts/partials/sections/education.html @@ -1,10 +1,9 @@ -{{ if .Site.Params.education.enable | default false }} -
+
-

{{ .Site.Params.education.title | default "Education" }}

+

{{ .title | default (strings.FirstUpper .type) }}

- {{ $indexMenu := .Site.Params.education.index }} - {{ range $index, $element := .Site.Params.education.items }} + {{ $indexMenu := .index }} + {{ range $index, $element := .items }}
{{ if $indexMenu }} @@ -24,7 +23,7 @@

{{ .Site.Params.education.title | default "Education" }} {{ .date }}

{{ .title }}
- + {{ if .school.url }}
@@ -40,7 +39,7 @@
GPA: {{ .GPA }} - +
{{ end }}
@@ -63,4 +62,3 @@
-{{ end }} diff --git a/layouts/partials/sections/experience.html b/layouts/partials/sections/experience.html index f9c2d13d..5e3de60f 100644 --- a/layouts/partials/sections/experience.html +++ b/layouts/partials/sections/experience.html @@ -1,35 +1,34 @@ -{{ if .Site.Params.experience.enable | default false }} -
+
-

{{ .Site.Params.experience.title | default "Experience" }}

+

{{ .title | default (strings.FirstUpper .type) }}

- {{ range $index, $element := .Site.Params.experience.items }} + {{ range $index, $element := .items }} {{ if (eq $index 0) }} - {{ else }} -
{{ .Site.Params.experience.title | default "Experience" {{ .job }} - {{ .company }} - +
{{ .date }} {{ if .info.enable | default true }} - + > {{ end }}
- + {{ if .featuredLink.enable | default false }}
- {{ .featuredLink.name | default "Featured Link" }} + {{ .featuredLink.name | default "Featured Link" }}
{{ end }} @@ -127,4 +126,3 @@

{{ .Site.Params.experience.title | default "Experience"

-{{ end }} diff --git a/layouts/partials/sections/header.html b/layouts/partials/sections/header.html index 72e73b33..219c0e49 100644 --- a/layouts/partials/sections/header.html +++ b/layouts/partials/sections/header.html @@ -40,7 +40,7 @@ if(resetHeaderStyle) { profileHeaderElem.classList.remove("showHeaderOnTop"); } - prevScrollPos = currentScrollPos; + prevScrollPos = currentScrollPos; }); {{ end }} @@ -86,57 +86,17 @@ {{ end }} - {{ if and (.Site.Params.about.enable | default false) (not (.Site.Params.navbar.menus.disableAbout | default false)) }} -
  • - - {{ .Site.Params.about.title | default "About" }} - -
    • - {{ end }} - - {{ if and (.Site.Params.experience.enable | default false) (not (.Site.Params.navbar.menus.disableExperience | default false)) }} -
  • - - {{ .Site.Params.experience.title | default "Experience" }} - -
    • - {{ end }} - - {{ if and (.Site.Params.education.enable | default false) (not (.Site.Params.navbar.menus.disableEducation | default false)) }} -
  • - - {{ .Site.Params.education.title | default "Education" }} - -
    • - {{ end }} - - {{ if and (.Site.Params.projects.enable | default false) (not (.Site.Params.navbar.menus.disableProjects | default false)) }} -
  • - - {{ .Site.Params.projects.title | default "Projects" }} - -
    • - {{ end }} - - {{ if and (.Site.Params.achievements.enable | default false) (not (.Site.Params.navbar.menus.disableAchievements | default false)) }} -
  • - - {{ .Site.Params.achievements.title | default "Achievements" }} - -
    • - {{ end }} - - {{ if and (.Site.Params.contact.enable | default false) (not (.Site.Params.navbar.menus.disableContact | default false)) }} -
  • - - {{ .Site.Params.contact.title | default "Contact" }} - -
    • + {{ range (where (where .Site.Params.sections "enable" true) "showInNavbar" true) }} + {{ if and (.type) (not (eq .type "hero")) }} + {{ $id := (.id | default .type) }} + {{ $title := (.title | default (strings.FirstUpper .type)) }} + +
  • + + {{ $title }} + +
    • + {{ end }} {{ end }} diff --git a/layouts/partials/sections/hero/index.html b/layouts/partials/sections/hero/index.html index cf580e6c..1e3208a4 100644 --- a/layouts/partials/sections/hero/index.html +++ b/layouts/partials/sections/hero/index.html @@ -1,28 +1,20 @@ -{{ if .Site.Params.hero.enable | default false }} -
    +{{ if .enable | default false }} +
    - - {{ .Site.Params.hero.intro }} - -

    - {{ .Site.Params.hero.title }} -

    -

    - {{ .Site.Params.hero.subtitle }} -

    -

    - {{ .Site.Params.hero.content | markdownify }} -

    + {{ .intro }} +

    {{ .title }}

    +

    {{ .subtitle }}

    +

    {{ .content | markdownify }}

    - {{ if .Site.Params.hero.button.enable }} - - {{ .Site.Params.hero.button.name }} + {{ if .button.enable }} + + {{ .button.name }} {{ end }}
    @@ -34,8 +26,8 @@

    -
    @@ -43,7 +35,7 @@

    - {{ if .Site.Params.hero.bottomImage.enable | default true }} + {{ if .bottomImage.enable | default true }}
    @@ -308,4 +300,4 @@

    {{ end }}
    -{{ end }} \ No newline at end of file +{{ end }} diff --git a/layouts/partials/sections/hero/social.html b/layouts/partials/sections/hero/social.html index 04761f8c..1623b0cc 100644 --- a/layouts/partials/sections/hero/social.html +++ b/layouts/partials/sections/hero/social.html @@ -1,5 +1,5 @@ - {{ range .Site.Params.hero.socialLinks.fontAwesomeIcons }} + {{ range .socialLinks.fontAwesomeIcons }}