From f5bf5ebb82e3af420dcd23d602b1be6cc86838e1 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 3 May 2017 02:04:16 +0200
Subject: Replace sprockets/browserify with Webpack (#2617)

* Replace browserify with webpack

* Add react-intl-translations-manager

* Do not minify in development, add offline-plugin for ServiceWorker background cache updates

* Adjust tests and dependencies

* Fix production deployments

* Fix tests

* More optimizations

* Improve travis cache for npm stuff

* Re-run travis

* Add back support for custom.scss as before

* Remove offline-plugin and babili

* Fix issue with Immutable.List().unshift(...values) not working as expected

* Make travis load schema instead of running all migrations in sequence

* Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of
React.PureComponent. ImmutablePureComponent uses Immutable.is() to compare props. Replace dynamic callback bindings in
<UI />

* Add react definitions to places that use JSX

* Add Procfile.dev for running rails, webpack and streaming API at the same time
---
 .../javascripts/components/reducers/settings.jsx   | 48 ----------------------
 1 file changed, 48 deletions(-)
 delete mode 100644 app/assets/javascripts/components/reducers/settings.jsx

(limited to 'app/assets/javascripts/components/reducers/settings.jsx')

diff --git a/app/assets/javascripts/components/reducers/settings.jsx b/app/assets/javascripts/components/reducers/settings.jsx
deleted file mode 100644
index 820af99ed..000000000
--- a/app/assets/javascripts/components/reducers/settings.jsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import { SETTING_CHANGE } from '../actions/settings';
-import { STORE_HYDRATE } from '../actions/store';
-import Immutable from 'immutable';
-
-const initialState = Immutable.Map({
-  onboarded: false,
-
-  home: Immutable.Map({
-    shows: Immutable.Map({
-      reblog: true,
-      reply: true
-    })
-  }),
-
-  notifications: Immutable.Map({
-    alerts: Immutable.Map({
-      follow: true,
-      favourite: true,
-      reblog: true,
-      mention: true
-    }),
-
-    shows: Immutable.Map({
-      follow: true,
-      favourite: true,
-      reblog: true,
-      mention: true
-    }),
-
-    sounds: Immutable.Map({
-      follow: true,
-      favourite: true,
-      reblog: true,
-      mention: true
-    })
-  })
-});
-
-export default function settings(state = initialState, action) {
-  switch(action.type) {
-  case STORE_HYDRATE:
-    return state.mergeDeep(action.state.get('settings'));
-  case SETTING_CHANGE:
-    return state.setIn(action.key, action.value);
-  default:
-    return state;
-  }
-};
-- 
cgit