Merge pull request #485 from audioverse-org/AV-615-Logged-User-to-see…

…-Discover-Section-upon-accessing-website-currently-shows-Home-Page

Av 615 logged user to see discover section upon accessing website currently shows home page

public/compiled-lang/en.json

@@ -717,6 +717,24 @@
       "value": "All Audiobooks"
     }
   ],
+  "browse__topicsNext": [
+    {
+      "type": 0,
+      "value": "Next topics"
+    }
+  ],
+  "browse__topicsPrevious": [
+    {
+      "type": 0,
+      "value": "Previous topics"
+    }
+  ],
+  "browse_topicsHeading": [
+    {
+      "type": 0,
+      "value": "Topics"
+    }
+  ],
   "buttonShareRecording__emailSubject": [
     {
       "type": 1,

public/lang/en.json

@@ -361,6 +361,15 @@
   "books__title": {
     "string": "All Audiobooks"
   },
+  "browse__topicsNext": {
+    "string": "Next topics"
+  },
+  "browse__topicsPrevious": {
+    "string": "Previous topics"
+  },
+  "browse_topicsHeading": {
+    "string": "Topics"
+  },
   "buttonShareRecording__emailSubject": {
     "string": "{title} by {presenters}"
   },

src/components/organisms/cardSlider/section/topics.graphql

@@ -7,7 +7,7 @@ query getSectionTopics(
 		language: $language
 		first: $first
 		after: $after
-		orderBy: { field: ID, direction: DESC }
+		orderBy: { field: FEATURED, direction: ASC }
 	) {
 		nodes {
 			...cardTopic

src/components/organisms/cardSlider/section/topicsBrowse.graphql

@@ -0,0 +1,20 @@
+query getSectionTopicsBrowse(
+	$language: Language!
+	$first: Int! = 6
+	$after: String = null
+) {
+	topics(
+		language: $language
+		first: $first
+		after: $after
+		orderBy: { field: FEATURED, direction: DESC }
+	) {
+		nodes {
+			...cardTopic
+		}
+		pageInfo {
+			hasNextPage
+			endCursor
+		}
+	}
+}

src/components/organisms/cardSlider/section/topicsBrowse.tsx

@@ -0,0 +1,34 @@
+import React from 'react';
+import { useIntl } from 'react-intl';
+
+import { CardTopicFragment } from '~src/components/molecules/card/__generated__/topic';
+import CardTopic from '~src/components/molecules/card/topic';
+import root from '~src/lib/routes';
+import { useLanguageId } from '~src/lib/useLanguageId';
+
+import { useInfiniteGetSectionTopicsBrowseQuery } from './__generated__/topicsBrowse';
+import Section from './index';
+
+export default function TopicsBrowse(): JSX.Element {
+	const intl = useIntl();
+	const language = useLanguageId();
+	return (
+		<Section
+			infiniteQuery={useInfiniteGetSectionTopicsBrowseQuery}
+			heading={intl.formatMessage({
+				id: 'browse_topicsHeading',
+				defaultMessage: 'Topics',
+			})}
+			previous={intl.formatMessage({
+				id: 'browse__topicsPrevious',
+				defaultMessage: 'Previous topics',
+			})}
+			next={intl.formatMessage({
+				id: 'browse__topicsNext',
+				defaultMessage: 'Next topics',
+			})}
+			seeAllUrl={root.lang(language).topics.get()}
+			Card={(p: { node: CardTopicFragment }) => <CardTopic topic={p.node} />}
+		/>
+	);
+}

src/containers/account/loginRedirect.tsx

@@ -2,20 +2,16 @@ import { useRouter } from 'next/router';
 import React, { useEffect } from 'react';
 import { FormattedMessage } from 'react-intl';
 
-import root, { isRedirectRouteAllowed } from '~lib/routes';
+import root from '~lib/routes';
 import useLanguageRoute from '~lib/useLanguageRoute';
 
 export default function LoginRedirect(): JSX.Element {
 	const router = useRouter();
 	const route = useLanguageRoute();
 
 	useEffect(() => {
-		const backRoute = router.query.back as string;
-		router.push(
-			backRoute && isRedirectRouteAllowed(backRoute)
-				? backRoute
-				: root.lang(route).discover.get()
-		);
+		//const backRoute = router.query.back as string;
+		router.push(root.lang(route).discover.get());
 	}, [router, route]);
 
 	return (

src/containers/discover/collections.tsx

@@ -8,7 +8,7 @@ import ScriptureSongs from '~src/components/organisms/cardSlider/section/scriptu
 import Series from '~src/components/organisms/cardSlider/section/series';
 import Sponsors from '~src/components/organisms/cardSlider/section/sponsors';
 import StorySeasons from '~src/components/organisms/cardSlider/section/storySeasons';
-import Topics from '~src/components/organisms/cardSlider/section/topics';
+import TopicsBrowse from '~src/components/organisms/cardSlider/section/topicsBrowse';
 
 import { GetDiscoverCollectionsPageDataQuery } from './__generated__/collections';
 
@@ -18,7 +18,7 @@ export default function DiscoverCollections(): JSX.Element {
 	return (
 		<div>
 			<Presenters />
-			<Topics />
+			<TopicsBrowse />
 			<Series />
 			<Audiobooks />
 			<Conferences

src/pages/[language]/discover/collections.ts

@@ -42,6 +42,7 @@ export async function getStaticProps({
 		getSectionScriptureSongs: { language },
 		getSectionSeries: { language },
 		getSectionTopics: { language },
+		getSectionTopicsBrowse: { language },
 	});
 
 	return {

src/pages/[language]/discover/index.ts

@@ -36,6 +36,7 @@ export async function getStaticProps({
 		getSectionConferences: { language },
 		getSectionBlogPosts: { language },
 		getSectionTopics: { language },
+		getSectionTopicsBrowse: { language },
 		getSectionPresenters: { language },
 		getSectionBibleBooks: { language },
 		getSectionTrendingMusic: { language },