diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..ea388a7
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,155 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## [0.8.0] - 2024-01-28
+
+### About Us
+
+- Add-info (3bee074)
+
+### CHANGELOG.md
+
+- V0.8.0 (5c8beb3)
+
+### CI/CD
+
+- Setup gh actions to include ftp deploy (b9fbd43)
+- Add prod environment (c4808b3)
+- Fix (05417b3)
+- Fix relative path (375d74b)
+- Add debug cmds (d0f595b)
+- Remove debug cmds (1937140)
+
+### Careers
+
+- Page-update (0859656)
+- Info-update (af07f43)
+- Careers-update (393d499)
+- Add-job (4613f2c)
+- Translate-job-position (9c2c194)
+- Fixed-job-title (40b5866)
+
+### Contact
+
+- Fixed-map (9637dc9)
+- Change links to nextcloud and improve contact process (03a27f0)
+
+### Content
+
+- Update OSFV catalogue url (bf8612b)
+- Adjust yocto training duration (e86759a)
+- Revert repo links, add commented PL integration (36eb445)
+- Fix 404 errors (5e69a26)
+- Fix contact and image links regression (0752599)
+- Remove muxpi shop references (e65d2e6)
+- Redo dasharo tos changes (dbb6c27)
+- Add placeholder before archive event page will appear (b99de6a)
+- Add whitespace char for titles (8a239d0)
+- Fix typo (1ddb0ca)
+- Align coop_list with contact page (089d70f)
+
+### Events
+
+- Fix external broken links (b380ff9)
+- Page-update (0d79081)
+- Add-qubes2024 (24265d7)
+- Link-fix (9905e8c)
+- Link-fix-2 (5da4a1f)
+- Fixes (49261cb)
+- Add-dug4-info (5bf8c3d)
+- Add-upcoming-events (6aa1ca3)
+- Pre-commit (9f16844)
+- Link-fix (6548079)
+- Update (f60fbbe)
+- Event-update (abaedcc)
+- Dug4-update (fa0c560)
+
+### LICENSE
+
+- Update boilerplate notice (bc9649a)
+
+### Pre-commit
+
+- Add precommit hooks and fix issues (852d367)
+- Exclude tables form wrap rule (bed3587)
+- Fix issues (5c20381)
+- Exclude linuxplumbersconf.org (5556c20)
+- Autoupdate hooks (a185636)
+
+### README
+
+- Update with local preview and good practises (c2887c7)
+- Update local-preview guide (1c6aaaf)
+- Fix local-preview guide (25836ac)
+- Update local preview methods (9a597a4)
+- Wrap 80 chars (5544f63)
+- Add development workflow guide (a8c396f)
+- Update info about website urls (59b1fa9)
+- Update documentation (58bdc90)
+
+### SEO
+
+- Check links with lychee and fix broken links (73053fd)
+- Add oprhan pages and canonical links jobs (5ddb303)
+- Wait server to avoid race condition (efe290d)
+- Trigger on develop branch and extend timeout (8ea7320)
+- Accept 5XX codes (15e7e1f)
+- Fix broken links (7285448)
+
+### Scripts
+
+- Add local-preview.sh script (806c8ba)
+
+### Terms of Service
+
+- Add ToS (7d12d19)
+- Description-fix (356fca0)
+- Link-update (e3304df)
+
+### Theme
+
+- Add safeHTML for br tag (cc192f6)
+- Add leads email (9badc67)
+- Set _self for else nav targets (1adfa17)
+- Add hubspot contact form (90b8d64)
+- Fix font awesome 404 (6e0b8ab)
+
+### Video
+
+- Create landing page with embedded video and description (5445a11)
+- Change page layout (1ba1b13)
+- Add link to the profile (d6fb641)
+- Add CTAs (79a94a7)
+- Add language information (26a7079)
+- Replace yt private video with thumbnail (18a0acc)
+- Do not hardcode thumbnail in layout (da7ef5a)
+
+### Website Configuration
+
+- Change-shop-link (f27a47a)
+- Change-account-link (4902745)
+- Add htaccess file (c7655d6)
+- Change meta description (c4446ff)
+- Improve meta description (9a44daf)
+- Redirect dl.3mdeb.com/open-source-firmware (d94d716)
+- RewriteRule shop.3mdeb.com/shop (3f4b3f2)
+- Change-address (361a97c)
+- Update footer address (edc8cfc)
+- Add google tag manager id (83cca57)
+- Add ga4 to params (9b69cdc)
+- Create sitemap template (b1ad688)
+- Add new entry for dasharo-tos (907167c)
+
+### Why we fight for freedom
+
+- Change domain name (6c0d3a1)
+- Add video (da58207)
+
+### Cliff.toml
+
+- Initial support for git-cliff (2da10ed)
+
+### Images
+
+- Optimize size of the images (fed7445)
diff --git a/README.md b/README.md
index c9bd7dc..08cef3b 100644
--- a/README.md
+++ b/README.md
@@ -35,9 +35,11 @@ additional layer of control and verification in the beta/prod environment.
1. Whenever creating new branch for your changes, first, remember to checkout to
up to date `develop` branch.
2. After pushing changes to your branch, set a Pull Request to `develop` branch,
- instead of `main`. Reporter will verify patch and publish beta env to the
- production later.
+ instead of `main`. Reporter will verify patch and publish beta env.
* beta website:
+3. After successful deployment on the beta environment, if a whole set of
+ patches is merged in the `develop` branch, open a new PR to `main`. The
+ reporter will verify changes and publish prod env.
* prod website:
> **NOTE**: If you forgot about rule Ad. 1, you can change the source branch
diff --git a/cliff.toml b/cliff.toml
new file mode 100644
index 0000000..45506ae
--- /dev/null
+++ b/cliff.toml
@@ -0,0 +1,90 @@
+# git-cliff ~ configuration file
+# https://git-cliff.org/docs/configuration
+
+[changelog]
+# changelog header
+header = """
+# Changelog\n
+All notable changes to this project will be documented in this file.\n
+"""
+# template for the changelog body
+# https://keats.github.io/tera/docs/#introduction
+body = """
+{% if version %}\
+ ## [{{ version | trim_start_matches(pat="v") }}] - {{ timestamp | date(format="%Y-%m-%d") }}
+{% else %}\
+ ## [unreleased]
+{% endif %}\
+{% if previous %}\
+ {% if previous.commit_id %}
+ {{ previous.commit_id | truncate(length=7, end="") }}...\
+ {{ commit_id | truncate(length=7, end="") }}
+ {% endif %}\
+{% endif %}\
+{% for group, commits in commits | group_by(attribute="group") %}
+ ### {{ group | upper_first }}
+ {% for commit in commits %}
+ - {{ commit.message | upper_first }} ({{ commit.id | truncate(length=7, end="") }})\
+ {% endfor %}
+{% endfor %}\n
+"""
+# remove the leading and trailing whitespace from the templates
+trim = true
+
+[git]
+commit_preprocessors = [
+ { pattern = ']*>', replace = "$1"}
+]
+# parse the commits based on https://www.conventionalcommits.org
+conventional_commits = true
+# filter out the commits that are not conventional
+filter_unconventional = true
+# process each line of a commit as an individual commit
+split_commits = false
+# regex for parsing and grouping commits, (?i) makes pattern case insensitive
+commit_parsers = [
+ { message = "^.github", group = "CI/CD" },
+ { message = "^/", group = "CI/CD" },
+ { message = "^(?i)README", group = "README" },
+ { message = "^(?i)SEO", group = "SEO" },
+ { message = "^(?i)About-us", group = "About Us" },
+ { message = "^(?i)Careers", group = "Careers" },
+ { message = "^(?i)Contact", group = "Contact" },
+ { message = "^(?i)Content", group = "Content" },
+ { message = "^(?i)Newest-video", group = "Video" },
+ { message = "^(?i)Pre-commit", group = "Pre-commit" },
+ { message = "^.lycheeignore", group = "Pre-commit" },
+ { message = "^.markdown.yaml", group = "Pre-commit" },
+ { message = "^.pre-commit-config.yaml", group = "Pre-commit" },
+ { message = "^(?i)Event", group = "Events" },
+ { message = "^(?i)Dasharo-terms-of-service.md", group = "Terms of Service" },
+ { message = "^(?i)Return-refund-policy", group = "Terms of Service" },
+ { message = "^(?i)Why-fight-for-freedom", group = "Why we fight for freedom" },
+ { message = "^(?i)Themes", group = "Theme" },
+ { message = "^(?i)Layouts", group = "Theme" },
+ { message = "^3mdeb/layouts", group = "Theme" },
+ { message = "^3mbed/layouts", group = "Theme" },
+ { message = "^(?i)Partials", group = "Theme" },
+ { message = "^(?i)Scripts", group = "Scripts" },
+ { message = "^(?i)fix", group = "Bug Fixes" },
+ { message = "^[Cc]onfig", group = "Website Configuration" },
+ { message = "^(?i)Menus", group = "Website Configuration" },
+ { message = "^(?i)Params", group = "Website Configuration" },
+ { message = "^(?i)Sitemap", group = "Website Configuration" },
+ { message = "^(?i)Static/.htaccess", group = "Website Configuration" },
+ { message = "^(?i)Static/htaccess", group = "Website Configuration" },
+]
+# protect breaking changes from being skipped due to matching a skipping commit_parser
+protect_breaking_commits = false
+# filter out the commits that are not matched by commit parsers
+filter_commits = false
+# regex for matching git tags
+tag_pattern = "v[0-9].*"
+# regex for skipping tags
+skip_tags = "v0.1.0-beta.1"
+# regex for ignoring tags
+ignore_tags = ""
+# sort the tags topologically
+topo_order = false
+# sort the commits inside sections by oldest/newest order
+sort_commits = "oldest"
diff --git a/content/_index.md b/content/_index.md
index 3b24c0d..4ddcc4b 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -1,70 +1,56 @@
---
banner:
slider:
- - title: "OUR SOFTWARE"
- subtitle: "YOUR SOLUTION"
- image: "images/banner/our-software.jpg"
- link: ""
+ - title: "OUR SOFTWARE"
+ subtitle: "YOUR SOLUTION"
+ image: "images/banner/our-software.jpg"
+ link: ""
- - title: ""
- subtitle: ""
- image: "images/banner/testimonial.jpg"
- link: ""
+ - title: ""
+ subtitle: ""
+ image: "images/banner/testimonial.jpg"
+ link: ""
- - title: "Break the cycle"
- subtitle: "JOIN THE DASHARO FAMILY"
- image: "images/banner/dasharo.png"
- link: "https://dasharo.com/"
+ - title: "Break the cycle"
+ subtitle: "JOIN THE DASHARO FAMILY"
+ image: "images/banner/dasharo.png"
+ link: "https://dasharo.com/"
important_links:
- - title: "Open Source Software"
- image: "images/banner/open-source-software.jpg"
- link: "open-source-software/"
+ - title: "Open Source Software"
+ image: "images/banner/open-source-software.jpg"
+ link: "open-source-software/"
- - title: "Careers"
- image: "images/banner/careers.jpg"
- link: "careers/"
+ - title: "Careers"
+ image: "images/banner/careers.jpg"
+ link: "careers/"
- - title: "Training"
- image: "images/banner/training.jpg"
- link: "training/"
+ - title: "Training"
+ image: "images/banner/training.jpg"
+ link: "training/"
clients_image: "images/clients.jpg"
-
cooperation_with_us:
enable: true
title: "Cooperation with **3mdeb**"
coop_lists:
- - title: "Contact Us"
- content: |
- If you are interested in collaboration with 3mdeb, let us know by the [Contact Form](https://3mdeb.com/contact/) [Book a call](https://calendly.com/3mdeb)
-
- - title: "Complete the optional survey"
+ - title: "Initial Consultation"
content: |
- You can receive an initial, customized survey on e-mail. Your answers will help us to prepare a Project Discovery for further cooperation. [Contact Us](https://3mdeb.com/contact/)
+ Begin your journey with us through a consultation call. Here, we'll complete a detailed survey focusing on your Embedded Systems, Firmware & Training needs. [Book a call](https://cloud.3mdeb.com/index.php/apps/calendar/appointment/n7T65toSaD9t)
- - title: "Let’s Meet"
+ - title: "Documentation and Offer Preparation"
content: |
- In the next step, we will arrange a free meeting, during which we will answer your preliminary questions. [Contact Us](https://3mdeb.com/contact/)
+ If needed, we'll handle additional paperwork, including NDAs, to fully understand your project. We then craft a tailored offer with terms and conditions based on your provided documentation and any further queries.
- - title: "Define the requirements"
+ - title: "Project Implementation and Delivery"
content: |
- When agreed, on the basis of NDA contract, we will prepare a Project Discovery within 5-10 working days. Having it all set, we will contact you to discuss an initial plan of cooperation. [Contact Us](https://3mdeb.com/contact/)
+ Upon offer acceptance, we move into action, developing and testing your solution. Our commitment is to deliver high-quality results that meet your specifications.
- - title: "Discuss the project plan"
+ - title: "Post-Delivery Support and Maintenance"
content: |
- In the next step, we will present a full project design, including quote. At this stage, we will be able to clarify the list of requirements and prepare the terms of the contract. [Contact Us](https://3mdeb.com/contact/)
-
- - title: "Sign a contract"
- content: |
- After signing the contract, we will proceed to the implementation of the project, informing you about the progress. [Contact Us](https://3mdeb.com/contact/)
-
- - title: "Verify the received product"
- content: |
- After the product is delivered and tested, our cooperation can proceed to the next project or include additional maintenance. [Our Services](service-catalogues/)
-
+ Our relationship continues after delivery. We offer ongoing support and maintenance, ensuring your solution continues to perform at its best.
where_is_3mdeb:
enable: true
diff --git a/content/contact.md b/content/contact.md
index 77018b8..48a7429 100755
--- a/content/contact.md
+++ b/content/contact.md
@@ -6,40 +6,26 @@ keywords: [""]
draft: false
layout: "contact"
-
cooperation_with_us:
enable: true
title: "Cooperation with **3mdeb**"
coop_lists:
- - title: "Book a call"
- content: |
- If you are interested in collaboration with 3mdeb, let us know by the [Book a call](https://calendly.com/3mdeb)
-
- - title: "Complete the optional survey"
- content: |
- You can receive an initial, customized survey on e-mail. Your answers will help us to prepare a Project Discovery for further cooperation.
-
- - title: "Let’s Meet"
+ - title: "Initial Consultation"
content: |
- In the next step, we will arrange a free meeting, during which we will answer your preliminary questions.
+ Begin your journey with us through a consultation call. Here, we'll complete a detailed survey focusing on your Embedded Systems, Firmware & Training needs. [Book a call](https://cloud.3mdeb.com/index.php/apps/calendar/appointment/n7T65toSaD9t)
- - title: "Define the requirements"
+ - title: "Documentation and Offer Preparation"
content: |
- When agreed, on the basis of NDA contract, we will prepare a Project Discovery within 5-10 working days. Having it all set, we will contact you to discuss an initial plan of cooperation.
+ If needed, we'll handle additional paperwork, including NDAs, to fully understand your project. We then craft a tailored offer with terms and conditions based on your provided documentation and any further queries.
- - title: "Discuss the project plan"
+ - title: "Project Implementation and Delivery"
content: |
- In the next step, we will present a full project design, including quote. At this stage, we will be able to clarify the list of requirements and prepare the terms of the contract.
+ Upon offer acceptance, we move into action, developing and testing your solution. Our commitment is to deliver high-quality results that meet your specifications.
- - title: "Sign a contract"
+ - title: "Post-Delivery Support and Maintenance"
content: |
- After signing the contract, we will proceed to the implementation of the project, informing you about the progress.
-
- - title: "Verify the received product"
- content: |
- After the product is delivered and tested, our cooperation can proceed to the next project or include additional maintenance.
-
+ Our relationship continues after delivery. We offer ongoing support and maintenance, ensuring your solution continues to perform at its best.
lets_work_together:
title: "Let’s work **together**"
@@ -47,10 +33,8 @@ lets_work_together:
cta:
title: "Need direction on your **product development strategy** and our services?"
button:
- link: "https://calendly.com/3mdeb"
+ link: "https://cloud.3mdeb.com/index.php/apps/calendar/appointment/n7T65toSaD9t"
label: "BOOK A CALL"
-
google_map_embed_url: "https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2321.9026361369906!2d18.56620737691726!3d54.41169549448095!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x46fd745dc864c3fd%3A0x692893a8b0074f23!2s3mdeb%20Sp.%20z%20o.o.!5e0!3m2!1spl!2spl!4v1700219555836!5m2!1spl!2spl"
-
---
diff --git a/themes/3mdeb/layouts/_default/contact.html b/themes/3mdeb/layouts/_default/contact.html
index be2c31b..11ed57f 100755
--- a/themes/3mdeb/layouts/_default/contact.html
+++ b/themes/3mdeb/layouts/_default/contact.html
@@ -9,7 +9,7 @@