initial commit for GitHub

This commit is contained in:
Lucas Jensen
2024-12-01 19:15:25 -08:00
commit 925b334e4c
91 changed files with 8031 additions and 0 deletions

2
client/.env.example Normal file
View File

@@ -0,0 +1,2 @@
[api]
VITE_API_URL=http://localhost:8000/

18
client/.eslintrc.cjs Normal file
View File

@@ -0,0 +1,18 @@
module.exports = {
root: true,
env: { browser: true, es2020: true },
extends: [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:react-hooks/recommended",
],
ignorePatterns: ["dist", ".eslintrc.cjs"],
parser: "@typescript-eslint/parser",
plugins: ["react-refresh"],
rules: {
"react-refresh/only-export-components": [
"warn",
{ allowConstantExport: true },
],
},
};

29
client/.gitignore vendored Normal file
View File

@@ -0,0 +1,29 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*
node_modules
dist
dist-ssr
*.local
# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
# env
.env
/.vscode

30
client/README.md Normal file
View File

@@ -0,0 +1,30 @@
# React + TypeScript + Vite
This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
Currently, two official plugins are available:
- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
## Expanding the ESLint configuration
If you are developing a production application, we recommend updating the configuration to enable type aware lint rules:
- Configure the top-level `parserOptions` property like this:
```js
export default {
// other rules...
parserOptions: {
ecmaVersion: "latest",
sourceType: "module",
project: ["./tsconfig.json", "./tsconfig.node.json"],
tsconfigRootDir: __dirname,
},
};
```
- Replace `plugin:@typescript-eslint/recommended` to `plugin:@typescript-eslint/recommended-type-checked` or `plugin:@typescript-eslint/strict-type-checked`
- Optionally add `plugin:@typescript-eslint/stylistic-type-checked`
- Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and add `plugin:react/recommended` & `plugin:react/jsx-runtime` to the `extends` list

25
client/index.html Normal file
View File

@@ -0,0 +1,25 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/moonwish.svg" />
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Nunito:ital,wght@0,200..1000;1,200..1000&display=swap"
rel="stylesheet"
/>
<link
rel="stylesheet"
href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css"
integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN"
crossorigin="anonymous"
/>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Megan Johns</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
</html>

View File

@@ -0,0 +1,36 @@
server {
server_name meganjohns.com www.meganjohns.com;
location / {
root /home/lucas/MeganJohns/client/dist;
index index.html;
try_files $uri $uri/ /index.html;
}
listen 443 ssl; # managed by Certbot
ssl_certificate /etc/letsencrypt/live/www.meganjohns.com/fullchain.pem; # managed by Certbot
ssl_certificate_key /etc/letsencrypt/live/www.meganjohns.com/privkey.pem; # managed by Certbot
include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
}
server {
if ($host = www.meganjohns.com) {
return 301 https://$host$request_uri;
} # managed by Certbot
if ($host = meganjohns.com) {
return 301 https://$host$request_uri;
} # managed by Certbot
server_name meganjohns.com www.meganjohns.com;
listen 80;
return 404; # managed by Certbot
}

3696
client/package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

38
client/package.json Normal file
View File

@@ -0,0 +1,38 @@
{
"name": "client",
"private": true,
"version": "1.0.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview",
"prettier:check": "npx prettier --check .",
"prettier:fix": "npx prettier --write ."
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^6.5.2",
"@fortawesome/free-brands-svg-icons": "^6.5.2",
"@fortawesome/free-solid-svg-icons": "^6.5.2",
"@fortawesome/react-fontawesome": "^0.2.2",
"axios": "^1.7.2",
"bootstrap": "^5.3.3",
"react": "^18.2.0",
"react-bootstrap": "^2.10.2",
"react-dom": "^18.2.0",
"react-router-dom": "^6.23.1"
},
"devDependencies": {
"@types/react": "^18.2.66",
"@types/react-dom": "^18.2.22",
"@typescript-eslint/eslint-plugin": "^7.2.0",
"@typescript-eslint/parser": "^7.2.0",
"@vitejs/plugin-react": "^4.2.1",
"eslint": "^8.57.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.6",
"typescript": "^5.2.2",
"vite": "^5.2.0"
}
}

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 285 KiB

