docs(root): fixed file lost in rebase, changed file location to be ac…

…curate

fixed file lost in rebase, changed file location to be accurate

.github/workflows/ic-design-system-branches.yml

@@ -6,6 +6,7 @@ on:
   push:
     branches:
       - "develop"
+      - "v3.0.0/develop"
   pull_request:
     types: [opened, reopened, edited, synchronize]
 
@@ -64,8 +65,18 @@ jobs:
 
       - name: Deploy
         uses: JamesIves/github-pages-deploy-action@65b5dfd4f5bcd3a7403bbc2959c144256167464e #v4
+        if: ${{ steps.extract_branch.outputs.branch != 'v3.0.0/main' }}
         with:
           repository-name: mi6/ic-design-system-githubpages
           folder: ./public
           target-folder: ./branches/${{ steps.extract_branch.outputs.branch }}
           token: ${{ secrets.IC_DESIGN_SYSTEM_QA }}
+
+      - name: Deploy v3
+        uses: JamesIves/github-pages-deploy-action@65b5dfd4f5bcd3a7403bbc2959c144256167464e #v4
+        if: ${{ steps.extract_branch.outputs.branch == 'v3.0.0/main' }}
+        with:
+          repository-name: mi6/ic-design-system-githubpages
+          folder: ./public
+          target-folder: ./v3
+          token: ${{ secrets.IC_DESIGN_SYSTEM_QA }}

.github/workflows/release-design-system.yml

@@ -20,10 +20,6 @@ jobs:
         with:
           node-version: 18
       - uses: browser-actions/setup-chrome@latest
-      - name: Delete check-versions
-        uses: SvanBoxel/delete-merged-branch@main
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Create develop -> main PR
         run: |
           curl -L -X POST -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" -H "X-GitHub-Api-Version: 2022-11-28" "https://api.github.com/repos/mi6/ic-design-system/pulls" -d '{"title":"Develop -> Main","body":"Latest updates with latest package versions","head":"develop","base":"main"}'

.github/workflows/scorecards.yml

@@ -31,7 +31,7 @@ jobs:
           publish_results: false
 
       - name: "Upload artifact"
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 #v4.3.1
         with:
           name: SARIF file
           path: results.sarif

.github/workflows/update-v3-branch.yml

@@ -0,0 +1,46 @@
+name: Update v3.0.0 Branch
+
+on:
+  push:
+    branches:
+      - develop
+
+concurrency:
+  group: ci-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  update-v3-branch:
+    runs-on: ubuntu-latest
+    env:
+      MERGE_CONFLICTS: false
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
+        with:
+          fetch-depth: 0
+
+      - name: Rebase off develop
+        id: rebase
+        run: |
+          git fetch --all
+          git checkout v3.0.0/develop
+          git rebase origin/develop || echo "MERGE_CONFLICTS=true" >> "$GITHUB_ENV"
+
+      - name: Push changes if no conflicts
+        if: env.MERGE_CONFLICTS != 'true'
+        run: |
+          echo "No conflicts found...Pushing changes..."
+          git push origin v3.0.0/develop --force
+
+      - name: Push any changes and create PR
+        if: env.MERGE_CONFLICTS == 'true'
+        run: |
+          curl -L \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/mi6/ic-design-system/pulls \
+            -d '{"title":"Resolve conflicts between develop and v3.0.0/develop","head":"develop","base":"v3.0.0/develop","body":"This PR is to resolve conflicts between develop and v3.0.0/develop."}'

CONTRIBUTING.md

