Skip to content

Commit

Permalink
Revert "Fix meshery#12829"
Browse files Browse the repository at this point in the history 
This reverts commit fcd5ff5.
  • Loading branch information
@eyeaadil
eyeaadil committed Dec 5, 2024
1 parent fcd5ff5 commit b7a49be
Show file tree
Hide file tree
Showing 7 changed files with 3,323 additions and 32 deletions.
3,293 changes: 3,293 additions & 0 deletions docs/_data/errorref/mesheryctl_errors_export.json
View file

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@ module github.com/layer5io/meshery

go 1.21

replace (
github.com/docker/cli => github.com/docker/cli v23.0.6+incompatible
github.com/docker/docker => github.com/docker/docker v23.0.6+incompatible
github.com/kubernetes/kompose => github.com/meshery/kompose v1.26.2-0.20230425025309-3bb778d54007
k8s.io/client-go => k8s.io/client-go v0.28.3
k8s.io/kubectl => k8s.io/kubectl v0.28.3
oras.land/oras-go v1.2.4 => oras.land/oras-go v1.2.3
)

require (
cuelang.org/go v0.6.0
fortio.org/fortio v1.66.2
Expand Down Expand Up @@ -329,13 +338,4 @@ require (
sigs.k8s.io/yaml v1.4.0 // indirect
)

replace (
github.com/99designs/gqlgen => github.com/99designs/gqlgen v0.17.45
github.com/docker/cli => github.com/docker/cli v23.0.6+incompatible
github.com/docker/docker => github.com/docker/docker v23.0.6+incompatible
github.com/kubernetes/kompose => github.com/meshery/kompose v1.26.2-0.20230425025309-3bb778d54007
github.com/vektah/gqlparser/v2 => github.com/vektah/gqlparser/v2 v2.5.11
k8s.io/client-go => k8s.io/client-go v0.28.3
k8s.io/kubectl => k8s.io/kubectl v0.28.3
oras.land/oras-go v1.2.4 => oras.land/oras-go v1.2.3
)
replace github.com/vektah/gqlparser/v2 => github.com/vektah/gqlparser/v2 v2.5.11
1 change: 0 additions & 1 deletion ui/components/DashboardComponent/charts/WorkloadChart.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ export default function WorkloadChart({
<Typography style={{ fontSize: '1.5rem', marginBottom: '1rem' }} align="center">
No workloads found in your cluster(s).
</Typography>
{/* <h2>agagaggaga</h2> */}
<ConnectClustersBtn />
</div>
)}
Expand Down
16 changes: 8 additions & 8 deletions ui/components/LoadingComponents/Animations/AnimatedMeshery.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function getClassName(className, isActive) {

const AnimatedMeshery = (props) => {
const [isActive, setIsActive] = useState(true);
const textfill = props.textfill || '#000000';
const textFill = props.textFill || '#000000';

useEffect(() => {
setTimeout(() => {
Expand Down Expand Up @@ -137,31 +137,31 @@ const AnimatedMeshery = (props) => {
className={getClassName('svg-meshery-25', isActive)}
></polygon>
<polygon
fill={textfill}
fill={textFill}
points="172.5 235.15 172.5 236.6 172.5 243.43 172.5 251.76 172.5 263.92 204.87 263.92 204.87 257.09 179.33 257.09 179.33 251.76 179.33 250.26 198.95 250.26 198.95 243.43 179.33 243.43 179.33 236.6 204.87 236.6 204.87 229.77 172.5 229.77 172.5 235.15"
></polygon>
<polygon
fill={textfill}
fill={textFill}
points="47.96 235.15 47.96 236.6 47.96 243.43 47.96 251.76 47.96 263.92 80.34 263.92 80.34 257.09 54.79 257.09 54.79 251.76 54.79 250.26 74.42 250.26 74.42 243.43 54.79 243.43 54.79 236.6 80.34 236.6 80.34 229.77 47.96 229.77 47.96 235.15"
></polygon>
<path
fill={textfill}
fill={textFill}
d="M125.15,255a8.53,8.53,0,0,1-.7,3.46,8.73,8.73,0,0,1-1.94,2.85,9.52,9.52,0,0,1-2.84,1.91,8.78,8.78,0,0,1-3.49.71h-32v-7.2h32a1.71,1.71,0,0,0,1.73-1.73v-2.78a1.72,1.72,0,0,0-1.73-1.73h-23a8.53,8.53,0,0,1-3.46-.7,9.15,9.15,0,0,1-4.81-4.8,8.61,8.61,0,0,1-.7-3.47v-2.77a8.77,8.77,0,0,1,.7-3.49,9.13,9.13,0,0,1,1.94-2.84,9,9,0,0,1,2.87-1.94,8.53,8.53,0,0,1,3.46-.7h32V237h-32a1.64,1.64,0,0,0-1.23.5,1.67,1.67,0,0,0-.5,1.23v2.77a1.67,1.67,0,0,0,.5,1.23,1.64,1.64,0,0,0,1.23.5h23a8.78,8.78,0,0,1,3.49.71,9.25,9.25,0,0,1,2.84,1.94,9.13,9.13,0,0,1,1.94,2.84,8.73,8.73,0,0,1,.7,3.48Z"
></path>
<path
fill={textfill}
fill={textFill}
d="M168.23,263.92h-6.51V250.48h-25.4v13.44h-6.51V243.24h31.91V229.77h6.51ZM136.32,240h-6.51V229.77h6.51Z"
></path>
<polygon
fill={textfill}
fill={textFill}
points="261.17 241.72 252.63 229.77 244.09 229.77 257.75 250.26 257.75 263.92 264.58 263.92 264.58 250.26 278.24 229.77 269.81 229.77 261.17 241.72"
></polygon>
<path
fill={textfill}
fill={textFill}
d="M216.49,236.28H234v7.1H219.9v6.51h3.23l12.39,14H244l-12.39-14h4.84a5.3,5.3,0,0,0,5.3-5.3v-9.52a5.3,5.3,0,0,0-5.3-5.3H209.8v34.15h6.83Z"
></path>
<path
fill={textfill}
fill={textFill}
d="M42.71,263.92H35.47V239a1.83,1.83,0,0,0-.16-.77,1.9,1.9,0,0,0-.43-.64,2,2,0,0,0-.64-.43,1.83,1.83,0,0,0-.77-.16H0v-7.24H33.47a8.81,8.81,0,0,1,3.57.73,9.49,9.49,0,0,1,3,2,9.38,9.38,0,0,1,2,3,8.81,8.81,0,0,1,.73,3.57Zm-35.47,0H0V237l7.24-2Zm17.71,0H17.71V240.8H25Z"
></path>
</svg>
Expand Down
18 changes: 9 additions & 9 deletions ui/components/LoadingComponents/Animations/AnimatedMesheryCSS.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';

const AnimatedMeshery = (props) => {
const textfill = props.textfill || '#00000';
const textFill = props.textFill || '#00000';
return (
<div>
<svg
Expand Down Expand Up @@ -115,37 +115,37 @@ const AnimatedMeshery = (props) => {
className={'svg-meshery-25 active'}
></polygon>
<polygon
fill={textfill}
fill={textFill}
points="172.5 235.15 172.5 236.6 172.5 243.43 172.5 251.76 172.5 263.92 204.87 263.92 204.87 257.09 179.33 257.09 179.33 251.76 179.33 250.26 198.95 250.26 198.95 243.43 179.33 243.43 179.33 236.6 204.87 236.6 204.87 229.77 172.5 229.77 172.5 235.15"
></polygon>
<polygon
fill={textfill}
fill={textFill}
points="47.96 235.15 47.96 236.6 47.96 243.43 47.96 251.76 47.96 263.92 80.34 263.92 80.34 257.09 54.79 257.09 54.79 251.76 54.79 250.26 74.42 250.26 74.42 243.43 54.79 243.43 54.79 236.6 80.34 236.6 80.34 229.77 47.96 229.77 47.96 235.15"
></polygon>
<path
fill={textfill}
fill={textFill}
d="M125.15,255a8.53,8.53,0,0,1-.7,3.46,8.73,8.73,0,0,1-1.94,2.85,9.52,9.52,0,0,1-2.84,1.91,8.78,8.78,0,0,1-3.49.71h-32v-7.2h32a1.71,1.71,0,0,0,1.73-1.73v-2.78a1.72,1.72,0,0,0-1.73-1.73h-23a8.53,8.53,0,0,1-3.46-.7,9.15,9.15,0,0,1-4.81-4.8,8.61,8.61,0,0,1-.7-3.47v-2.77a8.77,8.77,0,0,1,.7-3.49,9.13,9.13,0,0,1,1.94-2.84,9,9,0,0,1,2.87-1.94,8.53,8.53,0,0,1,3.46-.7h32V237h-32a1.64,1.64,0,0,0-1.23.5,1.67,1.67,0,0,0-.5,1.23v2.77a1.67,1.67,0,0,0,.5,1.23,1.64,1.64,0,0,0,1.23.5h23a8.78,8.78,0,0,1,3.49.71,9.25,9.25,0,0,1,2.84,1.94,9.13,9.13,0,0,1,1.94,2.84,8.73,8.73,0,0,1,.7,3.48Z"
></path>
<path
fill={textfill}
fill={textFill}
d="M168.23,263.92h-6.51V250.48h-25.4v13.44h-6.51V243.24h31.91V229.77h6.51ZM136.32,240h-6.51V229.77h6.51Z"
></path>
<polygon
fill={textfill}
fill={textFill}
points="261.17 241.72 252.63 229.77 244.09 229.77 257.75 250.26 257.75 263.92 264.58 263.92 264.58 250.26 278.24 229.77 269.81 229.77 261.17 241.72"
></polygon>
<path
fill={textfill}
fill={textFill}
d="M216.49,236.28H234v7.1H219.9v6.51h3.23l12.39,14H244l-12.39-14h4.84a5.3,5.3,0,0,0,5.3-5.3v-9.52a5.3,5.3,0,0,0-5.3-5.3H209.8v34.15h6.83Z"
></path>
<path
fill={textfill}
fill={textFill}
d="M42.71,263.92H35.47V239a1.83,1.83,0,0,0-.16-.77,1.9,1.9,0,0,0-.43-.64,2,2,0,0,0-.64-.43,1.83,1.83,0,0,0-.77-.16H0v-7.24H33.47a8.81,8.81,0,0,1,3.57.73,9.49,9.49,0,0,1,3,2,9.38,9.38,0,0,1,2,3,8.81,8.81,0,0,1,.73,3.57Zm-35.47,0H0V237l7.24-2Zm17.71,0H17.71V240.8H25Z"
></path>{' '}
</svg>
</div>
);
};

export const AnimatedMesheryDark = (props) => <AnimatedMeshery {...props} textfill="#fff" />;
export const AnimatedMesheryDark = (props) => <AnimatedMeshery {...props} textFill="#fff" />;
export default AnimatedMeshery;
1 change: 0 additions & 1 deletion ui/components/User.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ const User = (props) => {

if (userData?.status == 'anonymous') {
const url = `${capabilitiesRegistry?.provider_url}?anonymousUserID=${userData?.id}&source=${sourceURL}&ref=${refURL}`;
console.log('AAAAAAAA', url);

return (
<Link href={url}>
Expand Down
6 changes: 3 additions & 3 deletions ui/components/VerticalCarousel/VerticalCarousel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import { Grid } from '@material-ui/core';
// item,
// setActiveIndex
// }) => {

//
// const handleClick = (direction) => {
// if(direction === "prev") setActiveIndex(prev => prev -1)
// if(direction === "next") setActiveIndex(prev => prev + 1)
// return
// }

//
// return (
// <div style={{position: "relative"}}>
// <IconButton
Expand All @@ -31,7 +31,7 @@ import { Grid } from '@material-ui/core';
// </div>
// );
// }

//
// VerticalCarousel.propTypes = {
// data: PropTypes.array.isRequired,
// leadingText: PropTypes.string.isRequired,
Expand Down

0 comments on commit b7a49be

Please sign in to comment.