1
client/public/vite.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@@ -0,0 +1,28 @@
import { Bio, ProfessionalService } from "../types/Bio";
import Quotes from "../Quotes/Quotes";
import { Quote } from "../types/Quote";
import ProfessionalServices from "./ProfessionalServices";
interface AboutProps {
bio: Bio;
quotes: Quote[];
services: ProfessionalService[];
}
export default function About(props: AboutProps) {
const bio = props.bio;
const quotes = props.quotes;
const services = props.services;
const bioHTML = () => {
return { __html: bio.bio };
};
return (
<section id="about" className="content-section">
<h2>Bio</h2>
<div dangerouslySetInnerHTML={bioHTML()} />
<ProfessionalServices services={services} />
<Quotes quotes={quotes} />
</section>
);
}

View File

@@ -0,0 +1,20 @@
import { ListGroup } from "react-bootstrap";
import { ProfessionalService } from "../types/Bio";
interface ProfessionalServicesProps {
services: ProfessionalService[];
}
export default function ProfessionalServices(props: ProfessionalServicesProps) {
const services = props.services;
return (
<>
<h4>Professional Services</h4>
<ListGroup>
{services.map((service) => (
<ListGroup.Item>{service.service_name}</ListGroup.Item>
))}
</ListGroup>
</>
);
}

32
client/src/Api.tsx Normal file
View File

@@ -0,0 +1,32 @@
import axios from "axios";
import { MeganJohns } from "./types/MeganJohns";
import { Artwork } from "./types/Artwork";
import { Quote } from "./types/Quote";
import { Video } from "./types/Video";
import { Album } from "./types/Album";
import { Bio, ProfessionalService } from "./types/Bio";
const baseURL = import.meta.env.VITE_API_URL as string;
const api = axios.create({ baseURL: baseURL });
export const getMeganJohns = async (): Promise<MeganJohns> => {
const response = await api.get<MeganJohns>("/");
const albums = response.data.albums as Album[];
const artwork = response.data.artwork as Artwork[];
const quotes = response.data.quotes as Quote[];
const videos = response.data.videos as Video[];
const bio = response.data.bio as Bio;
const professional_services = response.data
.professional_services as ProfessionalService[];
const version = response.data.version as string;
return {
artwork,
videos,
albums,
quotes,
bio,
professional_services,
version,
} as MeganJohns;
};

22
client/src/App.css Normal file
View File

@@ -0,0 +1,22 @@
#root {
text-align: center;
}
#main-content {
max-width: 1100px;
background-color: var(--mj-light-blue);
padding-left: 0;
padding-right: 0;
}
.card {
width: 18rem;
background-color: inherit;
border: none;
}
.content-section {
padding-top: 10rem;
margin-top: -8rem;
margin-bottom: 10em;
}

65
client/src/App.tsx Normal file
View File

