From 658d2f6b858246e720f08047946871b87baf6ea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chif=20Gerg=C5=91?= <chifgeri97@gmail.com> Date: Sun, 27 Jan 2019 13:17:01 +0100 Subject: [PATCH] Remove service worker --- src/components/Header.js | 1 + src/components/pages/Schedule.js | 1 - src/index.js | 3 - src/reducers/index.js | 3 + src/registerServiceWorker.js | 108 ------------------------------- 5 files changed, 4 insertions(+), 112 deletions(-) delete mode 100644 src/registerServiceWorker.js diff --git a/src/components/Header.js b/src/components/Header.js index 6667d99..57006a1 100644 --- a/src/components/Header.js +++ b/src/components/Header.js @@ -53,6 +53,7 @@ const menuItems = [ text: 'HĂĄzi feladatok', to: '/homework', prefix: '', + permissionLevel: 2, }, ] diff --git a/src/components/pages/Schedule.js b/src/components/pages/Schedule.js index 1b7e66e..df98a6f 100644 --- a/src/components/pages/Schedule.js +++ b/src/components/pages/Schedule.js @@ -67,7 +67,6 @@ class Schedule extends Component { > {panels} </Accordion> - <h2>TĂĄbor:</h2> </Container> ); } diff --git a/src/index.js b/src/index.js index d513a73..01b0629 100644 --- a/src/index.js +++ b/src/index.js @@ -8,7 +8,6 @@ import 'semantic-ui-css/semantic.min.css'; import moment from 'moment'; import configureStore from './configureStore'; import App from './components/App'; -import registerServiceWorker from './registerServiceWorker'; moment.locale(); @@ -23,5 +22,3 @@ render( </Provider>, document.getElementById('root'), ); - -registerServiceWorker(); diff --git a/src/reducers/index.js b/src/reducers/index.js index 777e686..c6a7093 100644 --- a/src/reducers/index.js +++ b/src/reducers/index.js @@ -6,6 +6,9 @@ import EditNewsReducer from './EditNewsReducer'; import HomeworksReducer from './HomeworksReducer'; import AddTaskReducer from './AddTaskReducer'; import AddSolutionReducer from './AddSolutionReducer'; +import EventReducer from './EventReducer'; +import NoteReducer from './NoteReducer'; +import TraineeReducer from './TraineeReducer'; const rootReducer = combineReducers({ user: UserReducer, diff --git a/src/registerServiceWorker.js b/src/registerServiceWorker.js deleted file mode 100644 index 4a3ccf0..0000000 --- a/src/registerServiceWorker.js +++ /dev/null @@ -1,108 +0,0 @@ -// In production, we register a service worker to serve assets from local cache. - -// This lets the app load faster on subsequent visits in production, and gives -// it offline capabilities. However, it also means that developers (and users) -// will only see deployed updates on the "N+1" visit to a page, since previously -// cached resources are updated in the background. - -// To learn more about the benefits of this model, read https://goo.gl/KwvDNy. -// This link also includes instructions on opting out of this behavior. - -const isLocalhost = Boolean( - window.location.hostname === 'localhost' || - // [::1] is the IPv6 localhost address. - window.location.hostname === '[::1]' || - // 127.0.0.1/8 is considered localhost for IPv4. - window.location.hostname.match( - /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/ - ) -); - -export default function register() { - if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) { - // The URL constructor is available in all browsers that support SW. - const publicUrl = new URL(process.env.PUBLIC_URL, window.location); - if (publicUrl.origin !== window.location.origin) { - // Our service worker won't work if PUBLIC_URL is on a different origin - // from what our page is served on. This might happen if a CDN is used to - // serve assets; see https://github.com/facebookincubator/create-react-app/issues/2374 - return; - } - - window.addEventListener('load', () => { - const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`; - - if (!isLocalhost) { - // Is not local host. Just register service worker - registerValidSW(swUrl); - } else { - // This is running on localhost. Lets check if a service worker still exists or not. - checkValidServiceWorker(swUrl); - } - }); - } -} - -function registerValidSW(swUrl) { - navigator.serviceWorker - .register(swUrl) - .then(registration => { - registration.onupdatefound = () => { - const installingWorker = registration.installing; - installingWorker.onstatechange = () => { - if (installingWorker.state === 'installed') { - if (navigator.serviceWorker.controller) { - // At this point, the old content will have been purged and - // the fresh content will have been added to the cache. - // It's the perfect time to display a "New content is - // available; please refresh." message in your web app. - console.log('New content is available; please refresh.'); - } else { - // At this point, everything has been precached. - // It's the perfect time to display a - // "Content is cached for offline use." message. - console.log('Content is cached for offline use.'); - } - } - }; - }; - }) - .catch(error => { - console.error('Error during service worker registration:', error); - }); -} - -function checkValidServiceWorker(swUrl) { - // Check if the service worker can be found. If it can't reload the page. - fetch(swUrl) - .then(response => { - // Ensure service worker exists, and that we really are getting a JS file. - if ( - response.status === 404 || - response.headers.get('content-type').indexOf('javascript') === -1 - ) { - // No service worker found. Probably a different app. Reload the page. - navigator.serviceWorker.ready.then(registration => { - registration.unregister().then(() => { - window.location.reload(); - }); - }); - } else { - // Service worker found. Proceed as normal. - registerValidSW(swUrl); - } - }) - .catch(() => { - console.log( - 'No internet connection found. App is running in offline mode.' - ); - }); -} - -export function unregister() { - if ('serviceWorker' in navigator) { - navigator.serviceWorker.ready.then(registration => { - registration.unregister(); - }); - } -} -- GitLab