diff --git a/go/go_ahead/src/Components/Organisms/NavBar.js b/go/go_ahead/src/Components/Organisms/NavBar.js new file mode 100644 index 0000000000000000000000000000000000000000..83d1d043f37e52494f6a970d031819e62253c4ed --- /dev/null +++ b/go/go_ahead/src/Components/Organisms/NavBar.js @@ -0,0 +1,50 @@ +import React from 'react'; +import { + Collapse, + Navbar, + NavbarToggler, + NavbarBrand, + Nav, + NavItem, + NavLink, + UncontrolledDropdown, + DropdownToggle, + DropdownMenu, + DropdownItem, +} from 'reactstrap'; + +export default class NavBar extends React.Component { + constructor(props) { + super(props); + + this.toggle = this.toggle.bind(this); + this.state = { + isOpen: false, + }; + } + toggle() { + this.setState({ + isOpen: !this.state.isOpen, + }); + } + render() { + return ( +
+ + Go + + + + + +
+ ); + } +} diff --git a/go/go_ahead/src/Components/Organisms/index.js b/go/go_ahead/src/Components/Organisms/index.js new file mode 100644 index 0000000000000000000000000000000000000000..980ef5c7398b8a08d4b4b46032c26636a30f7a74 --- /dev/null +++ b/go/go_ahead/src/Components/Organisms/index.js @@ -0,0 +1,3 @@ +import NavBar from './NavBar'; + +export { NavBar }; diff --git a/go/go_ahead/src/Components/index.js b/go/go_ahead/src/Components/index.js index 95ee09376b15ad966be87db33522e667d34325d1..7f817028d74197ab5122c80799dfd1b2f6149611 100644 --- a/go/go_ahead/src/Components/index.js +++ b/go/go_ahead/src/Components/index.js @@ -1,3 +1,4 @@ import { HomePage, AboutPage } from './Pages'; +import { NavBar } from './Organisms'; -export { HomePage, AboutPage }; +export { HomePage, AboutPage, NavBar }; diff --git a/go/go_ahead/src/index.js b/go/go_ahead/src/index.js index 928c38747eabd0fa249fd9f02005136844ddf0b9..9e6af137bf147fe3448246e2b91cf19a0d012bb7 100644 --- a/go/go_ahead/src/index.js +++ b/go/go_ahead/src/index.js @@ -1,24 +1,15 @@ import React from 'react'; import ReactDOM from 'react-dom'; import { HashRouter, Route, Link } from 'react-router-dom'; +import { Button } from 'reactstrap'; -import { HomePage, AboutPage } from './Components'; +import { HomePage, AboutPage, NavBar } from './Components'; const Dhaynes = () =>

dhaynes

