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

Policy #13

Merged
merged 7 commits into from
Jun 12, 2021
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
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>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a way to dynamically change this date based on modification times on the files?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If not I can approve

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We would either need to implement a backend or use an existing webhook provided by Github. According to this stack overflow post it is fairly straightforward.

However, it would add a decent amount of complexity to my already large PR and I would rather make it a separate issue and deal with it later on. I opened #16, and we can deal with it on the next milestone?

</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;