Skip to content

Commit 90b8d49

Browse files
Merge branch 'master' into feature/icons_section_6258
2 parents c3438c5 + c97b002 commit 90b8d49

8 files changed

Lines changed: 94 additions & 68 deletions

File tree

.github/workflows/kanvas.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: Kanvas Snapshot Service
2+
on: # rebuild any PRs and main branch changes
3+
pull_request_target:
4+
types: [opened, synchronize, reopened]
5+
6+
workflow_call:
7+
inputs:
8+
fileName:
9+
description: Relative file path from the root directory
10+
required: true
11+
type: string
12+
outputs:
13+
resource_url:
14+
description: "The URL of the generated resource."
15+
value: ${{ jobs.MeshMapScreenshot.outputs.resource_url }}
16+
permissions:
17+
actions: read
18+
contents: write
19+
security-events: write
20+
statuses: write
21+
pull-requests: write
22+
id-token: write
23+
24+
jobs:
25+
MeshMapScreenshot:
26+
runs-on: ubuntu-24.04
27+
outputs:
28+
resource_url: ${{ steps.test_result.outputs.resource_url }}
29+
steps:
30+
- name: Set PR number # To comment the final status on the Pull-request opened in any repository
31+
run: |
32+
export pull_number=$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH")
33+
echo "PULL_NO=$pull_number" >> $GITHUB_ENV
34+
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v4 #this step would go away
36+
with:
37+
path: action
38+
repository: layer5labs/kanvas-snapshot
39+
- id: test_result
40+
uses: layer5labs/Kanvas-Snapshot@v0.2.32
41+
with:
42+
githubToken: ${{ secrets.GITHUB_TOKEN }} # github's personal access token example: "ghp_...."
43+
mesheryToken: ${{ secrets.MESHERY_TOKEN }} # Meshery Cloud Authentication token, signin to meshery-cloud to get one, example: ey.....
44+
prNumber: ${{ env.PULL_NO }} # auto-filled from the above step
45+
application_type: Kubernetes Manifest # your application type, could be any of three: "Kubernetes Manifest", "Docker Compose", "Helm Chart"
46+
filePath: ${{ inputs.fileName == '' && 'install/deployment_yamls/k8s' || inputs.fileName }} # relative file-path from the root directory in the github-runner env, you might require to checkout the repository as described in step 2

.github/workflows/meshmap.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.

package-lock.json

Lines changed: 32 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
"@fullcalendar/interaction": "^6.0.1",
3636
"@fullcalendar/react": "^6.1.8",
3737
"@layer5/meshery-design-embed": "^0.4.0",
38-
"@layer5/sistent": "^0.14.164",
38+
"@layer5/sistent": "^0.14.166",
3939
"@loadable/component": "^5.16.4",
4040
"@mdx-js/mdx": "1.6.22",
4141
"@mdx-js/react": "1.6.22",
4242
"@mediacurrent/gatsby-plugin-silence-css-order-warning": "^1.0.0",
43-
"@mui/icons-material": "^5.16.4",
43+
"@mui/icons-material": "^6.4.6",
4444
"@mui/material": "^5.15.11",
4545
"@react-icons/all-files": "^4.1.0",
4646
"@svgr/webpack": "^8.0.1",
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
name: Zihan Kuang
3+
position: Contributor
4+
image_path: ./zihan-kuang.webp
5+
github: zihanKuang
6+
linkedin: zihan-kuang-6087b2329
7+
layer5: 30f82ac6-f326-44c0-80d0-275db76dae9b
8+
location: Gothenburg, Sweden
9+
bio: Hi, I'm Zihan Kuang! I'm a master's student in Software Engineering at Chalmers, passionate about front-end development, TypeScript, and cloud-native tech. I love building sleek UIs, exploring scalable web solutions, and occasionally baking treats to fuel my coding! 🍪
10+
status: Active
11+
published: true
12+
---
27.5 KB
Loading

src/sections/Community/Web-based-from/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ const WebBasedForm = () => {
6666

6767
useEffect(() => {
6868
if (submit) {
69-
axios.post("https://hook.us1.make.com/nd4srs976am5a4h5i17g3qmd4gq8defu", {
69+
axios.post("https://hook.us1.make.com/v66ana9yf3w11k4a1rf3epwquur1s9rd", {
7070
memberFormOne,
7171
MemberFormThirdValue,
7272
MemberFormFourValue,

src/sections/General/Navigation/navigation.style.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import styled from "styled-components";
22

33
const NavigationWrap = styled.header`
44
width: 100vw;
5+
position: sticky;
56
z-index: 9999;
67
top: 0;
78
background-color: ${(props) => props.theme.body};

0 commit comments

Comments
 (0)