Skip to content

Commit 79e6d69

Browse files
leecalcoteleecalcote
authored
Merge branch 'master' into patch-1
2 parents bcd6388 + 4b43d89 commit 79e6d69

10 files changed

Lines changed: 146 additions & 19 deletions

File tree

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ assignees: ''
3434
- 🛠 [Meshery Build & Release Strategy](https://docs.meshery.io/project/build-and-release)
3535
- 📚 [Instructions for contributing to documentation](https://github.com/meshery/meshery/blob/master/CONTRIBUTING.md#documentation-contribution-flow)
3636
- Meshery documentation [site](https://docs.meshery.io/) and [source](https://github.com/meshery/meshery/tree/master/docs)
37-
- 🎨 Wireframes and [designs for Meshery UI](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
37+
- 🎨 Wireframes and [designs for Meshery UI](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/GvB8SudhEOoq3JOvoLaoMs)
3838
- 🙋🏾🙋🏼 Questions: [Discussion Forum](http://discuss.meshery.io) and [Community Slack](https://slack.meshery.io)

‎.github/ISSUE_TEMPLATE/documentation.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ assignees: ''
1717
- 📚 [Instructions for contributing to documentation](https://docs.meshery.io/project/contributing/contributing-docs)
1818
- Meshery documentation [site](https://docs.meshery.io/) and [source](https://github.com/meshery/meshery/tree/master/docs)
1919
- 🛠 [Meshery Build & Release Strategy](https://docs.meshery.io/project/build-and-release)
20-
- 🎨 Wireframes and [designs for Meshery UI](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
20+
- 🎨 Wireframes and [designs for Meshery UI](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/GvB8SudhEOoq3JOvoLaoMs)
2121
- 🙋🏾🙋🏼 Questions: [Discussion Forum](http://discuss.meshery.io) and [Community Slack](https://slack.meshery.io)

‎.github/workflows/build-and-deploy-site.yml‎

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,47 @@
11
name: Build and Deploy Site
2+
23
on:
34
push:
45
branches: [ master ]
6+
paths:
7+
- 'site/**'
8+
- 'Makefile'
9+
- 'CNAME'
10+
- '.github/workflows/build-and-deploy-site.yml'
11+
- '.github/workflows/build-and-preview-site.yml'
12+
13+
permissions:
14+
contents: write
15+
16+
defaults:
17+
run:
18+
shell: bash
519

620
jobs:
721
build-and-deploy:
8-
runs-on: ubuntu-latest
22+
runs-on: ubuntu-24.04
923
steps:
10-
- name: Checkout 🛎️
11-
uses: actions/checkout@v3.5.3
12-
- name: Install and Build 🔧
24+
- name: Checkout site source
25+
uses: actions/checkout@v6
26+
27+
- name: Setup Node
28+
uses: actions/setup-node@v4
29+
with:
30+
node-version: "20"
31+
cache: "npm"
32+
cache-dependency-path: site/package-lock.json
33+
34+
- name: Install and Build
1335
run: |
14-
make setup-libs
36+
make setup
1537
make build
38+
cp CNAME site/build/CNAME
39+
touch site/build/.nojekyll
1640
17-
- name: Deploy 🚀
18-
uses: JamesIves/github-pages-deploy-action@v4.4.3
41+
- name: Deploy site
42+
uses: peaceiris/actions-gh-pages@v4
1943
with:
20-
branch: site # The branch the action should deploy to.
21-
folder: site/build # The folder the action should deploy.
22-
clean: true
44+
github_token: ${{ secrets.GITHUB_TOKEN }}
45+
publish_branch: gh-pages
46+
publish_dir: ./site/build
47+
keep_files: true

‎.github/workflows/build-and-preview-site.yml‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
name: Build and Preview Site
2+
3+
on:
4+
pull_request_target:
5+
branches: [master]
6+
types: [opened, synchronize, reopened, closed]
7+
paths:
8+
- '!**'
9+
- 'site/**'
10+
- 'Makefile'
11+
- 'CNAME'
12+
- '.github/workflows/build-and-preview-site.yml'
13+
- '.github/workflows/build-and-deploy-site.yml'
14+
15+
permissions:
16+
contents: write
17+
pull-requests: write
18+
19+
concurrency:
20+
group: preview-${{ github.event.pull_request.number || github.run_id }}
21+
cancel-in-progress: true
22+
23+
defaults:
24+
run:
25+
shell: bash
26+
27+
jobs:
28+
build-and-deploy-preview:
29+
runs-on: ubuntu-24.04
30+
31+
steps:
32+
- name: Checkout PR code
33+
if: github.event.action != 'closed'
34+
uses: actions/checkout@v6
35+
with:
36+
repository: ${{ github.event.pull_request.head.repo.full_name }}
37+
ref: ${{ github.event.pull_request.head.sha }}
38+
persist-credentials: false
39+
fetch-depth: 0
40+
41+
- name: Checkout for cleanup
42+
if: github.event.action == 'closed'
43+
uses: actions/checkout@v6
44+
with:
45+
ref: gh-pages
46+
fetch-depth: 0
47+
48+
- name: Setup Node
49+
if: github.event.action != 'closed'
50+
uses: actions/setup-node@v4
51+
with:
52+
node-version: "20"
53+
cache: "npm"
54+
cache-dependency-path: site/package-lock.json
55+
56+
- name: Install and Build PR preview
57+
if: github.event.action != 'closed'
58+
run: |
59+
make setup
60+
make build
61+
touch site/build/.nojekyll
62+
cat > site/build/robots.txt <<'EOF'
63+
User-agent: *
64+
Disallow: /
65+
EOF
66+
perl -0pi -e 's|<meta property="og:url" content="[^"]*" />|<meta property="og:url" content="https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/pr-preview/pr-${{ github.event.pull_request.number }}/" />|; s|</head>| <meta name="robots" content="noindex, nofollow" />\n</head>|' site/build/index.html
67+
68+
- name: Deploy PR preview
69+
if: github.event.action != 'closed'
70+
uses: rossjrw/pr-preview-action@v1.6.3
71+
with:
72+
source-dir: ./site/build
73+
preview-branch: gh-pages
74+
umbrella-dir: pr-preview
75+
action: auto
76+
comment: false
77+
78+
- name: Comment PR with Preview URL
79+
if: github.event.action != 'closed'
80+
uses: marocchino/sticky-pull-request-comment@v2
81+
with:
82+
header: pr-preview
83+
message: |
84+
🚀 **Preview deployment for PR #${{ github.event.pull_request.number }}**
85+
86+
🌐 **Preview URL**: https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/pr-preview/pr-${{ github.event.pull_request.number }}/
87+
88+
_This preview will be updated automatically when you push new commits to this PR._
89+
90+
- name: Cleanup PR preview on close
91+
if: github.event.action == 'closed'
92+
uses: rossjrw/pr-preview-action@v1.6.3
93+
with:
94+
preview-branch: gh-pages
95+
umbrella-dir: pr-preview
96+
action: remove

‎site/src/components/Discuss-Callout/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22
import DiscussWrapper from "./discuss.style";
3-
3+
import { DISCUSS_FORUM_URL } from "../../constants/links";
44
import Discuss from "../../assets/images/meshery-learn-logo-white.png";
55

66
const DiscussCallout = () => {
@@ -9,7 +9,7 @@ const DiscussCallout = () => {
99
<div className="explain">
1010
<div className="cards">
1111
<div className="card">
12-
<a href="http://discuss.meshery.io/" target="_blank" rel="noreferrer">
12+
<a href={DISCUSS_FORUM_URL} target="_blank" rel="noopener noreferrer">
1313
<div className="parentcard">
1414
<div className="section-title">
1515
<h2>Join the Conversation</h2>

‎site/src/components/Faq/faqSection.style.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ const FaqSectionWrapper = styled.section`
44
margin: 0.5rem auto;
55
position: relative;
66
overflow: scroll;
7+
width: 100%;
8+
max-width: 900px;
9+
box-sizing: border-box;
710
&::-webkit-scrollbar {
811
display: none;
912
}
@@ -40,6 +43,7 @@ const FaqSectionWrapper = styled.section`
4043
font-size: 18px;
4144
position: relative;
4245
color: #ffffff;
46+
padding-right: 3rem;
4347
}
4448
> div {
4549
&:focus {

‎site/src/components/Footer/index.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import LinkedinIcon from "../../assets/images/social-icons/linkedin.png";
99
import BlueskyIcon from "../../assets/images/social-icons/bluesky.svg";
1010
import { ReactComponent as TwitterLogo } from "../../assets/images/social-icons/twitter.svg";
1111
import FooterWrapper from "./Footer.styles";
12+
import { DISCUSS_FORUM_URL } from "../../constants/links";
1213

1314
const Footer = () => {
1415
return (
@@ -105,7 +106,7 @@ const Footer = () => {
105106
</h3>
106107
<ul className="section-categories">
107108
<li>
108-
<a className="category-link" href="http://discuss.meshery.io/">
109+
<a className="category-link" href={DISCUSS_FORUM_URL}>
109110
Discussion Forum
110111
</a>
111112
</li>

‎site/src/components/Navigation/index.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,15 @@ setScroll((window.scrollY || window.pageYOffset) > 50)
124124
style={{ display: `${dropDown ? "block" : "none"}` }}
125125
>
126126
<a
127-
rel="noreferrer"
127+
rel="noopener noreferrer"
128128
target="_blank"
129129
className="drop-item"
130130
href={`https://cloud.layer5.io/user/${userData.id}`}
131131
>
132132
<CloudIcon /> Cloud
133133
</a>
134134
<a
135-
rel="noreferrer"
135+
rel="noopener noreferrer"
136136
target="_blank"
137137
className="drop-item"
138138
href="https://playground.meshery.io"
@@ -148,7 +148,7 @@ setScroll((window.scrollY || window.pageYOffset) > 50)
148148
// Refresh the current page
149149
window.location.reload();
150150
}}
151-
rel="noreferrer"
151+
rel="noopener noreferrer"
152152
className="drop-item"
153153
>
154154
<div className="drop-item-icon">

‎site/src/constants/links.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const DISCUSS_FORUM_URL = "https://discuss.layer5.io/";

‎site/src/reusecore/Button/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const Button = ({
2727
<React.Fragment>
2828
{
2929
props.url ?
30-
(<a href={props.url} target="_blank" rel="noreferrer">{initalButton}</a>)
30+
(<a href={props.url} target="_blank" rel="noopener noreferrer">{initalButton}</a>)
3131
: initalButton
3232
}
3333
</React.Fragment>

0 commit comments

Comments
 (0)