Skip to content
This repository has been archived by the owner on Dec 3, 2022. It is now read-only.

Commit

Permalink
fix types
Browse files Browse the repository at this point in the history
  • Loading branch information
imbhargav5 committed Jul 17, 2021
1 parent e88451f commit 9051873
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 30 deletions.
10 changes: 9 additions & 1 deletion schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ schema {
type GitaChapterModel {
id: ID!
name: String
slug: String
nameTransliterated: String
nameTranslated: String
versesCount: Int
Expand Down Expand Up @@ -34,6 +35,7 @@ type GitaTranslationModel {
}
type GitaVerseModel {
id: ID!
slug: String
verseNumber: Int
chapterNumber: Int
text: String
Expand Down Expand Up @@ -61,7 +63,13 @@ type Query {
first: Int
skip: Int
): [GitaChapterModel]
verses(verseNumber: Int, limit: Int, first: Int, skip: Int): [GitaVerseModel]
verses(
verseNumber: Int
verseOrder: Int
limit: Int
first: Int
skip: Int
): [GitaVerseModel]
}
directive @cacheControl(
maxAge: Int
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions src/features/chapters/ChapterById.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ export function ChapterById({ chapterById }: ChapterByIdProps) {
graphql`
fragment ChapterById_ChapterDataFragment on GitaChapterModel {
name
chapterSummary
chapterNumber
chapterSummary
chapterNumber
nameTransliterated
nameTranslated
versesCount
nameMeaning
verses {
id
text
verseNumber
}
verses {
id
text
verseNumber
}
}
`,
chapterById
Expand All @@ -39,7 +39,7 @@ export function ChapterById({ chapterById }: ChapterByIdProps) {
chapterNumber,
chapterSummary,
nameMeaning,
nameTranslation,
nameTranslated,
nameTransliterated,
verses,
} = data;
Expand All @@ -50,7 +50,7 @@ export function ChapterById({ chapterById }: ChapterByIdProps) {
</h1>
<p>{chapterSummary}</p>
<p>{nameMeaning}</p>
<p>{nameTranslation}</p>
<p>{nameTranslated}</p>
<p>{nameTransliterated}</p>
<div className="flex flex-wrap -m-2">
{verses.map((verse) => {
Expand Down
17 changes: 9 additions & 8 deletions src/pages/verse/[verseNumber].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import { VerseById } from '@/features/verses/VerseById';
import { graphql, useFragment, usePreloadedQuery } from 'react-relay/hooks';
import { getRelayClientEnvironment } from '@/config/relay/getRelayClientEnvironment';
import { RelayProps, withRelay } from 'relay-nextjs';
import { VerseOrder_GitaVerseQuery } from '@/__generated__/VerseOrder_GitaVerseQuery.graphql';
import { VerseNumber_GitaVerseQuery } from '@/__generated__/VerseNumber_GitaVerseQuery.graphql';
import { Layout } from '@/components/Layout';

export interface IChapterPageProps {}

const VerseQuery = graphql`
query VerseOrder_GitaVerseQuery($verseNumber: Int) {
query VerseNumber_GitaVerseQuery($verseNumber: Int) {
verses(verseNumber: $verseNumber) {
id
...VerseById_VerseDataFragment
Expand All @@ -21,18 +21,18 @@ const VerseQuery = graphql`

function HandleData({
preloadedQuery,
}: RelayProps<{}, VerseOrder_GitaVerseQuery>) {
const {verses} = usePreloadedQuery<VerseOrder_GitaVerseQuery>(
}: RelayProps<{}, VerseNumber_GitaVerseQuery>) {
const { verses } = usePreloadedQuery<VerseNumber_GitaVerseQuery>(
VerseQuery,
preloadedQuery
);
if (verses && verses[0]) {
return <VerseById verse={verses[0]} />;
}
return null;
return null;
}

function VersePage(props: RelayProps<{}, VerseOrder_GitaVerseQuery>) {
function VersePage(props: RelayProps<{}, VerseNumber_GitaVerseQuery>) {
return (
<Layout>
<Suspenseful>
Expand All @@ -53,9 +53,10 @@ export default withRelay(VersePage, VerseQuery, {
},
variablesFromContext: (context) => {
const { verseNumber } = context.query;
console.log(verseNumber)
console.log(verseNumber);
return {
verseNumber: typeof verseNumber === 'string' ? parseInt(verseNumber) : verse_order,
verseNumber:
typeof verseNumber === 'string' ? parseInt(verseNumber) : verseNumber,
};
},
});
3 changes: 3 additions & 0 deletions src/types/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export type GitaChapterModel = {
readonly __typename?: 'GitaChapterModel';
readonly id: Scalars['ID'];
readonly name?: Maybe<Scalars['String']>;
readonly slug?: Maybe<Scalars['String']>;
readonly nameTransliterated?: Maybe<Scalars['String']>;
readonly nameTranslated?: Maybe<Scalars['String']>;
readonly versesCount?: Maybe<Scalars['Int']>;
Expand Down Expand Up @@ -64,6 +65,7 @@ export type GitaTranslationModel = {
export type GitaVerseModel = {
readonly __typename?: 'GitaVerseModel';
readonly id: Scalars['ID'];
readonly slug?: Maybe<Scalars['String']>;
readonly verseNumber?: Maybe<Scalars['Int']>;
readonly chapterNumber?: Maybe<Scalars['Int']>;
readonly text?: Maybe<Scalars['String']>;
Expand Down Expand Up @@ -104,6 +106,7 @@ export type QueryChaptersArgs = {

export type QueryVersesArgs = {
verseNumber?: Maybe<Scalars['Int']>;
verseOrder?: Maybe<Scalars['Int']>;
limit?: Maybe<Scalars['Int']>;
first?: Maybe<Scalars['Int']>;
skip?: Maybe<Scalars['Int']>;
Expand Down

0 comments on commit 9051873

Please sign in to comment.