Merge branch 'main' into feature/cms

.gitignore

@@ -34,6 +34,7 @@ Temporary Items
 #IDE
 .vscode/
 node_modules/
+*.py
 
 # Jekyll
 .jekyll-cache

_data/locales/client.json

@@ -0,0 +1,27 @@
+{
+  "name": {
+    "en": "Digital Transformation Office",
+    "fr": "Bureau de la transformation numérique"
+  },
+  "email": "[email protected]",
+  "phoneForTel": "555-123-4567",
+  "phoneFormatted": "(555) 123-4567",
+  "address": {
+      "lineOne": "First Address Line",
+      "lineTwo": "Second Address Line",
+      "city": "Denver",
+      "state": "CO",
+      "zip": "80206",
+      "mapLink": "https://goo.gl/maps/UAQn4vuGDiwv7DV39"
+  },
+  "social": {
+      "facebook": "https://www.facebook.com/",
+      "twitter": "https://twitter.com/",
+      "instagram": "https://www.instagram.com/",
+      "youtube": "https://www.youtube.com/"
+  },
+  "domain": {
+    "en": "https://blog.canada.ca",
+    "fr": "https://blogue.canada.ca"
+  }
+}

en/_posts/2024-06-05-unified-design-system.md

@@ -0,0 +1,33 @@
+---
+altLangPage: /2024/06/05/systeme-design-unifie.html
+css:
+-  ../../../css/blog.css
+date: 2024-06-05
+dateModified: 2024-06-05
+description: "Learn about how we're creating a unified source for code, design and documentation to help teams build websites and applications."
+title: "Unified design system and update of DTO’s merger with CDS"
+---
+
+<h2>A path toward a unified design system for the Government of Canada</h2>
+<p>One way to contribute to consistency in service delivery is through the use of a cohesive design system. In the Government of Canada, we’re working to develop an updated design system to meet evolving needs of service delivery teams and the public, in a digital age.</p>
+
+<p><b>Read more:</b></p>
+<div class="col-md-12 mrgn-bttm-xl">
+<div class="col-md-6">
+        <img class="img-responsive thumbnail" src="/images/DTO_CDS_DesignSystem_Blog_Post_EN.jpg" alt=""/>
+        <h3><a class="stretched-link" href="https://digital.canada.ca/2024/05/27/a-path-toward-a-unified-design-system-for-the-government-of-canada/">A path toward a unified design system for the Government of Canada</a></h3>
+</div>
+</div>
+
+<h2>A shared focus: Working together to improve online services</h2>
+
+<p>Some of you may already know that we, the Digital Transformation Office (DTO) have merged with the Canadian Digital Service (CDS). The merger was a result of the government creating a new Minister of Citizens’ Services.</p>
+
+<p><b>Read more:</b></p>
+
+<div class="col-md-12">
+<div class="col-md-6">
+        <img class="img-responsive thumbnail" src="/images/DTO_CDS_DesignSystem_Blog_Post_.jpg" alt=""/>
+        <h3><a class="stretched-link" href="https://digital.canada.ca/2024/05/15/a-shared-focus-working-together-to-improve-online-services/">A shared focus: Working together to improve online services</a></h3>
+</div>
+</div>

en/admin/config.yml

@@ -6,11 +6,100 @@ media_folder: "en/images/thumbs" # Media files will be stored in the repo under
 public_folder: "/en/images/thumbs"
 
 collections:
