Upgrade redwood to version 0.26.0
This commit is contained in:
Kurt Hutten
@@ -3,7 +3,7 @@
|
|||||||
"version": "0.0.0",
|
"version": "0.0.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@redwoodjs/api": "^0.25.0",
|
"@redwoodjs/api": "^0.26.2",
|
||||||
"cloudinary": "^1.23.0"
|
"cloudinary": "^1.23.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,10 +6,9 @@
|
|||||||
"web"
|
"web"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {},
|
||||||
},
|
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@redwoodjs/core": "^0.25.0"
|
"@redwoodjs/core": "^0.26.2"
|
||||||
},
|
},
|
||||||
"eslintConfig": {
|
"eslintConfig": {
|
||||||
"extends": "@redwoodjs/eslint-config"
|
"extends": "@redwoodjs/eslint-config"
|
||||||
|
|||||||
@@ -14,10 +14,10 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@material-ui/core": "^4.11.0",
|
"@material-ui/core": "^4.11.0",
|
||||||
"@redwoodjs/auth": "^0.25.0",
|
"@redwoodjs/auth": "^0.26.2",
|
||||||
"@redwoodjs/forms": "^0.25.0",
|
"@redwoodjs/forms": "^0.26.2",
|
||||||
"@redwoodjs/router": "^0.25.0",
|
"@redwoodjs/router": "^0.26.2",
|
||||||
"@redwoodjs/web": "^0.25.0",
|
"@redwoodjs/web": "^0.26.2",
|
||||||
"cloudinary-react": "^1.6.7",
|
"cloudinary-react": "^1.6.7",
|
||||||
"controlkit": "^0.1.9",
|
"controlkit": "^0.1.9",
|
||||||
"get-active-classes": "^0.0.11",
|
"get-active-classes": "^0.0.11",
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import { AuthProvider } from '@redwoodjs/auth'
|
import { AuthProvider } from '@redwoodjs/auth'
|
||||||
import GoTrue from 'gotrue-js'
|
import GoTrue from 'gotrue-js'
|
||||||
|
|
||||||
import ReactDOM from 'react-dom'
|
|
||||||
import { FatalErrorBoundary } from '@redwoodjs/web'
|
import { FatalErrorBoundary } from '@redwoodjs/web'
|
||||||
import { RedwoodApolloProvider } from '@redwoodjs/web/apollo'
|
import { RedwoodApolloProvider } from '@redwoodjs/web/apollo'
|
||||||
import FatalErrorPage from 'src/pages/FatalErrorPage'
|
import FatalErrorPage from 'src/pages/FatalErrorPage'
|
||||||
@@ -19,13 +18,14 @@ const goTrueClient = new GoTrue({
|
|||||||
setCookie: true,
|
setCookie: true,
|
||||||
})
|
})
|
||||||
|
|
||||||
ReactDOM.render(
|
const App = () => (
|
||||||
<FatalErrorBoundary page={FatalErrorPage}>
|
<FatalErrorBoundary page={FatalErrorPage}>
|
||||||
<AuthProvider client={goTrueClient} type="goTrue">
|
<AuthProvider client={goTrueClient} type="goTrue">
|
||||||
<RedwoodApolloProvider>
|
<RedwoodApolloProvider>
|
||||||
<Routes />
|
<Routes />
|
||||||
</RedwoodApolloProvider>
|
</RedwoodApolloProvider>
|
||||||
</AuthProvider>
|
</AuthProvider>
|
||||||
</FatalErrorBoundary>,
|
</FatalErrorBoundary>
|
||||||
document.getElementById('redwood-app')
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
export default App
|
||||||
@@ -36,7 +36,7 @@ const Routes = () => {
|
|||||||
<Route path="/policies/code-of-conduct" page={CodeOfConductPage} name="codeOfConduct" />
|
<Route path="/policies/code-of-conduct" page={CodeOfConductPage} name="codeOfConduct" />
|
||||||
<Route path="/account-recovery/update-password" page={UpdatePasswordPage} name="updatePassword" />
|
<Route path="/account-recovery/update-password" page={UpdatePasswordPage} name="updatePassword" />
|
||||||
<Route path="/account-recovery" page={AccountRecoveryPage} name="accountRecovery" />
|
<Route path="/account-recovery" page={AccountRecoveryPage} name="accountRecovery" />
|
||||||
<Route path="/" page={HomePage} name="home" />
|
<Route path="/" page={HomePage} name="home" prerender />
|
||||||
<Route notfound page={NotFoundPage} />
|
<Route notfound page={NotFoundPage} />
|
||||||
|
|
||||||
{/* Ownership enforced routes */}
|
{/* Ownership enforced routes */}
|
||||||
|
|||||||
@@ -26,7 +26,9 @@
|
|||||||
</script>
|
</script>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="redwood-app"></div>
|
<div id="redwood-app">
|
||||||
|
<%= prerenderPlaceholder %>
|
||||||
|
</div>
|
||||||
<div
|
<div
|
||||||
id="cascade-container"
|
id="cascade-container"
|
||||||
style="opacity: 0; overflow: hidden; height: 0"
|
style="opacity: 0; overflow: hidden; height: 0"
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import Footer from 'src/components/Footer'
|
|||||||
import { useLocation } from '@redwoodjs/router'
|
import { useLocation } from '@redwoodjs/router'
|
||||||
import LoginModal from 'src/components/LoginModal'
|
import LoginModal from 'src/components/LoginModal'
|
||||||
import ReactGA from 'react-ga'
|
import ReactGA from 'react-ga'
|
||||||
|
import { isBrowser } from '@redwoodjs/prerender/browserUtils'
|
||||||
|
|
||||||
import Svg from 'src/components/Svg'
|
import Svg from 'src/components/Svg'
|
||||||
import ImageUploader from 'src/components/ImageUploader'
|
import ImageUploader from 'src/components/ImageUploader'
|
||||||
@@ -63,7 +64,10 @@ const MainLayout = ({ children, shouldRemoveFooterInIde }) => {
|
|||||||
previousSubmission = newSubmission
|
previousSubmission = newSubmission
|
||||||
}
|
}
|
||||||
}, [pathname, params])
|
}, [pathname, params])
|
||||||
const hash = window.location.hash
|
let hash
|
||||||
|
if (isBrowser) {
|
||||||
|
hash = window.location.hash
|
||||||
|
}
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const [key, token] = hash.slice(1).split('=')
|
const [key, token] = hash.slice(1).split('=')
|
||||||
if (key === 'confirmation_token') {
|
if (key === 'confirmation_token') {
|
||||||
|
|||||||
Reference in New Issue
Block a user