Merge branch 'master' into feat/release-v0.5

Signed-off-by: leecalcote <[email protected]>

.eslintrc.js

@@ -1,77 +1,78 @@
 module.exports = {
-    "env": {
-        "browser": true,
-        "es6": true,
-        "amd": true
-    },
-    "settings": {
-        "react": {
-            "version": "require('./package.json').dependencies.react"
-        }
+  "env": {
+    "browser": true,
+    "es6": true,
+    "node": true,
+    "amd": true
+  },
+  "settings": {
+    "react": {
+      "version": "require('./package.json').dependencies.react"
+    }
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:react/recommended"
+  ],
+  "parser": "babel-eslint",
+  "parserOptions": {
+    "ecmaFeatures": {
+      "jsx": true
     },
-    "extends": [
-        "eslint:recommended",
-        "plugin:react/recommended"
+    "ecmaVersion": 2018,
+    "sourceType": "module"
+  },
+  "plugins": [
+    "react"
+  ],
+  "rules": {
+    "arrow-spacing": [
+      "error",
+      {
+        "after": true,
+        "before": true
+      }
     ],
-    "parser": "babel-eslint",
-    "parserOptions": {
-        "ecmaFeatures": {
-            "jsx": true
-        },
-        "ecmaVersion": 2018,
-        "sourceType": "module"
-    },
-    "plugins": [
-        "react"
+    "block-scoped-var": "error",
+    "block-spacing": "error",
+    "brace-style": [
+      "error",
+      "1tbs"
     ],
-    "rules": {
-        "arrow-spacing": [
-            "error",
-            {
-                "after": true,
-                "before": true
-            }
-        ],
-        "block-scoped-var": "error",
-        "block-spacing": "error",
-        "brace-style": [
-            "error",
-            "1tbs"
-        ],
-        "no-unused-vars": [
-            "warn",
-            {
-                "varsIgnorePattern": "React"
-            }
-        ],
-        "react/display-name": [0],
-        "react/prop-types": [0],
-        "react/no-unescaped-entities": [0],
-        "react/jsx-no-duplicate-props": [0],
-        'indent': [
-            'error', 2, {
-                "FunctionExpression": {"parameters": "first"},
-                "FunctionDeclaration": {"parameters": "first"},
-                "MemberExpression": 1,
-                "SwitchCase": 1,
-                "outerIIFEBody": 0,
-                "VariableDeclarator": { "var": 2, "let": 2, "const": 3 },
-                ignoredNodes: ['TemplateLiteral']
-            }
-        ],
-        "linebreak-style": [
-            "error",
-            "unix"
-        ],
-        "quotes": [
-            "error",
-            "double"
-        ],
-        "semi": [
-            "error",
-            "always"
-        ],
-        "strict": 0
-    }
+    "no-unused-vars": [
+      "warn",
+      {
+        "varsIgnorePattern": "React"
+      }
+    ],
+    "react/display-name": [0],
+    "react/prop-types": [0],
+    "react/no-unescaped-entities": [0],
+    "react/jsx-no-duplicate-props": [0],
+    "indent": [
+      "error", 2, {
+        "FunctionExpression": {"parameters": "first"},
+        "FunctionDeclaration": {"parameters": "first"},
+        "MemberExpression": 1,
+        "SwitchCase": 1,
+        "outerIIFEBody": 0,
+        "VariableDeclarator": { "var": 2, "let": 2, "const": 3 },
+        ignoredNodes: ["TemplateLiteral"]
+      }
+    ],
+    "linebreak-style": [
+      "error",
+      "unix"
+    ],
+    "quotes": [
+      "error",
+      "double"
+    ],
+    "semi": [
+      "error",
+      "always"
+    ],
+    "strict": 0
+  }
 };
 

.github/ISSUE_TEMPLATE/chore_task.md

@@ -23,4 +23,4 @@ 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)
-- See Layer5 site designs in this [Figma project](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs).
+- See Layer5 site designs in this [Figma project](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs). Join the [Layer5 Community](http://slack.layer5.io) for access.

.github/ISSUE_TEMPLATE/community_member_profile.md

@@ -18,10 +18,13 @@ Let's recognize <@github-username> as a contributor and community member by crea
 - LinkedIn: <!-- <profilename> only (https://www.linkedin.com/in/<profilename>)-->
 - 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)
+
+The CONTRIBUTING.md file has a "Common Types of Site Updates" section with detailed examples to follow here.[CONTRIBUTING.md](https://github.com/layer5io/layer5/blob/master/CONTRIBUTING.md)
 ---
 
 **Contributor Resources**
 
 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)
-- See Layer5 site designs in this [Figma project](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs).
+- See Layer5 site designs in this [Figma project](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs). Join the [Layer5 Community](http://slack.layer5.io) for access.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -23,4 +23,4 @@ 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)
-- See Layer5 site designs in this [Figma project](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs).
+- See Layer5 site designs in this [Figma project](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs). Join the [Layer5 Community](http://slack.layer5.io) for access.

.github/config.yml

@@ -15,9 +15,13 @@ newPRWelcomeComment: >
 # Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge
 # Comment to be posted to on pull requests merged by a first time user
 firstPRMergeComment: >
-  Thanks for your contribution to the Layer5 community! :tada:
-   
-  ![Congrats!](https://raw.githubusercontent.com/layer5io/layer5/master/.github/welcome/Layer5-celebration.png)
+     	   	    	    	 Thank you for contributing to the Layer5 community! :tada:
+  \
+  \
+  ![Congrats!](https://github.com/layer5io/layer5/blob/master/.github/welcome/Layer5-celebration.png)
+  \
+  \
+    	   	    	    	 [Join the community](http://slack.layer5.io), if you haven't yet and please leave a :star: [star on the project](../stargazers). :smile: and
 
 
 #-------------------------------------------------------------------------------

CONTRIBUTING.md

@@ -2,15 +2,33 @@
 You want to contribute to Layer5's community and projects? Yay! We want you to! Visit https://layer5.io/community/newcomers for a list of resources available to help you get started. Contributions of all shapes and sizes are welcome (contributors, too)! Layer5 is community-built and warmly welcomes collaboration. Contributors are expected to adhere to our [Code of Conduct](.CODE_OF_CONDUCT.md).
 
 ## Layer5 Site
-The Layer5 website is hosted in this repository and is built using Gatsbyjs. See the [design document](https://docs.google.com/document/d/1rvUZy2_S1a2_14BAQIg6b9cMhUuu04kYzkOPDPaPptI/edit#) for more information and the [#websites](https://layer5io.slack.com/archives/C015QJKUMPU) channel. 
+The Layer5 website is hosted in this repository and is built using Gatsbyjs. See the [design document](https://docs.google.com/document/d/1rvUZy2_S1a2_14BAQIg6b9cMhUuu04kYzkOPDPaPptI/edit#) for more information and the [#websites](https://layer5io.slack.com/archives/C015QJKUMPU) channel.
 
 When submitting a pull request a preview deployment will be built and made available to you on your PR.
 
 ### Common Types of Site Updates
 
 #### Community Member Profile ([create new issue](https://github.com/layer5io/layer5/issues/new?assignees=&labels=area%2Fcommunity&template=New+Member+Profile.md&title=%5BCommunity%5D+Member+Profile%3A))
 
-Layer5 community members are an integral part of what makes Layer5 and it's projects successful. Prominently highlighting our members and their works is important. When adding a new or updating an existing community member profile, be sure to use the [Community Member Profile issue template](https://github.com/layer5io/layer5/issues/new?assignees=&labels=area%2Fcommunity&template=New+Member+Profile.md&title=%5BCommunity%5D+Member+Profile%3A), which has all the instructions needed. 
+Layer5 community members are an integral part of what makes Layer5 and it's projects successful. Prominently highlighting our members and their works is important. When adding a new or updating an existing community member profile, be sure to use the [Community Member Profile issue template](https://github.com/layer5io/layer5/issues/new?assignees=&labels=area%2Fcommunity&template=New+Member+Profile.md&title=%5BCommunity%5D+Member+Profile%3A), which has all the instructions needed.
+
+#### Source code for Community Member Profiles
+
+When adding a new or updating an existing community member profile be sure to follow the existing template which can be found here [Community Member Profile template](https://github.com/layer5io/layer5/tree/master/src/collections/members/_member-profile-template). You can easily understand the template by checking out one of the profiles [here](https://github.com/layer5io/layer5/blob/master/src/collections/members/abishek-kumar/index.mdx)
+
+
+#### Badges for Community Members
+
+Badges offer recognition of the efforts and works of community members.  Badges are assigned to a community member in acknowledgement of their engagement within and/or contribution to the representative project or (sub-)community. A variety of badges exist so that community members and their efforts may be affiliated with a particular project or community initiative. An example of how a badge assigned using markdown can be found [here](https://github.com/layer5io/layer5/blob/master/src/collections/members/abishek-kumar/index.mdx), and it will be appear [this way](https://layer5.io/community/members/abishek-kumar) on a member profile.
+##### Possible badges include
+
+- <img src="https://github.com/layer5io/layer5/blob/master/src/sections/Community/Member-single/community-green.svg" width="25px" height="25px"/> community
+- <img src="https://github.com/layer5io/layer5/blob/master/src/sections/Community/Member-single/landscape-green.png" width="25px" height="25px"/> Landscape
+- <img src="https://github.com/layer5io/layer5/blob/master/src/sections/Community/Member-single/layer5-image-hub.svg" width="25px" height="25px"/> Layer5
+- <img src="https://github.com/layer5io/layer5/blob/master/src/sections/Community/Member-single/meshery-logo-light.svg" width="25px" height="25px"/> Meshery
+- <img src="https://github.com/layer5io/layer5/blob/master/src/sections/Community/Member-single/meshery-operator-dark.svg" width="25px" height="25px"/> Meshery Operator
+- <img src="https://github.com/layer5io/layer5/blob/master/src/sections/Community/Member-single/smp-dark-text.svg" width="25px" height="25px"/> smp
+- <img src="https://github.com/layer5io/layer5/blob/master/src/sections/Community/Member-single/smp-dark.svg" width="25px" height="25px"/> smp
 
 #### <a name="updating-the-service-mesh-landscape">Updating the Service Mesh Landscape ([create new issue](https://github.com/layer5io/layer5/issues/new?assignees=&labels=area%2Flandscape&template=landscape.md&title=%5BLandscape%5D))
 
@@ -41,7 +59,6 @@ To update the Service Mesh Timeline, add the new service mesh in the [non-functi
 Before building the site, ensure that you have the following dependencies installed on your system.
 
 - [Nodejs and npm](https://nodejs.org/en/): To verify run `node -v` & `npm -v`
-- [gatsby cli](https://www.gatsbyjs.org/tutorial/part-zero/#using-the-gatsby-cli): e.g., `npm install -g gatsby-cli`
 
 ### Building the site
 
@@ -58,7 +75,7 @@ Please contribute! The Layer5 site uses Gatsby. The process of contributing to d
 1. Switch to the `master` branch.
 `git checkout master`
 1. Create and checkout a new branch to make changes within
-`git checkout -b <my-username>/<my-changes>` 
+`git checkout -b <my-username>/<my-changes>`
 1. Edit site/add content.
 `vi <specific page>.md` # or use your favorite IDE
 1. Run site locally to preview changes.
@@ -103,4 +120,3 @@ To ensure all your commits are signed, you may choose to add this alias to your
 Or you may configure your IDE, for example, Visual Studio Code to automatically sign-off commits for you:
 
 <a href="./.github/assets/images/git-signoff-vscode.png" ><img src="./.github/assets/images/git-signoff-vscode.png" width="50%"/><a>
-

Makefile

@@ -7,7 +7,7 @@ build:
 
 .PHONY: setup-libs
 setup-libs:
-	npm install
+	npm install --legacy-peer-deps
 
 .PHONY: site
 site:

README.md

@@ -85,7 +85,7 @@ alt="Layer5" align="left" /></a>
 <br />
 <p style="clear:both;">
 <h2><a href="https://layer5.io/smi">GetNightHawk </a></h2>
-<a href="https://getnighthawk.dev/"><img src=".github/assets/images/layer5/5-light-bg.png"
+<a href="https://getnighthawk.dev/"><img src=".github/assets/images/getnighthawk/getnighthawk-logo.svg"
 style="margin:10px;" width="125px"
 alt="Layer5" align="left" /></a>
 <a href="https://getnighthawk.dev/">Nighthawk</a> is a Layer 7 (HTTP/HTTPS/HTTP2) performance characterization tool. Nighthawk is Envoy’s load generator and is written in C++. Meshery integrates Nighthawk as one of (currently) three choices of load generator for characterizing and managing the performance of service meshes and their workloads.

gatsby-config.js

@@ -193,6 +193,7 @@ module.exports = {
         name: "events",
       },
     },
+    "gatsby-plugin-image",
     "gatsby-plugin-sharp",
     {
       resolve: "gatsby-transformer-sharp",

gatsby-node.js

@@ -42,7 +42,16 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
   createRedirect({ fromPath: "/contact", toPath: "/company/contact", redirectInBrowser: true, isPermanent: true });
   createRedirect({ fromPath: "/news", toPath: "/company/news", redirectInBrowser: true, isPermanent: true });
   createRedirect({ fromPath: "/service-meshes", toPath: "/service-mesh-landscape", redirectInBrowser: true, isPermanent: true });
+  createRedirect({ fromPath: "/calendar", toPath: "/community/calendar", redirectInBrowser: true, isPermanent: true });
+  createRedirect({ fromPath: "/smi", toPath: "/projects/service-mesh-interface-conformance", redirectInBrowser: true, isPermanent: true });
 
+  //****
+  // External Resoruce Redirects
+  //****
+
+  // New Community Member (Google Form)
+  createRedirect({ fromPath: "/newcomer", toPath: "https://docs.google.com/forms/d/e/1FAIpQLSdMLeZY6hZ46yYNkoKKV5OM-jCypjbYcqptbUNltEE73EqCjA/viewform", redirectInBrowser: true, isPermanent: true });
+
   // Create Pages
   const { createPage } = actions;
   const blogPostTemplate = path.resolve(