@@ -0,0 +1,65 @@
import { useEffect, useState } from "react";
import { getMeganJohns } from "./Api";
import { MeganJohns } from "./types/MeganJohns";
import { Album } from "./types/Album";
import { Artwork } from "./types/Artwork";
import { Quote } from "./types/Quote";
import { Video } from "./types/Video";
import { Bio, ProfessionalService } from "./types/Bio";
import MjSection from "./MjSection";
import Header from "./Header/Header";
import About from "./About/Homepage";
import { Container } from "react-bootstrap";
import Videos from "./Videos/Videos";
import "./App.css";
function App() {
const [mj, setMj] = useState<MeganJohns | undefined>(undefined);
const [albums, setAlbums] = useState<Album[]>([]);
const [artwork, setArtwork] = useState<Artwork[]>([]);
const [bio, setBio] = useState<Bio | undefined>(undefined);
const [quotes, setQuotes] = useState<Quote[]>([]);
const [videos, setVideos] = useState<Video[]>([]);
const [services, setServices] = useState<ProfessionalService[]>([]);
useEffect(() => {
getMeganJohns().then(
(mjData) => {
setMj(mjData);
},
(error) => {
console.error(error);
},
);
}, []);
useEffect(() => {
if (mj) {
setAlbums(mj.albums);
setArtwork(mj.artwork);
setBio(mj.bio);
setQuotes(mj.quotes);
setVideos(mj.videos);
setServices(mj.professional_services);
}
}, [mj]);
if (!mj || !bio) {
return <>Loading</>;
}
return (
<Container className="">
<Container id="main-content">
<Header mj={mj} />
<MjSection sectionTitle="discography" works={albums} />
<MjSection sectionTitle="artwork" works={artwork} />
<Videos videos={videos} />
<About bio={bio} quotes={quotes} services={services} />
<p>{mj.version}</p>
</Container>
</Container>
);
}
export default App;

View File

@@ -0,0 +1,45 @@
import Modal from "react-bootstrap/Modal";
import { Artwork } from "../types/Artwork";
import Image from "react-bootstrap/Image";
import { Container } from "react-bootstrap";
interface ArtworkModalProps {
artwork: Artwork;
show: boolean;
onHide: () => void;
}
export default function ArtworkModal(props: ArtworkModalProps) {
const artwork = props.artwork;
return (
<Modal
{...props}
size="lg"
aria-labelledby={`{artwork.artwork_name}-centered`}
centered
>
<Modal.Header closeButton>
<Modal.Title id={`{artwork.artwork_name}-modal`}>
{artwork.artwork_name}
</Modal.Title>
</Modal.Header>
<Modal.Body>
<Container className="d-flex justify-content-center">
<a href={artwork.source} target="_blank">
<Image src={artwork.source} thumbnail />
</a>
</Container>
</Modal.Body>
<Modal.Footer>
<p>
<em>
<small>
{artwork.medium?.medium_name} {artwork.size} (
{artwork.release_year})
</small>
</em>
</p>
</Modal.Footer>
</Modal>
);
}

View File

@@ -0,0 +1,31 @@
import Col from "react-bootstrap/Col";
import Container from "react-bootstrap/Container";
import Image from "react-bootstrap/Image";
import Row from "react-bootstrap/Row";
import { Album } from "../types/Album";
interface AlbumArtworkProps {
album: Album;
}
export default function AlbumArtwork(props: AlbumArtworkProps) {
const album = props.album;
const numArtworks =
(album.front_artwork_url ? 1 : 0) + (album.rear_artwork_url ? 1 : 0);
return (
<Container>
<Row>
{album.front_artwork_url && (
<Col xs={12} md={numArtworks === 1 ? 12 : 6}>
<Image src={album.front_artwork_url} thumbnail />
</Col>
)}
{album.rear_artwork_url && (
<Col xs={12} md={numArtworks === 1 ? 12 : 6}>
<Image src={album.rear_artwork_url} thumbnail />
</Col>
)}
</Row>
</Container>
);
}

View File

@@ -0,0 +1,43 @@
import { Modal } from "react-bootstrap";
import { Album } from "../types/Album";
import SourceList from "./SourceList/SourceList";
import AlbumArtwork from "./AlbumArtwork";
interface AlbumModalProps {
album: Album;
show: boolean;
onHide: () => void;
}
export default function AlbumModal(props: AlbumModalProps) {
const album = props.album;
const bandcampPlayer = album.bandcamp_player ? (
<div
dangerouslySetInnerHTML={{
__html: album.bandcamp_player,
}}
/>
) : null;
const handleClose = () => {
props.onHide();
};
return (
<Modal {...props} onHide={handleClose} size="lg" centered>
<Modal.Header closeButton>
<Modal.Title id={`{album.album_name}-modal`}>
{album.album_name}
</Modal.Title>
</Modal.Header>
<AlbumArtwork album={album} />
<Modal.Body>
<SourceList album={album} />
{bandcampPlayer}
</Modal.Body>
<Modal.Footer>
{album.artist.artist_name} ({album.release_year})
</Modal.Footer>
</Modal>
);
}

