Skip to content

Commit 8ae36fe

Browse files
yi-nuo426yi-nuo426
committed
chore: update dependencies and improve UI components
- Updated @sistent/sistent from 0.14.201 to 0.15.12 - Updated billboard.js from 3.10.3 to 3.17.2 - Updated react-joyride from 2.4.0 to 2.9.3 - Updated react-scripts from 5.0.0 to 5.0.1 - Updated web-vitals from 2.1.4 to 5.1.0 - Changed application title from "Meshery" to "Kanvas" in index.html - Refactored AuthedDashboard component to use QanelasSistentThemeProvider - Updated styled components to replace StyledLink with StyledButtonLink - Enhanced sign-in tooltip in ExtensionComponent with additional information - Updated font styles in styles.css for better typography consistency - Created QanelasSistentThemeProvider to align Sistent's MUI theme with Qanelas font stacks Signed-off-by: Yi Nuo <218099172+yi-nuo426@users.noreply.github.com>
1 parent aa944f6 commit 8ae36fe

File tree

12 files changed

+3254
-1462
lines changed

12 files changed

+3254
-1462
lines changed

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ LABEL org.opencontainers.image.title="Kanvas" \
6565
com.docker.desktop.extension.icon="https://raw.githubusercontent.com/layer5io/kanvas-docker-extension/master/assets/kanvas-mark-logo-light.svg" \
6666
com.docker.extension.publisher-url="https://layer5.io" \
6767
com.docker.extension.categories="kubernetes, cloud-deployment" \
68-
com.docker.extension.changelog="$RELEASE_NOTES" \
69-
com.docker.extension.additional-urls="[{\"title\":\"Documentation\",\"url\":\"https://docs.layer5.io\"},{\"title\":\"Project\",\"url\":\"https://layer5.io\"},{\"title\":\"Slack\",\"url\":\"https://slack.layer5.io\"},{\"title\":\"Discussion Forum\",\"url\":\"https://layer5.io/community#community-forums\"}]"
68+
com.docker.extension.changelog="See https://docs.layer5.io/kanvas/reference/releases/$EXTENSION_TAG" \
69+
com.docker.extension.additional-urls="[{\"title\":\"Documentation\",\"url\":\"https://docs.layer5.io\"},{\"title\":\"Videos\",\"url\":\"https://docs.layer5.io\videos\"},{\"title\":\"Slack\",\"url\":\"https://slack.layer5.io\"},{\"title\":\"Discussion Forum\",\"url\":\"https://discuss.layer5.io\"}]"
7070
COPY --from=builder /backend/bin/service /
7171

7272
ENV EXTENSION_TAG=$EXTENSION_TAG

‎bin/service‎

689 KB
Binary file not shown.

‎package-lock.json‎

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

‎ui/package-lock.json‎

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

