Skip to content

Commit 64f2fc3

Browse files
authored
Merge pull request #590 from rowyio/rc
v2.2.0
2 parents 1ce9bdb + f130772 commit 64f2fc3

File tree

321 files changed

+9275
-4499
lines changed

Some content is hidden

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

321 files changed

+9275
-4499
lines changed

package.json

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Rowy",
3-
"version": "2.1.0",
3+
"version": "2.2.0",
44
"homepage": "https://rowy.io",
55
"repository": {
66
"type": "git",
@@ -13,32 +13,34 @@
1313
"@emotion/react": "^11.4.0",
1414
"@emotion/styled": "^11.3.0",
1515
"@hookform/resolvers": "^2.8.1",
16-
"@mdi/js": "^6.2.95",
17-
"@monaco-editor/react": "^4.1.0",
18-
"@mui/icons-material": "^5.0.0",
19-
"@mui/lab": "^5.0.0-alpha.50",
20-
"@mui/material": "^5.0.0",
21-
"@mui/styles": "^5.0.0",
22-
"@rowy/form-builder": "^0.3.1",
16+
"@mdi/js": "^6.5.95",
17+
"@monaco-editor/react": "^4.3.1",
18+
"@mui/icons-material": "^5.2.0",
19+
"@mui/lab": "^5.0.0-alpha.58",
20+
"@mui/material": "^5.2.2",
21+
"@mui/styles": "^5.2.2",
22+
"@rowy/form-builder": "^0.4.2",
2323
"@rowy/multiselect": "^0.2.3",
2424
"@tinymce/tinymce-react": "^3.12.6",
2525
"algoliasearch": "^4.8.6",
2626
"ansi-to-react": "^6.1.5",
2727
"colord": "^2.7.0",
28+
"compare-versions": "^4.1.1",
2829
"craco-swc": "^0.1.3",
2930
"csv-parse": "^4.15.3",
3031
"date-fns": "^2.19.0",
3132
"dompurify": "^2.2.6",
3233
"file-saver": "^2.0.5",
3334
"firebase": "8.6.8",
3435
"hotkeys-js": "^3.7.2",
35-
"json-format": "^1.0.1",
36+
"jotai": "^1.4.2",
37+
"json-stable-stringify-without-jsonify": "^1.0.1",
3638
"json2csv": "^5.0.6",
3739
"jszip": "^3.6.0",
3840
"jwt-decode": "^3.1.2",
3941
"lodash": "^4.17.21",
40-
"moment": "^2.29.1",
4142
"notistack": "^2.0.2",
43+
"pb-util": "^1.0.1",
4244
"query-string": "^6.8.3",
4345
"react": "^17.0.2",
4446
"react-beautiful-dnd": "^13.0.0",
@@ -67,8 +69,7 @@
6769
"use-algolia": "^1.4.1",
6870
"use-debounce": "^3.3.0",
6971
"use-persisted-state": "^0.3.3",
70-
"yarn": "^1.22.10",
71-
"yup": "^0.32.9"
72+
"yarn": "^1.22.10"
7273
},
7374
"scripts": {
7475
"upstream": "git fetch upstream;git merge upstream/main;git commit -m'merge upstream';git push",

src/App.tsx

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,34 @@ import AdapterDateFns from "@mui/lab/AdapterDateFns";
66
import { StyledEngineProvider } from "@mui/material/styles";
77
import "./space-grotesk.css";
88

9-
import CustomBrowserRouter from "utils/CustomBrowserRouter";
10-
import PrivateRoute from "utils/PrivateRoute";
11-
import ErrorBoundary from "components/ErrorBoundary";
12-
import Loading from "components/Loading";
13-
import Navigation from "components/Navigation";
14-
import Logo from "assets/Logo";
9+
import CustomBrowserRouter from "@src/utils/CustomBrowserRouter";
10+
import PrivateRoute from "@src/utils/PrivateRoute";
11+
import ErrorBoundary from "@src/components/ErrorBoundary";
12+
import Loading from "@src/components/Loading";
13+
import Navigation from "@src/components/Navigation";
14+
import Logo from "@src/assets/Logo";
1515

16-
import SwrProvider from "contexts/SwrContext";
17-
import ConfirmationProvider from "components/ConfirmationDialog/Provider";
18-
import { AppProvider } from "contexts/AppContext";
19-
import { ProjectContextProvider } from "contexts/ProjectContext";
20-
import { SnackbarProvider } from "contexts/SnackbarContext";
21-
import { SnackLogProvider } from "contexts/SnackLogContext";
22-
import routes from "constants/routes";
16+
import SwrProvider from "@src/contexts/SwrContext";
17+
import ConfirmationProvider from "@src/components/ConfirmationDialog/Provider";
18+
import { AppProvider } from "@src/contexts/AppContext";
19+
import { ProjectContextProvider } from "@src/contexts/ProjectContext";
20+
import { SnackbarProvider } from "@src/contexts/SnackbarContext";
21+
import { SnackLogProvider } from "@src/contexts/SnackLogContext";
22+
import routes from "@src/constants/routes";
2323

24-
import AuthPage from "pages/Auth";
25-
import SignOutPage from "pages/Auth/SignOut";
26-
import SignUpPage from "pages/Auth/SignUp";
27-
import DeployPage from "pages/Deploy";
28-
import TestPage from "pages/Test";
29-
import RowyRunTestPage from "pages/RowyRunTest";
30-
import PageNotFound from "pages/PageNotFound";
24+
import AuthPage from "@src/pages/Auth";
25+
import SignOutPage from "@src/pages/Auth/SignOut";
26+
import SignUpPage from "@src/pages/Auth/SignUp";
27+
import DeployPage from "@src/pages/Deploy";
28+
import TestPage from "@src/pages/Test";
29+
import RowyRunTestPage from "@src/pages/RowyRunTest";
30+
import PageNotFound from "@src/pages/PageNotFound";
3131

32-
import Favicon from "assets/Favicon";
33-
import "analytics";
32+
import Favicon from "@src/assets/Favicon";
33+
import "@src/analytics";
3434

3535
// prettier-ignore
36-
const AuthSetupGuidePage = lazy(() => import("pages/Auth/SetupGuide" /* webpackChunkName: "AuthSetupGuide" */));
36+
const AuthSetupGuidePage = lazy(() => import("@src/pages/Auth/SetupGuide" /* webpackChunkName: "AuthSetupGuide" */));
3737
// prettier-ignore
3838
const ImpersonatorAuthPage = lazy(() => import("./pages/Auth/ImpersonatorAuth" /* webpackChunkName: "ImpersonatorAuthPage" */));
3939
// prettier-ignore
@@ -51,7 +51,7 @@ const UserSettingsPage = lazy(() => import("./pages/Settings/UserSettings" /* we
5151
// prettier-ignore
5252
const UserManagementPage = lazy(() => import("./pages/Settings/UserManagement" /* webpackChunkName: "UserManagementPage" */));
5353
// prettier-ignore
54-
const SetupPage = lazy(() => import("pages/Setup" /* webpackChunkName: "SetupPage" */));
54+
const SetupPage = lazy(() => import("@src/pages/Setup" /* webpackChunkName: "SetupPage" */));
5555

5656
export default function App() {
5757
return (

src/assets/BrandedBackground.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import { use100vh } from "react-div-100vh";
44
import { useTheme, alpha } from "@mui/material/styles";
55
import { Box, BoxProps } from "@mui/material";
66

7-
import bgPattern from "assets/bg-pattern.svg";
8-
import bgPatternDark from "assets/bg-pattern-dark.svg";
7+
import bgPattern from "@src/assets/bg-pattern.svg";
8+
import bgPatternDark from "@src/assets/bg-pattern-dark.svg";
99

1010
export default function BrandedBackground() {
1111
const theme = useTheme();
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon";
2+
import { mdiResizeBottomRight } from "@mdi/js";
3+
4+
export default function ResizeBottomRight(props: SvgIconProps) {
5+
return (
6+
<SvgIcon {...props}>
7+
<path d={mdiResizeBottomRight} />
8+
</SvgIcon>
9+
);
10+
}

src/assets/icons/UpdatedAt.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon";
2+
import { mdiClockEditOutline } from "@mdi/js";
23

34
export default function UpdatedAt(props: SvgIconProps) {
45
return (
56
<SvgIcon {...props}>
6-
<path d="m19.06 14.88 2.05 2-6 6.07H13v-2.01l6.06-6.06ZM12 2a10 10 0 0 1 9.98 9.373 2.561 2.561 0 0 0-2.001.047A8 8 0 0 0 4 12a8.001 8.001 0 0 0 7 7.938v2.013C5.941 21.447 2 17.164 2 12 2 6.477 6.477 2 12 2Zm9.42 11.35 1.28 1.28c.21.21.21.56 0 .77l-1 .95-2.05-2 1-1a.55.55 0 0 1 .77 0ZM12.5 7v5.25l4.018 2.384-1.051 1.045L11 13V7h1.5Z" />
7+
<path d={mdiClockEditOutline} />
78
</SvgIcon>
89
);
910
}

src/assets/icons/Webhook.tsx

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

src/assets/service-account.mp4

-787 KB
Binary file not shown.

src/components/Auth/AuthLayout.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import {
77
LinkProps,
88
} from "@mui/material";
99
import { alpha } from "@mui/material/styles";
10-
import BrandedBackground, { Wrapper } from "assets/BrandedBackground";
11-
import Logo from "assets/Logo";
10+
import BrandedBackground, { Wrapper } from "@src/assets/BrandedBackground";
11+
import Logo from "@src/assets/Logo";
1212

13-
import { useAppContext } from "contexts/AppContext";
14-
import { EXTERNAL_LINKS } from "constants/externalLinks";
13+
import { useAppContext } from "@src/contexts/AppContext";
14+
import { EXTERNAL_LINKS } from "@src/constants/externalLinks";
1515

1616
export interface IAuthLayoutProps {
1717
hideLogo?: boolean;

src/components/Auth/FirebaseUi.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import Skeleton from "@mui/material/Skeleton";
1111

1212
import { auth, db } from "@src/firebase";
1313
import { defaultUiConfig, getSignInOptions } from "@src/firebase/firebaseui";
14-
import { PUBLIC_SETTINGS } from "config/dbPaths";
14+
import { PUBLIC_SETTINGS } from "@src/config/dbPaths";
1515

1616
const useStyles = makeStyles((theme) =>
1717
createStyles({

src/components/Auth/MarketingBanner.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { Stack, Paper, Typography, Button } from "@mui/material";
22
import { alpha } from "@mui/material/styles";
3-
import DiscordIcon from "assets/icons/Discord";
3+
import DiscordIcon from "@src/assets/icons/Discord";
44
import TwitterIcon from "@mui/icons-material/Twitter";
55

6-
import Logo from "assets/Logo";
7-
import { EXTERNAL_LINKS } from "constants/externalLinks";
6+
import Logo from "@src/assets/Logo";
7+
import { EXTERNAL_LINKS } from "@src/constants/externalLinks";
88

99
export default function MarketingBanner() {
1010
return (

0 commit comments

Comments
 (0)