Skip to content

Commit

Permalink
Merge branch 'master' into alero/content-learn/mastering-meshery/depl…
Browse files Browse the repository at this point in the history
…oying-designs
  • Loading branch information
sudhanshutech authored Nov 23, 2024
2 parents 8e03e41 + 1816f9e commit 267a23a
Show file tree
Hide file tree
Showing 2,739 changed files with 33,641 additions and 16,425 deletions.
2 changes: 1 addition & 1 deletion .desktop-lighthouserc.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = {
"http://localhost/?desktop",
"http://localhost/company/about/index.html?desktop",
"http://localhost/cloud-native-management/meshery/index.html?desktop",
"http://localhost/cloud-native-management/meshmap/index.html?desktop",
"http://localhost/cloud-native-management/kanvas/index.html?desktop",
"http://localhost/learn/learning-paths/index.html?desktop",
"http://localhost/learn/service-mesh-books/index.html?desktop",
"http://localhost/learn/service-mesh-workshops/index.html?desktop",
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/chore_task.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ assignees: ''
The layer5.io website uses Gatsby, React, and GitHub Pages. Site content is found under the [`master` branch](https://github.com/layer5io/layer5/tree/master).
- 📚 See [contributing instructions](https://github.com/layer5io/layer5/blob/master/CONTRIBUTING.md).
- 🎨 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: [Discussion Forum](https://discuss.layer5.io) and [Community Slack](https://slack.layer5.io).

<img src="https://raw.githubusercontent.com/layer5io/layer5/master/.github/assets/images/buttons/community.webp" height="22px" align="left" />Join the Layer5 Community by submitting your [community member form](https://layer5.io/newcomer).
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/community_member_profile.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Let's recognize <@github-username> as a contributor and community member by crea
- GitHub: <!-- username only -->
- Twitter: <!-- handle only -->
- LinkedIn: <!-- <profilename> only https://www.linkedin.com/in/<profilename> -->
- Layer5 Cloud: <!-- <user ID> only UUID https://meshery.layer5.io/user/<uuid> -->
- Layer5 Cloud: <!-- <user ID> only UUID https://cloud.layer5.io/user/<uuid> -->
- Link to profile picture:

A detailed explanation on how to set up a community member profile can be found in the [CONTRIBUTING.md](https://github.com/layer5io/layer5/blob/master/CONTRIBUTING.md)
Expand Down
29 changes: 29 additions & 0 deletions .github/ISSUE_TEMPLATE/sistent_feature.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
name: 🚀 Enhancement in Sistent Project
about: Propose a new feature, suggest a component, or report an issue for Sistent.
title: '[Sistent]'
labels: 'project/sistent, kind/enhancement'
assignees: ''
---
### Current Behavior
<!-- A brief description of what the problem is. (e.g. I need to be able to...) -->

### Desired Behavior
<!-- A brief description of the enhancement. -->

### Screenshots / Mockups
<!-- Add any other context or screenshots about the feature request here. -->

### Implementation
<!-- Specifics on the approach to fulfilling the feature request. -->

---
<img src="https://raw.githubusercontent.com/layer5io/layer5/master/.github/assets/images/layer5/5-light-small.svg" width="24px" align="left" /><h2>Contributor Resources and <a href="https://layer5.io/community/handbook">Handbook</a></h2>

The layer5.io website uses Gatsby, React, and GitHub Pages. Site content is found under the [`master` branch](https://github.com/layer5io/layer5/tree/master).
- 🎨 See [Sistent Repository](https://github.com/layer5io/sistent).
- 📚 See [contributing instructions](https://github.com/layer5io/layer5/blob/master/CONTRIBUTING.md).
- 🎨 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: [Discussion Forum](https://discuss.layer5.io) and [Community Slack](https://slack.layer5.io).

<img src="https://raw.githubusercontent.com/layer5io/layer5/master/.github/assets/images/buttons/community.webp" height="22px" align="left" />Join the Layer5 Community by submitting your [community member form](https://layer5.io/newcomer).
10 changes: 8 additions & 2 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,13 @@ project/meshery:
- changed-files:
- any-glob-to-any-file:
- "src/collections/integrations/**/*"
project/meshmap:
project/kanvas:
- changed-files:
- any-glob-to-any-file:
- "src/sections/Meshmap/**/*"
- "src/sections/Kanvas/**/*"
project/sistent:
- changed-files:
- any-glob-to-any-file:
- "src/components/SistentNavigation/**/*"
- "src/pages/projects/sistent/**/*"
- "src/sections/Projects/Sistent/**/*"
6 changes: 3 additions & 3 deletions .github/workflows/build-and-deploy-site.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Build and Deploy Site
on:
push:
branches: [ master ]
branches: [master]

jobs:
build-and-deploy:
Expand All @@ -12,9 +12,9 @@ jobs:
with:
fetch-depth: 1

- name: Install and Build 🔧
- name: Install and Build 🔧
run: |
npm install
npm install --legacy-peer-deps
npm run build
- name: Deploy 🚀
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/build-and-preview-site.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
name: Build and Preview Site
on:
pull_request:
branches: [ master ]
branches: [master]
types: [opened, synchronize, reopened]


jobs:
site-preview:
runs-on: ubuntu-latest
Expand All @@ -15,9 +14,9 @@ jobs:
persist-credentials: false
fetch-depth: 1

- name: Install and Build 🔧
- name: Install and Build 🔧
run: |
npm install
npm install --legacy-peer-deps
npm run noIndex
- name: Zip Site
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fetch-depth: 1

- name: NPM Install
run: npm install
run: npm install --legacy-peer-deps

- name: Build
run: npm run build
Expand Down
87 changes: 87 additions & 0 deletions .github/workflows/feature-list.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
name: Feature List

on:
workflow_dispatch:
inputs:
spreadsheet_uri:
description: 'Link of the spreadsheet containing subscription details.'
type: string
required: true
schedule:
- cron: '0 0 * * *'

permissions:
contents: write
actions: read

jobs:
trigger-feature-list:
runs-on: ubuntu-latest
env:
FEATURES_FILE: 'feature_data.json'

steps:
- name: Checkout current repository
uses: actions/checkout@v4

- name: Restore cache
id: cache-sha
uses: actions/cache@v3
with:
path: .sha-cache
key: feature-data-sha
restore-keys: |
feature-data-sha
- name: Check for updates in source repository
id: check-updates
uses: actions/github-script@v7
with:
script: |
const { data: sourceFile } = await github.rest.repos.getContent({
owner: 'layer5labs',
repo: 'meshery-extensions-packages',
path: 'feature_data.json',
ref: 'master'
});
// Store the latest commit SHA
const latestSHA = sourceFile.sha;
const fs = require('fs');
// Check if we have a previous SHA
let hasUpdates = true;
const shaCachePath = '.sha-cache/latest-sha';
if (fs.existsSync(shaCachePath)) {
const lastSHA = fs.readFileSync(shaCachePath, 'utf8');
hasUpdates = lastSHA !== latestSHA;
}
if (hasUpdates) {
// Save the new SHA
fs.mkdirSync('.sha-cache', { recursive: true });
fs.writeFileSync(shaCachePath, latestSHA);
// Decode and save the content
const content = Buffer.from(sourceFile.content, 'base64').toString('utf8');
// Write the new content
fs.writeFileSync(process.env.FEATURES_FILE, content);
core.setOutput('has-updates', 'true');
} else {
core.setOutput('has-updates', 'false');
}
- name: Commit changes
if: steps.check-updates.outputs.has-updates == 'true'
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: "Updated feature data from source repository"
file_pattern: ${{ env.FEATURES_FILE }}
branch: master
commit_options: "--signoff"
commit_user_name: l5io
commit_user_email: [email protected]
commit_author: 'l5io <[email protected]>'
2 changes: 1 addition & 1 deletion .github/workflows/lighthouseci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version: 19
- run: npm install && npm install -g @lhci/[email protected]
- run: npm install --legacy-peer-deps && npm install -g @lhci/[email protected]
- run: CI=false npm run build
- run: lhci collect --config=.desktop-lighthouserc.js
- run: lhci assert --config=.desktop-lighthouserc.js
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/meshmap.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: MeshMap Screenshot Service
name: Kanvas Screenshot Service
'on':
pull_request_target:
types:
Expand All @@ -14,7 +14,7 @@ name: MeshMap Screenshot Service
outputs:
resource_url:
description: The URL of the generated resource.
value: ${{ jobs.MeshMapScreenshot.outputs.resource_url }}
value: ${{ jobs.KanvasScreenshot.outputs.resource_url }}
permissions:
actions: read
contents: write
Expand All @@ -23,7 +23,7 @@ permissions:
pull-requests: write
id-token: write
jobs:
MeshMapScreenshot:
KanvasScreenshot:
runs-on: ubuntu-latest
outputs:
resource_url: ${{ steps.test_result.outputs.resource_url }}
Expand All @@ -32,16 +32,16 @@ jobs:
run: |
export pull_number=$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH")
echo "PULL_NO=$pull_number" >> $GITHUB_ENV
- uses: actions/checkout@v3
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/checkout@v4
with:
path: action
repository: layer5labs/meshmap-snapshot
repository: layer5labs/kanvas-snapshot
- id: test_result
uses: ${GITHUB_REF/refs/tags//}
uses: layer5labs/[email protected]
with:
githubToken: ${{ secrets.GITHUB_TOKEN }}
providerToken: ${{ secrets.PROVIDER_TOKEN }}
mesheryToken: ${{ secrets.MESHERY_TOKEN }}
prNumber: ${{ env.PULL_NO }}
application_type: Kubernetes Manifest
filePath: ${{ inputs.fileName == '' && 'lkjh' || inputs.fileName }}
filePath: ${{ inputs.fileName == '' && '.gitpod.yml' || inputs.fileName }}
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx lint-staged
npm run checklint
2 changes: 1 addition & 1 deletion .lighthouserc.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = {
"http://localhost",
"http://localhost/company/about/index.html",
"http://localhost/cloud-native-management/meshery/index.html",
"http://localhost/cloud-native-management/meshmap/index.html",
"http://localhost/cloud-native-management/kanvas/index.html",
"http://localhost/learn/learning-paths/index.html",
"http://localhost/learn/service-mesh-books/index.html",
"http://localhost/learn/service-mesh-workshops/index.html",
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ We are beyond excited to see that you want to contribute! We would love to accep

⚠️ Cloning this repository ⚠️

Cloning the repo with all its history results in a ~6 GB download. If you don't need the whole history you can use the depth parameter to significantly reduce download size.
Cloning the repo with all its history results in a ~6 GB download. To contribute to this site, you don't need its entire history. Use the `--depth=1` flag to significantly reduce the footprint this repo creates in your environment.

```bash
git clone --depth=1 https://github.com/layer5io/layer5.git
Expand Down Expand Up @@ -227,7 +227,7 @@ OR

- SVG or image uses transparent sections that change with the background color to work with either theme.

[Example of SVG file with transparent sections](https://github.com/layer5io/layer5/blob/master/src/assets/images/meshmap/icon-only/meshmap-icon.svg)
[Example of SVG file with transparent sections](https://github.com/layer5io/layer5/blob/master/src/assets/images/kanvas/icon-only/kanvas-icon-color.svg)

[Example of image file with transparent sections](https://github.com/layer5io/layer5/blob/master/src/assets/images/app/projects/meshery-logo-light.webp)

Expand Down Expand Up @@ -331,7 +331,7 @@ If possible we wish to avoid using images dependent on the theme because we are

1. To change images or SVG as the image source, according to the theme, you have to import the hook `useStyledDarkMode` from the following [folder](https://github.com/layer5io/layer5/blob/master/src/theme/app/useStyledDarkMode.js), and then use the `isDark` value from `useStyledDarkMode` hook for the conditional.

For example, you can view the code for [this file](https://github.com/layer5io/layer5/blob/master/src/sections/Meshmap/Meshmap-collaborate/meshmap-collaborate-banner.js).
For example, you can view the code for [this file](https://github.com/layer5io/layer5/blob/master/src/sections/Kanvas/Kanvas-collaborate/kanvas-collaborate-banner.js).

Here are the relevant parts of the code:

Expand Down Expand Up @@ -403,7 +403,7 @@ Badges are a great way of highlighting the area of contribution by any given com
- <img src="https://github.com/layer5io/layer5/blob/master/src/assets/images/docker-extension/docker-extension-meshery-logo.svg" width="25px" height="25px"/> Docker Extension
- <img src="https://github.com/layer5io/layer5/blob/master/src/assets/images/docs/docs.svg" width="25px" height="25px"/> Docs
- <img src="https://github.com/layer5io/layer5/blob/master/src/assets/images/meshery/meshery-catalog.svg" width="25px" height="25px"/> Meshery Catalog
- <img src="https://github.com/layer5io/layer5/blob/master/src/assets/images/meshmap/icon-only/meshmap-icon.svg" width="25px" height="25px"/> MeshMap
- <img src="https://github.com/layer5io/layer5/blob/master/src/assets/images/kanvas/icon-only/kanvas-icon-color.svg" width="25px" height="25px"/> Kanvas
- <img src="https://github.com/layer5io/layer5/blob/master/src/assets/images/landscape/layer5_landscape_green.svg" width="25px" height="25px"/> Landscape
- <img src="https://github.com/layer5io/layer5/blob/master/src/assets/images/image-hub/layer5-image-hub.svg" width="25px" height="25px"/> ImageHub
- <img src="https://github.com/layer5io/layer5/blob/master/src/assets/images/meshery/icon-only/meshery-logo-light.svg" width="25px" height="25px"/> Meshery
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ setup-libs:

## Install layer5.io dependencies your local machine.
setup:
npm install
npm install --legacy-peer-deps

## Run layer5.io on your local machine.
site:
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@


<p style="clear:both;">
<h2><a href="https://layer5.io/meshmap">MeshMap</a></h2>
<a href="https://layer5.io/meshmap">
<img src="src/assets/images/meshmap/meshmap-color-icon.svg" alt="MeshMap logo" width="125px" style="margin:10px;" align="left" />
<h2><a href="https://layer5.io/kanvas">Kanvas</a></h2>
<a href="https://layer5.io/kanvas">
<img src="src/assets/images/kanvas/icon-only/kanvas-icon-color.svg" alt="Kanvas logo" width="125px" style="margin:10px;" align="left" />
</a>
<a href="https://layer5.io/meshmap">MeshMap</a> is an end-to-end management platform, here to help teams understand problems, deploy designs, apply patterns, manage and operate your deployments and services in real-time.
<a href="https://layer5.io/kanvas">Kanvas</a> is an end-to-end management platform, here to help teams understand problems, deploy designs, apply patterns, manage and operate your deployments and services in real-time.
<br /><br /><br/>
</p>
<br />
Expand Down Expand Up @@ -147,7 +147,7 @@ alt="Nighthawk" align="left" />


<p style="clear:both;">
<h2><a href="https://meshery.layer5.io/catalog">Meshery Catalog</a></h2>
<h2><a href="https://cloud.layer5.io/catalog">Meshery Catalog</a></h2>
<a href="">
<img src=".github/assets/images/catalog/catalog.svg"
style="float:left;margin:10px;" width="125px"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ In the Istio management page:

3. Click the `Deploy` button on the confirmation modal.

{" "}
<a href={IstioDeploy}>
<img src={IstioDeploy} width="70%" align="center" />
</a>
Expand Down
Loading

0 comments on commit 267a23a

Please sign in to comment.