Skip to content

Commit 88f72ab

Browse files
notsidneynotsidney
authored
Merge pull request #561 from rowyio/rc
v2.1.0
2 parents 19c1b15 + 2534618 commit 88f72ab

File tree

112 files changed

+3074
-2024
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+3074
-2024
lines changed

‎package.json

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Rowy",
3-
"version": "2.0.0",
3+
"version": "2.1.0",
44
"homepage": "https://rowy.io",
55
"repository": {
66
"type": "git",
@@ -13,14 +13,14 @@
1313
"@emotion/react": "^11.4.0",
1414
"@emotion/styled": "^11.3.0",
1515
"@hookform/resolvers": "^2.8.1",
16-
"@mdi/js": "^5.9.55",
16+
"@mdi/js": "^6.2.95",
1717
"@monaco-editor/react": "^4.1.0",
1818
"@mui/icons-material": "^5.0.0",
19-
"@mui/lab": "^5.0.0-alpha.47",
19+
"@mui/lab": "^5.0.0-alpha.50",
2020
"@mui/material": "^5.0.0",
2121
"@mui/styles": "^5.0.0",
22-
"@rowy/form-builder": "^0.2.4",
23-
"@rowy/multiselect": "^0.2.1",
22+
"@rowy/form-builder": "^0.3.1",
23+
"@rowy/multiselect": "^0.2.3",
2424
"@tinymce/tinymce-react": "^3.12.6",
2525
"algoliasearch": "^4.8.6",
2626
"ansi-to-react": "^6.1.5",
@@ -59,7 +59,6 @@
5959
"react-router-dom": "^5.0.1",
6060
"react-router-hash-link": "^2.4.3",
6161
"react-scripts": "^4.0.3",
62-
"react-scroll-sync": "^0.8.0",
6362
"react-usestateref": "^1.0.5",
6463
"serve": "^11.3.2",
6564
"swr": "^1.0.1",

‎public/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<link rel="stylesheet" href="https://rsms.me/inter/inter.css" />
7373
<link
7474
rel="stylesheet"
75-
href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:ital,wght@0,400;0,600;1,400;1,600&display=swap"
75+
href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,400;0,700;1,400;1,700&display=swap"
7676
/>
7777

7878
<title>Rowy</title>

‎src/App.tsx

+159-156
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import Loading from "components/Loading";
1313
import Navigation from "components/Navigation";
1414
import Logo from "assets/Logo";
1515

16+
import SwrProvider from "contexts/SwrContext";
1617
import ConfirmationProvider from "components/ConfirmationDialog/Provider";
1718
import { AppProvider } from "contexts/AppContext";
1819
import { ProjectContextProvider } from "contexts/ProjectContext";
@@ -56,166 +57,168 @@ export default function App() {
5657
return (
5758
<StyledEngineProvider injectFirst>
5859
<ErrorBoundary>
59-
<LocalizationProvider dateAdapter={AdapterDateFns}>
60-
<AppProvider>
61-
<Favicon />
62-
<SnackbarProvider>
63-
<ConfirmationProvider>
64-
<SnackLogProvider>
65-
<CustomBrowserRouter>
66-
<Suspense fallback={<Loading fullScreen />}>
67-
<Switch>
68-
<Route
69-
exact
70-
path={routes.auth}
71-
render={() => <AuthPage />}
72-
/>
73-
<Route
74-
exact
75-
path={routes.authSetup}
76-
render={() => <AuthSetupGuidePage />}
77-
/>
78-
<Route
79-
exact
80-
path={routes.jwtAuth}
81-
render={() => <JwtAuthPage />}
82-
/>
83-
<Route
84-
exact
85-
path={routes.signOut}
86-
render={() => <SignOutPage />}
87-
/>
88-
<Route
89-
exact
90-
path={routes.signUp}
91-
render={() => <SignUpPage />}
92-
/>
93-
<Route
94-
exact
95-
path={routes.setup}
96-
render={() => <SetupPage />}
97-
/>
98-
<Route
99-
exact
100-
path={routes.deploy}
101-
render={() => <DeployPage />}
102-
/>
60+
<SwrProvider>
61+
<LocalizationProvider dateAdapter={AdapterDateFns}>
62+
<AppProvider>
63+
<Favicon />
64+
<SnackbarProvider>
65+
<ConfirmationProvider>
66+
<SnackLogProvider>
67+
<CustomBrowserRouter>
68+
<Suspense fallback={<Loading fullScreen />}>
69+
<Switch>
70+
<Route
71+
exact
72+
path={routes.auth}
73+
render={() => <AuthPage />}
74+
/>
75+
<Route
76+
exact
77+
path={routes.authSetup}
78+
render={() => <AuthSetupGuidePage />}
79+
/>
80+
<Route
81+
exact
82+
path={routes.jwtAuth}
83+
render={() => <JwtAuthPage />}
84+
/>
85+
<Route
86+
exact
87+
path={routes.signOut}
88+
render={() => <SignOutPage />}
89+
/>
90+
<Route
91+
exact
92+
path={routes.signUp}
93+
render={() => <SignUpPage />}
94+
/>
95+
<Route
96+
exact
97+
path={routes.setup}
98+
render={() => <SetupPage />}
99+
/>
100+
<Route
101+
exact
102+
path={routes.deploy}
103+
render={() => <DeployPage />}
104+
/>
103105

104-
<Route
105-
exact
106-
path={"/test"}
107-
render={() => <TestPage />}
108-
/>
106+
<Route
107+
exact
108+
path={"/test"}
109+
render={() => <TestPage />}
110+
/>
109111

110-
<PrivateRoute
111-
exact
112-
path={[
113-
routes.home,
114-
routes.tableWithId,
115-
routes.tableGroupWithId,
116-
routes.settings,
117-
routes.projectSettings,
118-
routes.userSettings,
119-
routes.userManagement,
120-
routes.impersonatorAuth,
121-
routes.rowyRunTest,
122-
]}
123-
render={() => (
124-
<ProjectContextProvider>
125-
<Switch>
126-
<Route
127-
exact
128-
path={routes.impersonatorAuth}
129-
render={() => <ImpersonatorAuthPage />}
130-
/>
131-
<Route
132-
exact
133-
path={routes.rowyRunTest}
134-
render={() => <RowyRunTestPage />}
135-
/>
136-
<PrivateRoute
137-
exact
138-
path={routes.home}
139-
render={() => (
140-
<Navigation
141-
title="Home"
142-
titleComponent={(open, pinned) =>
143-
!(open && pinned) && (
144-
<Logo
145-
style={{
146-
display: "block",
147-
margin: "0 auto",
148-
}}
149-
/>
150-
)
151-
}
152-
>
153-
<HomePage />
154-
</Navigation>
155-
)}
156-
/>
157-
<PrivateRoute
158-
path={routes.tableWithId}
159-
render={() => <TablePage />}
160-
/>
161-
<PrivateRoute
162-
path={routes.tableGroupWithId}
163-
render={() => <TablePage />}
164-
/>
112+
<PrivateRoute
113+
exact
114+
path={[
115+
routes.home,
116+
routes.tableWithId,
117+
routes.tableGroupWithId,
118+
routes.settings,
119+
routes.projectSettings,
120+
routes.userSettings,
121+
routes.userManagement,
122+
routes.impersonatorAuth,
123+
routes.rowyRunTest,
124+
]}
125+
render={() => (
126+
<ProjectContextProvider>
127+
<Switch>
128+
<Route
129+
exact
130+
path={routes.impersonatorAuth}
131+
render={() => <ImpersonatorAuthPage />}
132+
/>
133+
<Route
134+
exact
135+
path={routes.rowyRunTest}
136+
render={() => <RowyRunTestPage />}
137+
/>
138+
<PrivateRoute
139+
exact
140+
path={routes.home}
141+
render={() => (
142+
<Navigation
143+
title="Home"
144+
titleComponent={(open, pinned) =>
145+
!(open && pinned) && (
146+
<Logo
147+
style={{
148+
display: "block",
149+
margin: "0 auto",
150+
}}
151+
/>
152+
)
153+
}
154+
>
155+
<HomePage />
156+
</Navigation>
157+
)}
158+
/>
159+
<PrivateRoute
160+
path={routes.tableWithId}
161+
render={() => <TablePage />}
162+
/>
163+
<PrivateRoute
164+
path={routes.tableGroupWithId}
165+
render={() => <TablePage />}
166+
/>
165167

166-
<PrivateRoute
167-
exact
168-
path={routes.settings}
169-
render={() => (
170-
<Redirect to={routes.userSettings} />
171-
)}
172-
/>
173-
<PrivateRoute
174-
exact
175-
path={routes.projectSettings}
176-
render={() => (
177-
<Navigation title="Project Settings">
178-
<ProjectSettingsPage />
179-
</Navigation>
180-
)}
181-
/>
182-
<PrivateRoute
183-
exact
184-
path={routes.userSettings}
185-
render={() => (
186-
<Navigation title="Settings">
187-
<UserSettingsPage />
188-
</Navigation>
189-
)}
190-
/>
191-
<PrivateRoute
192-
exact
193-
path={routes.userManagement}
194-
render={() => (
195-
<Navigation title="User Management">
196-
<UserManagementPage />
197-
</Navigation>
198-
)}
199-
/>
200-
</Switch>
201-
</ProjectContextProvider>
202-
)}
203-
/>
168+
<PrivateRoute
169+
exact
170+
path={routes.settings}
171+
render={() => (
172+
<Redirect to={routes.userSettings} />
173+
)}
174+
/>
175+
<PrivateRoute
176+
exact
177+
path={routes.projectSettings}
178+
render={() => (
179+
<Navigation title="Project Settings">
180+
<ProjectSettingsPage />
181+
</Navigation>
182+
)}
183+
/>
184+
<PrivateRoute
185+
exact
186+
path={routes.userSettings}
187+
render={() => (
188+
<Navigation title="Settings">
189+
<UserSettingsPage />
190+
</Navigation>
191+
)}
192+
/>
193+
<PrivateRoute
194+
exact
195+
path={routes.userManagement}
196+
render={() => (
197+
<Navigation title="User Management">
198+
<UserManagementPage />
199+
</Navigation>
200+
)}
201+
/>
202+
</Switch>
203+
</ProjectContextProvider>
204+
)}
205+
/>
204206

205-
<Route
206-
exact
207-
path={routes.pageNotFound}
208-
render={() => <PageNotFound />}
209-
/>
210-
<Route render={() => <PageNotFound />} />
211-
</Switch>
212-
</Suspense>
213-
</CustomBrowserRouter>
214-
</SnackLogProvider>
215-
</ConfirmationProvider>
216-
</SnackbarProvider>
217-
</AppProvider>
218-
</LocalizationProvider>
207+
<Route
208+
exact
209+
path={routes.pageNotFound}
210+
render={() => <PageNotFound />}
211+
/>
212+
<Route render={() => <PageNotFound />} />
213+
</Switch>
214+
</Suspense>
215+
</CustomBrowserRouter>
216+
</SnackLogProvider>
217+
</ConfirmationProvider>
218+
</SnackbarProvider>
219+
</AppProvider>
220+
</LocalizationProvider>
221+
</SwrProvider>
219222
</ErrorBoundary>
220223
</StyledEngineProvider>
221224
);

‎src/assets/icons/CreatedAt.tsx

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon";
2+
import { mdiClockPlusOutline } from "@mdi/js";
3+
4+
export default function CreatedAt(props: SvgIconProps) {
5+
return (
6+
<SvgIcon {...props}>
7+
<path d={mdiClockPlusOutline} />
8+
</SvgIcon>
9+
);
10+
}

‎src/assets/icons/CreatedBy.tsx

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon";
2+
3+
export default function CreatedBy(props: SvgIconProps) {
4+
return (
5+
<SvgIcon {...props}>
6+
<path d="M19 13v3h3v2h-3v3h-2v-3h-3v-2h3v-3h2Zm-9 0c.87 0 2.022.142 3.18.426a5.967 5.967 0 0 0-.891 1.73A11.097 11.097 0 0 0 10 14.9c-1.188 0-2.402.234-3.43.555l-.43.143c-.138.049-.272.099-.402.15l-.372.157C4.475 16.3 3.9 16.725 3.9 17v1.1h8.2A5.96 5.96 0 0 0 12.803 20L2 20v-3c0-2.01 3.043-3.266 5.682-3.76l.46-.08.227-.033.44-.056A11.02 11.02 0 0 1 10 13Zm0-9a4 4 0 1 1 0 8 4 4 0 0 1 0-8Zm0 1.9a2.1 2.1 0 1 0 0 4.2 2.1 2.1 0 0 0 0-4.2Z" />
7+
</SvgIcon>
8+
);
9+
}

0 commit comments

Comments
 (0)