Merge branch 'open-source' into feature/open-source
@ -16,6 +16,7 @@ import { DatabaseProvider } from "./contexts/DatabaseContext";
|
|||||||
import { UserIdProvider } from "./contexts/UserIdContext";
|
import { UserIdProvider } from "./contexts/UserIdContext";
|
||||||
|
|
||||||
import { ToastProvider } from "./components/Toast";
|
import { ToastProvider } from "./components/Toast";
|
||||||
|
import { MigrationNotification } from "./MigrationNotification";
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
return (
|
return (
|
||||||
@ -24,6 +25,7 @@ function App() {
|
|||||||
<AuthProvider>
|
<AuthProvider>
|
||||||
<KeyboardProvider>
|
<KeyboardProvider>
|
||||||
<ToastProvider>
|
<ToastProvider>
|
||||||
|
<MigrationNotification />
|
||||||
<Router>
|
<Router>
|
||||||
<Switch>
|
<Switch>
|
||||||
{/* Legacy support camel case routes */}
|
{/* Legacy support camel case routes */}
|
||||||
|
40
src/MigrationNotification.tsx
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
import { useState } from "react";
|
||||||
|
import { Box, Close, Link, Text } from "theme-ui";
|
||||||
|
|
||||||
|
export function MigrationNotification() {
|
||||||
|
const [closed, setClosed] = useState(false);
|
||||||
|
|
||||||
|
if (closed) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Box
|
||||||
|
sx={{ position: "fixed", bottom: 0, left: 0, right: 0, zIndex: 1000 }}
|
||||||
|
bg="highlight"
|
||||||
|
>
|
||||||
|
<Box
|
||||||
|
m={2}
|
||||||
|
mb={0}
|
||||||
|
sx={{
|
||||||
|
borderRadius: "4px",
|
||||||
|
padding: "12px 16px",
|
||||||
|
display: "flex",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Text as="p" variant="body2" sx={{ flexGrow: 1, textAlign: "center" }}>
|
||||||
|
The new era of Owlbear Rodeo is coming on July 18th. Make sure to
|
||||||
|
migrate your data before July 18th.{" "}
|
||||||
|
<Link
|
||||||
|
href="https://blog.owlbear.rodeo/owlbear-rodeo-2-0-release-date-announcement/"
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
>
|
||||||
|
Read more
|
||||||
|
</Link>
|
||||||
|
</Text>
|
||||||
|
<Close onClick={() => setClosed(true)} sx={{ minWidth: "32px" }} />
|
||||||
|
</Box>
|
||||||
|
</Box>
|
||||||
|
);
|
||||||
|
}
|
@ -1,14 +1,5 @@
|
|||||||
import { useState, useEffect } from "react";
|
import { useState, useEffect } from "react";
|
||||||
import {
|
import { Flex, Button, Image, Text, IconButton, Link } from "theme-ui";
|
||||||
Flex,
|
|
||||||
Button,
|
|
||||||
Image,
|
|
||||||
Text,
|
|
||||||
IconButton,
|
|
||||||
Link,
|
|
||||||
Message,
|
|
||||||
Paragraph,
|
|
||||||
} from "theme-ui";
|
|
||||||
|
|
||||||
import Footer from "../components/Footer";
|
import Footer from "../components/Footer";
|
||||||
|
|
||||||
@ -61,18 +52,6 @@ function Home() {
|
|||||||
Owlbear Rodeo
|
Owlbear Rodeo
|
||||||
</Text>
|
</Text>
|
||||||
<Image src={owlington} m={2} />
|
<Image src={owlington} m={2} />
|
||||||
<Message mb={4}>
|
|
||||||
<Paragraph
|
|
||||||
sx={{
|
|
||||||
fontSize: "12px",
|
|
||||||
fontFamily:
|
|
||||||
"system-ui,-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,'Helvetica Neue',sans-serif",
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
Check out our <Link href="https://blog.owlbear.rodeo/">blog</Link>{" "}
|
|
||||||
for all the news on the next version of Owlbear Rodeo
|
|
||||||
</Paragraph>
|
|
||||||
</Message>
|
|
||||||
<Button
|
<Button
|
||||||
variant="secondary"
|
variant="secondary"
|
||||||
m={2}
|
m={2}
|
||||||
|
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 5.7 KiB |
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 6.2 KiB |
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 5.3 KiB |
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 6.7 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 5.7 KiB |
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 6.1 KiB |
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 5.2 KiB |
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 5.9 KiB |
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 5.8 KiB |
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 6.0 KiB |
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 6.8 KiB |
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 5.7 KiB |
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 6.6 KiB |
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 7.1 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 6.6 KiB |
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 5.1 KiB |
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 5.5 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 6.2 KiB |
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 6.2 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 5.8 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 5.3 KiB |
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 6.9 KiB |
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 6.7 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 6.5 KiB |
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 5.2 KiB |
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 6.8 KiB |
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 7.4 KiB |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 6.7 KiB |
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 5.3 KiB |
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 4.7 KiB |