Merge pull request #105 from aayushdutt/contact

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

compress.sh

@@ -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"

package.json

@@ -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",

src/App.js

@@ -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">
@@ -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} />

src/components/Footer.js

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

src/json-files/management.json

@@ -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" }
+]

src/json-files/members.json

@@ -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",

src/pages/member/Member.js

@@ -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) => {