Skip to content

Commit dbebf0b

Browse files
SasSwartSasSwart
committed
revert backend changes for now. so that we can review and merge the db side
1 parent 494f165 commit dbebf0b

38 files changed

+1306
-1071
lines changed

‎site/.storybook/preview.jsx

+8
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,14 @@ export const parameters = {
6464
},
6565
type: "tablet",
6666
},
67+
iphone12: {
68+
name: "iPhone 12",
69+
styles: {
70+
height: "844px",
71+
width: "390px",
72+
},
73+
type: "mobile",
74+
},
6775
terminal: {
6876
name: "Terminal",
6977
styles: {

‎site/package.json

+10-11
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
"update-emojis": "cp -rf ./node_modules/emoji-datasource-apple/img/apple/64/* ./static/emojis"
3535
},
3636
"dependencies": {
37-
"@alwaysmeticulous/recorder-loader": "2.137.0",
3837
"@emoji-mart/data": "1.2.1",
3938
"@emoji-mart/react": "1.1.1",
4039
"@emotion/cache": "11.14.0",
@@ -45,15 +44,15 @@
4544
"@fontsource-variable/inter": "5.0.15",
4645
"@fontsource/ibm-plex-mono": "5.1.0",
4746
"@monaco-editor/react": "4.6.0",
48-
"@mui/icons-material": "5.16.7",
49-
"@mui/lab": "5.0.0-alpha.173",
50-
"@mui/material": "5.16.7",
51-
"@mui/system": "5.16.7",
52-
"@mui/utils": "5.16.6",
53-
"@mui/x-tree-view": "7.18.0",
47+
"@mui/icons-material": "5.16.13",
48+
"@mui/lab": "5.0.0-alpha.175",
49+
"@mui/material": "5.16.13",
50+
"@mui/system": "5.16.13",
51+
"@mui/utils": "5.16.13",
52+
"@mui/x-tree-view": "7.23.2",
5453
"@radix-ui/react-avatar": "1.1.2",
5554
"@radix-ui/react-collapsible": "1.1.2",
56-
"@radix-ui/react-dialog": "1.1.2",
55+
"@radix-ui/react-dialog": "1.1.4",
5756
"@radix-ui/react-dropdown-menu": "2.1.4",
5857
"@radix-ui/react-label": "2.1.0",
5958
"@radix-ui/react-popover": "1.1.3",
@@ -103,7 +102,7 @@
103102
"react-markdown": "9.0.1",
104103
"react-query": "npm:@tanstack/react-query@4.35.3",
105104
"react-router-dom": "6.26.2",
106-
"react-syntax-highlighter": "15.5.0",
105+
"react-syntax-highlighter": "15.6.1",
107106
"react-virtualized-auto-sizer": "1.0.24",
108107
"react-window": "1.8.10",
109108
"remark-gfm": "4.0.0",
@@ -131,7 +130,7 @@
131130
"@storybook/addon-links": "8.4.6",
132131
"@storybook/addon-mdx-gfm": "8.4.6",
133132
"@storybook/addon-themes": "8.4.6",
134-
"@storybook/preview-api": "8.4.6",
133+
"@storybook/preview-api": "8.4.7",
135134
"@storybook/react": "8.4.6",
136135
"@storybook/react-vite": "8.4.6",
137136
"@storybook/test": "8.4.6",
@@ -147,7 +146,7 @@
147146
"@types/file-saver": "2.0.7",
148147
"@types/jest": "29.5.14",
149148
"@types/lodash": "4.17.13",
150-
"@types/node": "20.17.6",
149+
"@types/node": "20.17.11",
151150
"@types/react": "18.3.12",
152151
"@types/react-color": "3.0.12",
153152
"@types/react-date-range": "1.4.4",

‎site/pnpm-lock.yaml

+294-351
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎site/src/api/api.ts

-13
Original file line numberDiff line numberDiff line change
@@ -2097,19 +2097,6 @@ class ApiMethods {
20972097
return response.data;
20982098
};
20992099

2100-
getInsightsUserStatusCountsOverTime = async (
2101-
offset = Math.trunc(new Date().getTimezoneOffset() / 60),
2102-
): Promise<TypesGen.GetUserStatusCountsOverTimeResponse> => {
2103-
const searchParams = new URLSearchParams({
2104-
offset: offset.toString(),
2105-
});
2106-
const response = await this.axios.get(
2107-
`/api/v2/insights/user-status-counts-over-time?${searchParams}`,
2108-
);
2109-
2110-
return response.data;
2111-
};
2112-
21132100
getHealth = async (force = false) => {
21142101
const params = new URLSearchParams({ force: force.toString() });
21152102
const response = await this.axios.get<TypesGen.HealthcheckReport>(

‎site/src/api/queries/insights.ts

-7
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,3 @@ export const insightsUserActivity = (params: InsightsParams) => {
2020
queryFn: () => API.getInsightsUserActivity(params),
2121
};
2222
};
23-
24-
export const userStatusCountsOverTime = () => {
25-
return {
26-
queryKey: ["userStatusCountsOverTime"],
27-
queryFn: () => API.getInsightsUserStatusCountsOverTime(),
28-
};
29-
};

‎site/src/api/queries/users.ts

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import type {
99
UpdateUserProfileRequest,
1010
User,
1111
UsersRequest,
12+
ValidateUserPasswordRequest,
1213
} from "api/typesGenerated";
1314
import {
1415
type MetadataState,

‎site/src/api/typesGenerated.ts

+2-24
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎site/src/components/ActiveUserChart/ActiveUserChart.stories.tsx

+8-61
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,14 @@ const meta: Meta<typeof ActiveUserChart> = {
55
title: "components/ActiveUserChart",
66
component: ActiveUserChart,
77
args: {
8-
series: [
9-
{
10-
label: "Daily",
11-
data: [
12-
{ date: "1/1/2024", amount: 5 },
13-
{ date: "1/2/2024", amount: 6 },
14-
{ date: "1/3/2024", amount: 7 },
15-
{ date: "1/4/2024", amount: 8 },
16-
{ date: "1/5/2024", amount: 9 },
17-
{ date: "1/6/2024", amount: 10 },
18-
{ date: "1/7/2024", amount: 11 },
19-
],
20-
},
8+
data: [
9+
{ date: "1/1/2024", amount: 5 },
10+
{ date: "1/2/2024", amount: 6 },
11+
{ date: "1/3/2024", amount: 7 },
12+
{ date: "1/4/2024", amount: 8 },
13+
{ date: "1/5/2024", amount: 9 },
14+
{ date: "1/6/2024", amount: 10 },
15+
{ date: "1/7/2024", amount: 11 },
2116
],
2217
interval: "day",
2318
},
@@ -27,51 +22,3 @@ export default meta;
2722
type Story = StoryObj<typeof ActiveUserChart>;
2823

2924
export const Example: Story = {};
30-
31-
export const MultipleSeries: Story = {
32-
args: {
33-
series: [
34-
{
35-
label: "Active",
36-
data: [
37-
{ date: "1/1/2024", amount: 150 },
38-
{ date: "1/2/2024", amount: 165 },
39-
{ date: "1/3/2024", amount: 180 },
40-
{ date: "1/4/2024", amount: 155 },
41-
{ date: "1/5/2024", amount: 190 },
42-
{ date: "1/6/2024", amount: 200 },
43-
{ date: "1/7/2024", amount: 210 },
44-
],
45-
color: "green",
46-
},
47-
{
48-
label: "Dormant",
49-
data: [
50-
{ date: "1/1/2024", amount: 80 },
51-
{ date: "1/2/2024", amount: 82 },
52-
{ date: "1/3/2024", amount: 85 },
53-
{ date: "1/4/2024", amount: 88 },
54-
{ date: "1/5/2024", amount: 90 },
55-
{ date: "1/6/2024", amount: 92 },
56-
{ date: "1/7/2024", amount: 95 },
57-
],
58-
color: "grey",
59-
},
60-
{
61-
label: "Suspended",
62-
data: [
63-
{ date: "1/1/2024", amount: 20 },
64-
{ date: "1/2/2024", amount: 22 },
65-
{ date: "1/3/2024", amount: 25 },
66-
{ date: "1/4/2024", amount: 23 },
67-
{ date: "1/5/2024", amount: 28 },
68-
{ date: "1/6/2024", amount: 30 },
69-
{ date: "1/7/2024", amount: 32 },
70-
],
71-
color: "red",
72-
},
73-
],
74-
interval: "day",
75-
userLimit: 100,
76-
},
77-
};

0 commit comments

Comments
 (0)