‎ui/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
"@mui/material": "^5.5.3",
1616
"@mui/styled-engine-sc": "^5.5.2",
1717
"@mui/styles": "^5.5.3",
18-
"@sistent/sistent": "0.14.201",
18+
"@sistent/sistent": "0.15.12",
1919
"@testing-library/jest-dom": "^5.16.2",
2020
"@testing-library/react": "^12.1.4",
2121
"@testing-library/user-event": "^13.5.0",
2222
"assert": "^2.1.0",
2323
"axios": "^1.12.0",
24-
"billboard.js": "^3.10.3",
24+
"billboard.js": "^3.17.2",
2525
"fs": "^0.0.1-security",
2626
"https-browserify": "^1.0.0",
2727
"isomorphic-unfetch": "^3.1.0",
@@ -32,15 +32,15 @@
3232
"react": "^17.0.2",
3333
"react-app-rewired": "^2.2.1",
3434
"react-dom": "^17.0.2",
35-
"react-joyride": "^2.4.0",
36-
"react-scripts": "5.0.0",
35+
"react-joyride": "^2.9.3",
36+
"react-scripts": "5.0.1",
3737
"sans-serif": "^1.0.0",
3838
"stream-browserify": "^3.0.0",
3939
"stream-http": "^3.2.0",
4040
"styled-components": "^5.3.5",
4141
"url": "^0.11.4",
4242
"web-pingjs": "^1.0.1",
43-
"web-vitals": "^2.1.4",
43+
"web-vitals": "^5.1.0",
4444
"xstate": "^5.17.4"
4545
},
4646
"scripts": {

‎ui/public/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
work correctly both with client-side routing and a non-root public URL.
2828
Learn how to configure a non-root public URL by running `npm run build`.
2929
-->
30-
<title>Meshery</title>
30+
<title>Kanvas</title>
3131
</head>
3232
<body>
3333
<noscript>You need to enable JavaScript to run this app.</noscript>

‎ui/src/components/ExtensionComponent/AuthedDashboard.js‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,10 @@ import {
1616
SectionWrapper,
1717
VersionText,
1818
StyledButton,
19-
StyledLink,
19+
StyledButtonLink,
2020
} from "./styledComponents";
2121

22-
import {
23-
SistentThemeProviderWithoutBaseLine,
24-
InfoCircleIcon,
25-
CustomTooltip,
26-
Box,
27-
CircularProgress,
28-
} from "@sistent/sistent";
22+
import { InfoCircleIcon, CustomTooltip, Box, CircularProgress,SistentThemeProvider } from "@sistent/sistent";
2923

3024
// import KanvasColor from "../../img/SVGs/kanvasColor";
3125
import KanvasWhite from "../../img/SVGs/kanvasWhite";
@@ -35,6 +29,7 @@ import KanvasHorizontalLight from "../../img/SVGs/KanvasHorizontalLight";
3529
import { randomApplicationNameGenerator } from "../../utils";
3630
import { getBase64EncodedFile, getUnit8ArrayDecodedFile } from "../utils/file";
3731
import RecentDesignsCard, { refreshRecentDesignsEvent } from "./RecentDesigns";
32+
import QanelasSistentThemeProvider from "../../theme/QanelasSistentThemeProvider";
3833

3934
const proxyUrl = "http://127.0.0.1:7877";
4035

@@ -62,16 +57,18 @@ const HeaderSection = ({ isDarkTheme }) => (
6257
<MuiBox
6358
display="flex"
6459
justifyContent={"end"}
65-
gap={2}
60+
gap={4}
6661
alignItems={"center"}
67-
mb={2}
62+
m={2}
6863
>
64+
<VersionInfoSection isDarkTheme={isDarkTheme} />
6965
<DocsButton
7066
isDarkTheme={isDarkTheme}
7167
onClick={() =>
7268
window.ddClient.host.openExternal("https://docs.layer5.io/kanvas/")
7369
}
74-
/>
70+
/>
71+
7572
<UserAccountSection isDarkTheme={isDarkTheme} />
7673
</MuiBox>
7774
<MuiBox display="flex" justifyContent="center" mb={2}>
@@ -120,12 +117,12 @@ const LaunchKanvasSection = ({ isDarkTheme }) => {
120117
size="24"
121118
/>
122119
)}
123-
<StyledLink style={{ color: "white" }}>
120+
<StyledButtonLink style={{ color: "white" }}>
124121
{launching ? "Launching" : "Launch"} Kanvas
125-
</StyledLink>
122+
</StyledButtonLink>
126123
</MuiBox>
127124
</StyledButton>
128-
<StyledLink
125+
<StyledButtonLink
129126
style={{
130127
color: "#ccc",
131128
cursor: "pointer",
@@ -137,7 +134,7 @@ const LaunchKanvasSection = ({ isDarkTheme }) => {
137134
>
138135
open in external window
139136
<ExternalLinkIcon width="12" fill="#eee" />
140-
</StyledLink>
137+
</StyledButtonLink>
141138
</AccountDiv>
142139
</ExtensionWrapper>
143140
);
@@ -180,6 +177,7 @@ const ImportDesignSection = ({ isDarkTheme }) => {
180177
};
181178

182179
return (
180+
183181
<ExtensionWrapper
184182
sx={{ backgroundColor: isDarkTheme ? "#393F49" : "#D7DADE" }}
185183
>
@@ -332,7 +330,7 @@ export const Dasboard = ({ isDarkMode }) => {
332330
const isDarkTheme = isDarkMode;
333331

334332
return (
335-
<SistentThemeProviderWithoutBaseLine>
333+
<QanelasSistentThemeProvider>
336334
<HeaderSection isDarkTheme={isDarkTheme} />
337335
<SectionWrapper
338336
sx={{
@@ -355,7 +353,9 @@ export const Dasboard = ({ isDarkMode }) => {
355353
</SectionWrapper>
356354
<RecentDesignsCard isDarkTheme={isDarkMode} />
357355
</SectionWrapper>
358-
<VersionInfoSection isDarkTheme={isDarkMode} />
359-
</SistentThemeProviderWithoutBaseLine>
356+
</QanelasSistentThemeProvider>
357+
358+
359+
360360
);
361361
};

0 commit comments

Comments
 (0)