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

refactor, optimise and update compress script, move management field to json, update footer year #105

Merged
merged 3 commits into from
Jan 29, 2019
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
31 changes: 31 additions & 0 deletions compress.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
COUNT=0
INPUT_DIR=./src/images
OUTPUT_DIR=./public/assets/img
OUTPUT_OPTIMISED_DIR=./public/assets/img/opImg

for originalImg in $INPUT_DIR/*/*.*g
do
W=`identify $originalImg | cut -f 3 -d " " | sed s/x.*//` #width'

DIR_NAME=`basename $(dirname $originalImg)`
IMG_NAME=`basename $originalImg`
OUTPUT_PATH=$OUTPUT_DIR/$DIR_NAME/$IMG_NAME
OUTPUT_OPTIMISED_PATH=$OUTPUT_OPTIMISED_DIR/$DIR_NAME/$IMG_NAME
FILESIZE=$(du -k $originalImg | cut -f 1)

echo Current Image: $IMG_NAME
echo Input Path: $originalImg
echo Output Path: $OUTPUT_PATH
# echo Optimised Image Path: $OUTPUT_OPTIMISED_PATH
echo __________________________________________

if [ $W -gt 300 ] || [ $FILESIZE -gt 50 ]
then
((COUNT++))
convert $originalImg -resize 300 $OUTPUT_PATH
convert $OUTPUT_PATH -quality 50 $OUTPUT_PATH
fi
# convert $originalImg -resize 300 $OUTPUT_OPTIMISED_PATH
done

echo "Total changes: $COUNT"
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"react-scripts": "1.1.4"
},
"scripts": {
"start": "./shell.sh && react-scripts start",
"start": "react-scripts start",
"compress": "./compress.sh",
"client": "react-scripts start",
"build": "react-scripts build",
"test": "eslint src public && react-scripts test --env=jsdom",
Expand Down
Binary file modified public/assets/img/alumni/abdur.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/alumni/ankit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/alumni/ashishverma.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/alumni/ishu.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/alumni/janpreet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/alumni/jibinmathews.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/alumni/kriti1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/alumni/medha.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/alumni/mohit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/alumni/nikitakapoor.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/alumni/prabodh.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/alumni/sam.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/alumni/venkat.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/cyberLabsLogo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/management/mohit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/management/naveen-jain.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/management/sachin-tripathi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/memberProfile/aarush-juneja.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/memberProfile/aayush-ahuja.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/img/memberProfile/aayush-dutt.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/memberProfile/aditya-mudgil.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/memberProfile/ajay-bhave.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/memberProfile/amardeep-kumar.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/memberProfile/aniket-teotia.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/memberProfile/anirudh-jain.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/memberProfile/anurag-gupta.jpg
Binary file modified public/assets/img/memberProfile/anushka-mittal.jpg
Binary file modified public/assets/img/memberProfile/banipreet-singh-raheja.jpg
Binary file modified public/assets/img/memberProfile/dev-vats.jpg
Binary file modified public/assets/img/memberProfile/madhav-shah-sisodiya.jpg
Binary file modified public/assets/img/memberProfile/manish-kumar.jpg
Binary file modified public/assets/img/memberProfile/mayank-kumar.jpg
Binary file modified public/assets/img/memberProfile/mrinalini-singh.jpg
Binary file modified public/assets/img/memberProfile/naveen-jain.jpg
Binary file modified public/assets/img/memberProfile/nikhil-arora.jpg
Binary file modified public/assets/img/memberProfile/osama-ashhad-azmi.jpg
Binary file modified public/assets/img/memberProfile/osama-ashhad-azmi2.jpg
Binary file modified public/assets/img/memberProfile/pawan-mohan-dogra.jpg
Binary file modified public/assets/img/memberProfile/perul-jain.jpg
Binary file modified public/assets/img/memberProfile/raj-rani.jpg
Binary file modified public/assets/img/memberProfile/rishabh-verma.jpg
Binary file modified public/assets/img/memberProfile/ritesh-manna.jpg
Binary file modified public/assets/img/memberProfile/saloni-mohta.jpg
Binary file modified public/assets/img/memberProfile/sanket-singh.jpg
Binary file modified public/assets/img/memberProfile/shivansh-awasthi.jpg
Binary file modified public/assets/img/memberProfile/shridhar-goel.jpg
Binary file modified public/assets/img/memberProfile/suyog-jadhav.jpg
Binary file modified public/assets/img/memberProfile/tejus.jpg
Binary file modified public/assets/img/memberProfile/udbhav-bamba.jpg
Binary file modified public/assets/img/memberProfile/ujjawal-jaiswal.jpg
Binary file modified public/assets/img/memberProfile/vanshika-arora.jpg
Binary file modified public/assets/img/project/aditya-ruler.jpg
Binary file modified public/assets/img/project/anushka-Crypto.png
Binary file modified public/assets/img/project/anushka-breakout.png
Binary file modified public/assets/img/project/suyog-facesearch.png
Binary file modified public/assets/img/project/tejus-mnist.png
Binary file modified public/assets/img/project/udbhav-neutralstyle.png
Binary file modified public/assets/img/projects-old/SH_captions.jpg
Binary file modified public/assets/img/projects-old/buzzlogs.png
Binary file modified public/assets/img/projects-old/digibin.jpg
Binary file modified public/assets/img/projects-old/manoj_matrix.png
Binary file modified public/assets/img/projects-old/old_cl.jpg
Binary file modified public/assets/img/projects-old/sddefault.jpg
Binary file modified public/assets/img/projects-old/shril_earthquake.png
Binary file modified public/assets/img/projects-old/shril_pagerank.png
Binary file modified public/assets/img/projects-old/smartMirror.jpg
Binary file modified public/assets/img/projects-old/thumb_digiboard.png
Binary file removed public/assets/opImg/alumni/abdur.jpg
Diff not rendered.
Binary file removed public/assets/opImg/alumni/ankit.png
Diff not rendered.
Binary file removed public/assets/opImg/alumni/ashishverma.jpg
Diff not rendered.
Binary file removed public/assets/opImg/alumni/ishu.jpg
Diff not rendered.
Binary file removed public/assets/opImg/alumni/janpreet.png
Diff not rendered.
Binary file removed public/assets/opImg/alumni/jibinmathews.jpg
Diff not rendered.
Binary file removed public/assets/opImg/alumni/kriti1.jpg
Diff not rendered.
Binary file removed public/assets/opImg/alumni/medha.jpg
Diff not rendered.
Binary file removed public/assets/opImg/alumni/mohit.png
Diff not rendered.
Binary file removed public/assets/opImg/alumni/nikitakapoor.jpg
Diff not rendered.
Binary file removed public/assets/opImg/alumni/prabodh.jpg
Diff not rendered.
Binary file removed public/assets/opImg/alumni/sam.jpg
Diff not rendered.
Binary file removed public/assets/opImg/alumni/venkat.jpg
Diff not rendered.
Binary file removed public/assets/opImg/management/mohit.png
Diff not rendered.
Binary file removed public/assets/opImg/management/naveen-jain.jpg
Diff not rendered.
Binary file removed public/assets/opImg/management/sachin-tripathi.png
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/aarush-juneja.jpg
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/aayush-ahuja.jpg
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/aditya-mudgil.jpg
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/ajay-bhave.jpg
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/amardeep-kumar.jpg
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/aniket-teotia.jpg
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/anirudhh-jain.jpg
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/anurag-gupta.jpg
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/anushka-mittal.jpg
Diff not rendered.
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/dev-vats.png
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/madhav-shah.jpg
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/manish-kumar.jpg
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/mayank-kumar.jpg
Diff not rendered.
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/naveen-jain.jpg
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/nikhil-arora.jpeg
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/osama-azmi.jpg
Diff not rendered.
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/perul-jain.jpg
Diff not rendered.
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/rishab-verma.jpg
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/ritesh-manna.jpg
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/saloni-mohta.jpg
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/sanket-singh.jpg
Diff not rendered.
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/shridhar-goyal.jpg
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/suyog-jadhav.jpg
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/tejus.jpg
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/udbhav-bamba.jpg
Diff not rendered.
Binary file removed public/assets/opImg/memberProfile/vanshika-arora.jpg
Diff not rendered.
Binary file removed public/assets/opImg/project/aditya-ruler.jpg
Diff not rendered.
Binary file removed public/assets/opImg/project/anushka-Crypto.png
Diff not rendered.
Binary file removed public/assets/opImg/project/anushka-breakout.png
Diff not rendered.
Binary file removed public/assets/opImg/project/suyog-facesearch.png
Diff not rendered.
Binary file removed public/assets/opImg/project/tejus-mnist.png
Diff not rendered.
Binary file removed public/assets/opImg/project/udbhav-neutralstyle.png
Diff not rendered.
28 changes: 0 additions & 28 deletions shell.sh

This file was deleted.

6 changes: 2 additions & 4 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,16 @@ import Management from "./pages/people/Management";
import Project from "./pages/project/Project";
import Alumni from "./pages/people/Alumni";
import About from "./pages/about/About";
import Contact from "./pages/contact/Contact";
import Publication from "./pages/publication/Publication";
import ComingSoon from "./pages/comingSoon/ComingSoon";

import "./App.css";

class App extends Component {
componentDidMount() {
window.scrollTo(0, 0)
window.scrollTo(0, 0);
}

render() {
return (
<div className="App">
Expand All @@ -34,7 +33,6 @@ class App extends Component {
<Route exact path="/alumni" component={Alumni} />
<Route exact path="/projects" component={Project} />
<Route exact path="/about" component={About} />
<Route exact path="/contact" component={Contact} />
<Route exact path="/publication" component={Publication} />
<Route exact path="/comingSoon" component={ComingSoon} />
<Footer key={window.location.pathname} />
Expand Down
10 changes: 6 additions & 4 deletions src/components/Footer.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
import React, {Component} from "react";
import React, { Component } from "react";

class Footer extends Component {
render() {
return (
<footer id="footer-box">
<div className="footer-margin">
<div className="copyright" id="footer-left">© Copyright 2018 cyberlabs.club. All Rights Reserved.</div>
<div className="copyright" id="footer-left">
© Copyright 2019 Cyber Labs. All Rights Reserved.
</div>
</div>
</footer>
)
);
}
}

export default Footer;
export default Footer;
Binary file added src/images/alumni/abdur.jpg
Binary file added src/images/alumni/ankit.png
Binary file added src/images/alumni/ashishverma.jpg
Binary file added src/images/alumni/ishu.jpg
Binary file added src/images/alumni/janpreet.png
Binary file added src/images/alumni/jibinmathews.jpg
Binary file added src/images/alumni/kriti1.jpg
Binary file added src/images/alumni/medha.jpg
Binary file added src/images/alumni/mohit.png
Binary file added src/images/alumni/nikitakapoor.jpg
Binary file added src/images/alumni/prabodh.jpg
Binary file added src/images/alumni/sam.jpg
Binary file added src/images/alumni/venkat.jpg
Binary file added src/images/cyberLabsLogo.jpg
Binary file added src/images/default-profile-icon.jpg
Binary file added src/images/favico.png
Binary file added src/images/management/mohit.png
Binary file added src/images/management/naveen-jain.jpg
Binary file added src/images/management/sachin-tripathi.png
Binary file added src/images/memberProfile/aarush-juneja.jpg
Binary file added src/images/memberProfile/aayush-ahuja.jpg
Binary file added src/images/memberProfile/aayush-dutt.jpg
Binary file added src/images/memberProfile/aditya-mudgil.jpg
Binary file added src/images/memberProfile/ajay-bhave.jpg
Binary file added src/images/memberProfile/amardeep-kumar.jpg
Binary file added src/images/memberProfile/aniket-teotia.jpg
Binary file added src/images/memberProfile/anirudh-jain.jpg
Binary file added src/images/memberProfile/anurag-gupta.jpg
Binary file added src/images/memberProfile/anushka-mittal.jpg
Binary file added src/images/memberProfile/dev-vats.jpg
Binary file added src/images/memberProfile/manish-kumar.jpg
Binary file added src/images/memberProfile/mayank-kumar.jpg
Binary file added src/images/memberProfile/mrinalini-singh.jpg
Binary file added src/images/memberProfile/naveen-jain.jpg
Binary file added src/images/memberProfile/nikhil-arora.jpg
Binary file added src/images/memberProfile/osama-ashhad-azmi.jpg
Binary file added src/images/memberProfile/osama-ashhad-azmi2.jpg
Binary file added src/images/memberProfile/pawan-mohan-dogra.jpg
Binary file added src/images/memberProfile/perul-jain.jpg
Binary file added src/images/memberProfile/raj-rani.jpg
Binary file added src/images/memberProfile/rishabh-verma.jpg
Binary file added src/images/memberProfile/ritesh-manna.jpg
Binary file added src/images/memberProfile/saloni-mohta.jpg
Binary file added src/images/memberProfile/sanket-singh.jpg
Binary file added src/images/memberProfile/shivansh-awasthi.jpg
Binary file added src/images/memberProfile/shridhar-goel.jpg
Binary file added src/images/memberProfile/suyog-jadhav.jpg
Binary file added src/images/memberProfile/tejus.jpg
Binary file added src/images/memberProfile/udbhav-bamba.jpg
Binary file added src/images/memberProfile/ujjawal-jaiswal.jpg
Binary file added src/images/memberProfile/vanshika-arora.jpg
Binary file added src/images/nav_favico.png
Binary file added src/images/project-placeholder.png
Binary file added src/images/project/aditya-ruler.jpg
Binary file added src/images/project/anushka-Crypto.png
Binary file added src/images/project/anushka-breakout.png
Binary file added src/images/project/suyog-facesearch.png
Binary file added src/images/project/tejus-mnist.png
Binary file added src/images/project/udbhav-neutralstyle.png
Binary file added src/images/projects-old/SH_captions.jpg
Binary file added src/images/projects-old/buzzlogs.png
Binary file added src/images/projects-old/digibin.jpg
Binary file added src/images/projects-old/manoj_matrix.png
Binary file added src/images/projects-old/old_cl.jpg
Binary file added src/images/projects-old/sddefault.jpg
Binary file added src/images/projects-old/shril_earthquake.png
Binary file added src/images/projects-old/shril_pagerank.png
Binary file added src/images/projects-old/smartMirror.jpg
Binary file added src/images/projects-old/thumb_digiboard.png
9 changes: 9 additions & 0 deletions src/json-files/management.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[
{
"name": "Prof. Sachin Tripathi",
"img": "sachin-tripathi.png",
"position": "President"
},
{ "name": "Mohit Chawla", "img": "mohit.png", "position": "Founder" },
{ "name": "Naveen Jain", "img": "naveen-jain.jpg", "position": "Secretary" }
]
9 changes: 5 additions & 4 deletions src/json-files/members.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,14 @@
},
{
"yearOfPassing": "2021",
"email": "[email protected]",
"name": "Aayush Dutt",
"team": "Web Development",
"contactNo": "",
"about": "Web Application Developer at Cyber Labs",
"links": {},
"img": ""
"about": "Node.js Fanboy",
"links": {
"website": "https://www.aayushdutt.com"
},
"img": "aayush-dutt.jpg"
},
{
"yearOfPassing": "2021",
Expand Down
46 changes: 0 additions & 46 deletions src/pages/contact/Contact.js

This file was deleted.

99 changes: 0 additions & 99 deletions src/pages/member/Member.Card.js

This file was deleted.

4 changes: 2 additions & 2 deletions src/pages/member/Member.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React, { Component } from "react";
import MemberCard from "./Member.Card";
import MemberCard from "./MemberCard";
import data from "../../json-files/members.json";
class Member extends Component {
componentDidMount() {
window.scrollTo(0, 0)
window.scrollTo(0, 0);
}
renderGrid = () => {
data.sort((a, b) => {
Expand Down
Loading