View File

@@ -0,0 +1,16 @@
import { ListGroup } from "react-bootstrap";
interface SourceItemProps {
sourceName: string;
sourceUrl: string;
}
export default function SourceItem(props: SourceItemProps) {
return (
<ListGroup.Item>
<a href={props.sourceUrl} target="_blank">
{props.sourceName}
</a>
</ListGroup.Item>
);
}

View File

@@ -0,0 +1,31 @@
import { Album } from "../../types/Album";
import { ListGroup } from "react-bootstrap";
import SourceItem from "./SourceItem";
interface SourceListProps {
album: Album;
}
export default function SourceList(props: SourceListProps) {
const album = props.album;
return (
<ListGroup className="mb-2">
{album.apple_music_url && (
<SourceItem
sourceName="Apple Music"
sourceUrl={album.apple_music_url}
/>
)}
{album.spotify_url && (
<SourceItem sourceName="Spotify" sourceUrl={album.spotify_url} />
)}
{album.bandcamp_url && (
<SourceItem sourceName="Bandcamp" sourceUrl={album.bandcamp_url} />
)}
{album.itunes_url && (
<SourceItem sourceName="iTunes" sourceUrl={album.itunes_url} />
)}
</ListGroup>
);
}

View File

@@ -0,0 +1,25 @@
#global-header {
position: sticky;
top: 0;
z-index: 1000;
background-color: var(--mj-white);
margin-left: 0;
margin-right: 0;
padding-left: 0;
padding-right: 0;
}
.navbar-title {
text-transform: uppercase;
font-size: 90%;
}
.list-group-item,
.list-group-item.disabled {
background-color: transparent;
border: none;
}
.navbar-link {
background-color: transparent;
}

View File

@@ -0,0 +1,20 @@
import { MeganJohns } from "../types/MeganJohns";
import Title from "./Title";
import NavList from "./NavList";
import SocialBanner from "./SocialBanner/SocialBanner";
import { Container } from "react-bootstrap";
interface HeaderProps {
mj: MeganJohns;
}
export default function Header(props: HeaderProps) {
const mj = props.mj;
return (
<Container id="global-header" className="">
<SocialBanner socials={mj.bio.social_urls} />
<Title name={mj.bio.name} />
<NavList />
</Container>
);
}

View File

@@ -0,0 +1,28 @@
import { Col, Container, ListGroup, Row } from "react-bootstrap";
import "./Header.css";
export default function NavList() {
return (
<Container>
<Row className="justify-content-center">
<Col xs="auto">
<ListGroup horizontal className="justify-content-center navbar-title">
<ListGroup.Item>
<a href="#discography">Music</a>
</ListGroup.Item>
<ListGroup.Item>
<a href="#artwork">Art</a>
</ListGroup.Item>
<ListGroup.Item>
<a href="#videos">Videos</a>
</ListGroup.Item>
<ListGroup.Item>
<a href="#about">About</a>
</ListGroup.Item>
<ListGroup.Item disabled>News</ListGroup.Item>
</ListGroup>
</Col>
</Row>
</Container>
);
}

View File

@@ -0,0 +1,14 @@
.social-banner {
background-color: none;
border: none;
}
.social-icon {
border: inherit;
background-color: transparent;
color: var(--mj-gray);
}
.social-icon:hover {
color: var(--mj-dark-teal);
}

View File

