Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: enable dynamic spotify embed #364

Merged
merged 2 commits into from
Dec 20, 2022
Merged

feat: enable dynamic spotify embed #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49e83bc
feat: enable spotify
rutajdash Dec 20, 2022
0cc8646
feat: show dynamic embded
rutajdash Dec 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions client/src/components/podcast/List.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import { PODCAST } from '../../assets/placeholder/podcast';
// Images
import podcastCover from '../../assets/images/podcast_cover.png';

const PodcastList = () => {
const PodcastList = ({ spotify }) => {
const Podcast = PODCAST;
const classes = useStyles();
return (
<Container>
<div className={classes.wrapper}>
{/* <div className={classes.wrapper}>
<Paper>
<Table>
<TableHead>
Expand Down Expand Up @@ -57,11 +57,11 @@ const PodcastList = () => {
</TableBody>
</Table>
</Paper>
</div>
</div> */}

<div>
<iframe
src='https://open.spotify.com/embed/episode/7zq8d36zXutK0XXU5xp8kO?utm_source=generator'
src={`https://open.spotify.com/embed/episode/${spotify[0].id}`}
width='100%'
height='152'
frameBorder='0'
Expand Down
1 change: 1 addition & 0 deletions client/src/pages/expressions/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ const ExpressionsPage = ({
<Expressions
witsdom={witsdom}
photostory={photostory}
spotify={spotify}
editorial={editorial}
miscellaneous={miscellaneous}
/>
Expand Down
20 changes: 13 additions & 7 deletions client/src/screens/Expressions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@ import ROUTES from '../utils/getRoutes';
// Placeholders
import { CAROUSEL } from '../assets/placeholder/guide';

function Expressions({ witsdom, photostory, editorial, miscellaneous }) {
function Expressions({
witsdom,
photostory,
spotify,
editorial,
miscellaneous,
}) {
const classes = useStyles();

const CONTENT = [
Expand Down Expand Up @@ -61,11 +67,11 @@ function Expressions({ witsdom, photostory, editorial, miscellaneous }) {
container: true,
section: <ArticleCardStack articleList={editorial} />,
},
// {
// name: 'Podcasts',
// container: true,
// section: <PodcastList />,
// },
{
name: 'Podcasts',
container: true,
section: <PodcastList spotify={spotify} />,
},
{
name: 'Miscellaneous',
container: true,
Expand Down Expand Up @@ -110,7 +116,7 @@ function Expressions({ witsdom, photostory, editorial, miscellaneous }) {
<SectionTitle
heading={name}
link={shortName}
path={path + '/1'}
path={path.includes('http') ? path : path + '/1'}
container={!container}
/>
{section}
Expand Down
3 changes: 2 additions & 1 deletion client/src/utils/getLinks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ const SUB_CATEGORIES = {
GALLERY: `${CATEGORIES.EXPRESSIONS}/gallery`,
NITR_IN_MOTION: `${CATEGORIES.EXPRESSIONS}/nitrInMotion`,
EDITORIAL: `${CATEGORIES.EXPRESSIONS}/editorial`,
PODCASTS: `${CATEGORIES.EXPRESSIONS}/podcasts`,
// PODCASTS: `${CATEGORIES.EXPRESSIONS}/podcasts`,
PODCASTS: `https://open.spotify.com/show/7ljgcbXzt4VQRJ1SLIECNf`,
MISCELLANEOUS: `${CATEGORIES.EXPRESSIONS}/miscellaneous`,
},
};
Expand Down
16 changes: 8 additions & 8 deletions client/src/utils/getRoutes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,14 +282,14 @@ const EXPRESSIONS = [
idNumber: 66,
exact: true,
},
// {
// name: 'Podcasts',
// shortName: LINKS.SUB_CATEGORIES.EXPRESSIONS.PODCASTS.split('/')[2],
// path: LINKS.SUB_CATEGORIES.EXPRESSIONS.PODCASTS,
// asyncRoutePath: './Podcast',
// idNumber: 65,
// exact: true,
// },
{
name: 'Podcasts',
shortName: LINKS.SUB_CATEGORIES.EXPRESSIONS.PODCASTS.split('/')[2],
path: LINKS.SUB_CATEGORIES.EXPRESSIONS.PODCASTS,
asyncRoutePath: './Podcast',
idNumber: 65,
exact: true,
},
{
name: 'Miscellaneous',
shortName: LINKS.SUB_CATEGORIES.EXPRESSIONS.MISCELLANEOUS.split('/')[2],
Expand Down