From b040af43b430d77cf1a99185156c0fc3459fe9b0 Mon Sep 17 00:00:00 2001 From: Carolina Date: Mon, 21 Jan 2019 17:42:39 -0500 Subject: [PATCH 01/29] Deploys on firebase --- web-app/.firebase/hosting.YnVpbGQ.cache | 20 ++++++++++++++++++++ web-app/.firebaserc | 5 +++++ web-app/firebase.json | 19 +++++++++++++++++++ web-app/src/App.js | 2 +- 4 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 web-app/.firebase/hosting.YnVpbGQ.cache create mode 100644 web-app/.firebaserc create mode 100644 web-app/firebase.json diff --git a/web-app/.firebase/hosting.YnVpbGQ.cache b/web-app/.firebase/hosting.YnVpbGQ.cache new file mode 100644 index 0000000..320a3f4 --- /dev/null +++ b/web-app/.firebase/hosting.YnVpbGQ.cache @@ -0,0 +1,20 @@ +asset-manifest.json,1548110228262,6bee6052ea9c9d65cd8194679c7ca65e121bc03c3968c1b3bf440dbf980818d9 +manifest.json,1548110187930,ed7b98046be74c7d1476b73ebb8cd1f00c2b34443af1525af60b9dd20be9fb9a +index.html,1548110228262,cea1595bea098f2ea98bd5268db0341bd5daa4e72ec084c10eadbcdea5a3ee5c +precache-manifest.b716970de631d02c6800fa5e0dd08bd0.js,1548110228262,f67bd7dc05fa36aae27decfd596b26c6499e16318221258559048b66a4d19a80 +service-worker.js,1548110228262,287e681ee60067f1fd06308edd43ac75f21d7db5cffe79f4caee29d3382ffe5d +favicon.ico,1548110187918,faae64ff3a1ac10cbf1da491098de5759106408eeafe87df2af6e20a3a288994 +static/css/main.b7a8d86d.chunk.css,1548110228266,2b4a391f96d7a77f843bd51091a2fbc2c4ff118c077f1e0eae3b0bec162ffdda +static/css/1.d2c7f27a.chunk.css,1548110228298,681272800fb387175f65ee1378f8793a7c24ce4403bb443597eea655f2ed5651 +static/css/main.b7a8d86d.chunk.css.map,1548110228298,318440d85124f83964e42f18c5b04e753e5e684f0ff0a6ddf656b1d9c4768433 +static/css/1.d2c7f27a.chunk.css.map,1548110228298,c617a99b86f04bfa65a9b45395ec28dbfe064b0c5e8df535f68f7079bdc2a733 +static/js/runtime~main.229c360f.js,1548110228298,2e5bdf81abe3dfb85b930a37763ebe52edd73bf233bd2f3491353835ac89605f +static/js/main.250fde91.chunk.js,1548110228266,e5e6cb272d73a0fa1d35357bfb8615f3916084453c7839e1a11cc80fcb9c6197 +static/js/runtime~main.229c360f.js.map,1548110228298,47447d7abf374aeab73847dc273d1925ba0d4514c32589274970412a22b8e95e +images/jointDev.png,1548110187918,9deab2ee0d3ec2c6fe3401310da32ff27197dd1ceabc33856598394fb95a8db1 +static/js/main.250fde91.chunk.js.map,1548110228298,0408063d13f99a559bb22083ec40316af92299bad855d26a71e8ef60ca61f96f +images/logo_utp.png,1548110187918,f01c47de30142e6ff41efd9a63442c962d9c92106e7e57fa2aaea08fe336726a +images/logo_sirius.png,1548110187918,7b5bca61cfea674375b3b5e63bf880f5ddc13a0724249b3de567d51a503529ae +static/media/bg.24962eab.jpg,1548110228266,f11ffca9583baba9932c6bdc160de35184928839af102831657439159adfee10 +static/js/1.822fd4e8.chunk.js,1548110228298,fe74b5bc434975c47f20e31aa55377826bab59c51670b88af944299b9077df3d +static/js/1.822fd4e8.chunk.js.map,1548110228298,0e664cce506980950e3cf0679c3512914ae1282e2c3dee44fef33ff2e22f0fe1 diff --git a/web-app/.firebaserc b/web-app/.firebaserc new file mode 100644 index 0000000..f4ced89 --- /dev/null +++ b/web-app/.firebaserc @@ -0,0 +1,5 @@ +{ + "projects": { + "default": "jointdevweb" + } +} diff --git a/web-app/firebase.json b/web-app/firebase.json new file mode 100644 index 0000000..12b37b4 --- /dev/null +++ b/web-app/firebase.json @@ -0,0 +1,19 @@ +{ + "hosting": { + "public": "build", + "ignore": [ + "firebase.json", + "**/.*", + "**/node_modules/**" + ], + "rewrites": [ + { + "source": "**", + "destination": "/index.html" + } + ], + "headers": [ + {"source": "./src/serviceWorker.js", "headers": [{"key": "Cache-Control", "value": "no-cache"}]} + ] + } +} diff --git a/web-app/src/App.js b/web-app/src/App.js index 8d53fd2..aa9c236 100644 --- a/web-app/src/App.js +++ b/web-app/src/App.js @@ -14,7 +14,7 @@ import { withFirebase } from './components/Firebase'; class App extends Component { render() { return ( - +
From 738d96f85e7001c55019eb15a0bb10c68e9b5db2 Mon Sep 17 00:00:00 2001 From: Carolina Date: Thu, 24 Jan 2019 15:50:38 -0500 Subject: [PATCH 02/29] Update gitignore --- web-app/.firebase/hosting.YnVpbGQ.cache | 20 -------------------- web-app/.gitignore | 2 ++ 2 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 web-app/.firebase/hosting.YnVpbGQ.cache diff --git a/web-app/.firebase/hosting.YnVpbGQ.cache b/web-app/.firebase/hosting.YnVpbGQ.cache deleted file mode 100644 index 320a3f4..0000000 --- a/web-app/.firebase/hosting.YnVpbGQ.cache +++ /dev/null @@ -1,20 +0,0 @@ -asset-manifest.json,1548110228262,6bee6052ea9c9d65cd8194679c7ca65e121bc03c3968c1b3bf440dbf980818d9 -manifest.json,1548110187930,ed7b98046be74c7d1476b73ebb8cd1f00c2b34443af1525af60b9dd20be9fb9a -index.html,1548110228262,cea1595bea098f2ea98bd5268db0341bd5daa4e72ec084c10eadbcdea5a3ee5c -precache-manifest.b716970de631d02c6800fa5e0dd08bd0.js,1548110228262,f67bd7dc05fa36aae27decfd596b26c6499e16318221258559048b66a4d19a80 -service-worker.js,1548110228262,287e681ee60067f1fd06308edd43ac75f21d7db5cffe79f4caee29d3382ffe5d -favicon.ico,1548110187918,faae64ff3a1ac10cbf1da491098de5759106408eeafe87df2af6e20a3a288994 -static/css/main.b7a8d86d.chunk.css,1548110228266,2b4a391f96d7a77f843bd51091a2fbc2c4ff118c077f1e0eae3b0bec162ffdda -static/css/1.d2c7f27a.chunk.css,1548110228298,681272800fb387175f65ee1378f8793a7c24ce4403bb443597eea655f2ed5651 -static/css/main.b7a8d86d.chunk.css.map,1548110228298,318440d85124f83964e42f18c5b04e753e5e684f0ff0a6ddf656b1d9c4768433 -static/css/1.d2c7f27a.chunk.css.map,1548110228298,c617a99b86f04bfa65a9b45395ec28dbfe064b0c5e8df535f68f7079bdc2a733 -static/js/runtime~main.229c360f.js,1548110228298,2e5bdf81abe3dfb85b930a37763ebe52edd73bf233bd2f3491353835ac89605f -static/js/main.250fde91.chunk.js,1548110228266,e5e6cb272d73a0fa1d35357bfb8615f3916084453c7839e1a11cc80fcb9c6197 -static/js/runtime~main.229c360f.js.map,1548110228298,47447d7abf374aeab73847dc273d1925ba0d4514c32589274970412a22b8e95e -images/jointDev.png,1548110187918,9deab2ee0d3ec2c6fe3401310da32ff27197dd1ceabc33856598394fb95a8db1 -static/js/main.250fde91.chunk.js.map,1548110228298,0408063d13f99a559bb22083ec40316af92299bad855d26a71e8ef60ca61f96f -images/logo_utp.png,1548110187918,f01c47de30142e6ff41efd9a63442c962d9c92106e7e57fa2aaea08fe336726a -images/logo_sirius.png,1548110187918,7b5bca61cfea674375b3b5e63bf880f5ddc13a0724249b3de567d51a503529ae -static/media/bg.24962eab.jpg,1548110228266,f11ffca9583baba9932c6bdc160de35184928839af102831657439159adfee10 -static/js/1.822fd4e8.chunk.js,1548110228298,fe74b5bc434975c47f20e31aa55377826bab59c51670b88af944299b9077df3d -static/js/1.822fd4e8.chunk.js.map,1548110228298,0e664cce506980950e3cf0679c3512914ae1282e2c3dee44fef33ff2e22f0fe1 diff --git a/web-app/.gitignore b/web-app/.gitignore index 4d29575..8e630bb 100644 --- a/web-app/.gitignore +++ b/web-app/.gitignore @@ -21,3 +21,5 @@ npm-debug.log* yarn-debug.log* yarn-error.log* + +*.cache From 41a78a3119f99d497cb16bf12db0bb387e70cb4d Mon Sep 17 00:00:00 2001 From: Carolina Date: Thu, 14 Nov 2019 16:59:17 -0300 Subject: [PATCH 03/29] Adds media queries for text in navbar --- web-app/src/components/NavBar/Nav.css | 60 ++++++++++++++++++++++----- web-app/src/components/NavBar/Nav.js | 8 ++-- 2 files changed, 54 insertions(+), 14 deletions(-) diff --git a/web-app/src/components/NavBar/Nav.css b/web-app/src/components/NavBar/Nav.css index da4c6b4..ee86e7a 100644 --- a/web-app/src/components/NavBar/Nav.css +++ b/web-app/src/components/NavBar/Nav.css @@ -3,21 +3,61 @@ height: 10vh; } -.Nav img { - width: auto; - height: 20vh; +/* Extra small devices (portrait phones, less than 576px) */ +@media (max-width: 575.98px) { + .Nav .font-subtitle { + font-size: 8px; + } + .Nav img { + width: auto; + height: 50px; + min-height: 50px; + min-width: 110px; + } } -.Nav .font-subtitle { - font-size: 2vw; +/* Small devices (landscape phones, 576px and up) */ +@media (min-width: 576px) and (max-width: 767.98px) { + .Nav .font-subtitle { + font-size: 10px; + } + .Nav img { + width: auto; + height: 70px; + } } -.Nav .navbar-brand p { - font-size: 3vh; +/* Medium devices (tablets, 768px and up) */ +@media (min-width: 768px) and (max-width: 991.98px) { + .Nav .font-subtitle { + font-size: 14px; + } + .Nav img { + width: auto; + height: 80px; + } } -.navbar-nav { - display: block; +/* Large devices (desktops, 992px and up) */ +@media (min-width: 992px) and (max-width: 1199.98px) { + .Nav .font-subtitle { + font-size: 18px; + } + .Nav img { + width: auto; + height: 90px; + } +} + +/* Extra large devices (large desktops, 1200px and up) */ +@media (min-width: 1200px) { + .Nav .font-subtitle { + font-size: 20px; + } + .Nav img { + width: auto; + height: 100px; + } } .Nav .navbar li { @@ -31,7 +71,7 @@ } .Nav .scrolled { - background-color: rgba(0,0,0,.2) !important; + background-color: rgba(70, 20, 66, 0.8); transition: background-color 200ms linear; z-index: 1000; } diff --git a/web-app/src/components/NavBar/Nav.js b/web-app/src/components/NavBar/Nav.js index c8e9d54..50179aa 100644 --- a/web-app/src/components/NavBar/Nav.js +++ b/web-app/src/components/NavBar/Nav.js @@ -43,18 +43,18 @@ class Nav extends React.Component { render() { return (
-