@@ -18,6 +18,7 @@ Welcome and thank you for contributing to the [Intelligence Community Design Sys
   - [Accessibility](#accessibility)
   - [Style guide](#style-guide)
   - [Git commit](#git-commit)
+  - [Amending a commit](#amending-a-commit)
   - [Styling](#styling)
 
 - [Testing](#testing)
@@ -26,7 +27,7 @@ Welcome and thank you for contributing to the [Intelligence Community Design Sys
 
 ## Code of conduct
 
-The Intelligence Community Design System (ICDS) has adopted the [Contributor Covenant](https://www.contributor-covenant.org/). Please familiarise yourself with our full [conduct principles](/CODE_OF_CONDUCT).
+The Intelligence Community Design System (ICDS) has adopted the [Contributor Covenant](https://www.contributor-covenant.org/). Please familiarise yourself with our full [conduct principles](/CODE_OF_CONDUCT.md).
 
 ## How to contribute
 
@@ -153,6 +154,48 @@ Follow these steps when making a commit:
 8. Provide a link to the issue by entering the reference e.g. `#123`.
 9. When the editor opens up, check your commit message and press `Ctrl`+`x` to confirm.
 
+### Amending a commit
+
+If you need to make changes to a commit (for example, after receiving comments on a PR), follow these steps:
+
+1. **If you're amending the most recent commit:**
+
+   - Stage your changes using `git add` and include the files you want to update.
+   - Run `git commit --amend --no-edit` to amend the most recent commit without changing the commit message.
+   - The Commitizen prompt will still appear as if you are making a new commit. Exit the prompt (usually by pressing Ctrl+C).
+   - Push the changes to the remote repository using: `git push --force`.
+
+2. **If you're amending an older commit:**
+
+   - Use `git rebase` to modify an older commit. For example, to modify commit `a1312407`, run:
+
+     ```sh
+     git rebase --interactive a1312407
+     ```
+
+   - In the default editor, change `pick` to `edit` for the line mentioning `a1312407`.
+
+   - Save the file and exit. Git will interpret and automatically execute the commands in the file, placing you in the state just after creating commit `a1312407`.
+
+   - Amend the commit by making your changes and then running:
+
+     ```sh
+     git commit --all --amend --no-edit
+     ```
+
+   - The Commitizen prompt will still appear as if you are making a new commit. Exit the prompt (usually by pressing Ctrl+C).
+
+   - Continue the rebase process by running:
+
+     ```sh
+     git rebase --continue
+     ```
+
+   - Push the changes to the remote repository using:
+     ```sh
+     git push --force
+     ```
+
 ### Styling
 
 - Avoid using inline css.

audit-ci.json

@@ -23,8 +23,8 @@
     "GHSA-p6mc-m468-83gw",
     "GHSA-wr3j-pwj9-hqq6",
     "GHSA-35jh-r3h4-6jhm",
-    "GHSA-2p57-rm9w-gvfp",
     "GHSA-3h5v-q93c-6h6q",
-    "GHSA-25hc-qcg6-38wj"
+    "GHSA-25hc-qcg6-38wj",
+    "GHSA-q9mw-68c2-j6m5"
   ]
 }

gatsby-browser.js

@@ -3,6 +3,7 @@ import "@ukic/web-components/dist/core/core.css";
 import "@ukic/web-components/dist/core/normalize.css";
 import "./src/styles/gatsby-override.css";
 import "./src/styles/gatsby-reset.css";
+import "./src/styles/color-mode.css";
 
 import React from "react";
 import Layout from "./src/components/Layout";

gatsby-config.js

@@ -78,18 +78,24 @@ module.exports = {
               frontmatter {
                 path
                 title
+                subTitle
+                tags
               }
+              body
             }
           }
         `,
         ref: "id",
-        index: ["title"],
-        store: ["id", "path", "title"],
+        index: ["title", "subTitle", "body", "tags"],
+        store: ["id", "path", "title", "subTitle", "body", "tags"],
         normalizer: ({ data }) =>
           data.allContent.map((node) => ({
             id: node.id,
             path: node.frontmatter.path,
             title: node.frontmatter.title,
+            subTitle: node.frontmatter.subTitle,
+            body: node.body,
+            tags: node.frontmatter.tags,
           })),
       },
     },
@@ -157,15 +163,15 @@ module.exports = {
       options: {
         name: `src`,
         path: `${__dirname}/src/`,
-        ignore: [`\.(tsx|ts|jsx|js|css|md|mdx)$`],
+        ignore: [`.(tsx|ts|jsx|js|css|md|mdx)$`],
       },
     },
     {
       resolve: `gatsby-source-filesystem`,
       options: {
         name: `static`,
         path: `${__dirname}/static/`,
-        ignore: [`\.(doc|doc|html)$`],
+        ignore: [`.(doc|doc|html)$`],
       },
     },
   ],