Skip to content

Commit

Permalink
Merge pull request #561 from rowyio/rc
Browse files Browse the repository at this point in the history 
v2.1.0
  • Loading branch information
@notsidney
notsidney authored Oct 15, 2021
2 parents 19c1b15 + 2534618 commit 88f72ab
Show file tree
Hide file tree
Showing 112 changed files with 3,074 additions and 2,024 deletions.
11 changes: 5 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Rowy",
"version": "2.0.0",
"version": "2.1.0",
"homepage": "https://rowy.io",
"repository": {
"type": "git",
Expand All @@ -13,14 +13,14 @@
"@emotion/react": "^11.4.0",
"@emotion/styled": "^11.3.0",
"@hookform/resolvers": "^2.8.1",
"@mdi/js": "^5.9.55",
"@mdi/js": "^6.2.95",
"@monaco-editor/react": "^4.1.0",
"@mui/icons-material": "^5.0.0",
"@mui/lab": "^5.0.0-alpha.47",
"@mui/lab": "^5.0.0-alpha.50",
"@mui/material": "^5.0.0",
"@mui/styles": "^5.0.0",
"@rowy/form-builder": "^0.2.4",
"@rowy/multiselect": "^0.2.1",
"@rowy/form-builder": "^0.3.1",
"@rowy/multiselect": "^0.2.3",
"@tinymce/tinymce-react": "^3.12.6",
"algoliasearch": "^4.8.6",
"ansi-to-react": "^6.1.5",
Expand Down Expand Up @@ -59,7 +59,6 @@
"react-router-dom": "^5.0.1",
"react-router-hash-link": "^2.4.3",
"react-scripts": "^4.0.3",
"react-scroll-sync": "^0.8.0",
"react-usestateref": "^1.0.5",
"serve": "^11.3.2",
"swr": "^1.0.1",
Expand Down
2 changes: 1 addition & 1 deletion public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<link rel="stylesheet" href="https://rsms.me/inter/inter.css" />
<link
rel="stylesheet"
href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:ital,wght@0,400;0,600;1,400;1,600&display=swap"
href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,400;0,700;1,400;1,700&display=swap"
/>

<title>Rowy</title>
Expand Down
315 changes: 159 additions & 156 deletions src/App.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import Loading from "components/Loading";
import Navigation from "components/Navigation";
import Logo from "assets/Logo";

import SwrProvider from "contexts/SwrContext";
import ConfirmationProvider from "components/ConfirmationDialog/Provider";
import { AppProvider } from "contexts/AppContext";
import { ProjectContextProvider } from "contexts/ProjectContext";
Expand Down Expand Up @@ -56,166 +57,168 @@ export default function App() {
return (
<StyledEngineProvider injectFirst>
<ErrorBoundary>
<LocalizationProvider dateAdapter={AdapterDateFns}>
<AppProvider>
<Favicon />
<SnackbarProvider>
<ConfirmationProvider>
<SnackLogProvider>
<CustomBrowserRouter>
<Suspense fallback={<Loading fullScreen />}>
<Switch>
<Route
exact
path={routes.auth}
render={() => <AuthPage />}
/>
<Route
exact
path={routes.authSetup}
render={() => <AuthSetupGuidePage />}
/>
<Route
exact
path={routes.jwtAuth}
render={() => <JwtAuthPage />}
/>
<Route
exact
path={routes.signOut}
render={() => <SignOutPage />}
/>
<Route
exact
path={routes.signUp}
render={() => <SignUpPage />}
/>
<Route
exact
path={routes.setup}
render={() => <SetupPage />}
/>
<Route
exact
path={routes.deploy}
render={() => <DeployPage />}
/>
<SwrProvider>
<LocalizationProvider dateAdapter={AdapterDateFns}>
<AppProvider>
<Favicon />
<SnackbarProvider>
<ConfirmationProvider>
<SnackLogProvider>
<CustomBrowserRouter>
<Suspense fallback={<Loading fullScreen />}>
<Switch>
<Route
exact
path={routes.auth}
render={() => <AuthPage />}
/>
<Route
exact
path={routes.authSetup}
render={() => <AuthSetupGuidePage />}
/>
<Route
exact
path={routes.jwtAuth}
render={() => <JwtAuthPage />}
/>
<Route
exact
path={routes.signOut}
render={() => <SignOutPage />}
/>
<Route
exact
path={routes.signUp}
render={() => <SignUpPage />}
/>
<Route
exact
path={routes.setup}
render={() => <SetupPage />}
/>
<Route
exact
path={routes.deploy}
render={() => <DeployPage />}
/>

<Route
exact
path={"/test"}
render={() => <TestPage />}
/>
<Route
exact
path={"/test"}
render={() => <TestPage />}
/>

<PrivateRoute
exact
path={[
routes.home,
routes.tableWithId,
routes.tableGroupWithId,
routes.settings,
routes.projectSettings,
routes.userSettings,
routes.userManagement,
routes.impersonatorAuth,
routes.rowyRunTest,
]}
render={() => (
<ProjectContextProvider>
<Switch>
<Route
exact
path={routes.impersonatorAuth}
render={() => <ImpersonatorAuthPage />}
/>
<Route
exact
path={routes.rowyRunTest}
render={() => <RowyRunTestPage />}
/>
<PrivateRoute
exact
path={routes.home}
render={() => (
<Navigation
title="Home"
titleComponent={(open, pinned) =>
!(open && pinned) && (
<Logo
style={{
display: "block",
margin: "0 auto",
}}
/>
)
}
>
<HomePage />
</Navigation>
)}
/>
<PrivateRoute
path={routes.tableWithId}
render={() => <TablePage />}
/>
<PrivateRoute
path={routes.tableGroupWithId}
render={() => <TablePage />}
/>
<PrivateRoute
exact
path={[
routes.home,
routes.tableWithId,
routes.tableGroupWithId,
routes.settings,
routes.projectSettings,
routes.userSettings,
routes.userManagement,
routes.impersonatorAuth,
routes.rowyRunTest,
]}
render={() => (
<ProjectContextProvider>
<Switch>
<Route
exact
path={routes.impersonatorAuth}
render={() => <ImpersonatorAuthPage />}
/>
<Route
exact
path={routes.rowyRunTest}
render={() => <RowyRunTestPage />}
/>
<PrivateRoute
exact
path={routes.home}
render={() => (
<Navigation
title="Home"
titleComponent={(open, pinned) =>
!(open && pinned) && (
<Logo
style={{
display: "block",
margin: "0 auto",
}}
/>
)
}
>
<HomePage />
</Navigation>
)}
/>
<PrivateRoute
path={routes.tableWithId}
render={() => <TablePage />}
/>
<PrivateRoute
path={routes.tableGroupWithId}
render={() => <TablePage />}
/>

<PrivateRoute
exact
path={routes.settings}
render={() => (
<Redirect to={routes.userSettings} />
)}
/>
<PrivateRoute
exact
path={routes.projectSettings}
render={() => (
<Navigation title="Project Settings">
<ProjectSettingsPage />
</Navigation>
)}
/>
<PrivateRoute
exact
path={routes.userSettings}
render={() => (
<Navigation title="Settings">
<UserSettingsPage />
</Navigation>
)}
/>
<PrivateRoute
exact
path={routes.userManagement}
render={() => (
<Navigation title="User Management">
<UserManagementPage />
</Navigation>
)}
/>
</Switch>
</ProjectContextProvider>
)}
/>
<PrivateRoute
exact
path={routes.settings}
render={() => (
<Redirect to={routes.userSettings} />
)}
/>
<PrivateRoute
exact
path={routes.projectSettings}
render={() => (
<Navigation title="Project Settings">
<ProjectSettingsPage />
</Navigation>
)}
/>
<PrivateRoute
exact
path={routes.userSettings}
render={() => (
<Navigation title="Settings">
<UserSettingsPage />
</Navigation>
)}
/>
<PrivateRoute
exact
path={routes.userManagement}
render={() => (
<Navigation title="User Management">
<UserManagementPage />
</Navigation>
)}
/>
</Switch>
</ProjectContextProvider>
)}
/>

<Route
exact
path={routes.pageNotFound}
render={() => <PageNotFound />}
/>
<Route render={() => <PageNotFound />} />
</Switch>
</Suspense>
</CustomBrowserRouter>
</SnackLogProvider>
</ConfirmationProvider>
</SnackbarProvider>
</AppProvider>
</LocalizationProvider>
<Route
exact
path={routes.pageNotFound}
render={() => <PageNotFound />}
/>
<Route render={() => <PageNotFound />} />
</Switch>
</Suspense>
</CustomBrowserRouter>
</SnackLogProvider>
</ConfirmationProvider>
</SnackbarProvider>
</AppProvider>
</LocalizationProvider>
</SwrProvider>
</ErrorBoundary>
</StyledEngineProvider>
);
Expand Down
10 changes: 10 additions & 0 deletions src/assets/icons/CreatedAt.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon";
import { mdiClockPlusOutline } from "@mdi/js";

export default function CreatedAt(props: SvgIconProps) {
return (
<SvgIcon {...props}>
<path d={mdiClockPlusOutline} />
</SvgIcon>
);
}
9 changes: 9 additions & 0 deletions src/assets/icons/CreatedBy.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon";

export default function CreatedBy(props: SvgIconProps) {
return (
<SvgIcon {...props}>
<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" />
</SvgIcon>
);
}
Loading

0 comments on commit 88f72ab

Please sign in to comment.