diff options
author | 2018-02-08 11:02:06 +0100 | |
---|---|---|
committer | 2018-02-08 11:02:06 +0100 | |
commit | 38addc95dc6f1678d7fa1952cccd83138946aec1 (patch) | |
tree | 6dc85397d4fe474b7d411143a3d055a4f9718296 /src | |
parent | [MINOR] fix linting errors (diff) | |
parent | Merge branch 'develop' into move-subscription-folders (diff) | |
download | ferdium-app-38addc95dc6f1678d7fa1952cccd83138946aec1.tar.gz ferdium-app-38addc95dc6f1678d7fa1952cccd83138946aec1.tar.zst ferdium-app-38addc95dc6f1678d7fa1952cccd83138946aec1.zip |
Merge pull request #631 from meetfranz/move-subscription-folders
Refactor subscription folders
Diffstat (limited to 'src')
-rw-r--r-- | src/app.js | 2 | ||||
-rw-r--r-- | src/components/auth/Pricing.js | 2 | ||||
-rw-r--r-- | src/components/settings/account/AccountDashboard.js | 2 | ||||
-rw-r--r-- | src/components/subscription/SubscriptionForm.js (renamed from src/components/ui/Subscription.js) | 0 | ||||
-rw-r--r-- | src/components/subscription/SubscriptionPopup.js (renamed from src/components/ui/SubscriptionPopup.js) | 0 | ||||
-rw-r--r-- | src/containers/subscription/SubscriptionFormScreen.js (renamed from src/containers/ui/SubscriptionFormScreen.js) | 2 | ||||
-rw-r--r-- | src/containers/subscription/SubscriptionPopupScreen.js (renamed from src/containers/ui/SubscriptionPopupScreen.js) | 2 |
7 files changed, 5 insertions, 5 deletions
diff --git a/src/app.js b/src/app.js index 8e62776d2..97be9f898 100644 --- a/src/app.js +++ b/src/app.js | |||
@@ -35,7 +35,7 @@ import ImportScreen from './containers/auth/ImportScreen'; | |||
35 | import PricingScreen from './containers/auth/PricingScreen'; | 35 | import PricingScreen from './containers/auth/PricingScreen'; |
36 | import InviteScreen from './containers/auth/InviteScreen'; | 36 | import InviteScreen from './containers/auth/InviteScreen'; |
37 | import AuthLayoutContainer from './containers/auth/AuthLayoutContainer'; | 37 | import AuthLayoutContainer from './containers/auth/AuthLayoutContainer'; |
38 | import SubscriptionPopupScreen from './containers/ui/SubscriptionPopupScreen'; | 38 | import SubscriptionPopupScreen from './containers/subscription/SubscriptionPopupScreen'; |
39 | 39 | ||
40 | // Add Polyfills | 40 | // Add Polyfills |
41 | smoothScroll.polyfill(); | 41 | smoothScroll.polyfill(); |
diff --git a/src/components/auth/Pricing.js b/src/components/auth/Pricing.js index 761561a89..3cc8d5f6b 100644 --- a/src/components/auth/Pricing.js +++ b/src/components/auth/Pricing.js | |||
@@ -7,7 +7,7 @@ import { defineMessages, intlShape } from 'react-intl'; | |||
7 | // import Button from '../ui/Button'; | 7 | // import Button from '../ui/Button'; |
8 | import Loader from '../ui/Loader'; | 8 | import Loader from '../ui/Loader'; |
9 | import Appear from '../ui/effects/Appear'; | 9 | import Appear from '../ui/effects/Appear'; |
10 | import SubscriptionForm from '../../containers/ui/SubscriptionFormScreen'; | 10 | import SubscriptionForm from '../../containers/subscription/SubscriptionFormScreen'; |
11 | 11 | ||
12 | const messages = defineMessages({ | 12 | const messages = defineMessages({ |
13 | headline: { | 13 | headline: { |
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js index 43272fe96..4992f0913 100644 --- a/src/components/settings/account/AccountDashboard.js +++ b/src/components/settings/account/AccountDashboard.js | |||
@@ -9,7 +9,7 @@ import Loader from '../../ui/Loader'; | |||
9 | import Button from '../../ui/Button'; | 9 | import Button from '../../ui/Button'; |
10 | import Infobox from '../../ui/Infobox'; | 10 | import Infobox from '../../ui/Infobox'; |
11 | import Link from '../../ui/Link'; | 11 | import Link from '../../ui/Link'; |
12 | import SubscriptionForm from '../../../containers/ui/SubscriptionFormScreen'; | 12 | import SubscriptionForm from '../../../containers/subscription/SubscriptionFormScreen'; |
13 | 13 | ||
14 | const messages = defineMessages({ | 14 | const messages = defineMessages({ |
15 | headline: { | 15 | headline: { |
diff --git a/src/components/ui/Subscription.js b/src/components/subscription/SubscriptionForm.js index dd350479d..dd350479d 100644 --- a/src/components/ui/Subscription.js +++ b/src/components/subscription/SubscriptionForm.js | |||
diff --git a/src/components/ui/SubscriptionPopup.js b/src/components/subscription/SubscriptionPopup.js index 528d02907..528d02907 100644 --- a/src/components/ui/SubscriptionPopup.js +++ b/src/components/subscription/SubscriptionPopup.js | |||
diff --git a/src/containers/ui/SubscriptionFormScreen.js b/src/containers/subscription/SubscriptionFormScreen.js index ac4593670..fc6e3c4be 100644 --- a/src/containers/ui/SubscriptionFormScreen.js +++ b/src/containers/subscription/SubscriptionFormScreen.js | |||
@@ -5,7 +5,7 @@ import { inject, observer } from 'mobx-react'; | |||
5 | 5 | ||
6 | import PaymentStore from '../../stores/PaymentStore'; | 6 | import PaymentStore from '../../stores/PaymentStore'; |
7 | 7 | ||
8 | import SubscriptionForm from '../../components/ui/Subscription'; | 8 | import SubscriptionForm from '../../components/subscription/SubscriptionForm'; |
9 | 9 | ||
10 | const { BrowserWindow } = remote; | 10 | const { BrowserWindow } = remote; |
11 | 11 | ||
diff --git a/src/containers/ui/SubscriptionPopupScreen.js b/src/containers/subscription/SubscriptionPopupScreen.js index 0b6432e50..bb0603170 100644 --- a/src/containers/ui/SubscriptionPopupScreen.js +++ b/src/containers/subscription/SubscriptionPopupScreen.js | |||
@@ -2,7 +2,7 @@ import React, { Component } from 'react'; | |||
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { inject, observer } from 'mobx-react'; | 3 | import { inject, observer } from 'mobx-react'; |
4 | 4 | ||
5 | import SubscriptionPopup from '../../components/ui/SubscriptionPopup'; | 5 | import SubscriptionPopup from '../../components/subscription/SubscriptionPopup'; |
6 | 6 | ||
7 | 7 | ||
8 | @inject('stores', 'actions') @observer | 8 | @inject('stores', 'actions') @observer |