Skip to content

Commit 7864f51

Browse files
authored
Merge branch 'master' into M-DEV-1/copy-to-clipboard
2 parents 7ed8905 + b250bdc commit 7864f51

File tree

13 files changed

+201
-203
lines changed

13 files changed

+201
-203
lines changed

.github/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ newIssueWelcomeComment: >
77
# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
88
# Comment to be posted to on PRs from first time contributors in your repository
99
newPRWelcomeComment: >
10-
Yay, your first pull request! :thumbsup: A contributor will be by to give feedback soon. In the meantime, you can find updates in the [#github-notifications](https://layer5io.slack.com/archives/CLVT4TSG4) channel in the [community Slack](https://slack.meshery.io).
10+
Yay, your first pull request! :thumbsup: A contributor will be by to give feedback soon. In the meantime, you can find updates in the [#github-notifications](https://mesheryio.slack.com/archives/CLVT4TSG4) channel in the [community Slack](https://slack.meshery.io).
1111
12-
Be sure to double-check that you have signed your commits. Here are instructions for [making signing an implicit activity while performing a commit](https://github.com/layer5io/layer5/blob/master/CONTRIBUTING.md#signing-off-on-commits-developer-certificate-of-origin).
12+
Be sure to double-check that you have signed your commits. Here are instructions for [making signing an implicit activity while performing a commit](https://github.com/meshery/meshery/blob/master/CONTRIBUTING.md#signing-off-on-commits-developer-certificate-of-origin).
1313
1414
#-------------------------------------------------------------------------------
1515
# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge
@@ -23,7 +23,7 @@ firstPRMergeComment: >
2323
<img alt="Meshery Logo" src="">
2424
</picture>
2525
26-
&nbsp; &#9; &nbsp; &#9; &nbsp; &#9; &nbsp; &#9; [Join the community](http://slack.meshery.io), if you haven't yet and please leave a :star: [star on the project](../stargazers). :smile:
26+
&nbsp; &#9; &nbsp; &#9; &nbsp; &#9; &nbsp; &#9; [Join the community](http://slack.meshery.io), if you haven't yet and please leave a :star: [star on the project](../stargazers). :smile:
2727
2828
#-------------------------------------------------------------------------------
2929
# Configuration for request-info - https://github.com/behaviorbot/request-info
@@ -33,7 +33,7 @@ requestInfoReplyComment: >
3333
# *OPTIONAL* Add a list of people whose Issues/PRs will not be commented on
3434
# keys must be GitHub usernames
3535
#requestInfoUserstoExclude:
36-
# - layer5io/maintainers
36+
# - meshery/maintainers
3737

3838
#-------------------------------------------------------------------------------
3939
# Configuration for sentiment-bot - https://github.com/behaviorbot/sentiment-bot

.github/workflows/eslint-gh.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@v4
1313
- name: Run eslint
14-
run: cd site && npm i eslint && npx eslint .
14+
run: cd site && npm install && NODE_ENV=test npx eslint .
1515

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ alt="Meshery Logo" width="70%" /></picture></a><br /><br /></p>
77
<p align="center">
88
<a href="https://hub.docker.com/r/meshery/meshery" alt="Docker pulls">
99
<img src="https://img.shields.io/docker/pulls/layer5/meshery.svg" /></a>
10-
<a href="https://github.com/issues?q=is%3Aopen+is%3Aissue+archived%3Afalse+org%3Alayer5io+org%3Ameshery+org%3Aservice-mesh-performance+org%3Aservice-mesh-patterns+org%3A+label%3A%22help+wanted%22+" alt="GitHub issues by-label">
11-
<img src="https://img.shields.io/github/issues/layer5io/meshery/help%20wanted.svg?color=informational" /></a>
10+
<a href="https://github.com/issues?q=is%3Aopen+is%3Aissue+archived%3Afalse+org%3Ameshery+org%3Aservice-mesh-performance+org%3Aservice-mesh-patterns+org%3A+label%3A%22help+wanted%22+" alt="GitHub issues by-label">
11+
<img src="https://img.shields.io/github/issues/meshery/meshery/help%20wanted.svg?color=informational" /></a>
1212
<a href="https://github.com/meshery/meshery/blob/master/LICENSE" alt="LICENSE">
1313
<img src="https://img.shields.io/github/license/meshery/meshery?color=brightgreen" /></a>
1414
<a href="https://artifacthub.io/packages/helm/meshery/meshery" alt="Artifact Hub Meshery">
@@ -20,9 +20,9 @@ alt="Meshery Logo" width="70%" /></picture></a><br /><br /></p>
2020
<a href="https://bestpractices.coreinfrastructure.org/projects/3564" alt="CLI Best Practices">
2121
<img src="https://bestpractices.coreinfrastructure.org/projects/3564/badge" /></a>
2222
<a href="https://meshery.io/community#discussion-forums" alt="Discuss Users">
23-
<img src="https://img.shields.io/discourse/users?label=discuss&logo=discourse&server=https%3A%2F%2Fdiscuss.layer5.io" /></a>
23+
<img src="https://img.shields.io/discourse/users?label=discuss&logo=discourse&server=http%3A%2F%2Fdiscuss.meshery.io" /></a>
2424
<a href="https://slack.meshery.io" alt="Join Slack">
25-
<img src="https://img.shields.io/badge/Slack-@layer5.svg?logo=slack" /></a>
25+
<img src="https://img.shields.io/badge/Slack-@meshery.svg?logo=slack" /></a>
2626
<a href="https://twitter.com/intent/follow?screen_name=mesheryio" alt="Twitter Follow">
2727
<img src="https://img.shields.io/twitter/follow/mesheryio.svg?label=Follow+Meshery&style=social" /></a>
2828
<a href="https://github.com/meshery/meshery/releases" alt="Meshery Downloads">
@@ -84,24 +84,24 @@ Anyone can create new components. When they do, they can use a predefined shape
8484
Our projects are community-built and welcome collaboration. 👍 Be sure to see the <a href="https://layer5.io/community/newcomers">Contributor Journey Map</a> and <a href="https://meshery.io/community#handbook">Community Handbook</a> for a tour of resources available to you and the <a href="https://layer5.io/community/handbook/repository-overview">Repository Overview</a> for a cursory description of repository by technology and programming language. Jump into community <a href="https://slack.meshery.io">Slack</a> or <a href="https://meshery.io/community#discussion-forums">discussion forum</a> to participate.
8585

8686
<p style="clear:both;">
87-
<a href ="https://meshery.io/community"><img alt="MeshMates" src=".github/assets/images/readme/layer5-community-sign.png" style="margin-right:36px; margin-bottom:7px;" width="140px" align="left" /></a>
87+
<a href ="https://meshery.io/community"><img alt="MeshMates" src=".github/assets/images/readme/community-sign.png" style="margin-right:36px; margin-bottom:7px;" width="140px" align="left" /></a>
8888
<h3>Find your MeshMate</h3>
8989

90-
<p>MeshMates are experienced Layer5 community members, who will help you learn your way around, discover live projects, and expand your community network. Connect with a Meshmate today!</p>
90+
<p>MeshMates are experienced community members, who will help you learn your way around, discover live projects, and expand your community network. Connect with a Meshmate today!</p>
9191

9292
Learn more about the <a href="https://meshery.io/community#meshmates">MeshMates</a> program. <br />
9393

9494
</p>
9595
<br /><br />
9696
<div style="display: flex; justify-content: center; align-items:center;">
9797
<div>
98-
<a href="https://meshery.io/community"><img alt="Layer5 Cloud Native Community" src="https://docs.meshery.io/assets/img/readme/community.png" width="140px" style="margin-right:36px; margin-bottom:7px;" width="140px" align="left"/></a>
98+
<a href="https://meshery.io/community"><img alt="Cloud Native Community" src="https://docs.meshery.io/assets/img/readme/community.png" width="140px" style="margin-right:36px; margin-bottom:7px;" width="140px" align="left"/></a>
9999
</div>
100100
<div style="width:60%; padding-left: 16px; padding-right: 16px">
101101
<p>
102102
✔️ <em><strong>Join</strong></em> any or all of the weekly meetings on <a href="https://meshery.io/calendar">community calendar</a>.<br />
103103
✔️ <em><strong>Watch</strong></em> community <a href="https://www.youtube.com/@mesheryio?sub_confirmation=1">meeting recordings</a>.<br />
104-
✔️ <em><strong>Fill-in</strong></em> a <a href="https://layer5.io/newcomers">member form</a> and gain access to community resources.
104+
✔️ <em><strong>Fill-in</strong></em> a <a href="https://meshery.io/newcomers">member form</a> and gain access to community resources.
105105
<br />
106106
✔️ <em><strong>Discuss</strong></em> in the <a href="https://meshery.io/community#discussion-forums">community forum</a>.<br />
107107
✔️ <em><strong>Explore more</strong></em> in the <a href="https://meshery.io/community#handbook">community handbook</a>.<br />

site/.eslintrc.js

Lines changed: 92 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,98 @@
11
module.exports = {
22

3-
"env": {
4-
"browser": true,
5-
"es6": true,
6-
"node": true,
7-
"amd": true
3+
"env": {
4+
"browser": true,
5+
"es6": true,
6+
"node": true,
7+
"amd": true
8+
},
9+
"settings": {
10+
"react": {
11+
"version": "detect"
12+
}
13+
},
14+
"extends": [
15+
"eslint:recommended",
16+
"plugin:react/recommended"
17+
],
18+
"parser": "@babel/eslint-parser",
19+
"parserOptions": {
20+
"ecmaFeatures": {
21+
"jsx": true
822
},
9-
"settings": {
10-
"react": {
11-
"version": "detect"
23+
"ecmaVersion": 2018,
24+
"sourceType": "module"
25+
},
26+
"plugins": [
27+
"react"
28+
],
29+
"rules": {
30+
"array-bracket-spacing": ["error", "never"],
31+
"comma-style": ["error"],
32+
"arrow-spacing": [
33+
"error",
34+
{
35+
"after": true,
36+
"before": true
1237
}
13-
},
14-
"extends": [
15-
"eslint:recommended",
16-
"plugin:react/recommended"
1738
],
18-
"parser": "@babel/eslint-parser",
19-
"parserOptions": {
20-
"ecmaFeatures": {
21-
"jsx": true
22-
},
23-
"ecmaVersion": 2018,
24-
"sourceType": "module"
25-
},
26-
"plugins": [
27-
"react"
39+
"block-scoped-var": "error",
40+
"block-spacing": "error",
41+
"brace-style": [
42+
"error",
43+
"1tbs"
2844
],
29-
"rules": {
30-
"array-bracket-spacing": ["error", "never"],
31-
"comma-style": ["error"],
32-
"arrow-spacing": [
33-
"error",
34-
{
35-
"after": true,
36-
"before": true
37-
}
38-
],
39-
"block-scoped-var": "error",
40-
"block-spacing": "error",
41-
"brace-style": [
42-
"error",
43-
"1tbs"
44-
],
45-
"jsx-quotes": ["error", "prefer-double"],
46-
"keyword-spacing": "error",
47-
"key-spacing": ["error", {
48-
"beforeColon": false,
49-
"afterColon": true,
50-
}],
51-
"no-unused-vars": [
52-
"warn",
53-
{
54-
"varsIgnorePattern": "React"
55-
}
56-
],
57-
"no-trailing-spaces": "error",
58-
"object-curly-spacing": ["error", "always"],
59-
"react/display-name": 0,
60-
"react/prop-types": 0,
61-
"react/no-unescaped-entities": [0],
62-
"react/jsx-no-duplicate-props": [0],
63-
"indent": [
64-
"error", 2, {
65-
"FunctionExpression": { "parameters": "first" },
66-
"FunctionDeclaration": { "parameters": "first" },
67-
"MemberExpression": 1,
68-
"SwitchCase": 1,
69-
"outerIIFEBody": 0,
70-
"VariableDeclarator": { "var": 2, "let": 2, "const": 3 },
71-
ignoredNodes: ["TemplateLiteral"]
72-
}
73-
],
74-
"linebreak-style": [
75-
"error",
76-
"unix"
77-
],
78-
"quotes": [
79-
"error",
80-
"double"
81-
],
82-
"semi": [
83-
"error",
84-
"always"
85-
],
86-
"strict": 0,
87-
"valid-typeof": 0,
88-
"space-unary-ops": [
89-
1, {
90-
"words": true,
91-
"nonwords": false
92-
}
93-
],
94-
"space-infix-ops": [
95-
"error"
96-
]
97-
}
98-
};
45+
"jsx-quotes": ["error", "prefer-double"],
46+
"keyword-spacing": "error",
47+
"key-spacing": ["error", {
48+
"beforeColon": false,
49+
"afterColon": true,
50+
}],
51+
"no-unused-vars": [
52+
"warn",
53+
{
54+
"varsIgnorePattern": "React"
55+
}
56+
],
57+
"no-trailing-spaces": "error",
58+
"object-curly-spacing": ["error", "always"],
59+
"react/display-name": 0,
60+
"react/prop-types": 0,
61+
"react/no-unescaped-entities": [0],
62+
"react/jsx-no-duplicate-props": [0],
63+
"indent": [
64+
"error", 2, {
65+
"FunctionExpression": { "parameters": "first" },
66+
"FunctionDeclaration": { "parameters": "first" },
67+
"MemberExpression": 1,
68+
"SwitchCase": 1,
69+
"outerIIFEBody": 0,
70+
"VariableDeclarator": { "var": 2, "let": 2, "const": 3 },
71+
ignoredNodes: ["TemplateLiteral"]
72+
}
73+
],
74+
"linebreak-style": [
75+
"error",
76+
"unix"
77+
],
78+
"quotes": [
79+
"error",
80+
"double"
81+
],
82+
"semi": [
83+
"error",
84+
"always"
85+
],
86+
"strict": 0,
87+
"valid-typeof": 0,
88+
"space-unary-ops": [
89+
1, {
90+
"words": true,
91+
"nonwords": false
92+
}
93+
],
94+
"space-infix-ops": [
95+
"error"
96+
]
97+
}
98+
};

site/gatsby-config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
*/
44
module.exports = {
55
siteMetadata: {
6-
title: `Meshery Shape Builder`,
7-
siteUrl: `https://shapes.meshery.io`
6+
title: "Meshery Shape Builder",
7+
siteUrl: "https://shapes.meshery.io"
88
},
99
plugins: ["gatsby-plugin-styled-components"]
1010
};

site/gatsby-node.js

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
exports.onCreateWebpackConfig = ({ actions, getConfig }) => {
2-
const config = getConfig();
3-
4-
// fallbacks for node core modules
5-
config.resolve.fallback = {
6-
...config.resolve.fallback,
7-
path: require.resolve("path-browserify"),
8-
process: require.resolve("process/browser"),
9-
url: require.resolve("url/"),
10-
};
11-
12-
actions.replaceWebpackConfig(config);
2+
const config = getConfig();
3+
4+
// fallbacks for node core modules
5+
config.resolve.fallback = {
6+
...config.resolve.fallback,
7+
path: require.resolve("path-browserify"),
8+
process: require.resolve("process/browser"),
9+
url: require.resolve("url/"),
1310
};
14-
11+
12+
actions.replaceWebpackConfig(config);
13+
};

site/src/components/Navigation/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function Navigation({ theme, toggleTheme, showSignUpButton }) {
3232
}
3333
useEffect(() => {
3434
window.addEventListener("scroll", () =>
35-
setScroll((window.scrollY || window.pageYOffset) > 50)
35+
setScroll((window.scrollY || window.pageYOffset) > 50)
3636
);
3737
}, []);
3838

site/src/components/ShapeBuilder/index.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
import React, { useEffect, useRef, useState } from "react";
33
import { Wrapper, CanvasContainer, OutputBox, StyledSVG } from "./shapeBuilder.styles";
44
import { Button, Typography, Box } from "@layer5/sistent";
5-
import { SVG, extend as SVGextend } from '@svgdotjs/svg.js';
6-
import draw from '@svgdotjs/svg.draw.js';
5+
import { SVG, extend as SVGextend } from "@svgdotjs/svg.js";
6+
import draw from "@svgdotjs/svg.draw.js";
77

88
SVGextend(SVG.Polygon, draw);
99

@@ -76,7 +76,7 @@ const ShapeBuilder = () => {
7676
if (e.ctrlKey && e.key.toLowerCase() === "z") {
7777
const points = getPlottedPoints(poly);
7878
if (!points) return;
79-
poly.plot(points.slice(0, -1));
79+
poly.plot(points.slice(0, -1));
8080
}
8181
};
8282

@@ -180,21 +180,21 @@ const ShapeBuilder = () => {
180180
</StyledSVG>
181181
{error && (
182182
<div style={{
183-
position: 'absolute',
184-
top: '50%',
185-
left: '50%',
186-
transform: 'translate(-50%, -50%)',
187-
color: 'red',
188-
backgroundColor: 'white',
189-
padding: '10px',
190-
borderRadius: '5px'
183+
position: "absolute",
184+
top: "50%",
185+
left: "50%",
186+
transform: "translate(-50%, -50%)",
187+
color: "red",
188+
backgroundColor: "white",
189+
padding: "10px",
190+
borderRadius: "5px"
191191
}}>
192192
{error}
193193
</div>
194194
)}
195195
</CanvasContainer>
196196

197-
<Box sx={{ display: 'flex', justifyContent: 'center', gap: 2, mt: 3, mb: 3, flexWrap: 'wrap' }}>
197+
<Box sx={{ display: "flex", justifyContent: "center", gap: 2, mt: 3, mb: 3, flexWrap: "wrap" }}>
198198
<Button variant="contained" onClick={clearShape}>Clear</Button>
199199
<Button variant="contained" onClick={closeShape}>Close Shape</Button>
200200
<Button variant="contained" onClick={handleMaximize}>Maximize</Button>

0 commit comments

Comments
 (0)