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.

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

Add similar movies #517

Merged
merged 25 commits into from
Jul 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ module.exports = {
},
i18n,
images: {
domains: ['image.tmdb.org'],
remotePatterns: [
{
protocol: 'https',
hostname: 'image.tmdb.org',
},
],
},
}
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
},
"dependencies": {
"@meilisearch/instant-meilisearch": "0.16.0",
"@twicpics/components": "^0.29.2",
"clsx": "^2.1.1",
"dotenv": "^16.0.3",
"lodash.get": "^4.4.2",
"next": "^14.1.0",
Expand Down Expand Up @@ -54,7 +56,7 @@
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-cypress": "^2.11.3",
"eslint-plugin-prettier": "^3.4.0",
"meilisearch": "^0.37.0",
"meilisearch": "^0.41.0",
"ofetch": "^1.3.3",
"postcss": "^8.4.38",
"prettier": "^2.3.2",
Expand Down
17 changes: 16 additions & 1 deletion public/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"movies": "Movies",
"results": "Results",
"synopsis": "Synopsis",
"overview": "Overview",
"whereToWatch": "Where to Watch",
"cast": "Cast",
"buy": "Buy",
Expand All @@ -34,5 +33,21 @@
"heading": "What's trending?",
"semanticLabel": "semantic",
"semanticTooltip": "Determines how semantic search affects the results."
},

"overview": {
"heading": "Overview"
},

"platforms": {
"heading": "Platforms",
"description": "Find platforms to watch {{title}}.",
"mobileDescription": "Where can I watch {{title}}?"
},

"similar": {
"heading": "Similar movies",
"mobileHeading": "Similar",
"description": "Watch movies similar to {{title}}."
}
}
24 changes: 14 additions & 10 deletions scripts/update-settings.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Task } from 'meilisearch'
import { ofetch } from 'ofetch'
import { checkEnv } from './utils'
import { checkEnv, isUsingMeilisearchCloud } from './utils'

type TaskResponse = {
taskUid: Task['uid']
Expand Down Expand Up @@ -33,15 +33,19 @@ const indexesConfig = [
async function main() {
console.log(`Connecting to: ${MEILISEARCH_HOST}`)

await ofetch<TaskResponse>(`${MEILISEARCH_HOST}/experimental-features`, {
method: 'PATCH',
headers: {
Authorization: `Bearer ${MEILISEARCH_ADMIN_API_KEY}`,
},
body: {
vectorStore: true,
},
})
const shouldEnableVectorStore = !isUsingMeilisearchCloud(MEILISEARCH_HOST)
if (shouldEnableVectorStore) {
console.log('Enabling vector store')
await ofetch<TaskResponse>(`${MEILISEARCH_HOST}/experimental-features`, {
method: 'PATCH',
headers: {
Authorization: `Bearer ${MEILISEARCH_ADMIN_API_KEY}`,
},
body: {
vectorStore: true,
},
})
}

for (const { indexName, documentTemplate } of indexesConfig) {
const endpoint = `${MEILISEARCH_HOST}/indexes/${indexName}/settings`
Expand Down
14 changes: 9 additions & 5 deletions scripts/utils.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
import dotenv from 'dotenv';
import dotenv from 'dotenv'

dotenv.config(); // load environment variables from a .env file into process.env
dotenv.config() // load environment variables from a .env file into process.env

export const checkEnv = (variables: string | string[]) => {
export const checkEnv = (variables: string | string[]) => {
if (Array.isArray(variables)) {
variables.forEach(variable => {
if (process.env[variable] === undefined) {
throw new Error(`Please set the ${variable} environment variable.`);
throw new Error(`Please set the ${variable} environment variable.`)
}
})
return
}
if (process.env[variables] === undefined) {
throw new Error(`Please set the ${variables} environment variable.`);
throw new Error(`Please set the ${variables} environment variable.`)
}
}

export const isUsingMeilisearchCloud = host => {
return host.includes('edge.meilisearch') || host.includes('meilisearch.io')
}
47 changes: 0 additions & 47 deletions src/components/Card.js

This file was deleted.

57 changes: 57 additions & 0 deletions src/components/Card.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
import React from 'react'
import styled from 'styled-components'
import { TwicImg } from '@twicpics/components/react'
import { getTwicpicsUrl } from '~/utils'
import { MOVIE_POSTER_ASPECT_RATIO } from '~/lib/constants'
import Typography from 'components/Typography'
import Rating from 'components/Rating'
import { MovieData } from '~/types'
import clsx from 'clsx'

type CardProps = MovieData & {
className?: string
imageClassName?: string
}

const Title = styled(Typography)`
color: var(--800-100);
`

const ReleaseYear = styled(Typography)`
color: var(--gray-300);
`

const Card = ({
poster_path = '',
title = '',
release_date = '',
vote_average,
...props
}: CardProps) => {
const releaseYear = new Date(release_date).getFullYear()
return (
<div className={clsx('flex flex-col', props.className)}>
<div
className={clsx(
'rounded-lg overflow-hidden mb-2',
props.imageClassName
)}
>
<TwicImg
src={getTwicpicsUrl('tmdb', poster_path)}
ratio={MOVIE_POSTER_ASPECT_RATIO}
className="w-full h-full object-cover"
/>
</div>
<Title variant="cardTitle" className="text-wrap">
{title}
</Title>
<div className="flex items-center flex-wrap space-x-4">
<ReleaseYear variant="subtitle">{releaseYear}</ReleaseYear>
<Rating rating={Math.round((vote_average / 2) * 10) / 10} />
</div>
</div>
)
}

export default Card
6 changes: 5 additions & 1 deletion src/components/MovieContent/BackdropImage.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import styled from 'styled-components'
import get from 'utils/get'

const BackdropImage = styled.div`
const Wrapper = styled.div`
background: linear-gradient(
to bottom,
rgba(var(--movie-content-image-gradient), 0.5) 0%,
Expand All @@ -24,4 +24,8 @@ const BackdropImage = styled.div`
padding: 246px 50px 0;
}
`

const BackdropImage = ({ children, imageUrl }) => {
return <Wrapper $image={imageUrl}>{children}</Wrapper>
}
export default BackdropImage
19 changes: 3 additions & 16 deletions src/components/MovieContent/Cast.js
Original file line number Diff line number Diff line change
@@ -1,30 +1,17 @@
import React from 'react'
import styled from 'styled-components'
import People from 'components/People'
import get from 'utils/get'

const Peoples = styled.div`
display: grid;
grid-template-columns: repeat(4, 1fr);
grid-gap: 24px;

@media (min-width: ${get('breakpoints.desktop')}) {
margin-top: 22px;
grid-template-columns: repeat(8, 1fr);
grid-gap: 30px;
}
`
import clsx from 'clsx'

const Cast = ({ cast, ...props }) => (
<Peoples {...props}>
<div {...props} className={clsx('flex flex-wrap gap-6', props.className)}>
{cast.map((people, index) => (
<People
key={`${people?.name}-${people?.character || index}`}
people={people}
data-cast={people?.name}
/>
))}
</Peoples>
</div>
)

export default Cast
59 changes: 0 additions & 59 deletions src/components/MovieContent/Desktop/DesktopLayout.js

This file was deleted.

Loading
Loading