From 46b21e028c0a183ac1a7db40a9cd6479e7eafc22 Mon Sep 17 00:00:00 2001 From: Hugo MARTIN Date: Sat, 3 Oct 2020 05:59:28 +0200 Subject: [PATCH] Translations and i18n (#60) * Managing i18n * Fix absolute path * Config files * Home link manage langage * Fixing footer i18n * Implemented i18n on newsletter * Implemented two languages in example * Removed old section directory * Using yaml in data to organize home summary * Fully working for old versions without i18n * Integrating language menu CSS * Fix language dropdown CSS * Refactor translation codes * Remove duplicate code * Fix URL issues * Move customMenus and other site related config into data section * Fix error during language toggle * Only show the available translation for the posts * Handle navbar brand URL properly * Fix responsiveness Co-authored-by: Hugo MARTIN Co-authored-by: hossainemruz --- exampleSite/config.yaml | 50 +++++------- exampleSite/data/bn/author.yaml | 16 ++++ exampleSite/data/bn/sections/about.yaml | 77 +++++++++++++++++++ .../data/bn/sections/achievements.yaml | 24 ++++++ exampleSite/data/bn/sections/experiences.yaml | 64 +++++++++++++++ exampleSite/data/bn/sections/projects.yaml | 64 +++++++++++++++ .../data/bn/sections/recent-posts.yaml | 11 +++ exampleSite/data/bn/sections/skills.yaml | 49 ++++++++++++ exampleSite/data/bn/site.yaml | 11 +++ exampleSite/data/en/author.yaml | 18 +++++ exampleSite/data/{ => en}/sections/about.yaml | 1 + .../data/{ => en}/sections/achievements.yaml | 0 .../data/{ => en}/sections/experiences.yaml | 0 .../data/{ => en}/sections/projects.yaml | 0 .../data/{ => en}/sections/recent-posts.yaml | 0 .../data/{ => en}/sections/skills.yaml | 0 exampleSite/data/en/site.yaml | 11 +++ exampleSite/data/fr/author.yaml | 19 +++++ exampleSite/data/fr/sections/about.yaml | 77 +++++++++++++++++++ .../data/fr/sections/achievements.yaml | 24 ++++++ exampleSite/data/fr/sections/experiences.yaml | 64 +++++++++++++++ exampleSite/data/fr/sections/projects.yaml | 64 +++++++++++++++ .../data/fr/sections/recent-posts.yaml | 11 +++ exampleSite/data/fr/sections/skills.yaml | 49 ++++++++++++ exampleSite/data/fr/site.yaml | 11 +++ i18n/bn.toml | 30 ++++++++ i18n/en.toml | 30 ++++++++ i18n/fr.toml | 30 ++++++++ layouts/_default/list.html | 7 +- layouts/_default/single.html | 5 +- layouts/index.html | 9 ++- layouts/partials/cards/post.html | 4 +- layouts/partials/cards/project.html | 2 +- layouts/partials/cards/skill.html | 2 +- layouts/partials/footer.html | 42 +++++++--- layouts/partials/header.html | 2 +- layouts/partials/helpers/country-code.html | 13 ++++ .../navigators/floating-lang-selector.html | 19 +++++ .../partials/navigators/lang-selector-2.html | 19 +++++ .../partials/navigators/lang-selector.html | 14 ++++ layouts/partials/navigators/navbar-2.html | 30 ++++---- layouts/partials/navigators/navbar.html | 43 +++++++---- layouts/partials/navigators/sidebar.html | 4 +- layouts/partials/scripts.html | 1 + layouts/partials/sections/about.html | 4 +- .../partials/sections/achievements/entry.html | 2 +- layouts/partials/sections/home.html | 47 +++++++---- package-lock.json | 70 ++++++++--------- package.json | 2 +- static/assets/css/layouts/list.css | 7 ++ static/assets/css/layouts/main.css | 10 ++- static/assets/css/layouts/single.css | 3 + static/assets/css/navigators/navbar.css | 58 ++++++++++---- static/assets/css/sections/home.css | 3 +- static/assets/js/main.js | 74 +++++++++--------- static/assets/js/popper.min.js | 5 ++ 56 files changed, 1116 insertions(+), 190 deletions(-) create mode 100644 exampleSite/data/bn/author.yaml create mode 100644 exampleSite/data/bn/sections/about.yaml create mode 100644 exampleSite/data/bn/sections/achievements.yaml create mode 100644 exampleSite/data/bn/sections/experiences.yaml create mode 100644 exampleSite/data/bn/sections/projects.yaml create mode 100644 exampleSite/data/bn/sections/recent-posts.yaml create mode 100644 exampleSite/data/bn/sections/skills.yaml create mode 100644 exampleSite/data/bn/site.yaml create mode 100644 exampleSite/data/en/author.yaml rename exampleSite/data/{ => en}/sections/about.yaml (98%) rename exampleSite/data/{ => en}/sections/achievements.yaml (100%) rename exampleSite/data/{ => en}/sections/experiences.yaml (100%) rename exampleSite/data/{ => en}/sections/projects.yaml (100%) rename exampleSite/data/{ => en}/sections/recent-posts.yaml (100%) rename exampleSite/data/{ => en}/sections/skills.yaml (100%) create mode 100644 exampleSite/data/en/site.yaml create mode 100644 exampleSite/data/fr/author.yaml create mode 100644 exampleSite/data/fr/sections/about.yaml create mode 100644 exampleSite/data/fr/sections/achievements.yaml create mode 100644 exampleSite/data/fr/sections/experiences.yaml create mode 100644 exampleSite/data/fr/sections/projects.yaml create mode 100644 exampleSite/data/fr/sections/recent-posts.yaml create mode 100644 exampleSite/data/fr/sections/skills.yaml create mode 100644 exampleSite/data/fr/site.yaml create mode 100644 i18n/bn.toml create mode 100644 i18n/en.toml create mode 100644 i18n/fr.toml create mode 100644 layouts/partials/helpers/country-code.html create mode 100644 layouts/partials/navigators/floating-lang-selector.html create mode 100644 layouts/partials/navigators/lang-selector-2.html create mode 100644 layouts/partials/navigators/lang-selector.html create mode 100644 static/assets/js/popper.min.js diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml index a268aed2a..784f6b7ef 100644 --- a/exampleSite/config.yaml +++ b/exampleSite/config.yaml @@ -3,6 +3,21 @@ languageCode: en-us title: "Toha" theme: "toha" +# Manage languages +# For any more details, you can check the official documentation: https://gohugo.io/content-management/multilingual/ +languages: + en: + languageName: English + weight: 1 + fr: + languageName: Français + weight: 2 + bn: + languageName: বাংলা + weight: 3 +# Force a locale to be use, really useful to develop the application ! Should be commented in production, the "weight" should rocks. +#DefaultContentLanguage: fr + # Allow raw html in markdown file markup: goldmark: @@ -24,12 +39,6 @@ enableEmoji: true # Custom parameters params: - # Copyright Notice - copyright: © 2020 Copyright. - - # Meta description for your site. This will help the search engines to find your site. - description: Portfolio and personal blog of Jane Doe. - # background image of the landing page background: "images/background.jpg" @@ -37,9 +46,9 @@ params: # transparent navbar and the main logo will be used in the non-transparent navbar. # It will be default to the theme logos if not provided. logo: - main: /assets/images/main-logo.png - inverted: /assets/images/inverted-logo.png - favicon: /assets/images/favicon.png + main: assets/images/main-logo.png + inverted: assets/images/inverted-logo.png + favicon: assets/images/favicon.png # GitHub repo URL of your site gitRepo: https://github.com/hossainemruz/toha-example-site @@ -50,30 +59,7 @@ params: # specify whether you want to show Table of Contents in reading page enableTOC: true - # specify the list of custom menus that you want to show in the top navbar. - # they will be separated by a divider from the main menus. - customMenus: - - name: Notes - url: https://hossainnotes.netlify.app/docs/example/ - # Provide newsletter configuration. This feature hasn't been implemented yet. # Currently, you can just hide it from the footer. newsletter: enable: true - - # some information about you - author: - name: "Jane Doe" - nickname: "Jane" - image: "images/avatar.png" - # greeting message before your name. it will default to "Hi! I am" if not provided - greeting: "Hi, I am" - # give your some contact information. they will be used in the footer - contactInfo: - email: "janedoe@example.com" - phone: "+0123456789" - # a summary of what you do - summary: - - I am a Developer - - I work with Go - - I love to work with some fun projects diff --git a/exampleSite/data/bn/author.yaml b/exampleSite/data/bn/author.yaml new file mode 100644 index 000000000..815fc21e9 --- /dev/null +++ b/exampleSite/data/bn/author.yaml @@ -0,0 +1,16 @@ +# some information about you +name: "জেইন ডো" +nickname: "জেইন" +# greeting message before your name. it will default to "Hi! I am" if not provided +greeting: "হ্যালো, আমি হলাম" +image: "images/avatar.png" +# give your some contact information. they will be used in the footer +contactInfo: + email: "janedoe@example.com" + phone: "+0123456789" + +# some summary about what you do +summary: + - আমি একজন ডেভেলপার + - আমি ওপেন সোর্স প্রোজেক্ট এ কাজ করতে পছন্দ করি + - আমি মজার কিছু প্রোজেক্ট এ কাজ করতে ভালবাসি diff --git a/exampleSite/data/bn/sections/about.yaml b/exampleSite/data/bn/sections/about.yaml new file mode 100644 index 000000000..e6951073a --- /dev/null +++ b/exampleSite/data/bn/sections/about.yaml @@ -0,0 +1,77 @@ +# section information +section: + name: আমার-সম্পর্কে + enable: true + weight: 1 + showOnNavbar: true + template: sections/about.html + +# your designation +designation: Software Engineer +# your company information +company: + name: Example Co. + url: "https://www.example.com" + +# your resume. this file path should be relative to you "static" directory +resume: "files/resume.pdf" + +# a summary about you +summary: 'I am a passionate software engineer with x years of working experience. I built OSS tools for [Kubernetes](https://kubernetes.io/) using GO. My tools help people to deploy their workloads in Kubernetes. Sometimes, I work on some fun projects such as writing a theme, etc.' + +# your social links +# give as many as you want. use font-awesome for the icons. +socialLinks: +- name: Email + icon: "fas fa-envelope" + url: "example@gmail.com" + +- name: Github + icon: "fab fa-github" + url: "https://www.github.com/example" + +- name: Stackoverflow + icon: "fab fa-stack-overflow" + url: "#" + +- name: LinkedIn + icon: "fab fa-linkedin" + url: "#" + +- name: Twitter + icon: "fab fa-twitter" + url: "#" + +- name: Facebook + icon: "fab fa-facebook" + url: "#" + +# your soft skills +# give the percentage between 50 to 100 with 5 intervals. +# currently supported colors: blue, yellow, pink, green, sky, orange +softSkills: +- name: Leadership + percentage: 85 + color: blue +- name: Team Work + percentage: 90 + color: yellow +- name: Communication + percentage: 85 + color: pink +- name: Hard Working + percentage: 85 + color: green +- name: Fast Learner + percentage: 85 + color: sky +- name: Problem Solving + percentage: 85 + color: orange +# you can also provide color code instead of pre-defined color name +# - name: Example 1 +# percentage: 75 +# color: "#00adb5" +# - name: Example 2 +# percentage: 65 +# color: "#8b8383" diff --git a/exampleSite/data/bn/sections/achievements.yaml b/exampleSite/data/bn/sections/achievements.yaml new file mode 100644 index 000000000..0d2055010 --- /dev/null +++ b/exampleSite/data/bn/sections/achievements.yaml @@ -0,0 +1,24 @@ +# section information +section: + name: সাফল্য + enable: true + weight: 6 + showOnNavbar: true + template: sections/achievements.html + # Can optionally hide the title in sections + # hideTitle: true + +# Your achievements achievements +achievements: +- title: Best Presenter + image: images/achievements/presenter.jpg + summary: Best presenter in the 2020 XYZ conference. +- title: Champion + image: images/achievements/sport.jpg + summary: Champion in cycling inter-city cycling championship 2020. +- title: Graduation + image: images/achievements/graduation-cap.jpg + summary: Received Bachelor of Science (B.Sc.) in Computer Science and Engineer from XYZ University. +- title: Award Winner + image: images/achievements/woman-winner.jpg + summary: Lorem ipsum dolor sit amet consectetur adipisicing elit. Possimus architecto minus facere vero? diff --git a/exampleSite/data/bn/sections/experiences.yaml b/exampleSite/data/bn/sections/experiences.yaml new file mode 100644 index 000000000..f4ace2871 --- /dev/null +++ b/exampleSite/data/bn/sections/experiences.yaml @@ -0,0 +1,64 @@ +# section information +section: + name: অভিজ্ঞতা + enable: true + weight: 3 + showOnNavbar: true + template: sections/experiences.html + # Can optionally hide the title in sections + # hideTitle: true + +# Your experiences +experiences: +- company: + name: Example Co. + url: "https://www.example.com" + location: Dhaka Branch + # company overview + overview: Example Co. is a widely recognized company for cloud-native development. It builds tools for Kubernetes. + positions: + - designation: Senior Software Engineer + start: Nov 2019 + # don't provide end date if you are currently working there. It will be replaced by "Present" + # end: Dec 2020 + # give some points about what was your responsibilities at the company. + responsibilities: + - Design and develop XYZ tool for ABC task + - Design, develop and manage disaster recovery tool [Xtool](https://www.example.com) that backup Kubernetes volumes, databases, and cluster's resource definition. + - Lead backend team. + + - designation: Junior Software Engineer + start: Nov 2017 + end: Oct 2019 + responsibilities: + - Implement and test xyz feature for abc tool. + - Support client for abc tool. + - Learn k,d,w technology for xyz. + +- company: + name: PreExample Co. + url: "https://www.preexample.com" + location: Nowhere + overview: PreExample Co. is a gateway company to enter into Example co. So, nothing special here. + positions: + - designation: Software Engineer + start: March 2016 + end: May 2017 + responsibilities: + - Write lots of example codes. + - Read lots of examples. + - See lots of example videos. + +- company: + name: Intern Counting Company (ICC). + url: "https://www.intern.com" + location: Intern Land + overview: Intern counting Company (ICC) is responsible for counting worldwide intern Engineers. + positions: + - designation: Intern + start: Jun 2015 + end: Jan 2016 + responsibilities: + - Count lost of interns. + - Count more interns. + - Count me as an intern. diff --git a/exampleSite/data/bn/sections/projects.yaml b/exampleSite/data/bn/sections/projects.yaml new file mode 100644 index 000000000..6e39f275d --- /dev/null +++ b/exampleSite/data/bn/sections/projects.yaml @@ -0,0 +1,64 @@ +# section information +section: + name: প্রোজেক্ট + enable: true + weight: 4 + showOnNavbar: true + template: sections/projects.html + # Can optionally hide the title in sections + # hideTitle: true + +# filter buttons +buttons: +- name: All + filter: "all" +- name: Professional + filter: "professional" +- name: Academic + filter: "academic" +- name: Hobby + filter: "hobby" + +# your projects +projects: +- name: Kubernetes + logo: images/projects/kubernetes.png + role: Contributor + timeline: "March 2018 - Present" + repo: https://github.com/kubernetes/kubernetes # If your project is a public repo on GitHub, then provide this link. it will show star count. + #url: "" # If your project is not a public repo but it has a website or any external details url then provide it here. don't provide "repo" and "url" simultaneously. + summary: Production-Grade Container Scheduling and Management. + tags: ["professional", "kubernetes", "cloud"] + +- name: Tensorflow + logo: images/projects/tensorflow.png + role: Developer + timeline: "Jun 2018 - Present" + repo: https://github.com/tensorflow/tensorflow + #url: "" + summary: An Open Source Machine Learning Framework for Everyone. + tags: ["professional", "machine-learning","academic"] + +- name: A sample academic paper + role: Team Lead + timeline: "Jan 2017 - Nov 2017" + url: "https://www.example.com" + summary: Lorem ipsum dolor sit amet consectetur adipisicing elit. Sapiente eius reprehenderit animi suscipit autem eligendi esse amet aliquid error eum. Accusantium distinctio soluta aliquid quas placeat modi suscipit eligendi nisi. + tags: ["academic","iot"] + +- name: Nocode + logo: images/projects/no-code.png + role: Nothing + timeline: "Oct 2019 - Dec 2019" + repo: https://github.com/kelseyhightower/nocode + #url: "" + summary: The best way to write secure and reliable applications. Write nothing; deploy nowhere. + tags: ["hobby", "fun"] + +- name: Toha + logo: images/projects/toha.png + role: Owner + timeline: "Jun 2019 - Present" + repo: https://github.com/hossainemruz/toha + summary: A Hugo theme for personal portfolio. + tags: ["hobby","hugo","theme","professional"] diff --git a/exampleSite/data/bn/sections/recent-posts.yaml b/exampleSite/data/bn/sections/recent-posts.yaml new file mode 100644 index 000000000..4fd6f61ac --- /dev/null +++ b/exampleSite/data/bn/sections/recent-posts.yaml @@ -0,0 +1,11 @@ +# section information +section: + name: সাম্প্রতিক-পোস্ট + enable: true + weight: 5 + showOnNavbar: true + template: sections/recent-posts.html + # Can optionally hide the title in sections + # hideTitle: true + +# no additional configuration is required diff --git a/exampleSite/data/bn/sections/skills.yaml b/exampleSite/data/bn/sections/skills.yaml new file mode 100644 index 000000000..8e166bedd --- /dev/null +++ b/exampleSite/data/bn/sections/skills.yaml @@ -0,0 +1,49 @@ +# section information +section: + name: দক্ষতা + enable: true + weight: 2 + showOnNavbar: true + template: sections/skills.html + # Can optionally hide the title in sections + # hideTitle: true + +# Your Skills. +# Give a summary of you each skill in the summary section. +skills: +- name: Kubernetes + icon: "images/skills/kubernetes.png" + summary: "Capable of deploying, managing application on Kubernetes. Experienced in writing Kubernetes controllers for CRDs." + url: "https://kubernetes.io/" + +- name: Go Development + icon: "images/skills/go.png" + summary: "Using as the main language for professional development. Capable of writing scalable, testable, and maintainable program." + url: "https://golang.org/" + +- name: Cloud Computing + icon: "images/skills/cloud.png" + summary: "Worked with most of the major clouds such as GCP, AWS, Azure etc." + +- name: Docker + icon: "images/skills/docker.svg" + summary: "Write most of the programs as dockerized container. Experienced with multi-stage, multi-arch build process." + url: "https://www.docker.com/" + +- name: Prometheus + icon: "images/skills/prometheus.png" + summary: "Capable of setup, configure Prometheus metrics. Experienced with PromQL, AlertManager. Also, experienced with writing metric exporters." + url: "https://prometheus.io/" + +- name: Linux + icon: "images/skills/linux.png" + summary: "Using as the main operating system. Capable of writing bash/shell scripts." + +- name: Git + icon: "images/skills/git.png" + summary: "Experienced with git-based development. Mostly, use Github. Also, have experience in working with GitLab." + url: "https://git-scm.com/" + +- name: C++ + icon: "images/skills/c++.png" + summary: "Know basic C/C++ programming. Used for contest programming and problem solving." diff --git a/exampleSite/data/bn/site.yaml b/exampleSite/data/bn/site.yaml new file mode 100644 index 000000000..486805e0a --- /dev/null +++ b/exampleSite/data/bn/site.yaml @@ -0,0 +1,11 @@ +# Copyright Notice +copyright: © 2020 Copyright. + +# Meta description for your site. This will help the search engines to find your site. +description: Portfolio and personal blog of Jane Doe. + +# specify the list of custom menus that you want to show in the top navbar. +# they will be separated by a divider from the main menus. +customMenus: +- name: নোটসমুহ + url: https://hossainemruz.gitbook.io/ diff --git a/exampleSite/data/en/author.yaml b/exampleSite/data/en/author.yaml new file mode 100644 index 000000000..57a704fd0 --- /dev/null +++ b/exampleSite/data/en/author.yaml @@ -0,0 +1,18 @@ +# some information about you +name: "Jane Doe" +nickname: "Jane" +# greeting message before your name. it will default to "Hi! I am" if not provided +greeting: "Hi, I am" +image: "images/avatar.png" +# give your some contact information. they will be used in the footer +contactInfo: + email: "janedoe@example.com" + phone: "+0123456789" + +# some summary about what you do +summary: + - I am a Developer + - I am a Devops + - I love servers + - I work on open-source projects + - I love to work with some fun projects diff --git a/exampleSite/data/sections/about.yaml b/exampleSite/data/en/sections/about.yaml similarity index 98% rename from exampleSite/data/sections/about.yaml rename to exampleSite/data/en/sections/about.yaml index 048bff187..4ef5ee0bd 100644 --- a/exampleSite/data/sections/about.yaml +++ b/exampleSite/data/en/sections/about.yaml @@ -4,6 +4,7 @@ section: enable: true weight: 1 showOnNavbar: true + template: sections/about.html # your designation designation: Software Engineer diff --git a/exampleSite/data/sections/achievements.yaml b/exampleSite/data/en/sections/achievements.yaml similarity index 100% rename from exampleSite/data/sections/achievements.yaml rename to exampleSite/data/en/sections/achievements.yaml diff --git a/exampleSite/data/sections/experiences.yaml b/exampleSite/data/en/sections/experiences.yaml similarity index 100% rename from exampleSite/data/sections/experiences.yaml rename to exampleSite/data/en/sections/experiences.yaml diff --git a/exampleSite/data/sections/projects.yaml b/exampleSite/data/en/sections/projects.yaml similarity index 100% rename from exampleSite/data/sections/projects.yaml rename to exampleSite/data/en/sections/projects.yaml diff --git a/exampleSite/data/sections/recent-posts.yaml b/exampleSite/data/en/sections/recent-posts.yaml similarity index 100% rename from exampleSite/data/sections/recent-posts.yaml rename to exampleSite/data/en/sections/recent-posts.yaml diff --git a/exampleSite/data/sections/skills.yaml b/exampleSite/data/en/sections/skills.yaml similarity index 100% rename from exampleSite/data/sections/skills.yaml rename to exampleSite/data/en/sections/skills.yaml diff --git a/exampleSite/data/en/site.yaml b/exampleSite/data/en/site.yaml new file mode 100644 index 000000000..651271005 --- /dev/null +++ b/exampleSite/data/en/site.yaml @@ -0,0 +1,11 @@ +# Copyright Notice +copyright: © 2020 Copyright. + +# Meta description for your site. This will help the search engines to find your site. +description: Portfolio and personal blog of Jane Doe. + +# specify the list of custom menus that you want to show in the top navbar. +# they will be separated by a divider from the main menus. +customMenus: +- name: Notes + url: https://hossainemruz.gitbook.io/ diff --git a/exampleSite/data/fr/author.yaml b/exampleSite/data/fr/author.yaml new file mode 100644 index 000000000..d55c4f314 --- /dev/null +++ b/exampleSite/data/fr/author.yaml @@ -0,0 +1,19 @@ +name: "Jane Doe" +nickname: "Jane" +image: "images/avatar.png" + +# greeting message before your name. it will default to "Hi! I am" if not provided +greeting: "Bonjour, je suis" + +# give your some contact information. they will be used in the footer +contactInfo: + email: "janedoe@example.com" + phone: "+0123456789" + +# some summary about what you do +summary: + - Je suis un développeur + - Je suis un Devops + - J'aime les serveurs + - Je travaille sur des projets open-source + - J'aime travailler avec des projets amusants diff --git a/exampleSite/data/fr/sections/about.yaml b/exampleSite/data/fr/sections/about.yaml new file mode 100644 index 000000000..0fc0f7d23 --- /dev/null +++ b/exampleSite/data/fr/sections/about.yaml @@ -0,0 +1,77 @@ +# section information +section: + name: "A propos" + enable: true + weight: 1 + showOnNavbar: true + template: sections/about.html + +# your designation +designation: "Développeur logiciel" +# your company information +company: + name: Example Co. + url: "https://www.example.com" + +# your resume. this file path should be relative to you "static" directory +resume: "files/resume.pdf" + +# a summary about you +summary: "Je suis un ingénieur en logiciel passionné, avec x années d'expérience professionnelle. J'ai construit des outils OSS pour [Kubernetes](https://kubernetes.io/) en utilisant GO. Mes outils aident les gens à déployer leurs charges de travail dans Kubernetes. Parfois, je travaille sur des projets amusants comme l'écriture d'un thème, etc." + +# your social links +# give as many as you want. use font-awesome for the icons. +socialLinks: +- name: Email + icon: "fas fa-envelope" + url: "example@gmail.com" + +- name: Github + icon: "fab fa-github" + url: "https://www.github.com/example" + +- name: Stackoverflow + icon: "fab fa-stack-overflow" + url: "#" + +- name: LinkedIn + icon: "fab fa-linkedin" + url: "#" + +- name: Twitter + icon: "fab fa-twitter" + url: "#" + +- name: Facebook + icon: "fab fa-facebook" + url: "#" + +# your soft skills +# give the percentage between 50 to 100 with 5 intervals. +# currently supported colors: blue, yellow, pink, green, sky, orange +softSkills: +- name: Chef de projet + percentage: 85 + color: blue +- name: Travail d'équipe + percentage: 90 + color: yellow +- name: Communication + percentage: 85 + color: pink +- name: Persévérant + percentage: 85 + color: green +- name: Autonome + percentage: 85 + color: sky +- name: Logique + percentage: 85 + color: orange +# you can also provide color code instead of pre-defined color name +# - name: Example 1 +# percentage: 75 +# color: "#00adb5" +# - name: Example 2 +# percentage: 65 +# color: "#8b8383" diff --git a/exampleSite/data/fr/sections/achievements.yaml b/exampleSite/data/fr/sections/achievements.yaml new file mode 100644 index 000000000..baec23f09 --- /dev/null +++ b/exampleSite/data/fr/sections/achievements.yaml @@ -0,0 +1,24 @@ +# section information +section: + name: Realisations + enable: true + weight: 6 + showOnNavbar: true + template: sections/achievements.html + # Can optionally hide the title in sections + # hideTitle: true + +# Your achievements achievements +achievements: +- title: Meilleur présentateur + image: images/achievements/presenter.jpg + summary: Meilleur présentateur de la conférence XYZ 2020. +- title: Champion + image: images/achievements/sport.jpg + summary: Champion du championnat cycliste interurbain 2020. +- title: Remise des diplômes + image: images/achievements/graduation-cap.jpg + summary: J'ai obtenu une licence en sciences (B.Sc.) en informatique et en ingénierie à l'université XYZ. +- title: Lauréat du prix + image: images/achievements/woman-winner.jpg + summary: Lorem ipsum dolor sit amet consectetur adipisicing elit. Possimus architecto minus facere vero? diff --git a/exampleSite/data/fr/sections/experiences.yaml b/exampleSite/data/fr/sections/experiences.yaml new file mode 100644 index 000000000..f9e82d201 --- /dev/null +++ b/exampleSite/data/fr/sections/experiences.yaml @@ -0,0 +1,64 @@ +# section information +section: + name: Experiences + enable: true + weight: 3 + showOnNavbar: true + template: sections/experiences.html + # Can optionally hide the title in sections + # hideTitle: true + +# Your experiences +experiences: +- company: + name: Example Co. + url: "https://www.example.com" + location: Dhaka Branch + # company overview + overview: Example Co. est une entreprise largement reconnue pour le développement de l'utilisation des nuages. Elle construit des outils pour Kubernetes. + positions: + - designation: Ingénieur logiciel senior + start: Nov 2019 + # don't provide end date if you are currently working there. It will be replaced by "Present" + # end: Dec 2020 + # give some points about what was your responsibilities at the company. + responsibilities: + - Concevoir et développer l'outil XYZ pour la tâche ABC. + - Concevoir, développer et gérer l'outil de reprise après sinistre [Xtool](https://www.example.com) qui sauvegarde les volumes, les bases de données et la définition des ressources du cluster de Kubernetes. + - Diriger l'équipe de soutien. + + - designation: Ingénieur logiciel junior + start: Nov 2017 + end: Oct 2019 + responsibilities: + - Implémenter et tester la fonction xyz pour l'outil abc. + - Support client pour abc tool. + - Apprendre la technologie k,d,w pour xyz. + +- company: + name: PreExample Co. + url: "https://www.preexample.com" + location: Nowhere + overview: PreExample Co. est une société passerelle pour entrer dans Example co. Donc, rien de spécial ici. + positions: + - designation: Ingénieur logiciel + start: Mars 2016 + end: Mai 2017 + responsibilities: + - Rédigez de nombreux exemples de codes. + - Lire de nombreux exemples. + - Voir de nombreux exemples de vidéos. + +- company: + name: Intern Counting Company (ICC). + url: "https://www.intern.com" + location: Intern Land + overview: La Compagnie de comptage des stagiaires (ICC) est responsable du comptage des ingénieurs stagiaires du monde entier. + positions: + - designation: Stagiaire + start: Juin 2015 + end: Jan 2016 + responsibilities: + - Compte perdu des stagiaires. + - Comptez plus de stagiaires. + - Comptez-moi comme un stagiaire. \ No newline at end of file diff --git a/exampleSite/data/fr/sections/projects.yaml b/exampleSite/data/fr/sections/projects.yaml new file mode 100644 index 000000000..664642172 --- /dev/null +++ b/exampleSite/data/fr/sections/projects.yaml @@ -0,0 +1,64 @@ +# section information +section: + name: Projets + enable: true + weight: 4 + showOnNavbar: true + template: sections/projects.html + # Can optionally hide the title in sections + # hideTitle: true + +# filter buttons +buttons: +- name: All + filter: "all" +- name: Professionnel + filter: "professionnel" +- name: Ecole + filter: "ecole" +- name: Hobby + filter: "hobby" + +# your projects +projects: +- name: Kubernetes + logo: images/projects/kubernetes.png + role: Contributeur + timeline: "Mars 2018 - Présent" + repo: https://github.com/kubernetes/kubernetes # If your project is a public repo on GitHub, then provide this link. it will show star count. + #url: "" # If your project is not a public repo but it has a website or any external details url then provide it here. don't provide "repo" and "url" simultaneously. + summary: Planification et gestion des conteneurs de qualité production. + tags: ["professionnel", "kubernetes", "cloud"] + +- name: Tensorflow + logo: images/projects/tensorflow.png + role: Développeur + timeline: "Juin 2018 - Présent" + repo: https://github.com/tensorflow/tensorflow + #url: "" + summary: Un cadre d'apprentissage machine à source ouverte pour tous. + tags: ["professionnel", "machine-learning","ecole"] + +- name: Un exemple d'article académique + role: Chef d'équipe + timeline: "Janvier 2017 - Novembre 2017" + url: "https://www.example.com" + summary: Lorem ipsum dolor sit amet consectetur adipisicing elit. Sapiente eius reprehenderit animi suscipit autem eligendi esse amet aliquid error eum. Accusantium distinctio soluta aliquid quas placeat modi suscipit eligendi nisi. + tags: ["ecole","iot"] + +- name: Nocode + logo: images/projects/no-code.png + role: Rien + timeline: "Oct 2019 - Dec 2019" + repo: https://github.com/kelseyhightower/nocode + #url: "" + summary: La meilleure façon de rédiger des demandes sûres et fiables. N'écrivez rien, ne déployez rien. + tags: ["hobby", "fun"] + +- name: Toha + logo: images/projects/toha.png + role: Owner + timeline: "Juin 2019 - Présent" + repo: https://github.com/hossainemruz/toha + summary: Un thème Hugo pour le portfolio personnel. + tags: ["hobby","hugo","theme","professionnel"] diff --git a/exampleSite/data/fr/sections/recent-posts.yaml b/exampleSite/data/fr/sections/recent-posts.yaml new file mode 100644 index 000000000..0f267164c --- /dev/null +++ b/exampleSite/data/fr/sections/recent-posts.yaml @@ -0,0 +1,11 @@ +# section information +section: + name: Posts recents + enable: true + weight: 5 + showOnNavbar: true + template: sections/recent-posts.html + # Can optionally hide the title in sections + # hideTitle: true + +# no additional configuration is required diff --git a/exampleSite/data/fr/sections/skills.yaml b/exampleSite/data/fr/sections/skills.yaml new file mode 100644 index 000000000..60b6fbec9 --- /dev/null +++ b/exampleSite/data/fr/sections/skills.yaml @@ -0,0 +1,49 @@ +# section information +section: + name: Competences + enable: true + weight: 2 + showOnNavbar: true + template: sections/skills.html + # Can optionally hide the title in sections + # hideTitle: true + +# Your Skills. +# Give a summary of you each skill in the summary section. +skills: +- name: Kubernetes + icon: "images/skills/kubernetes.png" + summary: "Capable de déployer, de gérer l'application sur Kubernetes. Expérimenté dans la rédaction de contrôleurs Kubernetes pour les CRD." + url: "https://kubernetes.io/" + +- name: Go + icon: "images/skills/go.png" + summary: "Utiliser comme langue principale pour le développement professionnel. Capable d'écrire des programmes évolutifs, testables et maintenables." + url: "https://golang.org/" + +- name: Cloud Computing + icon: "images/skills/cloud.png" + summary: "A travaillé avec la plupart des principaux nuages tels que GCP, AWS, Azure, etc." + +- name: Docker + icon: "images/skills/docker.svg" + summary: "Inscrivez la plupart des programmes en tant que conteneur déchargé. Expérimenté dans le processus de construction en plusieurs étapes et en plusieurs arcs." + url: "https://www.docker.com/" + +- name: Prometheus + icon: "images/skills/prometheus.png" + summary: "Capable d'installation, de configurer les métriques de Prometheus. Expérimenté avec PromQL, AlertManager. Expérimenté également dans la rédaction d'exportateurs de métriques." + url: "https://prometheus.io/" + +- name: Linux + icon: "images/skills/linux.png" + summary: "Utilisé comme système d'exploitation principal. Capable d'écrire des scripts bash/shell." + +- name: Git + icon: "images/skills/git.png" + summary: "Expérimenté dans le développement basé sur les GIT. Surtout, utilisez Github. Avoir également une expérience de travail avec GitLab." + url: "https://git-scm.com/" + +- name: C++ + icon: "images/skills/c++.png" + summary: "Connaître les bases de la programmation C/C++. Utilisé pour la programmation de concours et la résolution de problèmes." diff --git a/exampleSite/data/fr/site.yaml b/exampleSite/data/fr/site.yaml new file mode 100644 index 000000000..9101f1eab --- /dev/null +++ b/exampleSite/data/fr/site.yaml @@ -0,0 +1,11 @@ +# Copyright Notice +copyright: © 2020 Droits d'auteur. + +# Meta description for your site. This will help the search engines to find your site. +description: Portfolio et blog personnel de Jane Doe. + +# specify the list of custom menus that you want to show in the top navbar. +# they will be separated by a divider from the main menus. +customMenus: +- name: Remarques + url: https://hossainemruz.gitbook.io/ diff --git a/i18n/bn.toml b/i18n/bn.toml new file mode 100644 index 000000000..958f5642e --- /dev/null +++ b/i18n/bn.toml @@ -0,0 +1,30 @@ +# More documentation here: https://github.com/nicksnyder/go-i18n +[home] +other = "হোম" + +[posts] +other = "পোষ্ট সমূহ" + +[resume] +other = "আমার জীবনবৃত্তান্ত" + +[navigation] +other = "নেভিগেশন" + +[contact_me] +other = "আমার সাথে যোগাযোগ করুনঃ" + +[newsletter_text] +other = "ইমেইল নোটিফিকেশান এর মাধ্যমে সর্বশেষ তথ্য জানুন" + +[newsletter_input_placeholder] +other = "ইমেইল প্রবেশ করান" + +[newsletter_warning] +other = "আমরা আপনার ইমেল অন্য কারও সাথে শেয়ার করব না।" + +[submit] +other = "জমা দিন" + +[hugoAttributionText] +other = "পাওয়ারড বাই" diff --git a/i18n/en.toml b/i18n/en.toml new file mode 100644 index 000000000..6a5be72a2 --- /dev/null +++ b/i18n/en.toml @@ -0,0 +1,30 @@ +# More documentation here: https://github.com/nicksnyder/go-i18n +[home] +other = "Home" + +[posts] +other = "Posts" + +[resume] +other = "My resume" + +[navigation] +other = "Navigation" + +[contact_me] +other = "Contact me:" + +[newsletter_text] +other = "Stay up to date with email notification" + +[newsletter_input_placeholder] +other = "Enter email" + +[newsletter_warning] +other = "We'll never share your email with anyone else." + +[submit] +other = "Submit" + +[hugoAttributionText] +other = "Powered by" diff --git a/i18n/fr.toml b/i18n/fr.toml new file mode 100644 index 000000000..7067bdd6e --- /dev/null +++ b/i18n/fr.toml @@ -0,0 +1,30 @@ +# More documentation here: https://github.com/nicksnyder/go-i18n +[home] +other = "Accueil" + +[posts] +other = "Des postes" + +[resume] +other = "Mon Curriculum vitæ" + +[navigation] +other = "Naviguation" + +[contact_me] +other = "Contactez moi :" + +[newsletter_text] +other = "Restez à jour par e-mail" + +[newsletter_input_placeholder] +other = "Entrez une adresse e-mail" + +[newsletter_warning] +other = "Nous ne partagerons jamais votre courriel avec quelqu'un d'autre." + +[submit] +other = "Envoyer" + +[hugoAttributionText] +other = "Alimenté par" diff --git a/layouts/_default/list.html b/layouts/_default/list.html index d2c0bf856..9c188b4f4 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -8,13 +8,18 @@ {{ end }} {{ define "sidebar" }} + {{ $blogHome:="#" }} + {{ if site.IsMultiLingual }} + {{ $blogHome = (path.Join (cond ( eq .Language.Lang "en") "" .Language.Lang) "post") }} + {{ end }} + {{ end }} diff --git a/layouts/index.html b/layouts/index.html index d2de69473..74dd04ec5 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -29,9 +29,14 @@ {{- partial "sections/home.html" . -}} - {{ if .Site.Data.sections }} + {{ $sections:= .Site.Data.sections }} + {{ if (index .Site.Data .Site.Language.Lang).sections }} + {{ $sections = (index .Site.Data .Site.Language.Lang).sections }} + {{ end }} + + {{ if $sections }} {{ $background:= "bg-white"}} - {{ range sort .Site.Data.sections "section.weight" }} + {{ range sort $sections "section.weight" }} {{ if .section.enable }}
{{ if .section.template }} diff --git a/layouts/partials/cards/post.html b/layouts/partials/cards/post.html index 663510b8e..766f9dc20 100644 --- a/layouts/partials/cards/post.html +++ b/layouts/partials/cards/post.html @@ -1,5 +1,5 @@
- +
@@ -11,7 +11,7 @@
{{ .Title }}
{{ .Date.Format "January 2, 2006" }} Read diff --git a/layouts/partials/cards/project.html b/layouts/partials/cards/project.html index 052adeb1a..a56dbf787 100644 --- a/layouts/partials/cards/project.html +++ b/layouts/partials/cards/project.html @@ -8,7 +8,7 @@
{{ if .logo }} - {{ .name }} + {{ .name }} {{ end }}
{{ .name }}
diff --git a/layouts/partials/cards/skill.html b/layouts/partials/cards/skill.html index ee8c48823..b9114055d 100644 --- a/layouts/partials/cards/skill.html +++ b/layouts/partials/cards/skill.html @@ -3,7 +3,7 @@
{{ if .icon }} - {{ .name }} + {{ .name }} {{ end }}
{{ .name }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index efa3f97c4..90cff758d 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,11 +1,29 @@ +{{ $author:= .Site.Data.author }} +{{ if (index .Site.Data .Site.Language.Lang).author }} + {{ $author = (index .Site.Data .Site.Language.Lang).author }} +{{ end }} + +{{ $sections:= .Site.Data.sections }} +{{ if (index .Site.Data .Site.Language.Lang).sections }} + {{ $sections = (index .Site.Data .Site.Language.Lang).sections }} +{{ end }} + +{{ $copyrightNotice := "© 2020 Copyright."}} +{{ if (index .Site.Data .Site.Language.Lang).site }} + {{ $siteConfig := (index .Site.Data .Site.Language.Lang).site }} + {{ if $siteConfig.copyright }} + {{ $copyrightNotice = $siteConfig.copyright }} + {{ end }} +{{ end }} +
diff --git a/layouts/partials/sections/achievements/entry.html b/layouts/partials/sections/achievements/entry.html index 8548a1a21..51621f0cb 100644 --- a/layouts/partials/sections/achievements/entry.html +++ b/layouts/partials/sections/achievements/entry.html @@ -1,6 +1,6 @@

{{ .title }}

diff --git a/layouts/partials/sections/home.html b/layouts/partials/sections/home.html index 549079d6f..4766a3154 100644 --- a/layouts/partials/sections/home.html +++ b/layouts/partials/sections/home.html @@ -1,34 +1,53 @@ -{{ $greeting:="Hi! I am" }} -{{ if .Site.Params.author.greeting }} - {{ $greeting = .Site.Params.author.greeting }} +{{ $author:= .Site.Data.author }} +{{ if (index .Site.Data .Site.Language.Lang).author }} + {{ $author = (index .Site.Data .Site.Language.Lang).author }} {{ end }} + {{ $name:="Jane Doe" }} -{{ if .Site.Params.author.nickname }} - {{ $name = .Site.Params.author.nickname }} -{{ else if .Site.Params.author.name }} - {{ $name = .Site.Params.author.name }} +{{ if $author.nickname }} + {{ $name = $author.nickname }} +{{ else if $author.name }} + {{ $name = $author.name }} {{ end }} + +{{ $sections:= .Site.Data.sections }} +{{ if (index .Site.Data .Site.Language.Lang).sections }} + {{ $sections = (index .Site.Data .Site.Language.Lang).sections }} +{{ end }} + +{{ $backgroundImage:= "assets/images/default-background.jpg" }} +{{ if .Site.Params.background }} + {{ $backgroundImage = .Site.Params.background }} +{{ end }} + +{{ $authorImage:= "assets/images/default-avatar.png" }} +{{ if $author.image }} + {{ $authorImage = $author.image }} +{{ end }} +
- -

{{ $greeting }} {{ $name }}

+

{{ $author.greeting }} {{ $name }}

- {{ if .Site.Data.sections }} - {{ range first 1 (where (sort .Site.Data.sections "section.weight") ".section.enable" true) }} + {{ if $sections }} + {{ range first 1 (where (sort $sections "section.weight") ".section.enable" true) }} {{ end }} {{ end }} diff --git a/package-lock.json b/package-lock.json index 0cfd26214..b5a67ec8d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -113,15 +113,15 @@ } }, "browserslist": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.0.tgz", - "integrity": "sha512-pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ==", + "version": "4.14.5", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz", + "integrity": "sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001111", - "electron-to-chromium": "^1.3.523", - "escalade": "^3.0.2", - "node-releases": "^1.1.60" + "caniuse-lite": "^1.0.30001135", + "electron-to-chromium": "^1.3.571", + "escalade": "^3.1.0", + "node-releases": "^1.1.61" } }, "caller-callsite": { @@ -155,9 +155,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001118", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001118.tgz", - "integrity": "sha512-RNKPLojZo74a0cP7jFMidQI7nvLER40HgNfgKQEJ2PFm225L0ectUungNQoK3Xk3StQcFbpBPNEvoWD59436Hg==", + "version": "1.0.30001141", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001141.tgz", + "integrity": "sha512-EHfInJHoQTmlMdVZrEc5gmwPc0zyN/hVufmGHPbVNQwlk7tJfCmQ2ysRZMY2MeleBivALUTyyxXnQjK18XrVpA==", "dev": true }, "chalk": { @@ -264,9 +264,9 @@ } }, "electron-to-chromium": { - "version": "1.3.550", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.550.tgz", - "integrity": "sha512-MWDHoJsSieBaJ6mObvi3V0eKZufR1iMJl56VIGdXCgFHyCUbVDGm2IMXUNjDxgbGbKa3tA5+zJmHuBQqRxGiLA==", + "version": "1.3.576", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.576.tgz", + "integrity": "sha512-uSEI0XZ//5ic+0NdOqlxp0liCD44ck20OAGyLMSymIWTEAtHKVJi6JM18acOnRgUgX7Q65QqnI+sNncNvIy8ew==", "dev": true }, "emoji-regex": { @@ -285,9 +285,9 @@ } }, "escalade": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz", - "integrity": "sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz", + "integrity": "sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==", "dev": true }, "escape-string-regexp": { @@ -370,9 +370,9 @@ "dev": true }, "get-stdin": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz", - "integrity": "sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", + "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", "dev": true }, "glob-parent": { @@ -559,9 +559,9 @@ } }, "node-releases": { - "version": "1.1.60", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.60.tgz", - "integrity": "sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==", + "version": "1.1.61", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz", + "integrity": "sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==", "dev": true }, "normalize-path": { @@ -641,9 +641,9 @@ "dev": true }, "postcss": { - "version": "7.0.32", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz", - "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==", + "version": "7.0.35", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", + "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -652,16 +652,16 @@ } }, "postcss-cli": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-7.1.1.tgz", - "integrity": "sha512-bYQy5ydAQJKCMSpvaMg0ThPBeGYqhQXumjbFOmWnL4u65CYXQ16RfS6afGQpit0dGv/fNzxbdDtx8dkqOhhIbg==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-7.1.2.tgz", + "integrity": "sha512-3mlEmN1v2NVuosMWZM2tP8bgZn7rO5PYxRRrXtdSyL5KipcgBDjJ9ct8/LKxImMCJJi3x5nYhCGFJOkGyEqXBQ==", "dev": true, "requires": { "chalk": "^4.0.0", "chokidar": "^3.3.0", "dependency-graph": "^0.9.0", "fs-extra": "^9.0.0", - "get-stdin": "^7.0.0", + "get-stdin": "^8.0.0", "globby": "^11.0.0", "postcss": "^7.0.0", "postcss-load-config": "^2.0.0", @@ -713,9 +713,9 @@ "dev": true }, "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { "has-flag": "^4.0.0" @@ -724,9 +724,9 @@ } }, "postcss-load-config": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz", - "integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz", + "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==", "dev": true, "requires": { "cosmiconfig": "^5.0.0", diff --git a/package.json b/package.json index 08f7e8e14..7abfad57d 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,6 @@ "homepage": "https://github.com/hossainemruz/toha#readme", "devDependencies": { "autoprefixer": "^9.8.6", - "postcss-cli": "^7.1.1" + "postcss-cli": "^7.1.2" } } diff --git a/static/assets/css/layouts/list.css b/static/assets/css/layouts/list.css index b3fde856a..8d09fa003 100644 --- a/static/assets/css/layouts/list.css +++ b/static/assets/css/layouts/list.css @@ -155,6 +155,13 @@ visibility: hidden; } + .navbar-collapse.lang-selector { + display: block !important; + position: absolute; + right: 0; + top: 0.5rem; + } + .content-cards { padding-top: 20px; width: 100%; diff --git a/static/assets/css/layouts/main.css b/static/assets/css/layouts/main.css index d54532b91..248df5a29 100644 --- a/static/assets/css/layouts/main.css +++ b/static/assets/css/layouts/main.css @@ -137,7 +137,7 @@ img.right { .card .card-head { height: 172px; -o-object-fit: cover; - object-fit: cover; + object-fit: cover; overflow: hidden; } @@ -238,6 +238,14 @@ img.right { /* IPad Pro */ @media (max-width: 1024px) { + .content-section .languageSelector { + position: fixed; + right: 0.5rem; + bottom: 1rem; + z-index: 10000000; + background-color: #f9fafc; + box-shadow: 0px 8px 56px rgba(15, 80, 100, 0.16); + } } /* Large devices (desktops, 992px and up) */ diff --git a/static/assets/css/layouts/single.css b/static/assets/css/layouts/single.css index 35ecff19b..b72877766 100644 --- a/static/assets/css/layouts/single.css +++ b/static/assets/css/layouts/single.css @@ -368,6 +368,9 @@ mark { .navbar-toggler { display: block; } + .navbar-collapse.lang-selector { + display: none; + } .hero-area { height: 300px; diff --git a/static/assets/css/navigators/navbar.css b/static/assets/css/navigators/navbar.css index f8e13f347..d3003b848 100644 --- a/static/assets/css/navigators/navbar.css +++ b/static/assets/css/navigators/navbar.css @@ -116,6 +116,39 @@ margin-left: -10px; } +.top-navbar .dropdown-menu { + box-shadow: 0px 8px 56px rgba(15, 80, 100, 0.16); + border: 1px solid #fff; + max-height: 0vh; + overflow: hidden; + display: block; + visibility: hidden; + transition: all 0.3s ease-out; +} + +.top-navbar .dropdown-menu.show { + max-height: 100vh; + visibility: visible; + transition: all 0.3s ease-in; +} + +.top-navbar .dropdown-menu a { + color: #1c2d41; + border-bottom: none; +} + +.top-navbar .dropdown-menu a:hover { + color: #2098d1; + transition: all 0.3s ease-out; + border-bottom: none; + background: rgb(2, 0, 36); + background: linear-gradient( + 90deg, + rgba(2, 0, 36, 1) 0%, + rgba(34, 136, 168, 0.2) 0% + ); +} + /* ============= Device specific fixes ======= */ /* Large screens such as TV */ @@ -163,11 +196,6 @@ border-bottom: none; } - .final-navbar .navbar-collapse.show { - box-shadow: 5px 10px 10px rgba(192, 204, 218, 0.3); - transition: all 0.3s ease-out; - } - .dropdown-divider { border-top: 1px solid #c0ccda; } @@ -177,6 +205,12 @@ width: auto; margin-right: 15px; } + .top-navbar .dropdown-menu { + text-align: center; + margin-bottom: 0.5rem; + margin-right: 1rem; + transition: all 0.3s ease-out; + } } /* Large devices (desktops, 992px and up) */ @@ -201,11 +235,6 @@ border-bottom: none; } - .final-navbar .navbar-collapse.show { - box-shadow: 5px 10px 10px rgba(192, 204, 218, 0.3); - transition: all 0.3s ease-out; - } - .dropdown-divider { border-top: 1px solid #c0ccda; } @@ -239,11 +268,6 @@ border-bottom: none; } - .final-navbar .navbar-collapse.show { - box-shadow: 5px 10px 10px rgba(192, 204, 218, 0.3); - transition: all 0.3s ease-out; - } - .dropdown-divider { border-top: 1px solid #c0ccda; } @@ -258,6 +282,10 @@ /* Small devices (landscape phones, 576px and up) */ @media only screen and (max-width: 576px) { + .top-navbar .dropdown-menu { + margin-left: -1rem; + margin-right: 0rem; + } } /* iPhoneX, iPhone 6,7,8 */ diff --git a/static/assets/css/sections/home.css b/static/assets/css/sections/home.css index 81965ce7c..ad8fa2a04 100644 --- a/static/assets/css/sections/home.css +++ b/static/assets/css/sections/home.css @@ -14,8 +14,7 @@ background-attachment: fixed; background-position: center; transform: scale(1.1); - -webkit-filter: blur(3px); - filter: blur(3px); + filter: blur(3px); background-size: cover; } diff --git a/static/assets/js/main.js b/static/assets/js/main.js index 745b547c6..1d468a86f 100644 --- a/static/assets/js/main.js +++ b/static/assets/js/main.js @@ -25,44 +25,48 @@ var isMobile = false, isTablet = false, isLaptop = false; function addSmoothScroll() { // ref: https://css-tricks.com/snippets/jquery/smooth-scrolling/ // Select all links with hashes - $('a[href*="#"]').click(function (event) { - // On-page links - if ( - location.pathname.replace(/^\//, '') == this.pathname.replace(/^\//, '') - && - location.hostname == this.hostname - ) { - // Figure out element to scroll to - var target = $(this.hash); - target = target.length ? target : $('[name=' + this.hash.slice(1) + ']'); - // Does a scroll target exist? - if (target.length) { - // Only prevent default if animation is actually gonna happen - event.preventDefault(); + $('a[href*="#"]') + // Remove links that don't actually link to anything + .not('[href="#"]') + .not('[href="#0"]') + .click(function (event) { + // On-page links + if ( + location.pathname.replace(/^\//, '') == this.pathname.replace(/^\//, '') + && + location.hostname == this.hostname + ) { + // Figure out element to scroll to + var target = $(this.hash); + target = target.length ? target : $('[name=' + this.hash.slice(1) + ']'); + // Does a scroll target exist? + if (target.length) { + // Only prevent default if animation is actually gonna happen + event.preventDefault(); - let offset = 60; - if (isMobile) { - offset = 710; - } else if (isTablet) { - offset = 60; + let offset = 60; + if (isMobile) { + offset = 710; + } else if (isTablet) { + offset = 60; + } + $('html, body').animate({ + scrollTop: target.offset().top - offset + }, 1000, function () { + // Callback after animation + // Must change focus! + var $target = $(target); + $target.focus(); + if ($target.is(":focus")) { // Checking if the target was focused + return false; + } else { + $target.attr('tabindex', '-1'); // Adding tabindex for elements not focusable + $target.focus(); // Set focus again + }; + }); } - $('html, body').animate({ - scrollTop: target.offset().top - offset - }, 1000, function () { - // Callback after animation - // Must change focus! - var $target = $(target); - $target.focus(); - if ($target.is(":focus")) { // Checking if the target was focused - return false; - } else { - $target.attr('tabindex', '-1'); // Adding tabindex for elements not focusable - $target.focus(); // Set focus again - }; - }); } - } - }); + }); } addSmoothScroll(); diff --git a/static/assets/js/popper.min.js b/static/assets/js/popper.min.js new file mode 100644 index 000000000..79ccbf58b --- /dev/null +++ b/static/assets/js/popper.min.js @@ -0,0 +1,5 @@ +/* + Copyright (C) Federico Zivolo 2018 + Distributed under the MIT License (license terms are at http://opensource.org/licenses/MIT). + */(function(e,t){'object'==typeof exports&&'undefined'!=typeof module?module.exports=t():'function'==typeof define&&define.amd?define(t):e.Popper=t()})(this,function(){'use strict';function e(e){return e&&'[object Function]'==={}.toString.call(e)}function t(e,t){if(1!==e.nodeType)return[];var o=getComputedStyle(e,null);return t?o[t]:o}function o(e){return'HTML'===e.nodeName?e:e.parentNode||e.host}function n(e){if(!e)return document.body;switch(e.nodeName){case'HTML':case'BODY':return e.ownerDocument.body;case'#document':return e.body;}var i=t(e),r=i.overflow,p=i.overflowX,s=i.overflowY;return /(auto|scroll|overlay)/.test(r+s+p)?e:n(o(e))}function r(e){return 11===e?re:10===e?pe:re||pe}function p(e){if(!e)return document.documentElement;for(var o=r(10)?document.body:null,n=e.offsetParent;n===o&&e.nextElementSibling;)n=(e=e.nextElementSibling).offsetParent;var i=n&&n.nodeName;return i&&'BODY'!==i&&'HTML'!==i?-1!==['TD','TABLE'].indexOf(n.nodeName)&&'static'===t(n,'position')?p(n):n:e?e.ownerDocument.documentElement:document.documentElement}function s(e){var t=e.nodeName;return'BODY'!==t&&('HTML'===t||p(e.firstElementChild)===e)}function d(e){return null===e.parentNode?e:d(e.parentNode)}function a(e,t){if(!e||!e.nodeType||!t||!t.nodeType)return document.documentElement;var o=e.compareDocumentPosition(t)&Node.DOCUMENT_POSITION_FOLLOWING,n=o?e:t,i=o?t:e,r=document.createRange();r.setStart(n,0),r.setEnd(i,0);var l=r.commonAncestorContainer;if(e!==l&&t!==l||n.contains(i))return s(l)?l:p(l);var f=d(e);return f.host?a(f.host,t):a(e,d(t).host)}function l(e){var t=1=o.clientWidth&&n>=o.clientHeight}),l=0a[e]&&!t.escapeWithReference&&(n=J(f[o],a[e]-('right'===e?f.width:f.height))),ae({},o,n)}};return l.forEach(function(e){var t=-1===['left','top'].indexOf(e)?'secondary':'primary';f=le({},f,m[t](e))}),e.offsets.popper=f,e},priority:['left','right','top','bottom'],padding:5,boundariesElement:'scrollParent'},keepTogether:{order:400,enabled:!0,fn:function(e){var t=e.offsets,o=t.popper,n=t.reference,i=e.placement.split('-')[0],r=Z,p=-1!==['top','bottom'].indexOf(i),s=p?'right':'bottom',d=p?'left':'top',a=p?'width':'height';return o[s]r(n[s])&&(e.offsets.popper[d]=r(n[s])),e}},arrow:{order:500,enabled:!0,fn:function(e,o){var n;if(!q(e.instance.modifiers,'arrow','keepTogether'))return e;var i=o.element;if('string'==typeof i){if(i=e.instance.popper.querySelector(i),!i)return e;}else if(!e.instance.popper.contains(i))return console.warn('WARNING: `arrow.element` must be child of its popper element!'),e;var r=e.placement.split('-')[0],p=e.offsets,s=p.popper,d=p.reference,a=-1!==['left','right'].indexOf(r),l=a?'height':'width',f=a?'Top':'Left',m=f.toLowerCase(),h=a?'left':'top',c=a?'bottom':'right',u=S(i)[l];d[c]-us[c]&&(e.offsets.popper[m]+=d[m]+u-s[c]),e.offsets.popper=g(e.offsets.popper);var b=d[m]+d[l]/2-u/2,y=t(e.instance.popper),w=parseFloat(y['margin'+f],10),E=parseFloat(y['border'+f+'Width'],10),v=b-e.offsets.popper[m]-w-E;return v=$(J(s[l]-u,v),0),e.arrowElement=i,e.offsets.arrow=(n={},ae(n,m,Q(v)),ae(n,h,''),n),e},element:'[x-arrow]'},flip:{order:600,enabled:!0,fn:function(e,t){if(W(e.instance.modifiers,'inner'))return e;if(e.flipped&&e.placement===e.originalPlacement)return e;var o=v(e.instance.popper,e.instance.reference,t.padding,t.boundariesElement,e.positionFixed),n=e.placement.split('-')[0],i=T(n),r=e.placement.split('-')[1]||'',p=[];switch(t.behavior){case he.FLIP:p=[n,i];break;case he.CLOCKWISE:p=z(n);break;case he.COUNTERCLOCKWISE:p=z(n,!0);break;default:p=t.behavior;}return p.forEach(function(s,d){if(n!==s||p.length===d+1)return e;n=e.placement.split('-')[0],i=T(n);var a=e.offsets.popper,l=e.offsets.reference,f=Z,m='left'===n&&f(a.right)>f(l.left)||'right'===n&&f(a.left)f(l.top)||'bottom'===n&&f(a.top)f(o.right),g=f(a.top)f(o.bottom),b='left'===n&&h||'right'===n&&c||'top'===n&&g||'bottom'===n&&u,y=-1!==['top','bottom'].indexOf(n),w=!!t.flipVariations&&(y&&'start'===r&&h||y&&'end'===r&&c||!y&&'start'===r&&g||!y&&'end'===r&&u);(m||b||w)&&(e.flipped=!0,(m||b)&&(n=p[d+1]),w&&(r=G(r)),e.placement=n+(r?'-'+r:''),e.offsets.popper=le({},e.offsets.popper,C(e.instance.popper,e.offsets.reference,e.placement)),e=P(e.instance.modifiers,e,'flip'))}),e},behavior:'flip',padding:5,boundariesElement:'viewport'},inner:{order:700,enabled:!1,fn:function(e){var t=e.placement,o=t.split('-')[0],n=e.offsets,i=n.popper,r=n.reference,p=-1!==['left','right'].indexOf(o),s=-1===['top','left'].indexOf(o);return i[p?'left':'top']=r[o]-(s?i[p?'width':'height']:0),e.placement=T(t),e.offsets.popper=g(i),e}},hide:{order:800,enabled:!0,fn:function(e){if(!q(e.instance.modifiers,'hide','preventOverflow'))return e;var t=e.offsets.reference,o=D(e.instance.modifiers,function(e){return'preventOverflow'===e.name}).boundaries;if(t.bottomo.right||t.top>o.bottom||t.right