Skip to content

Commit 197bbc9

Browse files
AllicolyerAllicolyer
committed
update imports on files
1 parent c271043 commit 197bbc9

23 files changed

+64
-59
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import * as React from 'react';
22
import { Mutation } from 'react-apollo';
3-
import { loginUser } from '../utils/auth';
4-
import { BookmarkButton } from './buttons';
5-
import { BookmarkTutorial } from '../utils/queries/tutorial';
6-
import { handleMutationResponse, ApiErrors } from '../utils/errorHandling';
3+
import { loginUser } from '../../utils/auth';
4+
import { BookmarkButton } from '../shared/buttons';
5+
import { BookmarkTutorial } from '../../utils/queries/tutorial';
6+
import { handleMutationResponse, ApiErrors } from '../../utils/errorHandling';
77

88
const BookmarkMutation = ({ tutorial }) => (
99
<Mutation

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
import * as React from 'react';
2-
import { Heading, Text, Card, Flex, Box } from './shared/base';
3-
import { getTutorialOverviewSlug } from '../utils/getTutorialSlug';
2+
import { Heading, Text, Card, Flex, Box } from '../shared/base';
3+
import { getTutorialOverviewSlug } from '../../utils/getTutorialSlug';
44
import { Link } from 'gatsby';
55
import { Query } from 'react-apollo';
66
import UpvoteMutation from './UpvoteMutation';
77
import BookmarkMutation from './BookmarkMutation';
8+
<<<<<<< HEAD
89
import Percentage from './Percentage';
910
import { getTutorialbyGatsbyID } from '../utils/queries/tutorial';
11+
=======
12+
import Percentage from '../shared/Percentage';
13+
import { GatsbyTutorialQuery } from '../../utils/queries/tutorial';
14+
>>>>>>> update imports on files
1015

1116
type TutorialListingProps = {
1217
tutorial: Tutorial;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import * as React from 'react';
22
import { Mutation } from 'react-apollo';
3-
import { loginUser } from '../utils/auth';
4-
import { handleMutationResponse, ApiErrors } from '../utils/errorHandling';
5-
import { VoteButton } from './buttons';
6-
import { Heading, Flex } from './shared/base';
7-
import { UpvoteTutorial } from '../utils/queries/tutorial';
3+
import { loginUser } from '../../utils/auth';
4+
import { handleMutationResponse, ApiErrors } from '../../utils/errorHandling';
5+
import { VoteButton } from '../shared/buttons';
6+
import { Heading, Flex } from '../shared/base';
7+
import { UpvoteTutorial } from '../../utils/queries/tutorial';
88

99
const UpvoteMutation = ({ tutorial }) => (
1010
<Mutation mutation={UpvoteTutorial} variables={{ id: tutorial.id }}>

‎packages/gatsby-theme/src/components/index/listing.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Link } from 'gatsby';
22
import * as React from 'react';
3-
import { styled } from '../styles';
4-
import { useAllTutorialQuery } from '../hooks/useAllTutorialQuery';
5-
import { getTutorialSlug } from '../utils/getTutorialSlug';
3+
import { styled } from '../../styles';
4+
import { useAllTutorialQuery } from '../../hooks/useAllTutorialQuery';
5+
import { getTutorialSlug } from '../../utils/getTutorialSlug';
66

77
const Post = styled.article`
88
box-shadow: 0 0.3rem 1rem rgba(25, 17, 34, 0.05);

‎packages/gatsby-theme/src/components/profile/Account.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import React from 'react';
2-
import { Text, Image, Flex } from './shared/base';
2+
import { Text, Image, Flex } from '../shared/base';
33
import { Link } from 'gatsby';
4-
import { GithubButton } from './buttons';
5-
import { loginUser } from '../utils/auth';
6-
import WithCurrentUser from '../utils/auth/WithCurrentUser';
7-
import { CenteredLoader } from '../components/Loader';
4+
import { GithubButton } from '../shared/buttons';
5+
import { loginUser } from '../../utils/auth';
6+
import WithCurrentUser from '../../utils/auth/WithCurrentUser';
7+
import { CenteredLoader } from '../shared/Loader';
88

99
const Account = () => {
1010
return (

‎packages/gatsby-theme/src/components/shared/Header.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import Account from '../Account';
2+
import Account from '../profile/Account';
33

44
// Vectors
55
import Logo from './Logo';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import { Text } from './shared/base';
2+
import { Text } from './base';
33

44
const Percentage = ({ tutorial }) => {
55
let progress = tutorial.viewerUserTutorial.currentChapter;

‎packages/gatsby-theme/src/components/shared/ProgressBar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react';
2-
import { styled } from '../styles';
3-
import { Text } from './shared/base';
2+
import { styled } from '../../styles';
3+
import { Text } from './base';
44

55
interface ProgressBarProps extends FillerProps, ContainerProps {}
66

‎packages/gatsby-theme/src/components/shared/buttons.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
2-
import { ButtonProps } from './shared/base';
3-
import { Flex, Image, Button } from './shared/base';
2+
import { ButtonProps } from './base';
3+
import { Flex, Image, Button } from './base';
44

55
export const VoteButton: React.FunctionComponent<
66
ButtonProps & {

‎packages/gatsby-theme/src/components/shared/layout.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { RouterProps } from '@reach/router';
22
import * as React from 'react';
33
import Helmet from 'react-helmet';
4-
import { theme, ThemeProvider, styled } from '../styles';
5-
import { useLayoutQuery } from '../hooks/useLayoutQuery';
6-
import Header from './shared/Header';
4+
import { theme, ThemeProvider, styled } from '../../styles';
5+
import { useLayoutQuery } from '../../hooks/useLayoutQuery';
6+
import Header from './Header';
77

88
const MainLayout = styled.main`
99
max-width: 90%;

0 commit comments

Comments
 (0)