Merge remote-tracking branch 'origin/master' into add-url-routing

This commit is contained in:
Josh Heng 2021-08-02 13:17:22 +01:00
commit 6a8af72f81
4 changed files with 34 additions and 1 deletions

View File

@ -1,5 +1,8 @@
# movie-web # movie-web
Small web app for watching movies easily. Check it out at **[movie.squeezebox.dev](https://movie.squeezebox.dev)**. Small web app for watching movies easily. Check it out at **[movie.squeezebox.dev](https://movie.squeezebox.dev)**.
**[Join the Discord community](https://discord.gg/vXsRvye8BS)**
## Credits ## Credits
- Thanks to [@JipFr](https://github.com/JipFr) for initial work on [movie-cli](https://github.com/JipFr/movie-cli) - Thanks to [@JipFr](https://github.com/JipFr) for initial work on [movie-cli](https://github.com/JipFr/movie-cli)
- Thanks to [@mrjvs](https://github.com/mrjvs) for help porting to React, and for the beautiful design - Thanks to [@mrjvs](https://github.com/mrjvs) for help porting to React, and for the beautiful design

View File

@ -0,0 +1,16 @@
.discordBanner {
margin-top: 0.5rem;
border-inline-start: none;
font-size: 16px;
font-weight: normal;
letter-spacing: -.01em;
padding: .5rem 1rem .5rem .75rem;
border-radius: .25rem;
background-color: var(--button);
color: var(--button-text);
}
.discordBanner a {
color: var(--button-text);
/* text-decoration: none; */
}

View File

@ -0,0 +1,12 @@
import React from 'react';
import './DiscordBanner.css';
export function DiscordBanner() {
return (
<div className="discordBanner">
<a href="https://discord.gg/vXsRvye8BS">
Join our Discord server
</a>
</div>
)
}

View File

@ -12,6 +12,7 @@ import { useMovie } from '../hooks/useMovie';
import { TypeSelector } from '../components/TypeSelector'; import { TypeSelector } from '../components/TypeSelector';
import './Search.css'; import './Search.css';
import { DiscordBanner } from '../components/DiscordBanner';
export function SearchView() { export function SearchView() {
const { navigate, setStreamUrl, setStreamData } = useMovie(); const { navigate, setStreamUrl, setStreamData } = useMovie();
@ -136,6 +137,7 @@ export function SearchView() {
return ( return (
<div className="cardView"> <div className="cardView">
<Card> <Card>
<DiscordBanner />
{errorStatus ? <ErrorBanner>{errorStatus}</ErrorBanner> : ''} {errorStatus ? <ErrorBanner>{errorStatus}</ErrorBanner> : ''}
<Title accent="Because watching content legally is boring"> <Title accent="Because watching content legally is boring">
What do you wanna watch? What do you wanna watch?
@ -176,7 +178,7 @@ export function SearchView() {
} }
</Card> </Card>
<div className="topRightCredits"> <div className="topRightCredits">
<a href="https://github.com/JamesHawkinss/movie-web" target="_blank" rel="noreferrer">Check it out on GitHub <Arrow /></a> <a href="https://github.com/JamesHawkinss/movie-web" target="_blank" rel="noreferrer">Check it out on GitHub <Arrow /></a>
</div> </div>
</div> </div>
) )