From dca61ec68f7448e4c3b1a15442c450a05221755a Mon Sep 17 00:00:00 2001 From: Suriel Date: Wed, 21 Apr 2021 15:43:40 -0500 Subject: [PATCH] Updated dak mode colors and added offline snackbar --- .firebase/hosting.YnVpbGQ.cache | 64 ++++++++++----------- .gitignore | 2 +- cypress/integration/network-status_spec.js | 2 +- public/assets/wifi_status.svg | 1 + src/App.css | 38 ------------ src/components/Progress/Progress.js | 1 - src/components/Skeleton.js | 1 - src/components/Snackbar.js | 12 +++- src/components/ToggleButton/ToggleButton.js | 1 - src/containers/Navigation/Navigation.js | 1 - src/containers/UserContainer.js | 1 - src/index.css | 9 +-- 12 files changed, 49 insertions(+), 84 deletions(-) create mode 100644 public/assets/wifi_status.svg diff --git a/.firebase/hosting.YnVpbGQ.cache b/.firebase/hosting.YnVpbGQ.cache index 53fff2a..b2f18b9 100644 --- a/.firebase/hosting.YnVpbGQ.cache +++ b/.firebase/hosting.YnVpbGQ.cache @@ -1,32 +1,32 @@ -asset-manifest.json,1616186826774,59cbb36027680461ad793bcc943440d8098327a25b2ae51985fb0ee2c0862bd4 -index.html,1616186826774,b96afb612ea87e942536a991ab8aee250adf1e683c586082b6fe830d3b5ff301 -manifest.json,1616186802259,341d52628782f8ac9290bbfc43298afccb47b7cbfcee146ae30cf0f46bc30900 -logo512.png,1616186802253,191fc21360b4ccfb1cda11a1efb97f489ed22672ca83f4064316802bbfdd750e -favicon.ico,1616186802187,b72f7455f00e4e58792d2bca892abb068e2213838c0316d6b7a0d6d16acd1955 -logo192.png,1616186802191,caff018b7f1e8fd481eb1c50d75b0ef236bcd5078b1d15c8bb348453fee30293 -static/css/2.ffda3d49.chunk.css,1616186826770,3d02efe93700c4f83a8146342affde147881823a0e3ea7589446793329768f6c -static/css/6.f8d41b26.chunk.css,1616186826771,7ac0851dee7003928162d122ea99fa0f91ca2d6db5f260f79caeddc32d2f1c0d -static/css/6.f8d41b26.chunk.css.map,1616186826770,c9b94518337e29837d8cff7ac2931be2ac01c811cecb2a9d1a2ce641335684b7 -static/css/2.ffda3d49.chunk.css.map,1616186826770,c9dd2110109b6717f1b9217e2ae48529a3a9416149cc01ea9eef08ded8efc79c -static/css/main.0ae22291.chunk.css,1616186826764,aae5854f1f6456ec1ad2421fde03b9c36136a101352ba41e499313d391119fc1 -static/js/2.f0f9d74e.chunk.js.LICENSE.txt,1616186826771,10c6f21b02a3e5df21b9e300b25eded1e0353200e84518db8b2a9e7a3f6fcfe0 -static/css/main.0ae22291.chunk.css.map,1616186826771,6f80832bb06de2812db6cb2b148440e5683f245c31beb88657edfb409ce6dc2d -static/js/3.20e956fa.chunk.js,1616186826771,a2e300b28c4ab35e38eabc0db2b662973cb7b7e86b7ff794e71d01e3b8af67c4 -robots.txt,1616186802263,391d14b3c2f8c9143a27a28c7399585142228d4d1bdbe2c87ac946de411fa9a2 -service-worker.js,1616186826746,43e56cbc87490760142cc63bd54e147140bf68f30b98de2a1117db82401f725e -static/js/4.add4a66e.chunk.js,1616186826771,3da0925903d1aa2892774fd7197ea4452ee95cc5785ff40d403b136991b67d1f -static/js/5.1648cd83.chunk.js,1616186826771,8cf591e23d9e3ef6660c7f710ab197b58e474ab662e09f6f853232954313aad9 -static/js/6.84618fbf.chunk.js,1616186826771,8ea9c6cacd130a59a9b400c5a6159feeee174d68c29ef39d9e1dbf29cf46bc85 -static/js/6.84618fbf.chunk.js.map,1616186826781,d92b4476b9f5450c06ee384525f0177c1198ae862a252ac99957010de152483e -static/js/7.ec564f08.chunk.js,1616186826771,0e03473f7977bfc69afd66438452c9d1a39e51f40951e611007cc391590ad8b1 -static/js/7.ec564f08.chunk.js.map,1616186826781,8c5912a7040b54e337bb45d086f513647a73dd8e4ae5607894ea31653d89e6c2 -static/js/main.6e7e18aa.chunk.js,1616186826766,78e6f9ae2813889118ac0d3c606a9b05fdc4203c705d7fd243c445f5ef531ece -static/js/3.20e956fa.chunk.js.map,1616186826780,3f9c4d2b7bee01e7debd892502af2ad59bb1a0afc7982fa8a4263d67f7196575 -static/js/runtime-main.90ff424f.js,1616186826770,18efbd68d87059669e05c3fa0e7151841804d8e3869a518ed4ab53939a753986 -static/js/main.6e7e18aa.chunk.js.map,1616186826773,2e718ca970937ef09991fdb5a9fc5c37d821e5995515b22a375c14ff3e63eb45 -static/js/runtime-main.90ff424f.js.map,1616186826779,0f90cae0d3dba50204be7eca5600629bb1c94e9a73df6b42a3c5391971cc9356 -static/js/5.1648cd83.chunk.js.map,1616186826780,74101e1b445c412056a5bc87ef6ab70281998092ddb854cda240490217c6bea8 -static/js/4.add4a66e.chunk.js.map,1616186826781,64c63ebaaaae3294a9f4d4d43b9f6c9cb5ec167a7c6247d522466a6921397b25 -static/js/2.f0f9d74e.chunk.js,1616186826770,7fac21b7d0122e56abf5afe10ccca9381b29b30b2c70da4420b97d589c4a9a73 -service-worker.js.map,1616186826755,4b55a725fd355b1754dd27a9e667edadf713c0d0aa9502f6ca53a8b447e3532a -static/js/2.f0f9d74e.chunk.js.map,1616186826780,f546dd8b4d409a9fbe6d1f1a3c86e073a3400ba7993caaca398b7392410813e0 +asset-manifest.json,1616195202021,21bb8e0cacb4a53372425b1af8324dfa64e12da38c0bacf7de2e4d9bc4216f98 +logo192.png,1616195185368,caff018b7f1e8fd481eb1c50d75b0ef236bcd5078b1d15c8bb348453fee30293 +favicon.ico,1616195185366,b72f7455f00e4e58792d2bca892abb068e2213838c0316d6b7a0d6d16acd1955 +index.html,1616195202021,c5867796c2d37b4fb2730b6173ed7501693086760206f83926c335334559a2c7 +service-worker.js,1616195202008,e6312b45225c0e8f5ad6c07d997a148352ed0dae87f4e6e67fff7c886240eb64 +static/css/2.ffda3d49.chunk.css,1616195202017,3d02efe93700c4f83a8146342affde147881823a0e3ea7589446793329768f6c +manifest.json,1616195185383,70052b7eb72b1c824b3f90293aefc439d2dc480922ecb1d95de4068823ddad61 +static/css/6.f8d41b26.chunk.css,1616195202017,7ac0851dee7003928162d122ea99fa0f91ca2d6db5f260f79caeddc32d2f1c0d +static/css/2.ffda3d49.chunk.css.map,1616195202017,c9dd2110109b6717f1b9217e2ae48529a3a9416149cc01ea9eef08ded8efc79c +robots.txt,1616195185385,391d14b3c2f8c9143a27a28c7399585142228d4d1bdbe2c87ac946de411fa9a2 +static/css/6.f8d41b26.chunk.css.map,1616195202017,c9b94518337e29837d8cff7ac2931be2ac01c811cecb2a9d1a2ce641335684b7 +static/css/main.91397e0d.chunk.css,1616195202013,c6f42cd557711507c769cf8bf38f96316c37d62b1fdc06b0e2e4f0d78354068a +static/js/2.f0f9d74e.chunk.js.LICENSE.txt,1616195202017,10c6f21b02a3e5df21b9e300b25eded1e0353200e84518db8b2a9e7a3f6fcfe0 +static/css/main.91397e0d.chunk.css.map,1616195202018,0dc9600f67406a20821cefb9a33e3624429881dda74529d41c0e3c542f874bca +logo512.png,1616195185379,191fc21360b4ccfb1cda11a1efb97f489ed22672ca83f4064316802bbfdd750e +static/js/3.20e956fa.chunk.js,1616195202018,a2e300b28c4ab35e38eabc0db2b662973cb7b7e86b7ff794e71d01e3b8af67c4 +static/js/4.add4a66e.chunk.js,1616195202018,3da0925903d1aa2892774fd7197ea4452ee95cc5785ff40d403b136991b67d1f +static/js/5.1648cd83.chunk.js,1616195202018,8cf591e23d9e3ef6660c7f710ab197b58e474ab662e09f6f853232954313aad9 +static/js/3.20e956fa.chunk.js.map,1616195202024,3f9c4d2b7bee01e7debd892502af2ad59bb1a0afc7982fa8a4263d67f7196575 +static/js/5.1648cd83.chunk.js.map,1616195202025,74101e1b445c412056a5bc87ef6ab70281998092ddb854cda240490217c6bea8 +static/js/6.84618fbf.chunk.js.map,1616195202025,d92b4476b9f5450c06ee384525f0177c1198ae862a252ac99957010de152483e +static/js/7.ec564f08.chunk.js,1616195202017,0e03473f7977bfc69afd66438452c9d1a39e51f40951e611007cc391590ad8b1 +static/js/7.ec564f08.chunk.js.map,1616195202025,8c5912a7040b54e337bb45d086f513647a73dd8e4ae5607894ea31653d89e6c2 +static/js/6.84618fbf.chunk.js,1616195202017,8ea9c6cacd130a59a9b400c5a6159feeee174d68c29ef39d9e1dbf29cf46bc85 +static/js/main.6e7e18aa.chunk.js,1616195202014,78e6f9ae2813889118ac0d3c606a9b05fdc4203c705d7fd243c445f5ef531ece +static/js/runtime-main.90ff424f.js,1616195202017,18efbd68d87059669e05c3fa0e7151841804d8e3869a518ed4ab53939a753986 +static/js/main.6e7e18aa.chunk.js.map,1616195202021,2e718ca970937ef09991fdb5a9fc5c37d821e5995515b22a375c14ff3e63eb45 +static/js/runtime-main.90ff424f.js.map,1616195202024,0f90cae0d3dba50204be7eca5600629bb1c94e9a73df6b42a3c5391971cc9356 +static/js/4.add4a66e.chunk.js.map,1616195202025,64c63ebaaaae3294a9f4d4d43b9f6c9cb5ec167a7c6247d522466a6921397b25 +static/js/2.f0f9d74e.chunk.js,1616195202017,7fac21b7d0122e56abf5afe10ccca9381b29b30b2c70da4420b97d589c4a9a73 +service-worker.js.map,1616195202008,4b55a725fd355b1754dd27a9e667edadf713c0d0aa9502f6ca53a8b447e3532a +static/js/2.f0f9d74e.chunk.js.map,1616195202024,f546dd8b4d409a9fbe6d1f1a3c86e073a3400ba7993caaca398b7392410813e0 diff --git a/.gitignore b/.gitignore index fb82749..f5f79d4 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,4 @@ yarn-debug.log* yarn-error.log* .vscode/ - .firebase/* + .firebase diff --git a/cypress/integration/network-status_spec.js b/cypress/integration/network-status_spec.js index 229f8b0..8c57a63 100644 --- a/cypress/integration/network-status_spec.js +++ b/cypress/integration/network-status_spec.js @@ -73,7 +73,7 @@ describe('Network status', function () { assertOffline(); }); - it('LIGTH - Offline mode ans show snackbar', function () { + it('LIGHT - Offline mode ans show snackbar', function () { visit(false); goOffline(); assertOffline(); diff --git a/public/assets/wifi_status.svg b/public/assets/wifi_status.svg new file mode 100644 index 0000000..4f9e9f6 --- /dev/null +++ b/public/assets/wifi_status.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/App.css b/src/App.css index 74b5e05..e69de29 100644 --- a/src/App.css +++ b/src/App.css @@ -1,38 +0,0 @@ -.App { - text-align: center; -} - -.App-logo { - height: 40vmin; - pointer-events: none; -} - -@media (prefers-reduced-motion: no-preference) { - .App-logo { - animation: App-logo-spin infinite 20s linear; - } -} - -.App-header { - background-color: #282c34; - min-height: 100vh; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - font-size: calc(10px + 2vmin); - color: white; -} - -.App-link { - color: #61dafb; -} - -@keyframes App-logo-spin { - from { - transform: rotate(0deg); - } - to { - transform: rotate(360deg); - } -} diff --git a/src/components/Progress/Progress.js b/src/components/Progress/Progress.js index f7c344a..55106f7 100644 --- a/src/components/Progress/Progress.js +++ b/src/components/Progress/Progress.js @@ -1,4 +1,3 @@ -// @ts-nocheck import React, { Fragment } from 'react'; import ReactDOM from 'react-dom'; diff --git a/src/components/Skeleton.js b/src/components/Skeleton.js index 00e3fd5..c7176af 100644 --- a/src/components/Skeleton.js +++ b/src/components/Skeleton.js @@ -1,4 +1,3 @@ -// @ts-nocheck import React from 'react'; import PropTypes from 'prop-types'; diff --git a/src/components/Snackbar.js b/src/components/Snackbar.js index acd6e04..cb9b458 100644 --- a/src/components/Snackbar.js +++ b/src/components/Snackbar.js @@ -1,11 +1,17 @@ import React from 'react'; import PropTypes from 'prop-types'; +import logo from '../logo.svg'; -const Snackbar = ({ showStatus = false }) => { +const Snackbar = ({ showStatus = true }) => { const status = (showStatus && { display: 'flex' }) || { display: 'none' }; return ( -
- Wifi status +
+ Wifi status

You are offline. Please check your network status.

); diff --git a/src/components/ToggleButton/ToggleButton.js b/src/components/ToggleButton/ToggleButton.js index d60e33c..558c6a0 100644 --- a/src/components/ToggleButton/ToggleButton.js +++ b/src/components/ToggleButton/ToggleButton.js @@ -1,4 +1,3 @@ -// @ts-nocheck import React from 'react'; import PropTypes from 'prop-types'; import './ToggleButton.css'; diff --git a/src/containers/Navigation/Navigation.js b/src/containers/Navigation/Navigation.js index f5a9526..9636ea1 100755 --- a/src/containers/Navigation/Navigation.js +++ b/src/containers/Navigation/Navigation.js @@ -1,4 +1,3 @@ -// @ts-nocheck import React from 'react'; import { NavLink, withRouter } from 'react-router-dom'; import PropTypes from 'prop-types'; diff --git a/src/containers/UserContainer.js b/src/containers/UserContainer.js index 77d1b17..e2c2e39 100644 --- a/src/containers/UserContainer.js +++ b/src/containers/UserContainer.js @@ -1,4 +1,3 @@ -// @ts-nocheck import React, { Fragment, useState, useEffect } from 'react'; import PropTypes from 'prop-types'; import Skeleton from '../components/Skeleton'; diff --git a/src/index.css b/src/index.css index 9748342..9b693a5 100644 --- a/src/index.css +++ b/src/index.css @@ -1,6 +1,6 @@ :root { --title: #2d3848; - --content: #484e59; + --content: #666c75; --header: #ffffff; --body: #ffffff; --bg: #ffffff; @@ -11,10 +11,10 @@ --title: #ffffff; --content: #ffffff; --header: #1a202c; - --body: #3a4556; + --body: #172b4d; --bg: #2d3747; --link: #74befa; - --skeleton: #1d2939; + --skeleton: #091e42; } body { @@ -84,6 +84,7 @@ p { z-index: 20; position: fixed; display: flex; + align-items: center; left: 16px; right: 16px; bottom: 16px; @@ -92,7 +93,7 @@ p { min-width: 288px; padding: 1rem; } -.snackbat-img { +.snackbar-img { margin-right: 1rem; } .snackbar-content {