+  # SETTINGS CONFIG
+  - label: Settings
+    name: settings
+    delete: false
+    editor:
+      preview: false
+    files:
+    - label: Website Settings
+      name: website_settings
+      file: _data/client.json
+      description: Allows a client to update their own contact information, through the default client.json file
+      fields:
+      - label: Business Name
+        name: name
+        widget: string
+        summary: Used in browser tab and sharing links
+        - label: English
+          name: en
+          widget: string
+        - label: French
+          name: fr
+          widget: string
+
+      - label: Email
+        name: email
+        widget: string
+        summary: Main email for customers to contact you
+
+      - label: Unformatted Telephone
+        name: phoneForTel
+        widget: string
+        summary: Used for clickable links to phone. Enter in format xxx-xxx-xxxx
+
+      - label: Formatted Telephone
+        name: phoneFormatted
+        widget: string
+        summary: Used for display on website. Enter in your preferred format
+
+      - label: Address
+        name: address
+        widget: object
+        collapsed: true
+        fields:
+        - label: Address Line One
+          name: lineOne
+          widget: string
+
+        - label: Address Line Two
+          name: lineTwo
+          widget: string
+
+        - label: City
+          name: city
+          widget: string
+
+        - label: State
+          name: state
+          widget: string
+
+        - label: Zip Code
+          name: zip
+          widget: string
+
+        - label: Google Maps Link
+          name: mapLink
+          widget: string
+          summary: Provide a Google Maps share link to guide visitors to your physical locations
+
+      - label: Social Media
+        name: social
+        widget: object
+        collapsed: true
+        fields:
+        - label: Facebook
+          name: facebook
+          widget: string
+
+        - label: Twitter
+          name: twitter
+          widget: string
+
+        - label: Instagram
+          name: instagram
+          widget: string
+
+        - label: Youtube
+          name: youtube
+          widget: string
+  # BLOG CONFIG
   - name: "blog" # Used in routes, e.g., /admin/collections/blog
     label: "Blog" # Used in the UI
     folder: "en/_posts" # The path to the folder where the documents are stored
     create: true # Allow users to create new documents in this collection
-    slug: "{{year}}/{{month}}/{{day}}/{{slug}}" # Filename template, e.g., YYYY-MM-DD-title.md
+    slug: "{{year}}/{{month}}/{{day}}/{{slug}}" # Filename template, e.g., YYYY/MM/DD/title.md
     identifier_field: slug
     fields: # The fields for each document, usually in front matter
       - { label: "Alternate language page url", name: "altLangPage", widget: "string" }
@@ -19,9 +108,10 @@ collections:
       - { label: "Description", name: "description",  widget: "string" }
       - { label: "Thumbnail image", name: "thumbnail", widget: "image" }
       - { label: "Body", name: "body", widget: "markdown" }
+  # PAGE CONFIG
   - name: "pages"
     label: "Pages"
-    folder: "pages"
+    folder: "en/pages"
     create: true
     slug: "{{slug}}"
     fields:

fr/_posts/2024-06-05-systeme-design-unifie.md

@@ -0,0 +1,33 @@
+---
+altLangPage: /2024/06/05/unified-design-system.html
+css:
+-  ../../../css/blogue.css
+date: 2024-06-05
+dateModified: 2024-06-05
+description: "Découvrez comment nous créons une source unifiée alliant code, conception et documentation afin d’aider les équipes à créer des sites Web et des applications."
+title: "Système de design unifié et mise à jour sur la fusion du BTN et du SNC"
+---
+
+<h2>Vers un système de design unifié pour le gouvernement du Canada</h2>
+<p>L’une des façons de tendre à l’uniformité de la prestation des services consiste à recourir à un système de design cohésif. Au gouvernement du Canada, nous mettons au point une nouvelle version de système de design qui permettra de répondre aux besoins changeants des équipes de prestation de services et du public à l’ère numérique.</p>
+
+<p><b>En savoir plus&nbsp;:</b></p>
+<div class="col-md-12 mrgn-bttm-xl">
+<div class="col-md-6">
+        <img class="img-responsive thumbnail" src="/images/DTO_CDS_DesignSystem_Blog_Post_FR.jpg" alt=""/>
+        <h3><a class="stretched-link" href="https://numerique.canada.ca/2024/05/27/vers-un-syst%C3%A8me-de-design-unifi%C3%A9-pour-le-gouvernement-du-canada/">Vers un système de design unifié pour le gouvernement du Canada</a></h3>
+</div>
+</div>
+
+<h2>Un objectif commun : améliorer ensemble les services en ligne</h2>
+
+<p>Certaines personnes parmi vous le savent déjà, mais le Bureau de la transformation numérique (BTN) a été intégré au Service numérique canadien (SNC). La transition découle de la création d’un nouveau poste de ministre des Services aux citoyens par le gouvernement.</p>
+
+<p><b>En savoir plus&nbsp;:</b></p>
+
+<div class="col-md-12">
+<div class="col-md-6">
+        <img class="img-responsive thumbnail" src="/images/DTO_CDS_DesignSystem_Blog_Post_-FR.jpg" alt=""/>
+        <h3><a class="stretched-link" href="https://numerique.canada.ca/2024/05/15/un-objectif-commun-am%C3%A9liorer-ensemble-les-services-en-ligne/">Un objectif commun : améliorer ensemble les services en ligne</a></h3>
+</div>
+</div>