@@ -0,0 +1,48 @@
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { SocialUrl } from "../../types/Bio";
import {
faItunesNote,
faFacebook,
faSoundcloud,
faYoutube,
faInstagram,
faSpotify,
faBandcamp,
IconDefinition,
} from "@fortawesome/free-brands-svg-icons";
import { Container, ListGroup } from "react-bootstrap";
import "./SocialBanner.css";
interface SocialBannerProps {
socials: SocialUrl[];
}
export default function SocialBanner(props: SocialBannerProps) {
const socials = props.socials;
const socialIconMap: { [key: string]: IconDefinition } = {
itunes: faItunesNote,
facebook: faFacebook,
soundcloud: faSoundcloud,
youtube: faYoutube,
instagram: faInstagram,
spotify: faSpotify,
bandcamp: faBandcamp,
};
return (
<Container>
<ListGroup horizontal className="justify-content-center">
{socials.map((social) => (
<ListGroup.Item key={social.id} className="social-icon">
<a href={social.social_url} target="_blank">
<FontAwesomeIcon
icon={socialIconMap[social.social_name]}
className="social-icon"
/>
</a>
</ListGroup.Item>
))}
</ListGroup>
</Container>
);
}

View File

@@ -0,0 +1,15 @@
import "./Header.css";
interface TitleProps {
name: string;
}
export default function Title(props: TitleProps) {
return (
<h2>
<a href="#root" className="title navbar-title" id="title">
{props.name}
</a>
</h2>
);
}

View File

@@ -0,0 +1,4 @@
.mj-card {
margin: 0 !important;
padding: 0 !important;
}

View File

@@ -0,0 +1,76 @@
/* eslint-disable no-case-declarations */
import { Button, Card } from "react-bootstrap";
import { Album } from "../types/Album";
import { Artwork } from "../types/Artwork";
import AlbumModal from "../Discography/AlbumModal";
import ArtworkModal from "../ArtworkSection/ArtworkModal";
import { useState } from "react";
import "./MjCard.css";
interface CardProps {
type: string;
work: Artwork | Album;
}
export default function MjCard(props: CardProps) {
let work = props.work;
const [show, setShow] = useState(false);
let thumbnail: string;
let title: string;
let subtitle: string;
switch (props.type) {
case "artwork":
work = work as Artwork;
thumbnail = work.thumbnail;
title = work.artwork_name;
const medium_name = work.medium?.medium_name || "";
const size = work?.size || "";
subtitle = `${medium_name} ${size}`;
break;
case "discography":
work = work as Album;
thumbnail = work.front_artwork_url;
title = work.album_name;
subtitle = work.artist.artist_name;
break;
default:
thumbnail = "";
title = "";
subtitle = "";
break;
}
return (
<>
<Card className="m-3 mj-card">
<Button
variant="none"
onClick={() => setShow(true)}
className="mj-card"
>
<Card.Img variant="top" src={thumbnail} />
<Card.Body>
<Card.Title>{title}</Card.Title>
<Card.Subtitle>{subtitle}</Card.Subtitle>
</Card.Body>
</Button>
</Card>
{props.type === "discography" && (
<AlbumModal
album={work as Album}
show={show}
onHide={() => setShow(false)}
/>
)}
{props.type === "artwork" && (
<ArtworkModal
artwork={work as Artwork}
show={show}
onHide={() => setShow(false)}
/>
)}
</>
);
}

33
client/src/MjSection.tsx Normal file
View File

@@ -0,0 +1,33 @@
// import { Album } from "./types/Album";
import { Col, Container, Row } from "react-bootstrap";
import { Artwork } from "./types/Artwork";
import MjCard from "./MjCard/MjCard";
import { Album } from "./types/Album";
interface MjSectionProps {
sectionTitle: string;
works: Artwork[] | Album[];
}
export default function MjSection(props: MjSectionProps) {
const sectionTitleAsTitle =
props.sectionTitle.charAt(0).toUpperCase() + props.sectionTitle.slice(1);
const works = props.works;
return (
<section id={props.sectionTitle} className="content-section">
<h2>{sectionTitleAsTitle}</h2>
<Container>
<Row>
{works.map((work) => (
<Col
key={`${props.sectionTitle}-${work.id}`}
className="d-flex justify-content-center align-items-center"
>
<MjCard type={props.sectionTitle} work={work} />
</Col>
))}
</Row>
</Container>
</section>
);
}

