Skip to content

Commit

Permalink
Merge pull request #13 from SoorajModi/3-policy
Browse files Browse the repository at this point in the history
Policy
  • Loading branch information
SoorajModi authored Jun 12, 2021
2 parents c975611 + 75fba12 commit deae4e0
Show file tree
Hide file tree
Showing 9 changed files with 87 additions and 17 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
"private": true,
"dependencies": {
"@material-ui/core": "^4.11.4",
"@material-ui/styles": "latest",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
"material-ui": "^0.20.2",
"prop-types": "latest",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.3",
"web-vitals": "^1.0.1",
"@material-ui/styles": "latest",
"prop-types": "latest"
"web-vitals": "^1.0.1"
},
"scripts": {
"start": "react-scripts start",
Expand Down
Binary file added src/assets/ClubSpacePolicy.pdf
Binary file not shown.
Binary file added src/assets/CommitteeAndStaffPolicy.pdf
Binary file not shown.
Binary file added src/assets/Constitution.pdf
Binary file not shown.
Binary file added src/assets/MakersSpacePolicy.pdf
Binary file not shown.
13 changes: 0 additions & 13 deletions src/pages/policy/PolicyPage.jsx

This file was deleted.

31 changes: 31 additions & 0 deletions src/pages/policy/fileViewer.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import React from 'react';

// eslint-disable-next-line react/prop-types
function FileViewer({ file }) {
return (
<div style={styles.container}>
<object data={file} type="application/pdf" style={styles.object}>
<p>
It appears you do not have a PDF plugin for this browser. No biggie... you can
<a href={file}>
click here to download the PDF
file.
</a>
</p>
</object>
</div>
);
}

const styles = {
container: {
height: '90vh',
paddingBottom: '10vh',
},
object: {
width: '100%',
height: '100%',
},
};

export default FileViewer;
24 changes: 24 additions & 0 deletions src/pages/policy/header.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import React from 'react';

function Header() {
return (
<div>
<h1 style={styles.title}>SOCIS Policies</h1>
<p style={styles.subtext}>Last updated May 28, 2021</p>
</div>
);
}

const styles = {
title: {
textAlign: 'center',
marginBottom: '0',
},
subtext: {
textAlign: 'center',
fontStyle: 'italic',
marginTop: '0',
},
};

export default Header;
30 changes: 29 additions & 1 deletion src/pages/policy/index.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
import PolicyPage from './PolicyPage';
import React from 'react';
import Container from '@material-ui/core/Container';
import { NavBar } from '../../components';
import Header from './header';
import FileViewer from './fileViewer';

import constitution from '../../assets/Constitution.pdf';
import clubSpacePolicy from '../../assets/ClubSpacePolicy.pdf';
import committeeAndStaffPolicy from '../../assets/CommitteeAndStaffPolicy.pdf';
import makersSpacePolicy from '../../assets/MakersSpacePolicy.pdf';

function PolicyPage() {
return (
<>
<NavBar />
<Container>
<Header />
<h2>Constitution</h2>
<FileViewer file={constitution} />
<h2>Club Space Policy</h2>
<FileViewer file={clubSpacePolicy} />
<h2>Committee and Staff Policy</h2>
<FileViewer file={committeeAndStaffPolicy} />
<h2>Makerspace Policy</h2>
<FileViewer file={makersSpacePolicy} />
</Container>
</>
);
}

export default PolicyPage;

0 comments on commit deae4e0

Please sign in to comment.