From ab341c01d3376064d0a7dedd6a624e4ad27ebf54 Mon Sep 17 00:00:00 2001 From: Ritam Jana Date: Mon, 24 May 2021 13:47:23 +0530 Subject: [PATCH 1/2] restructured team page with bootstrap --- package-lock.json | 173 ++++++++++++++++++ package.json | 2 + public/index.html | 7 + .../SubsystemHeads/SubsystemHeads.css | 74 +++----- .../SubsystemHeads/SubsystemHeads.js | 81 +++----- .../components/Subsystems/Subsystems.css | 12 ++ .../components/Subsystems/Subsystems.js | 117 ++++++------ 7 files changed, 300 insertions(+), 166 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5a5d659..e5c6483 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1585,6 +1585,25 @@ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz", "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==" }, + "@popperjs/core": { + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz", + "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==" + }, + "@restart/context": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@restart/context/-/context-2.1.4.tgz", + "integrity": "sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q==" + }, + "@restart/hooks": { + "version": "0.3.26", + "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.3.26.tgz", + "integrity": "sha512-7Hwk2ZMYm+JLWcb7R9qIXk1OoUg1Z+saKWqZXlrvFwT3w6UArVNWgxYOzf+PJoK9zZejp8okPAKTctthhXLt5g==", + "requires": { + "lodash": "^4.17.20", + "lodash-es": "^4.17.20" + } + }, "@svgr/babel-plugin-add-jsx-attribute": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-4.2.0.tgz", @@ -1772,6 +1791,19 @@ "@babel/types": "^7.3.0" } }, + "@types/classnames": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.3.1.tgz", + "integrity": "sha512-zeOWb0JGBoVmlQoznvqXbE0tEC/HONsnoUNH19Hc96NFsTAwTXbTqb8FMYkru1F/iqp7a18Ws3nWJvtA1sHD1A==", + "requires": { + "classnames": "*" + } + }, + "@types/invariant": { + "version": "2.2.34", + "resolved": "https://registry.npmjs.org/@types/invariant/-/invariant-2.2.34.tgz", + "integrity": "sha512-lYUtmJ9BqUN688fGY1U1HZoWT1/Jrmgigx2loq4ZcJpICECm/Om3V314BxdzypO0u5PORKGMM6x0OXaljV1YFg==" + }, "@types/istanbul-lib-coverage": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz", @@ -1799,16 +1831,49 @@ "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==" }, + "@types/prop-types": { + "version": "15.7.3", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz", + "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==" + }, "@types/q": { "version": "1.5.4", "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz", "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==" }, + "@types/react": { + "version": "17.0.6", + "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.6.tgz", + "integrity": "sha512-u/TtPoF/hrvb63LdukET6ncaplYsvCvmkceasx8oG84/ZCsoLxz9Z/raPBP4lTAiWW1Jb889Y9svHmv8R26dWw==", + "requires": { + "@types/prop-types": "*", + "@types/scheduler": "*", + "csstype": "^3.0.2" + } + }, + "@types/react-transition-group": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.1.tgz", + "integrity": "sha512-vIo69qKKcYoJ8wKCJjwSgCTM+z3chw3g18dkrDfVX665tMH7tmbDxEAnPdey4gTlwZz5QuHGzd+hul0OVZDqqQ==", + "requires": { + "@types/react": "*" + } + }, + "@types/scheduler": { + "version": "0.16.1", + "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.1.tgz", + "integrity": "sha512-EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA==" + }, "@types/stack-utils": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz", "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==" }, + "@types/warning": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/warning/-/warning-3.0.0.tgz", + "integrity": "sha1-DSUBJorY+ZYrdA04fEZU9fjiPlI=" + }, "@types/yargs": { "version": "13.0.11", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz", @@ -3029,6 +3094,11 @@ "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" }, + "bootstrap": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.1.tgz", + "integrity": "sha512-Fl79+wsLOZKoiU345KeEaWD0ik8WKRI5zm0YSPj2oF1Qr+BO7z0fco6GbUtqjoG1h4VI89PeKJnMsMMVQdKKTw==" + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -4154,6 +4224,11 @@ "cssom": "0.3.x" } }, + "csstype": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz", + "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==" + }, "currently-unhandled": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", @@ -8577,6 +8652,11 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, + "lodash-es": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", + "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" + }, "lodash._reinterpolate": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", @@ -10793,6 +10873,15 @@ "react-is": "^16.8.1" } }, + "prop-types-extra": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/prop-types-extra/-/prop-types-extra-1.1.1.tgz", + "integrity": "sha512-59+AHNnHYCdiC+vMwY52WmvP5dM3QLeoumYuEyceQDi9aEhtwN9zIQ2ZNo25sMyXnbh32h+P1ezDsUpUH3JAew==", + "requires": { + "react-is": "^16.3.2", + "warning": "^4.0.0" + } + }, "proxy-addr": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz", @@ -10969,6 +11058,53 @@ "whatwg-fetch": "^3.0.0" } }, + "react-bootstrap": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-1.6.0.tgz", + "integrity": "sha512-PaeOGeRC2+JH9Uf1PukJgXcIpfGlrKKHEBZIArymjenYzSJ/RhO2UdNX+e7nalsCFFZLRRgQ0/FKkscW2LmmRg==", + "requires": { + "@babel/runtime": "^7.13.8", + "@restart/context": "^2.1.4", + "@restart/hooks": "^0.3.26", + "@types/classnames": "^2.2.10", + "@types/invariant": "^2.2.33", + "@types/prop-types": "^15.7.3", + "@types/react": ">=16.9.35", + "@types/react-transition-group": "^4.4.1", + "@types/warning": "^3.0.0", + "classnames": "^2.2.6", + "dom-helpers": "^5.1.2", + "invariant": "^2.2.4", + "prop-types": "^15.7.2", + "prop-types-extra": "^1.1.0", + "react-overlays": "^5.0.0", + "react-transition-group": "^4.4.1", + "uncontrollable": "^7.2.1", + "warning": "^4.0.3" + }, + "dependencies": { + "dom-helpers": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz", + "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==", + "requires": { + "@babel/runtime": "^7.8.7", + "csstype": "^3.0.2" + } + }, + "react-transition-group": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.1.tgz", + "integrity": "sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==", + "requires": { + "@babel/runtime": "^7.5.5", + "dom-helpers": "^5.0.1", + "loose-envify": "^1.4.0", + "prop-types": "^15.6.2" + } + } + } + }, "react-bootstrap-switch": { "version": "15.5.3", "resolved": "https://registry.npmjs.org/react-bootstrap-switch/-/react-bootstrap-switch-15.5.3.tgz", @@ -11208,6 +11344,32 @@ "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.10.0.tgz", "integrity": "sha512-7i2L3ef+0ILXpL6P+Hg304eCQswh4jl3ynwR71BSlMU49PE2uk31k8B2GkP6yE9s2D4jTGKnzuSpzWxu4YxfQQ==" }, + "react-overlays": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-5.0.1.tgz", + "integrity": "sha512-plwUJieTBbLSrgvQ4OkkbTD/deXgxiJdNuKzo6n1RWE3OVnQIU5hffCGS/nvIuu6LpXFs2majbzaXY8rcUVdWA==", + "requires": { + "@babel/runtime": "^7.13.8", + "@popperjs/core": "^2.8.6", + "@restart/hooks": "^0.3.26", + "@types/warning": "^3.0.0", + "dom-helpers": "^5.2.0", + "prop-types": "^15.7.2", + "uncontrollable": "^7.2.1", + "warning": "^4.0.3" + }, + "dependencies": { + "dom-helpers": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz", + "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==", + "requires": { + "@babel/runtime": "^7.8.7", + "csstype": "^3.0.2" + } + } + } + }, "react-popper": { "version": "1.3.11", "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.11.tgz", @@ -13169,6 +13331,17 @@ "which-boxed-primitive": "^1.0.2" } }, + "uncontrollable": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-7.2.1.tgz", + "integrity": "sha512-svtcfoTADIB0nT9nltgjujTi7BzVmwjZClOmskKu/E8FW9BXzg9os8OLr4f8Dlnk0rYWJIWr4wv9eKUXiQvQwQ==", + "requires": { + "@babel/runtime": "^7.6.3", + "@types/react": ">=16.9.11", + "invariant": "^2.2.4", + "react-lifecycles-compat": "^3.0.4" + } + }, "unicode-canonical-property-names-ecmascript": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz", diff --git a/package.json b/package.json index e857d79..a66c4f7 100644 --- a/package.json +++ b/package.json @@ -5,12 +5,14 @@ "private": true, "dependencies": { "axios": "^0.21.1", + "bootstrap": "^5.0.1", "classnames": "2.2.6", "json-loader": "^0.5.7", "moment": "2.24.0", "node-sass": "4.13.1", "nouislider": "13.1.5", "react": "16.8.6", + "react-bootstrap": "^1.6.0", "react-bootstrap-switch": "15.5.3", "react-datetime": "2.16.3", "react-dom": "16.8.6", diff --git a/public/index.html b/public/index.html index 06931e5..0e43460 100644 --- a/public/index.html +++ b/public/index.html @@ -46,6 +46,7 @@ Learn how to configure a non-root public URL by running `npm run build`. --> + + + Team AUV-IITK diff --git a/src/views/TeamPage/components/SubsystemHeads/SubsystemHeads.css b/src/views/TeamPage/components/SubsystemHeads/SubsystemHeads.css index c9f386e..43437e4 100644 --- a/src/views/TeamPage/components/SubsystemHeads/SubsystemHeads.css +++ b/src/views/TeamPage/components/SubsystemHeads/SubsystemHeads.css @@ -1,63 +1,37 @@ -.light-dark-ssk5{ - background: linear-gradient(to bottom, rgb(2, 13, 19), rgb(19, 47, 93)); - background-size: cover; - background-position: top; - position: relative; - /* clip-path: polygon(0 10%, 100% 0, 100% 100%, 0 100%); */ +.rowPadding { + padding-bottom: 20px; } - - -.text-info13{ - font-family: Montserrat ; - color: #DDE2EC; - letter-spacing: 2px; - font-size: 20px; - padding-bottom: 20px; -} - -.image-prof{ - margin-top: -100px; - box-shadow: 2px 2px 2px #cccccc; +.colPadding { + padding: 0px 15px 50px 15px; } -img.image-prof{ - /* width: 40vh; */ - /* max-height: 20vw; */ - width: 85%; /* width of container */ - height: 85%; - /* width: 85%; */ - object-fit: cover; - /* height: 85%; */ -} -.margin-neg{ - margin-top: -40px; - /* border-bottom: 2px solid beige; */ - border-radius: 20px; -} - -.card-plain{ - perspective: 1000px; -} -.card-plain:hover{ - transform: scale(1.02); - transition: transform .5s; +.cardBody { + background: rgb(223, 223, 223); + border-radius: 10px; } -.flip:hover{ - transform: scale(2); - transition: transform ; +.memberImage { + padding: 20px 5px 10px 5px; + width: 100%; } -.card-ssk{ - box-shadow: 2px 2px 2px #cccccc; +.image-prof { + margin-top: -100px; + box-shadow: 2px 2px 2px #cccccc; + width: 85%; + height: 15%; } -.padding-small{ - padding-left: 5vw; - padding-right: 5vw; +.socialList { + padding: 0px; + list-style: none; + display: flex; + flex-direction: row; + justify-content: space-evenly; } -.auv-description-primary{ - text-align: center; +.social:hover { + color: blue; + transition: all 0.3s ease-in; } diff --git a/src/views/TeamPage/components/SubsystemHeads/SubsystemHeads.js b/src/views/TeamPage/components/SubsystemHeads/SubsystemHeads.js index dde8866..a7228b7 100644 --- a/src/views/TeamPage/components/SubsystemHeads/SubsystemHeads.js +++ b/src/views/TeamPage/components/SubsystemHeads/SubsystemHeads.js @@ -1,14 +1,5 @@ -import React from 'react'; -import { - Button, - Card, - CardBody, - CardFooter, - CardTitle, - Container, - Row, - Col -} from "reactstrap"; +import React from "react"; +import { Card, Row, Col, Container } from "react-bootstrap" import "./SubsystemHeads.css"; import team from "../../../../data/TeamMembers.json"; function TalkAbout() { @@ -19,51 +10,33 @@ function TalkAbout() { { team.teamData.map((section) => { - console.log(section); - return( + // console.log(section); + return (