; const App = () => (
- + diff --git a/go/go_ahead/templates/index.html b/go/go_ahead/templates/index.html index 8e3b9c516e2391eaadbda014c072208e64fd2ca2..e27fc629ae5a201278bb9122b498d2645e804e46 100644 --- a/go/go_ahead/templates/index.html +++ b/go/go_ahead/templates/index.html @@ -1,18 +1,22 @@ - - - - - - Welcome • SRCT Go - + + + + + + Welcome • SRCT Go + - - -
- + + +
+ - + - + + + + + \ No newline at end of file diff --git a/package.json b/package.json index 863f6d4010e32a32d8ad1515efdd473c5894d0ea..b09488e597ff9eba0809b58d98669bc42337c3ef 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "license": "Apache-2.0", "private": false, "scripts": { - "start": "yarn dev", + "start": "yarn dev", "dev": "webpack --mode development ./go/go_ahead/src/index.js --output ./go/static/main.js --watch", "build": "webpack --mode production ./project/frontend/src/index.js --output ./go/static/main.js" }, @@ -36,6 +36,7 @@ "react": "^16.4.2", "react-dom": "^16.4.2", "react-router-dom": "^4.3.1", + "reactstrap": "^6.5.0", "webpack": "^4.16.4", "webpack-cli": "^3.1.0" } diff --git a/yarn.lock b/yarn.lock index 23a0e51614e7d7af1b788d33ad6b3e7c771a10ff..33d7772e23c52c8b58588d61d1934d77dd0279b5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1978,6 +1978,11 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" +classnames@^2.2.3: + version "2.2.6" + resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce" + integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q== + cli-cursor@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" @@ -2282,6 +2287,11 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" +dom-helpers@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.3.1.tgz#fc1a4e15ffdf60ddde03a480a9c0fece821dd4a6" + integrity sha512-2Sm+JaYn74OiTM2wHvxJOo3roiq/h25Yi69Fqk269cNUwIXsCvATB6CRSFC9Am/20G2b28hGv/+7NiWydIrPvg== + domain-browser@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" @@ -3199,6 +3209,21 @@ lodash.debounce@^4.0.8: resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= +lodash.isfunction@^3.0.9: + version "3.0.9" + resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051" + integrity sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw== + +lodash.isobject@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-3.0.2.tgz#3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d" + integrity sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0= + +lodash.tonumber@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/lodash.tonumber/-/lodash.tonumber-4.0.3.tgz#0b96b31b35672793eb7f5a63ee791f1b9e9025d9" + integrity sha1-C5azGzVnJ5Prf1pj7nkfG56QJdk= + lodash@^4.17.10: version "4.17.11" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" @@ -3219,7 +3244,7 @@ long@^3.2.0: resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b" integrity sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s= -loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1: +loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== @@ -3779,6 +3804,11 @@ pkg-dir@^2.0.0: dependencies: find-up "^2.1.0" +popper.js@^1.14.1: + version "1.14.4" + resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.4.tgz#8eec1d8ff02a5a3a152dd43414a15c7b79fd69b6" + integrity sha1-juwdj/AqWjoVLdQ0FKFce3n9abY= + posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" @@ -3811,7 +3841,7 @@ promise@^7.1.1: dependencies: asap "~2.0.3" -prop-types@^15.6.0, prop-types@^15.6.1: +prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2: version "15.6.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102" integrity sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ== @@ -3917,6 +3947,19 @@ react-dom@^16.4.2: object-assign "^4.1.1" prop-types "^15.6.0" +react-lifecycles-compat@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" + integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== + +react-popper@^0.10.4: + version "0.10.4" + resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-0.10.4.tgz#af2a415ea22291edd504678d7afda8a6ee3295aa" + integrity sha1-rypBXqIike3VBGeNev2opu4ylao= + dependencies: + popper.js "^1.14.1" + prop-types "^15.6.1" + react-router-dom@^4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.3.1.tgz#4c2619fc24c4fa87c9fd18f4fb4a43fe63fbd5c6" @@ -3942,6 +3985,16 @@ react-router@^4.3.1: prop-types "^15.6.1" warning "^4.0.1" +react-transition-group@^2.3.1: + version "2.5.0" + resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.5.0.tgz#70bca0e3546102c4dc5cf3f5f57f73447cce6874" + integrity sha512-qYB3JBF+9Y4sE4/Mg/9O6WFpdoYjeeYqx0AFb64PTazVy8RPMiE3A47CG9QmM4WJ/mzDiZYslV+Uly6O1Erlgw== + dependencies: + dom-helpers "^3.3.1" + loose-envify "^1.4.0" + prop-types "^15.6.2" + react-lifecycles-compat "^3.0.4" + react@^16.4.2: version "16.4.2" resolved "https://registry.yarnpkg.com/react/-/react-16.4.2.tgz#2cd90154e3a9d9dd8da2991149fdca3c260e129f" @@ -3952,6 +4005,20 @@ react@^16.4.2: object-assign "^4.1.1" prop-types "^15.6.0" +reactstrap@^6.5.0: + version "6.5.0" + resolved "https://registry.yarnpkg.com/reactstrap/-/reactstrap-6.5.0.tgz#ba655e32646e2621829f61faa033e607ec6624e5" + integrity sha512-dWb3fB/wBAiQloteKlf+j9Nl2VLe6BMZgTEt6hpeTt0t9TwtkeU+2v2NBYONZaF4FZATfMiIKozhWpc2HmLW1g== + dependencies: + classnames "^2.2.3" + lodash.isfunction "^3.0.9" + lodash.isobject "^3.0.2" + lodash.tonumber "^4.0.3" + prop-types "^15.5.8" + react-lifecycles-compat "^3.0.4" + react-popper "^0.10.4" + react-transition-group "^2.3.1" + "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"