move page queries back to pages

Author: Allicolyer

packages/gatsby-theme/src/components/Percentage.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Mutation } from 'react-apollo';
 import { loginUser } from '../../utils/auth';
 import { BookmarkButton } from '../shared/buttons';
-import { BookmarkTutorial } from '../../utils/queries/tutorial';
+import { BookmarkTutorial } from '../../utils/queries';
 import { handleMutationResponse, ApiErrors } from '../../utils/errorHandling';
 
 const BookmarkMutation = ({ tutorial }) => (

packages/gatsby-theme/src/components/community/BookmarkMutation.tsx

@@ -5,13 +5,8 @@ import { Link } from 'gatsby';
 import { Query } from 'react-apollo';
 import UpvoteMutation from './UpvoteMutation';
 import BookmarkMutation from './BookmarkMutation';
-<<<<<<< HEAD
-import Percentage from './Percentage';
-import { getTutorialbyGatsbyID } from '../utils/queries/tutorial';
-=======
 import Percentage from '../shared/Percentage';
-import { GatsbyTutorialQuery } from '../../utils/queries/tutorial';
->>>>>>> update imports on files
+import { getTutorialbyGatsbyID } from '../../utils/queries';
 
 type TutorialListingProps = {
   tutorial: Tutorial;

packages/gatsby-theme/src/components/community/TutorialListing.tsx

@@ -4,7 +4,7 @@ import { loginUser } from '../../utils/auth';
 import { handleMutationResponse, ApiErrors } from '../../utils/errorHandling';
 import { VoteButton } from '../shared/buttons';
 import { Heading, Flex } from '../shared/base';
-import { UpvoteTutorial } from '../../utils/queries/tutorial';
+import { UpvoteTutorial } from '../../utils/queries';
 
 const UpvoteMutation = ({ tutorial }) => (
   <Mutation mutation={UpvoteTutorial} variables={{ id: tutorial.id }}>

packages/gatsby-theme/src/components/community/UpvoteMutation.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { upsertCurrentChapter } from '../../utils/queries/tutorial';
+import { upsertCurrentChapter } from '../../utils/queries';
 import { Mutation } from 'react-apollo';
 import { loginUser } from '../../utils/auth';
 import { handleMutationResponse, ApiErrors } from '../../utils/errorHandling';

packages/gatsby-theme/src/components/tutorial/ChapterMutation.tsx

@@ -3,9 +3,9 @@ import Layout from '../components/shared/layout';
 import { Content } from '../components/shared/styledHelpers';
 import TutorialListing from '../components/community/TutorialListing';
 import { Heading } from '../components/shared/base';
-import { CommunityTutorialQuery } from '../utils/queries/markdown';
+import { graphql } from 'gatsby';
 
-const Community = ({ data }) => {
+const community = ({ data }) => {
   const tutorials = data.tutorials.edges;
   return (
     <Layout>
@@ -23,4 +23,27 @@ const Community = ({ data }) => {
   );
 };
 
-export default Community;
+export const query = graphql`
+  query CommunityTutorialQuery {
+    tutorials: allMdx(
+      filter: {
+        frontmatter: { tutorialTitle: { ne: null } }
+        fileAbsolutePath: { regex: "/community/" }
+      }
+    ) {
+      edges {
+        node {
+          id
+          fileAbsolutePath
+          frontmatter {
+            id
+            tutorialTitle
+            description
+          }
+        }
+      }
+    }
+  }
+`;
+
+export default community;

packages/gatsby-theme/src/pages/community.tsx

@@ -3,7 +3,7 @@ import Layout from '../components/shared/layout';
 import CourseSection from '../components/courses/CourseSection';
 import { Content } from '../components/shared/styledHelpers';
 import { Heading, Text } from '../components/shared/base';
-import { FullStackCourseQuery } from '../utils/queries/markdown';
+import { graphql } from 'gatsby';
 
 const courses = ({ data }) => {
   const courseSectionData = [
@@ -43,4 +43,43 @@ const courses = ({ data }) => {
   );
 };
 
+export const query = graphql`
+  query FullStackCourseQuery {
+    frontend: allMdx(
+      filter: {
+        frontmatter: { tutorialTitle: { ne: null } }
+        fileAbsolutePath: { regex: "/courses/frontend/" }
+      }
+    ) {
+      edges {
+        node {
+          id
+          fileAbsolutePath
+          frontmatter {
+            tutorialTitle
+            description
+          }
+        }
+      }
+    }
+    backend: allMdx(
+      filter: {
+        frontmatter: { tutorialTitle: { ne: null } }
+        fileAbsolutePath: { regex: "/courses/backend/" }
+      }
+    ) {
+      edges {
+        node {
+          id
+          fileAbsolutePath
+          frontmatter {
+            tutorialTitle
+            description
+          }
+        }
+      }
+    }
+  }
+`;
+
 export default courses;

packages/gatsby-theme/src/pages/courses.tsx

@@ -4,7 +4,7 @@ import { Heading, Text, Image, Flex } from '../components/shared/base';
 import { logoutUser } from '../utils/auth';
 import { navigate } from 'gatsby';
 import { Query } from 'react-apollo';
-import { PROFILE_QUERY } from '../utils/queries/profile';
+import { PROFILE_QUERY } from '../utils/queries';
 import { optionalChaining } from '../utils/helpers';
 import { CenteredLoader } from '../components/shared/Loader';
 

packages/gatsby-theme/src/pages/profile.tsx

@@ -60,3 +60,35 @@ export const UpvoteTutorial = gql`
     }
   }
 `;
+
+export const PROFILE_QUERY = gql`
+  query profileQuery {
+    viewer {
+      user {
+        id
+        name
+        githubHandle
+        avatarUrl
+        bio
+        upvoted: userTutorials(where: { upvoted: true }) {
+          tutorial {
+            id
+            name
+          }
+        }
+        bookmarked: userTutorials(where: { bookmarked: true }) {
+          tutorial {
+            id
+            name
+          }
+        }
+        progress: userTutorials(where: { currentChapter_not: 0 }) {
+          tutorial {
+            id
+            name
+          }
+        }
+      }
+    }
+  }
+`;

packages/gatsby-theme/src/utils/queries/tutorial.tsx packages/gatsby-theme/src/utils/queries.tsx

@@ -1,11 +1,11 @@
-import React from "react";
-import { MDXProvider } from "@mdx-js/react";
-import { preToCodeBlock } from "mdx-utils";
-import { ApolloProvider } from "react-apollo";
+import React from 'react';
+import { MDXProvider } from '@mdx-js/react';
+import { preToCodeBlock } from 'mdx-utils';
+import { ApolloProvider } from 'react-apollo';
 
-import { client } from "./src/Apollo";
+import { client } from './src/Apollo';
 
-import { Code } from "./src/components/code";
+import { Code } from './src/components/shared/code';
 
 // components is its own object outside of render so that the references to
 // components are stable
@@ -19,7 +19,7 @@ const components = {
       // it's possible to have a pre without a code in it
       return <pre {...preProps} />;
     }
-  }
+  },
 };
 export const wrapRootElement = ({ element }) => {
   return (