feat: Change routing to 'maker/apps'

kyranjamie · kyranjamie · commit e822707b45d7 · 2019-10-29T13:15:59.000Z
diff --git a/pages/maker/apps/index.js b/pages/maker/apps/index.js
@@ -18,36 +18,35 @@ const MakerPortal = ({ params, apiServer, user, maker, errorMessage, appList, se
 
   const router = useRouter()
 
-  console.log(router)
-  const updateMakerRoute = id => {
-    router.push(
-      {
-        pathname: '/maker',
-        query: {
-          params: { appId: id }
-        },
-        as: `/maker/${id}`
-      },
-      {
-        shallow: true
-      }
-    )
-  }
+  const updateMakerRoute = id => router.push(
+    '/maker/apps',
+    `/maker/apps/${id}`,
+    {
+      shallow: true
+    }
+  )
 
   const getAppId = () => {
-
+    if (!params) return undefined
     const id = parseInt(params.appId, 10)
-    if (isNaN(id)) return null
+    if (isNaN(id)) return undefined
     return id
   }
 
   useEffect(() => {
     async function fetchAppsOnInit () {
       await fetchApps({ apiServer, user })(dispatch)
-
       if (hasAppId) {
         dispatch(selectAppAction(getAppId()))
       }
+      if (!hasAppId && process.browser) {
+        setTimeout(() => {
+          console.log(appList)
+          // if (!appList[0]) return
+          const { id } = appList[0]
+          dispatch(selectAppAction(id))
+        })
+      }
     }
     fetchAppsOnInit()
   }, [])
@@ -64,22 +63,13 @@ const MakerPortal = ({ params, apiServer, user, maker, errorMessage, appList, se
     )
   }
 
-  // if (!hasAppId) {
-    // if (appList.length === 0) throw new Error('wlkdsfsldfl')
-    // const { id } = appList[0]
-    // console.log('has no app id take first', id)
-    // updateMakerRoute(id)
-    // dispatch(selectAppAction(id))
-  // }
-
   function handleChangingApp (event) {
     event.persist()
     const id = event.target.value
     dispatch(selectAppAction(id))
     updateMakerRoute(id)
   }
 
-
   return (
     <Page innerPadding={0} wrap>
       <Head title={selectedApp.name} />
@@ -135,7 +125,12 @@ const MakerPortal = ({ params, apiServer, user, maker, errorMessage, appList, se
   )
 }
 
-const mapStateToProps = (state) => ({
+MakerPortal.getInitialProps = (x) => {
+  console.log(x.userApps)
+  return { params: x.query.params }
+}
+
+const mapStateToProps = state => ({
   user: selectUser(state),
   apiServer: selectApiServer(state),
   maker: selectMaker(state),
diff --git a/server.js b/server.js
@@ -66,7 +66,8 @@ async function renderAndCache(req, res, pagePath, serverData) {
       ...serverData,
       blockstackRankedApps,
       appMiningMonths,
-      appMiningApps
+      appMiningApps,
+      params: req.params
     }
     const html = await app.renderToHTML(req, res, pagePath, dataToPass)
     if (cacheKey) {
@@ -220,7 +221,9 @@ app.prepare().then(() => {
     /**
      * Maker pages
      */
-    server.get('/maker', (req, res) => renderAndCache(req, res, '/maker'))
+    server.get('/maker', (req, res) => res.redirect('/maker/apps'))
+    server.get('/maker/apps', (req, res) => renderAndCache(req, res, '/maker/apps'))
+    server.get('/maker/apps/:appId', (req, res) => renderAndCache(req, res, '/maker/apps'))
     server.get('/maker/:accessToken', (req, res) => renderAndCache(req, res, '/maker/magic-link', { accessToken: req.params.accessToken }))
 
     apps.platforms.forEach((platform) => {
diff --git a/stores/maker/actions.js b/stores/maker/actions.js
@@ -55,11 +55,11 @@ export const savePaymentDetails = ({ apiServer, appId, jwt, btcAddress, stxAddre
 }
 
 export const fetchApps = ({ user, apiServer }) => async dispatch => {
-  dispatch(fetchAppsAction())
   if (!(user && user.jwt)) {
     dispatch(errorAction())
     return
   }
+  dispatch(fetchAppsAction())
   try {
     const uri = `${apiServer}/api/maker/apps`
     const response = await fetch(uri, {
@@ -68,8 +68,7 @@ export const fetchApps = ({ user, apiServer }) => async dispatch => {
       }
     })
     const apps = await response.json()
-    dispatch(fetchAppsDoneAction(apps))
-    dispatch(setLoadingDoneAction())
+    await dispatch(fetchAppsDoneAction(apps))
   } catch (error) {
     dispatch(fetchAppsFailAction())
   }
diff --git a/stores/maker/reducer.js b/stores/maker/reducer.js
@@ -13,12 +13,6 @@ const initialState = {
 function makerReducer(state = initialState, action) {
   switch (action.type) {
 
-    case MakerActions.SET_LOADING_DONE:
-      return {
-        ...state,
-        loading: false
-      }
-
     case MakerActions.MAKER_AUTH_ERROR:
       return {
         ...state,
@@ -29,9 +23,10 @@ function makerReducer(state = initialState, action) {
     case MakerActions.FETCH_APPS_DONE:
       return {
         ...state,
+        loading: false,
         appIds: action.payload.apps.map(app => app.id),
-        appEntities: keyBy(action.payload.apps, 'id'),
-        selectedAppId: action.payload.apps.length ? action.payload.apps[0].id : null
+        appEntities: keyBy(action.payload.apps, 'id')
+        // selectedAppId: action.payload.apps.length ? action.payload.apps[0].id : null
       }
 
     case MakerActions.SELECT_APP:

Original file line number	Diff line number	Diff line change
`@@ -55,11 +55,11 @@ export const savePaymentDetails = ({ apiServer, appId, jwt, btcAddress, stxAddre`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`export const fetchApps = ({ user, apiServer }) => async dispatch => {`
`58`		`- dispatch(fetchAppsAction())`
`59`	`58`	`if (!(user && user.jwt)) {`
`60`	`59`	`dispatch(errorAction())`
`61`	`60`	`return`
`62`	`61`	`}`
	`62`	`+ dispatch(fetchAppsAction())`
`63`	`63`	`try {`
`64`	`64`	const uri = `${apiServer}/api/maker/apps`
`65`	`65`	`const response = await fetch(uri, {`
`@@ -68,8 +68,7 @@ export const fetchApps = ({ user, apiServer }) => async dispatch => {`
`68`	`68`	`}`
`69`	`69`	`})`
`70`	`70`	`const apps = await response.json()`
`71`		`- dispatch(fetchAppsDoneAction(apps))`
`72`		`- dispatch(setLoadingDoneAction())`
	`71`	`+ await dispatch(fetchAppsDoneAction(apps))`
`73`	`72`	`} catch (error) {`
`74`	`73`	`dispatch(fetchAppsFailAction())`
`75`	`74`	`}`