View File

@@ -0,0 +1,21 @@
import { Figure } from "react-bootstrap";
import "./Quotes.css";
interface QuoteProps {
body: string;
author: string;
source_url?: string;
}
export default function QuoteElement(props: QuoteProps) {
return (
<Figure>
<blockquote>
<p className="quote-body">{props.body}</p>
<figcaption className="blockquote-footer quote-giver">
{props.author}
</figcaption>
</blockquote>
</Figure>
);
}

View File

@@ -0,0 +1,7 @@
.quote-giver {
color: var(--mj-dark-gray);
}
.quote-body {
color: var(--mj-dark-teal);
}

View File

@@ -0,0 +1,22 @@
import { Quote } from "../types/Quote";
import QuoteElement from "./Quote";
interface QuotesProps {
quotes: Quote[];
}
export default function Quotes(props: QuotesProps) {
return (
<section id="quotes" className="content-section">
<h4>Quotes</h4>
{props.quotes.map((quote) => (
<QuoteElement
key={quote.id}
body={quote.body}
author={quote.author}
source_url={quote.source}
/>
))}
</section>
);
}

View File

View File

@@ -0,0 +1,27 @@
.videos-container {
max-width: 600px;
}
.youtube-player-container {
position: relative;
padding-bottom: 56.25%; /* 16:9 aspect ratio */
height: 0;
overflow: hidden;
max-width: 100%;
background: #000;
}
.youtube-player-container iframe,
.youtube-player-container object,
.youtube-player-container embed {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
}
.video-item {
background-color: inherit;
border: none;
}

View File

@@ -0,0 +1,41 @@
import { Container, ListGroup, Row } from "react-bootstrap";
import { Video } from "../types/Video";
import "./Videos.css";
interface VideosProps {
videos: Video[];
}
export default function Videos(props: VideosProps) {
const videos = props.videos;
return (
<section id="videos" className="content-section">
<h2>Videos</h2>
<Container className="videos-container">
<Row>
<ListGroup>
{videos.map((video) => (
<ListGroup.Item key={video.id} className="mb-4 video-item">
<h4>{video.title}</h4>
<h5>{video.subtitle}</h5>
<Container className="youtube-player-container">
<div
dangerouslySetInnerHTML={{
__html: video.embedded_player_iframe,
}}
/>
</Container>
<div
dangerouslySetInnerHTML={{
__html: video.description,
}}
></div>
</ListGroup.Item>
))}
</ListGroup>
</Row>
</Container>
</section>
);
}

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>

After

Width:  |  Height:  |  Size: 4.0 KiB

25
client/src/index.css Normal file
View File

@@ -0,0 +1,25 @@
:root {
--mj-white: #effffd;
--mj-gray: #a9a9a9;
--mj-dark-gray: #545454;
--mj-gold: #a46609;
--mj-teal: #72c6e5;
--mj-dark-teal: #006990;
--mj-light-blue: #a1dcf2;
--mj-light-blue-alt: #0088cb;
--mj-green: #79af13;
}
body {
font-family: nunito, system-ui, Avenir, Helvetica, Arial, sans-serif;
background-color: var(--mj-white);
}
a {
font-weight: 500;
color: var(--mj-gold);
text-decoration: inherit;
}
a:hover {
color: var(--mj-dark-teal);
}

10
client/src/main.tsx Normal file
View File

@@ -0,0 +1,10 @@
import React from "react";
import ReactDOM from "react-dom/client";
import App from "./App.tsx";
import "./index.css";
ReactDOM.createRoot(document.getElementById("root")!).render(
<React.StrictMode>
<App />
</React.StrictMode>,
);

