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

added members page with all member profiles #7

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
47 changes: 41 additions & 6 deletions src/pages/multimedia/Multimedia.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,52 @@
// Components
import React from 'react';
import PageHeader from '../PageHeader.js';
import PageDescription from '../PageDescription.js';
import SideMenu from './SideMenu.js';
import PageHeader from '../PageHeader';
import PageDescription from '../PageDescription';
import SideMenu from './SideMenu';
import Piece from './Piece';

// Styles
import '../../styles/css/multimedia.css';

// load media
import test_video from '../../assets/multimedia/test/video.png';
import test_img_1 from '../../assets/multimedia/test/pic1.png';
import test_img_2 from '../../assets/multimedia/test/pic2.png';
import test_img_3 from '../../assets/multimedia/test/pic3.png';

// data
const pieces = [
{
name: 'han',
title: 'Qian Hong',
description: 'Qian Hong is a Han fan dance that is a more modern style of traditional Chinese dancing. It is performed to a song that is historically well known in Chinese culture showcasing strength and perseverance.',
video: test_video,
images: [test_img_1, test_img_2, test_img_3]
},
{
name: 'mongolian',
title: 'Blessings from the Heart',
description: 'This is a warm, welcoming piece in which the dancers give their blessing, each in her own way, to the audience. It is an opportunity to share happy experiences through dance\n. Adapted by Ellen Qi and Robyn Zhang.',
video: test_video,
images: [test_img_1, test_img_2, test_img_3]
}
]

export default class Multimedia extends React.Component {
render() {
const title = 'Multimedia';
const description = 'Here you can find out more about our past performance pieces:';
const listPieces = pieces.map((piece, i) => <li key={i} className='list_pieces'><Piece name={piece.name} title={piece.title} description={piece.description} video={piece.video} images={piece.images} /></li>)
return(
<div>
<PageHeader title={title}></PageHeader>
<PageDescription description={description}></PageDescription>
<SideMenu></SideMenu>
<PageHeader title={title} />
<PageDescription description={description} />
<div className='multimedia-page-container'>
<SideMenu />
<ul>
{listPieces}
</ul>
</div>
</div>
)
}
Expand Down
11 changes: 0 additions & 11 deletions src/pages/multimedia/Performance.js

This file was deleted.

6 changes: 3 additions & 3 deletions src/styles/css/side_menu.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.menu-container {
width: 400px;
top: 70px;
left: 0; }
width: 25%;
min-width: 200px;
margin-right: 10px; }
.menu-container .side-menu-bar {
list-style-type: none;
margin: 0;
Expand Down
6 changes: 3 additions & 3 deletions src/styles/scss/side_menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ $red_theme: #9b1919;
$white: #ffffff;

.menu-container {
width: 400px;
top: 70px;
left: 0;
width: 25%;
min-width: 200px;
margin-right: 10px;

.side-menu-bar {
list-style-type: none;
Expand Down