{section.heading}

- - {section.items.map((teamMember)=>{ - console.log(teamMember); - return( - - - - e.preventDefault()}> -
- ... - <> - - {teamMember.name} - -
{teamMember.subheading}
-
- - - - - - + + {section.items.map((teamMember) => { + // console.log(teamMember); + return ( + + + + +
{teamMember.name}
 + +
{teamMember.subheading}
+ +
    +
  • + +
    • +
  • + +
    • +
+ ) @@ -80,4 +53,4 @@ function TalkAbout() { ); } -export default TalkAbout; \ No newline at end of file +export default TalkAbout; diff --git a/src/views/TeamPage/components/Subsystems/Subsystems.css b/src/views/TeamPage/components/Subsystems/Subsystems.css index e69de29..ded5151 100644 --- a/src/views/TeamPage/components/Subsystems/Subsystems.css +++ b/src/views/TeamPage/components/Subsystems/Subsystems.css @@ -0,0 +1,12 @@ +.small-heading { + padding-bottom: 20px; +} + +.subsys { + padding: 10px 20px 10px 20px; +} + +.subsysDesc { + padding: 0px 0px 0px 10px; + color: black; +} diff --git a/src/views/TeamPage/components/Subsystems/Subsystems.js b/src/views/TeamPage/components/Subsystems/Subsystems.js index e053897..d043035 100644 --- a/src/views/TeamPage/components/Subsystems/Subsystems.js +++ b/src/views/TeamPage/components/Subsystems/Subsystems.js @@ -1,13 +1,9 @@ import React from 'react'; import { - Container, Row, Col } from "reactstrap"; -import niotwin from '../../../../assets/img/niotwinner.jpeg'; -import desbot from '../../../../assets/img/designbot.png'; -import atwork from '../../../../assets/img/atwork.png'; import "./Subsystems.css" import software from "assets/img/software.jpg" @@ -15,69 +11,65 @@ import electrical from "assets/img/electrical.jpeg" import mechanical from "assets/img/mechanical.jpg" import business from "assets/img/business.jpg" - - function Posts() { return ( <>
- - -

Subsystems

- - -

Software

- -

The software subsystem develops the algorithms - controlling the robot and making it autonomous. We use latest cutting edge - technologies in the world of robotics software. We use ROS(Robot Operating System) - as a communication middleware between all processes running on our robot.The software - stack of Anahita consists of dedicated layers for the hardware integration, - controls and navigation, motion planning, perception and acoustic localization. - The software subsytem carries out simulations Gazebo and UWSim to ensure that - things work smoothly before actual testing.The main aim of software subsystem is - to write code, that is generic and error free, in order efficiently coordinate the - vehicles motion and enable it perform at full potential.

- - - - -

Electrical

- -

The Electrical Subsystem builds the electrical framework - powering our AUV. We work on the electrical aspects of the AUV, providing - power, driving actuators and interfacing with various sensors on board. We - build custom made PCBs to meet the specific requirements of the tasks. The - Electrical framework consists of Power Distribution System and the Monitoring - system. Arduino Mega is used to control the actuation and read - data from various sensors which in turn is controlled by an Intel NUC. - The main aim of the Electrical subsystem is to manage electrical setup and - act as an interface between the software and mechanical subsystems.

- - -

Mechanical

- -

The mechanical subsystem if responsible for design and - manufacture of the vehicle. We design the entire vehicle and accessories - - working on Fluid Dynamics, Actuator controls, and Pneumatics. We plan, simulate - and test the physical structure of the AUV and then manufacture it - using state of art manufacturing techniques. We use latest software such as SolidWorks and ANSYS - to make the design robust, modular, light and strong.

- - - -

Business

- -

The Business subsystem manages the fundings and outreach - activities of the team. We manage the expenditures and fundings of the team. - We represent the team before our sponsors and try to procure them. - We maintain the team website and pages on the different social media platforms. - The main aim of the business subsystem is to ensure that the team gets sufficient - fundings and has an excellent outreach to ensure the smooth functioning of the other - three subsystems.

- - + + +

Subsystems

+ + +

Software

+ {/* */} +

The software subsystem develops the algorithms + controlling the robot and making it autonomous. We use latest cutting edge + technologies in the world of robotics software. We use ROS(Robot Operating System) + as a communication middleware between all processes running on our robot.The software + stack of Anahita consists of dedicated layers for the hardware integration, + controls and navigation, motion planning, perception and acoustic localization. + The software subsytem carries out simulations Gazebo and UWSim to ensure that + things work smoothly before actual testing.The main aim of software subsystem is + to write code, that is generic and error free, in order efficiently coordinate the + vehicles motion and enable it perform at full potential.

+ + +

Electrical

+ {/* */} +

The Electrical Subsystem builds the electrical framework + powering our AUV. We work on the electrical aspects of the AUV, providing + power, driving actuators and interfacing with various sensors on board. We + build custom made PCBs to meet the specific requirements of the tasks. The + Electrical framework consists of Power Distribution System and the Monitoring + system. Arduino Mega is used to control the actuation and read + data from various sensors which in turn is controlled by an Intel NUC. + The main aim of the Electrical subsystem is to manage electrical setup and + act as an interface between the software and mechanical subsystems.

+ + +

Mechanical

+ {/* */} +

The mechanical subsystem if responsible for design and + manufacture of the vehicle. We design the entire vehicle and accessories - + working on Fluid Dynamics, Actuator controls, and Pneumatics. We plan, simulate + and test the physical structure of the AUV and then manufacture it + using state of art manufacturing techniques. We use latest software such as SolidWorks + and ANSYS + to make the design robust, modular, light and strong.

+ + +

Business

+ {/* */} +

The Business subsystem manages the fundings and outreach + activities of the team. We manage the expenditures and fundings of the team. + We represent the team before our sponsors and try to procure them. + We maintain the team website and pages on the different social media platforms. + The main aim of the business subsystem is to ensure that the team gets sufficient + fundings and has an excellent outreach to ensure the smooth functioning of the other + three subsystems.

+ +
@@ -86,4 +78,5 @@ function Posts() { } + export default Posts; \ No newline at end of file From 3aa6ecc0a3e7bb39d4cfda33702a0230bf244cab Mon Sep 17 00:00:00 2001 From: Ritam Jana Date: Mon, 24 May 2021 16:02:39 +0530 Subject: [PATCH 2/2] Fixed conflicts --- src/data/TeamMembers.json | 56 ++++++++++++++----- .../SubsystemHeads/SubsystemHeads.js | 10 ++-- .../components/Subsystems/Subsystems.css | 8 ++- .../components/Subsystems/Subsystems.js | 8 +-- 4 files changed, 58 insertions(+), 24 deletions(-) diff --git a/src/data/TeamMembers.json b/src/data/TeamMembers.json index 523cf78..ab28e56 100644 --- a/src/data/TeamMembers.json +++ b/src/data/TeamMembers.json @@ -6,7 +6,9 @@ { "name": "Prof. Indranil Saha", "subheading": "Computer Science and Engineering Department, IITK", - "image": "team/indranilSaha.jpg" + "image": "team/indranilSaha.jpg", + "facebook": "https://www.facebook.com/", + "linkedin": "https://www.linkedin.com/" } ] }, @@ -16,17 +18,23 @@ { "name": "Ayush Gupta", "subheading": "Y17, Software Subsystem", - "image": "team/ayush.jpg" + "image": "team/ayush.jpg", + "facebook": "https://www.facebook.com/", + "linkedin": "https://www.linkedin.com/" }, { "name": "Inshu Namdev", "subheading": "Y17, Electrical Subsystem", - "image": "team/inshu.jpg" + "image": "team/inshu.jpg", + "facebook": "https://www.facebook.com/", + "linkedin": "https://www.linkedin.com/" }, { "name": "Priank Prasad", "subheading": "Y17, Mechanical Subsystem", - "image": "team/p.jpg" + "image": "team/p.jpg", + "facebook": "https://www.facebook.com/", + "linkedin": "https://www.linkedin.com/" } ] }, @@ -36,17 +44,23 @@ { "name": "Devendra Kharolia", "subheading": "Y18, Team Head", - "image": "team/devendra.jpg" + "image": "team/devendra.jpg", + "facebook": "https://www.facebook.com/", + "linkedin": "https://www.linkedin.com/" }, { "name": "Jaskeerat Singh", "subheading": "Y18, Team Head", - "image": "team/jaskeerat.jpg" + "image": "team/jaskeerat.jpg", + "facebook": "https://www.facebook.com/", + "linkedin": "https://www.linkedin.com/" }, { "name": "Kamlesh Kalsariya", "subheading": "Y18, Team Head", - "image": "team/kamlesh.jpg" + "image": "team/kamlesh.jpg", + "facebook": "https://www.facebook.com/", + "linkedin": "https://www.linkedin.com/" } ] }, @@ -56,22 +70,30 @@ { "name": "Shubham Korde", "subheading": "", - "image": "team/shubham.jpg" + "image": "team/shubham.jpg", + "facebook": "https://www.facebook.com/", + "linkedin": "https://www.linkedin.com/" }, { "name": "Prakhar Maheshwari", "subheading": "", - "image": "team/prakhar.jpg" + "image": "team/prakhar.jpg", + "facebook": "https://www.facebook.com/", + "linkedin": "https://www.linkedin.com/" }, { "name": "Aaryansh Mohan Bansal", "subheading": "", - "image": "team/aryansh.jpg" + "image": "team/aryansh.jpg", + "facebook": "https://www.facebook.com/", + "linkedin": "https://www.linkedin.com/" }, { "name": "Krishna Agarwal", "subheading": "", - "image": "team/Krishna.jpg" + "image": "team/Krishna.jpg", + "facebook": "https://www.facebook.com/", + "linkedin": "https://www.linkedin.com/" } ] @@ -82,12 +104,16 @@ { "name": "Neelabh Singhania", "subheading": "", - "image": "team/neelabh.jpg" + "image": "team/neelabh.jpg", + "facebook": "https://www.facebook.com/", + "linkedin": "https://www.linkedin.com/" }, { "name": "Jayant Reddy", "subheading": "", - "image": "team/jayant.jpeg" + "image": "team/jayant.jpeg", + "facebook": "https://www.facebook.com/", + "linkedin": "https://www.linkedin.com/" } ] }, @@ -97,7 +123,9 @@ { "name": "Shashank Katiyar", "subheading": "", - "image": "team/shashank.jpeg" + "image": "team/shashank.jpeg", + "facebook": "https://www.facebook.com/", + "linkedin": "https://www.linkedin.com/" } ] } diff --git a/src/views/TeamPage/components/SubsystemHeads/SubsystemHeads.js b/src/views/TeamPage/components/SubsystemHeads/SubsystemHeads.js index a7228b7..b248713 100644 --- a/src/views/TeamPage/components/SubsystemHeads/SubsystemHeads.js +++ b/src/views/TeamPage/components/SubsystemHeads/SubsystemHeads.js @@ -10,14 +10,12 @@ function TalkAbout() { { team.teamData.map((section) => { - // console.log(section); return (

{section.heading}

{section.items.map((teamMember) => { - // console.log(teamMember); return ( @@ -30,10 +28,14 @@ function TalkAbout() { diff --git a/src/views/TeamPage/components/Subsystems/Subsystems.css b/src/views/TeamPage/components/Subsystems/Subsystems.css index ded5151..2b16c44 100644 --- a/src/views/TeamPage/components/Subsystems/Subsystems.css +++ b/src/views/TeamPage/components/Subsystems/Subsystems.css @@ -1,12 +1,16 @@ -.small-heading { +.subsysImg { padding-bottom: 20px; } +.small-heading { + padding: 20px; +} + .subsys { padding: 10px 20px 10px 20px; } .subsysDesc { - padding: 0px 0px 0px 10px; + padding: 0px 0px 20px 10px; color: black; } diff --git a/src/views/TeamPage/components/Subsystems/Subsystems.js b/src/views/TeamPage/components/Subsystems/Subsystems.js index d043035..6b481d7 100644 --- a/src/views/TeamPage/components/Subsystems/Subsystems.js +++ b/src/views/TeamPage/components/Subsystems/Subsystems.js @@ -22,7 +22,7 @@ function Posts() {

Software

- {/* */} +

The software subsystem develops the algorithms controlling the robot and making it autonomous. We use latest cutting edge technologies in the world of robotics software. We use ROS(Robot Operating System) @@ -36,7 +36,7 @@ function Posts() {

Electrical

- {/* */} +

The Electrical Subsystem builds the electrical framework powering our AUV. We work on the electrical aspects of the AUV, providing power, driving actuators and interfacing with various sensors on board. We @@ -49,7 +49,7 @@ function Posts() {

Mechanical

- {/* */} +

The mechanical subsystem if responsible for design and manufacture of the vehicle. We design the entire vehicle and accessories - working on Fluid Dynamics, Actuator controls, and Pneumatics. We plan, simulate @@ -60,7 +60,7 @@ function Posts() {

Business

- {/* */} +

The Business subsystem manages the fundings and outreach activities of the team. We manage the expenditures and fundings of the team. We represent the team before our sponsors and try to procure them.