-
Notifications
You must be signed in to change notification settings - Fork 6
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
Policy #13
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
7e7618a
Add policy documents
SoorajModi 5058877
Add fileViewer.js and display SOCIS policies
SoorajModi 0b75c9e
Improve CSS and add policy/header.jsx
SoorajModi 04b9c26
Move PolicyPage.jsx contents into index.jsx
SoorajModi 27bc98d
Remove div
SoorajModi 3aed863
Lover FileViewer height
SoorajModi 75fba12
Merge branch 'main' into 3-policy
SoorajModi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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?