View File

@@ -0,0 +1,19 @@
export interface Artist {
id: number;
artist_name: string;
artist_url?: string;
}
export interface Album {
id: number;
album_name: string;
release_year: number;
artist: Artist;
front_artwork_url: string;
spotify_url?: string;
itunes_url?: string;
bandcamp_url?: string;
apple_music_url?: string;
rear_artwork_url?: string;
bandcamp_player?: string;
}

View File

@@ -0,0 +1,52 @@
// class Medium {
// id: number;
// medium_name: string;
// constructor(id: number, medium_name: string) {
// this.id = id;
// this.medium_name = medium_name;
// }
// }
export interface Medium {
id: number;
medium_name: string;
}
export interface Artwork {
id: number;
artwork_name: string;
source: string;
thumbnail: string;
is_featured: boolean;
medium?: Medium;
release_year?: number;
size?: string;
}
// class Artwork {
// id: number;
// type: string = "artwork";
// artwork_name: string;
// medium: Medium;
// source_url: string;
// release_year: string;
// size?: string;
// constructor(
// id: number,
// artwork_name: string,
// medium: Medium,
// source_url: string,
// release_year: string,
// size?: string
// ) {
// this.id = id;
// this.type = "artwork";
// this.artwork_name = artwork_name;
// this.medium = medium;
// this.source_url = source_url;
// this.release_year = release_year;
// this.size = size;
// }
// }

16
client/src/types/Bio.tsx Normal file
View File

@@ -0,0 +1,16 @@
export interface ProfessionalService {
id: number;
service_name: string;
}
export interface SocialUrl {
id: number;
social_name: string;
social_url: string;
}
export interface Bio {
name: string;
bio: string;
social_urls: SocialUrl[];
}

View File

@@ -0,0 +1,15 @@
import { Album } from "./Album";
import { Artwork } from "./Artwork";
import { Bio, ProfessionalService } from "./Bio";
import { Quote } from "./Quote";
import { Video } from "./Video";
export interface MeganJohns {
artwork: Artwork[];
videos: Video[];
albums: Album[];
quotes: Quote[];
bio: Bio;
professional_services: ProfessionalService[];
version: string;
}

View File

@@ -0,0 +1,6 @@
export interface Quote {
id: number;
body: string;
author: string;
source?: string;
}

View File

@@ -0,0 +1,9 @@
export interface Video {
id: number;
title: string;
subtitle: string;
description: string;
source: string;
embedded_player_iframe: string;
website?: string;
}

1
client/src/vite-env.d.ts vendored Normal file
View File

@@ -0,0 +1 @@
/// <reference types="vite/client" />

31
client/tsconfig.json Normal file
View File

@@ -0,0 +1,31 @@
{
"compilerOptions": {
"target": "ES2020",
"useDefineForClassFields": true,
"lib": ["ES2020", "DOM", "DOM.Iterable"],
"module": "ESNext",
"skipLibCheck": true,
/* Bundler mode */
"moduleResolution": "bundler",
"allowImportingTsExtensions": true,
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
"jsx": "react-jsx",
/* Linting */
"strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true
},
"include": [
"src",
"src/ArtworkSection/.ArtworkCard.tsx",
"src/Discography/.AlbumCard.tsx"
],
"references": [
{
"path": "./tsconfig.node.json"
}
]
}

11
client/tsconfig.node.json Normal file
View File

@@ -0,0 +1,11 @@
{
"compilerOptions": {
"composite": true,
"skipLibCheck": true,
"module": "ESNext",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true,
"strict": true
},
"include": ["vite.config.ts"]
}

7
client/vite.config.ts Normal file
View File

@@ -0,0 +1,7 @@
import { defineConfig } from "vite";
import react from "@vitejs/plugin-react";
// https://vitejs.dev/config/
export default defineConfig({
plugins: [react()],
});