-
Notifications
You must be signed in to change notification settings - Fork 2
About page added #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
Open
UtkarshGoelUT
wants to merge
7
commits into
PECACM:develop
Choose a base branch
from
UtkarshGoelUT:master
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
73a7edc
About page added
UtkarshGoelUT 66ae452
Update About.js
UtkarshGoelUT a98c7f1
About page added
UtkarshGoelUT a2ddc18
About page added
UtkarshGoelUT 33616fa
Merge branch 'develop' into master
goyalritesh21 8f1a396
Tabs made responsive in About
UtkarshGoelUT 342e801
Merge branch 'master' of https://github.com/UtkarshGoelUT/pecacm_fron…
UtkarshGoelUT 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 hidden or 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,48 @@ | ||
| import Accordian from "./AccordianComponent"; | ||
|
|
||
| const data = [ | ||
| { | ||
| id: 1, | ||
| name: "Annual Reports", | ||
| to: "annual-report", | ||
| component: { Accordian }, | ||
| }, | ||
| { | ||
| id: 2, | ||
| name: "Awards", | ||
| to: "awards", | ||
| component: {}, | ||
| }, | ||
| { | ||
| id: 3, | ||
| name: "History of Day", | ||
| to: "history-of-day", | ||
| component: {}, | ||
| }, | ||
| { | ||
| id: 4, | ||
| name: "Member Services", | ||
| to: "member-services", | ||
| component: {}, | ||
| }, | ||
| { | ||
| id: 5, | ||
| name: "People", | ||
| to: "people", | ||
| component: {}, | ||
| }, | ||
| { | ||
| id: 6, | ||
| name: "Calender", | ||
| to: "calender", | ||
| component: {}, | ||
| }, | ||
| { | ||
| id: 7, | ||
| name: "Contact Us", | ||
| to: "contact-us", | ||
| component: {}, | ||
| }, | ||
| ]; | ||
|
|
||
| export default data; |
This file contains hidden or 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,54 +1,60 @@ | ||
| import UCS from '../assets/img/UCS.jpeg'; | ||
| import AWS from '../assets/img/aws.jpeg'; | ||
| import UCS from "../assets/img/UCS.jpeg"; | ||
| import AWS from "../assets/img/aws.jpeg"; | ||
|
|
||
| const reports = [ | ||
| { | ||
| 'title': 'Report 2018-19', | ||
| 'details': 'Click here to download the official report of PEC ACM Achievements and Awards for the year 2018-19', | ||
| 'link': '/', | ||
| title: "Report 2018-19", | ||
| details: | ||
| "Click here to download the official report of PEC ACM Achievements and Awards for the year 2018-19", | ||
| link: "/", | ||
| // 'linkLabel': '2018-19.pdf' | ||
| }, | ||
| { | ||
| 'title': 'Report 2019-20', | ||
| 'details': 'Click here to download the official report of PEC ACM Achievements and Awards for the year 2019-20', | ||
| 'link': '/', | ||
| title: "Report 2019-20", | ||
| details: | ||
| "Click here to download the official report of PEC ACM Achievements and Awards for the year 2019-20", | ||
| link: "/", | ||
| // 'linkLabel': '2019-20.pdf' | ||
| } | ||
| }, | ||
| ]; | ||
|
|
||
| const achievements = [ | ||
| { | ||
| title: 'UCS', | ||
| content: 'Ultimate Coding Showdown', | ||
| title: "UCS", | ||
| content: "Ultimate Coding Showdown", | ||
| image: UCS, | ||
| altText: 'Ultimate Coding Showdown', | ||
| }, { | ||
| title: 'AWS', | ||
| content: 'Amazon Web Services', | ||
| altText: "Ultimate Coding Showdown", | ||
| }, | ||
| { | ||
| title: "AWS", | ||
| content: "Amazon Web Services", | ||
| image: AWS, | ||
| altText: 'Amazon Web Services', | ||
| }, { | ||
| title: 'Andhadhun', | ||
| content: 'Ultimate Coding Showdown', | ||
| altText: "Amazon Web Services", | ||
| }, | ||
| { | ||
| title: "Andhadhun", | ||
| content: "Ultimate Coding Showdown", | ||
| image: UCS, | ||
| altText: 'Ultimate Coding Showdown', | ||
| altText: "Ultimate Coding Showdown", | ||
| }, | ||
| { | ||
| title: 'IIT Bombay', | ||
| content: 'Among top 10 teams for Ideate', | ||
| title: "IIT Bombay", | ||
| content: "Among top 10 teams for Ideate", | ||
| image: UCS, | ||
| altText: 'Ultimate Coding Showdown', | ||
| }, { | ||
| title: 'GNDU', | ||
| content: 'Bagged 1st prize in HackZeroToOne', | ||
| altText: "Ultimate Coding Showdown", | ||
| }, | ||
| { | ||
| title: "GNDU", | ||
| content: "Bagged 1st prize in HackZeroToOne", | ||
| image: AWS, | ||
| altText: 'Amazon Web Services', | ||
| }, { | ||
| title: 'CCET', | ||
| content: '3rd Prize in Chaos 2.0', | ||
| altText: "Amazon Web Services", | ||
| }, | ||
| { | ||
| title: "CCET", | ||
| content: "3rd Prize in Chaos 2.0", | ||
| image: UCS, | ||
| altText: 'Ultimate Coding Showdown', | ||
| } | ||
| altText: "Ultimate Coding Showdown", | ||
| }, | ||
| ]; | ||
|
|
||
| export {reports, achievements}; | ||
| export { reports, achievements }; |
This file contains hidden or 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,5 +1,60 @@ | ||
| import React from "react"; | ||
| import { Typography } from "@material-ui/core"; | ||
| import { Helmet } from "react-helmet"; | ||
| import Footer from "../Footer"; | ||
| import { BrowserRouter as Router, Route, Link } from "react-router-dom"; | ||
| import { Tabs, Tab } from "@material-ui/core"; | ||
| import data from "../aboutData"; | ||
|
|
||
| function RenderTab(props) { | ||
| return <Tab label={props.name} component={Link} to={`/about/${props.to}`} />; | ||
| } | ||
|
|
||
| function search(data, key) { | ||
| for (var i = 0; i < data.length; i++) { | ||
| if (data[i].to === key) { | ||
| console.log("found"); | ||
| return data[i].component; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| const Comp = ({ match }) => | ||
| console.log("match", match) || <div>{search(data, match.params.id)}</div>; | ||
|
|
||
| export default function About() { | ||
| return <div></div>; | ||
| return ( | ||
| <div> | ||
| <div className="Home"> | ||
| <Helmet> | ||
| <title>PEC ACM Society</title> | ||
| <meta name="title" content="Computer Science Society" /> | ||
| </Helmet> | ||
| <Typography | ||
| variant={"subtitle1"} | ||
| component={"h1"} | ||
| className="fadeInUp" | ||
| style={{ animationDelay: "0.7s" }} | ||
| > | ||
| About Us | ||
| </Typography> | ||
| </div> | ||
| <div className="Home"> | ||
| {/* Navtab*/} | ||
| <Router> | ||
| <Tabs | ||
| indicatorColor="primary" | ||
| textColor="primary" | ||
| className="tabs fadeInUp" | ||
| style={{ animationDelay: "1.2s" }} | ||
| > | ||
| {data.map(RenderTab)}; | ||
| </Tabs> | ||
| {/* Router*/} | ||
| <Route path="/about/:id" component={Comp} /> | ||
| </Router> | ||
| </div> | ||
| <Footer /> | ||
| </div> | ||
| ); | ||
| } | ||
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.
Tabs overlapping with header and footer.
Also, they are not centered properly.
Incomplete tabs rendered on phone.