Merge pull request #48 from TaloDev/develop

Release 0.13.0

Author: tudddorrr

jest.config.js

@@ -3,5 +3,8 @@ module.exports = {
   ...require('@snowpack/app-scripts-react/jest.config.js')(),
   collectCoverage: true,
   coverageReporters: ['lcov'],
-  coveragePathIgnorePatterns: ['/node_modules/', '/*/_snowpack/*/', '/*/api/*/', '/*/constants/*/']
+  coveragePathIgnorePatterns: ['/node_modules/', '/*/_snowpack/*/', '/*/api/*/', '/*/constants/*/'],
+  transformIgnorePatterns: [
+    '<rootDir>/node_modules/(?!lodash-es)'
+  ]
 }

package.json

@@ -7,15 +7,17 @@
     "lint": "eslint src/**/*.{js,jsx}"
   },
   "dependencies": {
+    "@dinero.js/currencies": "^2.0.0-alpha.8",
     "@hookform/resolvers": "^2.8.8",
     "@sentry/react": "^6.19.6",
     "@tabler/icons": "^1.68.0",
     "@tippyjs/react": "^4.2.5",
     "axios": "^0.26.0",
     "classnames": "^2.3.1",
     "date-fns": "^2.21.3",
+    "dinero.js": "^2.0.0-alpha.8",
     "framer-motion": "^6.3.3",
-    "lodash.uniqby": "^4.7.0",
+    "lodash-es": "^4.17.21",
     "prop-types": "^15.7.2",
     "querystring": "^0.2.1",
     "randomcolor": "^0.6.2",
@@ -65,5 +67,5 @@
   "lint-staged": {
     "*.{js,jsx}": "eslint --fix"
   },
-  "version": "0.12.0"
+  "version": "0.13.0"
 }

src/App.jsx

@@ -48,7 +48,7 @@ function App() {
   }
 
   useEffect(() => {
-    setIntendedUrl(window.location.pathname)
+    setIntendedUrl(window.location.pathname + window.location.search)
   }, [])
 
   useEffect(() => {

src/Router.jsx

@@ -30,6 +30,7 @@ const Stats = lazy(() => import(/* webpackChunkName: 'stats' */ './pages/Stats')
 const PlayerStats = lazy(() => import(/* webpackChunkName: 'player-stats' */ './pages/PlayerStats'))
 const AcceptInvite = lazy(() => import(/* webpackChunkName: 'accept-invite' */ './pages/AcceptInvite'))
 const Organisation = lazy(() => import(/* webpackChunkName: 'organisation' */ './pages/Organisation'))
+const Billing = lazy(() => import(/* webpackChunkName: 'billing' */ './pages/Billing'))
 
 function Router({ intendedUrl }) {
   const user = useRecoilValue(userState)
@@ -47,7 +48,7 @@ function Router({ intendedUrl }) {
             <Route exact path={routes.recover} element={<RecoverAccount />} />
             <Route exact path={routes.acceptInvite} element={<AcceptInvite />} />
 
-            <Route path='*' element={<Navigate to={`${routes.login}?next=${intendedUrl}`} replace />} />
+            <Route path='*' element={<Navigate to={`${routes.login}?next=${encodeURIComponent(intendedUrl)}`} replace />} />
           </Routes>
         </main>
       }
@@ -61,6 +62,7 @@ function Router({ intendedUrl }) {
               <Route exact path={routes.account} element={<Account />} />
               <Route exact path={routes.confirmPassword} element={<ConfirmPassword />} />
               {canViewPage(user, routes.organisation) && <Route exact path={routes.organisation} element={<Organisation />} />}
+              {canViewPage(user, routes.billing) && <Route exact path={routes.billing} element={<Billing />} />}
 
               {activeGame &&
                 <>

src/api/confirmPlan.js

@@ -0,0 +1,3 @@
+import api from './api'
+
+export default (prorationDate, pricingPlanId, pricingInterval) => api.post('/billing/confirm-plan', { prorationDate, pricingPlanId, pricingInterval })

src/api/createCheckoutSession.js

@@ -0,0 +1,3 @@
+import api from './api'
+
+export default (pricingPlanId, pricingInterval) => api.post('/billing/checkout-session', { pricingPlanId, pricingInterval })

src/api/createPortalSession.js

@@ -0,0 +1,3 @@
+import api from './api'
+
+export default () => api.post('/billing/portal-session')

src/api/useOrganisationPricingPlan.js

@@ -0,0 +1,23 @@
+import useSWR from 'swr'
+import buildError from '../utils/buildError'
+import api from './api'
+
+const useOrganisationPricingPlan = () => {
+  const fetcher = async (url) => {
+    const res = await api.get(url)
+    return res.data
+  }
+
+  const { data, error } = useSWR(
+    '/billing/organisation-plan',
+    fetcher
+  )
+
+  return {
+    plan: data?.pricingPlan ?? {},
+    loading: !data && !error,
+    error: error && buildError(error)
+  }
+}
+
+export default useOrganisationPricingPlan

src/api/usePricingPlanUsage.js

@@ -0,0 +1,23 @@
+import useSWR from 'swr'
+import buildError from '../utils/buildError'
+import api from './api'
+
+const usePricingPlanUsage = () => {
+  const fetcher = async (url) => {
+    const res = await api.get(url)
+    return res.data
+  }
+
+  const { data, error } = useSWR(
+    '/billing/usage',
+    fetcher
+  )
+
+  return {
+    usage: data?.usage ?? {},
+    loading: !data && !error,
+    error: error && buildError(error)
+  }
+}
+
+export default usePricingPlanUsage

src/api/usePricingPlans.js

@@ -0,0 +1,23 @@
+import useSWR from 'swr'
+import buildError from '../utils/buildError'
+import api from './api'
+
+const usePricingPlans = () => {
+  const fetcher = async (url) => {
+    const res = await api.get(url)
+    return res.data
+  }
+
+  const { data, error } = useSWR(
+    '/billing/plans',
+    fetcher
+  )
+
+  return {
+    plans: data?.pricingPlans ?? [],
+    loading: !data && !error,
+    error: error && buildError(error)
+  }
+}
+
+export default usePricingPlans