Merge branch 'master' into test-postgres

Signed-off-by: Lee Calcote <leecalcote@gmail.com>

Author: leecalcote

.github/ISSUE_TEMPLATE/bug_report.md

@@ -28,7 +28,7 @@ assignees: ''
 
 ---
 #### Contributor Guide and Resources
-- 📚 [Instructions for contributing to academy-example](https://github.com/layer5io/academy-example/blob/master/CONTRIBUTING.md)
-   - academy-example documentation [site](https://docs.layer5.io/cloud/academy/) and [source](https://github.com/layer5io/academy-example/)
+- 📚 [Instructions for contributing to layer5-academy](https://github.com/layer5io/layer5-academy/blob/master/CONTRIBUTING.md)
+   - academy-template documentation [site](https://docs.layer5.io/cloud/academy/), [example](https://github.com/layer5io/academy-example/) and [theme](https://github.com/layer5io/academy-theme/)
 - 🎨 Wireframes and [designs for Layer5 site](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
 - 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)

.github/ISSUE_TEMPLATE/ci.md

@@ -19,7 +19,7 @@ assignees: ''
 
 ---
 #### Contributor Guide and Resources
-- 📚 [Instructions for contributing to academy-example](https://github.com/layer5io/academy-example/blob/master/CONTRIBUTING.md)
-   - academy-example documentation [site](https://docs.layer5.io/cloud/academy/) and [source](https://github.com/layer5io/academy-example/)
+- 📚 [Instructions for contributing to layer5-academy](https://github.com/layer5io/layer5-academy/blob/master/CONTRIBUTING.md)
+   - academy-template documentation [site](https://docs.layer5.io/cloud/academy/), [example](https://github.com/layer5io/academy-example/) and [theme](https://github.com/layer5io/academy-theme/)
 - 🎨 Wireframes and [designs for Layer5 site](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
-- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)
+- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +1,5 @@
 blank_issues_enabled: false
+contact_links:
+- name: 🙋🏾🙋🏼‍Question
+  url: https://discuss.layer5.io
+  about: Submit your question on the discussion forum.

.github/ISSUE_TEMPLATE/documentation.md

@@ -13,7 +13,7 @@ assignees: ''
 
 ---
 #### Contributor Guide and Resources
-- 📚 [Instructions for contributing to academy-example](https://github.com/layer5io/academy-example/blob/master/CONTRIBUTING.md)
-   - academy-example documentation [site](https://docs.layer5.io/cloud/academy/) and [source](https://github.com/layer5io/academy-example/)
+- 📚 [Instructions for contributing to layer5-academy](https://github.com/layer5io/layer5-academy/blob/master/CONTRIBUTING.md)
+   - academy-template documentation [site](https://docs.layer5.io/cloud/academy/), [example](https://github.com/layer5io/academy-example/) and [theme](https://github.com/layer5io/academy-theme/)
 - 🎨 Wireframes and [designs for Layer5 site](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
 - 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,6 +1,6 @@
 ---
 name: 💡 Feature Request
-about: Suggest an enhancement to Meshery.
+about: Suggest an enhancement to Layer5 Academy.
 title: ''
 labels: 'kind/enhancement'
 assignees: ''
@@ -21,5 +21,8 @@ assignees: ''
 <!-- [Optional] Any visual diagrams of the desired user interface. -->
 
 ---
-**[Contributor Guide](https://github.com/layer5io/academy-example/blob/master/CONTRIBUTING.md)**
+#### Contributor Guide and Resources
+- 📚 [Instructions for contributing to layer5-academy](https://github.com/layer5io/layer5-academy/blob/master/CONTRIBUTING.md)
+   - academy-template documentation [site](https://docs.layer5.io/cloud/academy/), [example](https://github.com/layer5io/academy-example/) and [theme](https://github.com/layer5io/academy-theme/)
 - 🎨 Wireframes and [designs for Layer5 site](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
+- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)

.github/ISSUE_TEMPLATE/question.md

@@ -23,6 +23,8 @@ concurrency:
 jobs:
   # Single deploy job since we're just deploying
   deploy:
+    if: github.event.pull_request.head.repo.full_name != github.repository
+
     environment:
       name: pr-preview-${{ github.event.pull_request.number || github.run_id }}
       url: ${{ steps.deployment.outputs.page_url }}
@@ -47,8 +49,39 @@ jobs:
           # Upload just the public folder
           path: 'public'
       - name: Deploy to GitHub Pages
+        if: github.event.pull_request.head.repo.full_name == github.repository
         id: deployment
         uses: actions/deploy-pages@v4
+
+
+
+
+
+
+
+      - name: Commit changes
+        if: github.event.pull_request.head.repo.full_name != github.repository
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          file_pattern: mesheryctl/helpers server/helpers/ **.go docs/
+          commit_user_name: l5io
+          commit_user_email: ci@meshery.io
+          commit_author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
+          commit_options: "--signoff"
+          commit_message: "Deployment preview for PR ${{ github.event.pull_request.number }}"
+
+      # - name: Set up Git user
+      #   if: github.event.pull_request.head.repo.full_name != github.repository
+      #   run: |
+      #     git config user.name "l5io"
+      #     git config user.email "l5io@users.noreply.github.com"
+      # - name: Push branch to master repo
+      #   if: github.event.pull_request.head.repo.full_name != github.repository
+      #   run: |
+      #     git remote add main-origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
+      #     git push main-origin HEAD:refs/heads/pr-preview/${{ github.event.pull_request.number }} --force
+
+
       - name: Comment Preview URL on PR
         if: github.event_name == 'pull_request'
         uses: marocchino/sticky-pull-request-comment@v2
@@ -61,3 +94,24 @@ jobs:
             > 📖 General Preview: ${{ steps.deployment.outputs.page_url }}
             
             This preview will be updated automatically when you push new commits to this PR.
+
+
+
+
+
+
+
+
+
+  # mirror-fork-pr:
+  #   if: github.event.pull_request.head.repo.full_name != github.repository
+  #   environment:
+  #     name: pr-preview-${{ github.event.pull_request.number || github.run_id }}
+  #     # url: ${{ steps.deployment.outputs.page_url }}
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Checkout PR branch
+  #       uses: actions/checkout@v4
+  #       with:
+  #         ref: ${{ github.event.pull_request.head.ref }}
+  #         repository: ${{ github.event.pull_request.head.repo.full_name }}

.github/workflows/static.yml

@@ -1,9 +1,9 @@
 # <a name="contributing">Contributing Overview</a>
 Please do! Thanks for your help improving the project! :balloon:
 
-All contributors are welcome. Please see the [newcomers welcome guide](https://layer5.io/community/newcomers) for how, where and why to contribute. This project is community-built and welcomes collaboration. Contributors are expected to adhere to our [Code of Conduct](.CODE_OF_CONDUCT.md).
+All contributors are welcome. Please see the [newcomers welcome guide](https://layer5.io/community/newcomers) for how, where and why to contribute. This project is community-built and welcomes collaboration. Contributors are expected to adhere to our [Code of Conduct](CODE_OF_CONDUCT.md).
 
-Not sure where to start? First, see the [newcomers welcome guide](https://docs.google.com/document/d/17OPtDE_rdnPQxmk2Kauhm3GwXF1R5dZ3Cj8qZLKdo5E/edit). Grab an open issue with the [help-wanted label](../../labels/help%20wanted) and jump in. Join the [Slack account](http://slack.layer5.io) and engage in conversation. Create a [new issue](/../../issues/new/choose) if needed.  All [pull requests](/../../pulls) should reference an open [issue](/../../issues). Include keywords in your pull request descriptions, as well as commit messages, to [automatically close issues in GitHub](https://help.github.com/en/github/managing-your-work-on-github/closing-issues-using-keywords).
+Not sure where to start? First, see the [newcomers welcome guide](https://layer5.io/community/newcomers). Grab an open issue with the [help-wanted label](../../labels/help%20wanted) and jump in. Join the [Slack account](http://slack.layer5.io) and engage in conversation. Create a [new issue](/../../issues/new/choose) if needed.  All [pull requests](/../../pulls) should reference an open [issue](/../../issues). Include keywords in your pull request descriptions, as well as commit messages, to [automatically close issues in GitHub](https://help.github.com/en/github/managing-your-work-on-github/closing-issues-using-keywords).
 
 **Sections**
 - <a name="contributing">General Contribution Flow</a>
@@ -13,20 +13,17 @@ Relevant coding style guidelines are the Go Code Review Comments and the Formatt
 
 ## Important Information
 
-This repository serves as a content-only starter template for creating courses on the Layer5 Academy. Its primary purpose is to provide a clear example of how to structure learning paths.
+This repository serves as the **official content repository** for Layer5's Academy learning platform, hosting all official learning paths, challenges, and certifications.
 
-### Important Distinction: Content vs. Theme
-- This Repository (academy-example): This is for content only.
-- Theme Repository ([layer5io/academy-theme](https://github.com/layer5io/academy-theme/)): All visual elements, layouts, CSS, and Hugo logic are managed in the central layer5io/academy-theme repository.
 
 ### Detailed Guide
 For a complete, step-by-step guide on how to create, structure, and publish a new learning path, please refer to our official documentation:
 
-➡️ [Creating Your First Learning Path](https://docs.layer5.io/cloud/academy/creating-your-learning-path/)
+➡️ [Academy](https://docs.layer5.io/cloud/academy/)
 
 # <a name="contributing">General Contribution Flow</a>
 
-In order to contribute to Meshery, please follow the fork-and-pull request workflow described [here](./CONTRIBUTING-gitflow.md).
+In order to contribute to Layer5 Academy, please follow the fork-and-pull request workflow described [here](./CONTRIBUTING-gitflow.md).
 
 ## <a name="commit-signing">Signing-off on Commits (Developer Certificate of Origin)</a>
 
@@ -47,7 +44,7 @@ In most cases, you can add this signoff to your commit automatically with the
 `-s` or `--signoff` flag to `git commit`. You must use your real name and a reachable email
 address (sorry, no pseudonyms or anonymous contributions). An example of signing off on a commit:
 ```
-$ commit -s -m “my commit message w/signoff”
+$ commit -s -m "my commit message w/signoff"
 ```
 
 To ensure all your commits are signed, you may choose to add this alias to your global ```.gitconfig```:
@@ -63,16 +60,16 @@ Or you may configure your IDE, for example, Visual Studio Code to automatically
 
 <a href="https://user-images.githubusercontent.com/7570704/64490167-98906400-d25a-11e9-8b8a-5f465b854d49.png" ><img src="https://user-images.githubusercontent.com/7570704/64490167-98906400-d25a-11e9-8b8a-5f465b854d49.png" width="50%"><a>
 
-## <a name="contributing-docs">Documentation Contribution Flow</a>
-Please contribute! Layer5 documentation uses Jekyll and GitHub Pages to host docs sites. Learn more about [Layer5's documentation framework](https://docs.google.com/document/d/17guuaxb0xsfutBCzyj2CT6OZiFnMu9w4PzoILXhRXSo/edit?usp=sharing). The process of contributing follows this flow:
+## <a name="contributing-docs">Academy Content Contribution Flow</a>
+Please contribute! Layer5 Academy uses Hugo and GitHub Pages to host the learning platform. Learn more about [Layer5's Academy platform development](https://docs.layer5.io/cloud/academy/platform-development/). The process of contributing follows this flow:
 
 1. Create a fork, if you have not already, by following the steps described [here](./CONTRIBUTING-gitflow.md)
-1. In the local copy of your fork, navigate to the docs folder.
-`cd docs`
+1. In the local copy of your fork, navigate to the content folder.
+`cd content`
 1. Create and checkout a new branch to make changes within
 `git checkout -b <my-changes>`
-1. Edit/add documentation.
-`vi <specific page>.md`
+1. Edit/add learning content.
+`vi <specific content>.md`
 1. Run site locally to preview changes.
 `make site`
 1. Commit, [sign-off](#commit-signing), and push changes to your remote branch.
@@ -81,22 +78,26 @@ Please contribute! Layer5 documentation uses Jekyll and GitHub Pages to host doc
 
 
 #### Tests
-Users can now test their code on their local machine against the CI checks implemented using `make run-tests`.
+Users can now test their local development setup using the provided Makefile commands.
 
-To test code changes on your local machine, run the following command:
+To test your local Academy setup, run the following commands:
 ```
-make run-tests
+# Install dependencies
+make setup
+
+# Start local development server
+make site
 ```
 
-#### Building Docker image
-To build a Docker image of the project, please ensure you have `Docker` installed to be able to build the image. Now, run the following command to build the Docker image:
+#### Building the Site
+To build the Academy site for production, ensure you have `Hugo` and `Go` installed. Now, run the following command to build the site:
 ```sh
-make docker
+make build
 ```
 
-### UI Lint Rules
+### Content Guidelines
 
-Layer5 uses ES-Lint to maintain code quality & consistency in our UI Code.
+Layer5 Academy follows specific content and formatting guidelines for consistency across all learning materials.
 
 # <a name="maintaining"> Reviews</a>
 All contributors are invited to review pull requests. See this short video on [how to review a pull request](https://www.youtube.com/watch?v=isLfo7jfE6g&feature=youtu.be).
@@ -114,4 +115,4 @@ This repository and site are available as open source under the terms of the [Ap
 <p>The <a href="https://layer5.io/community">Layer5 community</a> represents the largest collection of service mesh projects and their maintainers in the world.</p>
 
 **Open Source First**
-<p>At Layer5, we champion developer-defined infrastructure, giving engineers the power to reshape application delivery. We empower operators in reimagining how they manage modern infrastructure: collaboratively.</p>
+<p>At Layer5, we champion developer-defined infrastructure, giving engineers the power to reshape application delivery. We empower operators in reimagining how they manage modern infrastructure: collaboratively.</p>