fix narrow study modules page

rage · Aug 22, 2023 · de7791f · de7791f
1 parent 1bf20d3
commit de7791f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/frontend/components/Dashboard/StudyModules/ModuleCard.tsx b/frontend/components/Dashboard/StudyModules/ModuleCard.tsx
@@ -121,7 +121,7 @@ function ModuleCard({ studyModule, image, loading }: ModuleCardProps) {
   const moduleNotFound = !loading && !studyModule
 
   return (
-    <Grid item xs={12} sm={6} lg={6}>
+    <Grid item xxxs={12} xxs={12} xs={12} sm={6} lg={6}>
       <Base>
         {loading && (
           <ImageBackgroundSkeleton>

diff --git a/frontend/lib/with-apollo-client/fetch-user-details.ts b/frontend/lib/with-apollo-client/fetch-user-details.ts
@@ -1,8 +1,10 @@
 import { ApolloClient } from "@apollo/client"
 
-import { CurrentUserDocument } from "/graphql/generated"
+import { CurrentUserDocument, CurrentUserQuery } from "/graphql/generated"
 
-export default async function fetchUserDetails(apollo: ApolloClient<object>) {
+export default async function fetchUserDetails(
+  apollo: ApolloClient<object>,
+): Promise<CurrentUserQuery["currentUser"]> {
   const { data } = await apollo.query({
     query: CurrentUserDocument,
     fetchPolicy: "cache-first",

diff --git a/frontend/lib/with-apollo-client/index.tsx b/frontend/lib/with-apollo-client/index.tsx
@@ -75,6 +75,10 @@ const withApolloClient = (App: any) => {
       pageProps = await App.getInitialProps(pageCtx)
     }
 
+    if (!pageProps.pageProps) {
+      pageProps.pageProps = {}
+    }
+
     pageProps.pageProps.currentUser = currentUser
 
     if (typeof window === "undefined") {

diff --git a/frontend/pages/_app.tsx b/frontend/pages/_app.tsx
@@ -126,8 +126,6 @@ MyApp.getInitialProps = async (props: AppContext) => {
   const admin = signedIn && isAdmin(ctx)
   const accessToken = getAccessToken(ctx)
 
-  /*Object.assign(originalProps.pageProps, { signedIn, admin, accessToken })
-  return originalProps*/
   return {
     ...originalProps,
     pageProps: {