Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: improve styling and features of wearables app #7

Merged
merged 11 commits into from
Sep 2, 2024
Merged

Feat: improve styling and features of wearables app #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8efd821
Chore: improve styling with colors & icons
joost-stessens Aug 29, 2024
b0e5107
Chore: update title in HTML
joost-stessens Aug 29, 2024
ea2e147
Chore: remove unused variables + dynamically retrieve font family fro…
joost-stessens Aug 29, 2024
b1a48c7
Chore: disable filtering on heat table
joost-stessens Aug 29, 2024
f11b3bc
Merge branch 'main' into feat/improve-styling-and-features
joost-stessens Aug 30, 2024
912c29d
Chore: slightly improve widget configurations
joost-stessens Sep 2, 2024
ce79762
Chore: add icons to user devices
joost-stessens Sep 2, 2024
48c8bda
Chore: improve topnav styling + add mock navigation elements
joost-stessens Sep 2, 2024
4d624b9
Chore: add custom breakpoints to theme
joost-stessens Sep 2, 2024
9c6ad17
Feat: improve UI layout + add circle gauge + make timeline interactiv…
joost-stessens Sep 2, 2024
e17c94c
Chore: push lock files
joost-stessens Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified wearables-dashboard/bun.lockb
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion wearables-dashboard/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
rel="stylesheet"
/>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Flex showcase</title>
<title>Healthosia - Luzmo Flex SDK sample application</title>
</head>
<body>
<div id="root"></div>
Expand Down
100 changes: 100 additions & 0 deletions wearables-dashboard/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions wearables-dashboard/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"@luzmo/react-embed": "next",
"@mui/icons-material": "^5.16.4",
"@mui/lab": "^5.0.0-alpha.172",
"axios": "^1.7.7",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"userflow.js": "^2.12.1"
Expand Down
51 changes: 36 additions & 15 deletions wearables-dashboard/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,27 @@ const theme = createTheme({
typography: {
fontFamily: "Lato",
},
palette: {
primary: {
main: "#6440EB",
},
secondary: {
main: "#fefefe",
},
// background color for the entire app
background: {
default: "#f4f5fd",
},
},
breakpoints: {
values: {
xs: 0,
sm: 900,
md: 1200,
lg: 1536,
xl: 1920,
},
},
});

import "./App.css";
Expand All @@ -33,23 +54,23 @@ function App() {
<>
<UserContext.Provider value={{ user, switchUser }}>
<ThemeProvider theme={theme}>
<Topnav selectedTab={selectedTab} onTabChange={setSelectedTab} />
<Grid
container
spacing={2}
paddingX={2}
paddingBottom={2}
<Box
className="userflow-wearables"
bgcolor="background.default"
minHeight="100vh"
>
{selectedTab === "analytics" && <Analytics />}
{selectedTab === "settings" && (
<Grid item xs={12}>
<Box padding={2}>
<Settings />
</Box>
</Grid>
)}
</Grid>
<Topnav selectedTab={selectedTab} onTabChange={setSelectedTab} />
<Grid container spacing={2} padding={2}>
{selectedTab === "analytics" && <Analytics />}
{selectedTab === "settings" && (
<Grid item xs={12}>
<Box padding={2}>
<Settings />
</Box>
</Grid>
)}
</Grid>
</Box>
</ThemeProvider>
</UserContext.Provider>
</>
Expand Down
Loading
Loading