hippo-fw 0.9.8 → 0.9.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/client/hippo/access/subscription-choice-layer.jsx +170 -0
- data/client/hippo/access/subscription-choice-layer/cancel-subscription.jsx +111 -0
- data/client/hippo/access/subscription-choice-layer/payment-form.jsx +154 -0
- data/client/hippo/access/subscription-choice-layer/subscription-choice.scss +29 -0
- data/client/hippo/boot.jsx +1 -1
- data/client/hippo/components/asset.jsx +1 -1
- data/client/hippo/components/asset.scss +1 -0
- data/client/hippo/components/data-table.jsx +36 -38
- data/client/hippo/components/date-time.jsx +25 -9
- data/client/hippo/components/form/api.js +1 -0
- data/client/hippo/components/form/fields.jsx +3 -2
- data/client/hippo/components/form/fields/checkbox-wrapper.jsx +1 -1
- data/client/hippo/components/form/fields/date-wrapper.jsx +1 -1
- data/client/hippo/components/form/fields/email-wrapper.jsx +31 -0
- data/client/hippo/components/form/fields/form-field.scss +8 -0
- data/client/hippo/components/form/fields/label.jsx +5 -7
- data/client/hippo/components/form/fields/select-wrapper.jsx +1 -1
- data/client/hippo/components/form/fields/tags-wrapper.jsx +1 -1
- data/client/hippo/components/form/fields/text-wrapper.jsx +1 -1
- data/client/hippo/components/form/fields/textarea-wrapper.jsx +1 -1
- data/client/hippo/components/form/wrapper.jsx +1 -1
- data/client/hippo/components/grid.js +1 -0
- data/client/hippo/components/master-detail.jsx +1 -1
- data/client/hippo/components/network-activity-overlay.jsx +6 -6
- data/client/hippo/components/payments/field.jsx +64 -0
- data/client/hippo/components/payments/field.scss +18 -0
- data/client/hippo/components/popout-window.jsx +1 -1
- data/client/hippo/components/query-builder.jsx +1 -1
- data/client/hippo/components/query-builder/boolean-picker.jsx +1 -1
- data/client/hippo/components/query-builder/clause-filter.jsx +2 -2
- data/client/hippo/components/query-builder/clause.jsx +16 -10
- data/client/hippo/components/query-builder/date-picker.jsx +1 -1
- data/client/hippo/components/query-builder/query-builder.scss +23 -2
- data/client/hippo/components/record-finder.jsx +5 -2
- data/client/hippo/components/record-finder/query-layer.jsx +1 -1
- data/client/hippo/components/save-button.jsx +1 -1
- data/client/hippo/components/screen.jsx +1 -1
- data/client/hippo/components/text-editor.jsx +82 -40
- data/client/hippo/components/text-editor/renderer.jsx +15 -35
- data/client/hippo/components/text-editor/renderer.scss +15 -0
- data/client/hippo/components/text-editor/text-editor.scss +2 -15
- data/client/hippo/components/text-editor/upload-adapter.js +66 -0
- data/client/hippo/components/time-zone-select.jsx +1 -1
- data/client/hippo/components/tool-tip.jsx +9 -14
- data/client/hippo/components/toolbar.jsx +16 -0
- data/client/hippo/components/warning-notification.jsx +1 -1
- data/client/hippo/extensions/base.js +3 -2
- data/client/hippo/extensions/index.js +1 -1
- data/client/hippo/lib/action_cable.js +8 -0
- data/client/hippo/lib/action_cable/cable.js +47 -0
- data/client/hippo/lib/action_cable/connection.js +192 -0
- data/client/hippo/lib/action_cable/connection_monitor.js +135 -0
- data/client/hippo/lib/action_cable/consumer.js +56 -0
- data/client/hippo/lib/action_cable/subscription.js +98 -0
- data/client/hippo/lib/action_cable/subscriptions.js +129 -0
- data/client/hippo/lib/date-range.js +22 -5
- data/client/hippo/lib/lazy-getter.js +31 -0
- data/client/hippo/lib/util.js +6 -1
- data/client/hippo/models/base.js +8 -3
- data/client/hippo/models/config.js +7 -2
- data/client/hippo/models/date-type.js +14 -0
- data/client/hippo/models/decorators.js +5 -5
- data/client/hippo/models/pub_sub.js +1 -1
- data/client/hippo/models/query/array-result.js +4 -1
- data/client/hippo/models/subscription.js +35 -0
- data/client/hippo/models/sync.js +1 -1
- data/client/hippo/models/tenant.js +14 -1
- data/client/hippo/react/component-not-found.jsx +14 -18
- data/client/hippo/screens/async-loading.jsx +46 -0
- data/client/hippo/screens/definition.js +2 -1
- data/client/hippo/screens/preferences.jsx +57 -0
- data/client/hippo/screens/system-settings.jsx +4 -6
- data/client/hippo/screens/system-settings/mailer-config.jsx +1 -1
- data/client/hippo/screens/system-settings/tenant.jsx +57 -4
- data/client/hippo/screens/user-management.jsx +2 -2
- data/client/hippo/screens/user-management/edit-form.jsx +1 -1
- data/client/hippo/styles/global/fancy-header.scss +2 -1
- data/client/hippo/styles/global/mixins.scss +14 -1
- data/client/hippo/testing/index.js +7 -0
- data/client/hippo/user.js +9 -2
- data/client/hippo/workspace/index.jsx +29 -8
- data/client/hippo/workspace/menu-group.jsx +1 -1
- data/client/hippo/workspace/menu-option.jsx +2 -0
- data/client/hippo/workspace/menu.jsx +30 -6
- data/client/hippo/workspace/screen.jsx +5 -1
- data/client/hippo/workspace/styles.scss +22 -3
- data/command-reference-files/initial/Gemfile +1 -1
- data/config/routes.rb +6 -0
- data/config/screens.rb +9 -17
- data/db/migrate/20171129024737_create_subscriptions.rb +12 -0
- data/fixtures/vcr_cassettes/Tenant_changes/sends_email_when_tenant_identifier_changes.yml +72 -0
- data/fixtures/vcr_cassettes/Tenant_isoloation/disallows_using_a_user_s_token_on_incorrect_domain.yml +141 -0
- data/fixtures/vcr_cassettes/Tenant_isoloation/isolates_bar_s_tenant_data_from_foo.yml +141 -0
- data/fixtures/vcr_cassettes/Tenant_isoloation/isolates_foo_s_tenant_data_from_bar.yml +141 -0
- data/hippo-fw.gemspec +4 -3
- data/lib/hippo.rb +1 -0
- data/lib/hippo/access/roles/basic_user.rb +1 -0
- data/lib/hippo/api/authentication_provider.rb +4 -5
- data/lib/hippo/api/handlers/asset.rb +9 -4
- data/lib/hippo/api/handlers/subscription.rb +39 -0
- data/lib/hippo/api/handlers/user_session.rb +0 -1
- data/lib/hippo/api/helper_methods.rb +8 -4
- data/lib/hippo/api/request_wrapper.rb +12 -1
- data/lib/hippo/command/console.rb +3 -3
- data/lib/hippo/concerns/asset_uploader.rb +8 -2
- data/lib/hippo/concerns/pub_sub.rb +8 -8
- data/lib/hippo/configuration.rb +6 -4
- data/lib/hippo/extension.rb +3 -2
- data/lib/hippo/model.rb +1 -0
- data/lib/hippo/models/subscription.rb +7 -0
- data/lib/hippo/payments.rb +129 -0
- data/lib/hippo/screen.rb +4 -2
- data/lib/hippo/screen/definition.rb +4 -0
- data/lib/hippo/spec_helper.rb +4 -4
- data/lib/hippo/templates/liquid/precision.rb +9 -0
- data/lib/hippo/tenant.rb +4 -5
- data/lib/hippo/user.rb +5 -5
- data/lib/hippo/version.rb +1 -1
- data/lib/hippo/webpack.rb +5 -1
- data/package-lock.json +437 -881
- data/package.json +19 -5
- data/spec/client/components/__snapshots__/query-builder.spec.jsx.snap +34 -1
- data/spec/client/components/__snapshots__/record-finder.spec.jsx.snap +1 -0
- data/spec/client/models/base.spec.js +7 -0
- data/spec/client/models/subscription.spec.js +8 -0
- data/spec/client/screens/__snapshots__/preferences.spec.jsx.snap +223 -0
- data/spec/client/screens/preferences.spec.jsx +10 -0
- data/spec/client/test-models.js +1 -1
- data/spec/client/workspace/__snapshots__/menu.spec.jsx.snap +12 -0
- data/spec/factories/subscription.rb +6 -0
- data/spec/factories/tenant.rb +1 -1
- data/spec/factories/user.rb +1 -1
- data/spec/server/api/tenant_change_spec.rb +11 -8
- data/spec/server/api/tenant_isolation_spec.rb +11 -8
- data/spec/server/api/user_sessions_spec.rb +10 -7
- data/spec/server/api/user_spec.rb +45 -0
- data/spec/server/models/subscription_spec.rb +10 -0
- data/spec/server/payment_helpers.rb +13 -0
- data/spec/server/print/form_spec.rb +1 -1
- data/spec/server/spec_helper.rb +3 -11
- data/templates/js/screen-definitions.js +4 -1
- data/templates/spec/factories/model.rb +1 -1
- data/views/hippo_root_view.erb +5 -5
- metadata +84 -25
- data/client/hippo/components/grid/config.json +0 -3
- data/client/hippo/components/grid/editors.scss +0 -78
- data/client/hippo/components/grid/index.js +0 -2
- data/client/hippo/components/grid/row-editor.scss +0 -74
- data/client/hippo/components/grid/styles.scss +0 -118
- data/client/hippo/components/text-editor/display-modes/Button.jsx +0 -20
- data/client/hippo/components/text-editor/display-modes/ToggleEdit.jsx +0 -23
- data/client/hippo/components/text-editor/display-modes/ToggleInsert.jsx +0 -22
- data/client/hippo/components/text-editor/display-modes/ToggleLayout.jsx +0 -22
- data/client/hippo/components/text-editor/display-modes/TogglePreview.jsx +0 -22
- data/client/hippo/components/text-editor/display-modes/ToggleResize.jsx +0 -22
- data/client/hippo/components/text-editor/display-modes/index.css +0 -0
- data/client/hippo/components/text-editor/display-modes/index.js +0 -30
- data/client/hippo/components/text-editor/image-plugin/Component/Display/index.js +0 -82
- data/client/hippo/components/text-editor/image-plugin/Component/Form/index.js +0 -42
- data/client/hippo/components/text-editor/image-plugin/Component/index.js +0 -16
- data/client/hippo/components/text-editor/image-plugin/Component/index.scss +0 -0
- data/client/hippo/components/text-editor/image-plugin/index.js +0 -32
- data/client/hippo/components/text-editor/image-plugin/index.scss +0 -25
- data/client/hippo/components/toolbar/changes-notification.scss +0 -63
- data/client/hippo/components/toolbar/index.js +0 -3
- data/client/hippo/components/toolbar/styles.scss +0 -74
@@ -1,78 +0,0 @@
|
|
1
|
-
// Only to be included from grid/styles
|
2
|
-
|
3
|
-
$editor-background: #e6e6e6;
|
4
|
-
$editor-border-color: #a8a8a8;
|
5
|
-
$editor-border: 1px solid $editor-border-color;
|
6
|
-
|
7
|
-
.toolbar {
|
8
|
-
.pull-right { margin-right: 10px; }
|
9
|
-
}
|
10
|
-
|
11
|
-
.editor {
|
12
|
-
|
13
|
-
.controls {
|
14
|
-
text-align: center;
|
15
|
-
position: relative;
|
16
|
-
overflow: visible;
|
17
|
-
.buttons {
|
18
|
-
display: inline-block;
|
19
|
-
margin: 0 auto;
|
20
|
-
//display: flex;
|
21
|
-
//justify-content: space-between;
|
22
|
-
}
|
23
|
-
}
|
24
|
-
// common styles shared between row, popover and other editors
|
25
|
-
.fields {
|
26
|
-
display: flex;
|
27
|
-
|
28
|
-
.field {
|
29
|
-
box-sizing: border-box;
|
30
|
-
margin: 3px;
|
31
|
-
flex: 1;
|
32
|
-
justify-content: center;
|
33
|
-
display: flex;
|
34
|
-
flex-direction: column;
|
35
|
-
> input {
|
36
|
-
width: 100%;
|
37
|
-
height: 35px;
|
38
|
-
border-radius: 5px;
|
39
|
-
}
|
40
|
-
&.center { justify-content: center; }
|
41
|
-
&.right { justify-content: flex-end; }
|
42
|
-
}
|
43
|
-
input {
|
44
|
-
padding: 0 5px;
|
45
|
-
}
|
46
|
-
input[type=checkbox] {
|
47
|
-
width: inherit;
|
48
|
-
}
|
49
|
-
}
|
50
|
-
|
51
|
-
//Popover editor
|
52
|
-
.popover {
|
53
|
-
min-width: 250px;
|
54
|
-
.fields {
|
55
|
-
flex-direction: column;
|
56
|
-
}
|
57
|
-
label {
|
58
|
-
display: block;
|
59
|
-
font-size: 85%;
|
60
|
-
}
|
61
|
-
input {
|
62
|
-
width: 100%;
|
63
|
-
}
|
64
|
-
.controls {
|
65
|
-
border-top: 1px solid darken($editor-background, 15%);
|
66
|
-
padding-top: 8px;
|
67
|
-
margin-top: 8px;
|
68
|
-
.buttons {
|
69
|
-
display: flex;
|
70
|
-
flex-direction: row;
|
71
|
-
justify-content: space-around;
|
72
|
-
flex: 1;
|
73
|
-
}
|
74
|
-
}
|
75
|
-
}
|
76
|
-
}
|
77
|
-
|
78
|
-
@import "./row-editor";
|
@@ -1,74 +0,0 @@
|
|
1
|
-
// The row editor
|
2
|
-
.editor.row {
|
3
|
-
position: absolute;
|
4
|
-
width: 100%;
|
5
|
-
right: 25px;
|
6
|
-
left: 5px;
|
7
|
-
z-index:11;
|
8
|
-
min-height: 10px;
|
9
|
-
|
10
|
-
pointer-events: none;
|
11
|
-
.editing-body { pointer-events: none; }
|
12
|
-
.fields { pointer-events: all; }
|
13
|
-
.controls { pointer-events: none; }
|
14
|
-
.buttons { pointer-events: all; }
|
15
|
-
|
16
|
-
label { display: none; }
|
17
|
-
|
18
|
-
.fields {
|
19
|
-
flex-direction: row;
|
20
|
-
background: $editor-background;
|
21
|
-
.value {
|
22
|
-
width: 100%;
|
23
|
-
height: 35px;
|
24
|
-
border-radius: 5px;
|
25
|
-
flex: 1;
|
26
|
-
.rw-input { height: 35px; }
|
27
|
-
}
|
28
|
-
.field {
|
29
|
-
&.center input { text-align: center; }
|
30
|
-
&.right input { text-align: right; }
|
31
|
-
}
|
32
|
-
.hippo-field, .form-group {
|
33
|
-
flex: 1;
|
34
|
-
display: flex;
|
35
|
-
align-items: center;
|
36
|
-
margin: 0;
|
37
|
-
}
|
38
|
-
}
|
39
|
-
.controls .buttons {
|
40
|
-
background: $editor-background;
|
41
|
-
padding: 2px 8px 8px 8px;
|
42
|
-
position: relative;
|
43
|
-
border-bottom-left-radius: 7px;
|
44
|
-
border-bottom-right-radius: 7px;
|
45
|
-
|
46
|
-
button {
|
47
|
-
margin-left: 20px;
|
48
|
-
&:first-child {
|
49
|
-
margin-left: 0;
|
50
|
-
}
|
51
|
-
}
|
52
|
-
// http://css-tricks.com/better-tabs-with-round-out-borders/
|
53
|
-
&:before,
|
54
|
-
&:after {
|
55
|
-
position: absolute;
|
56
|
-
top: -1px;
|
57
|
-
width: 7px;
|
58
|
-
height: 6px;
|
59
|
-
content: " ";
|
60
|
-
}
|
61
|
-
&:before {
|
62
|
-
left: -7px;
|
63
|
-
border-top-right-radius: 6px;
|
64
|
-
border-width: 1px 1px 0px 0px;
|
65
|
-
box-shadow: 3px 0px 0px $editor-background;
|
66
|
-
}
|
67
|
-
&:after {
|
68
|
-
right: -7px;
|
69
|
-
border-top-left-radius: 6px;
|
70
|
-
border-width: 1px 0px 0px 1px;
|
71
|
-
box-shadow: -3px 0px 0px $editor-background;
|
72
|
-
}
|
73
|
-
}
|
74
|
-
}
|
@@ -1,118 +0,0 @@
|
|
1
|
-
.grid-component {
|
2
|
-
|
3
|
-
min-height: 250px;
|
4
|
-
width: 100%;
|
5
|
-
border: 1px solid $table-border-color;
|
6
|
-
position: relative;
|
7
|
-
|
8
|
-
display: flex;
|
9
|
-
flex-direction: column;
|
10
|
-
flex: 1;
|
11
|
-
|
12
|
-
// styles shared between header and row
|
13
|
-
.header, .r {
|
14
|
-
display: flex;
|
15
|
-
flex-direction: row;
|
16
|
-
min-height: 40px;
|
17
|
-
display: flex;
|
18
|
-
flex-direction: row;
|
19
|
-
page-break-inside: avoid;
|
20
|
-
.c {
|
21
|
-
padding: $table-cell-padding;
|
22
|
-
line-height: $line-height-base;
|
23
|
-
display: flex;
|
24
|
-
flex-direction: row;
|
25
|
-
&.center { justify-content: center; }
|
26
|
-
&.right { justify-content: flex-end; }
|
27
|
-
|
28
|
-
}
|
29
|
-
&:first-child {
|
30
|
-
border-top: 0;
|
31
|
-
}
|
32
|
-
}
|
33
|
-
|
34
|
-
.header {
|
35
|
-
min-height: 40px;
|
36
|
-
.c {
|
37
|
-
border: 1px solid $table-border-color;
|
38
|
-
align-items: flex-end;
|
39
|
-
display: inline-block;
|
40
|
-
cursor: pointer;
|
41
|
-
|
42
|
-
display: flex;
|
43
|
-
flex-direction: row;
|
44
|
-
align-items: center;
|
45
|
-
justify-content: space-between;
|
46
|
-
&.sort {
|
47
|
-
&:after {
|
48
|
-
content: $fa-var-sort;
|
49
|
-
font-family: FontAwesome;
|
50
|
-
position: relative;
|
51
|
-
right: -5px;
|
52
|
-
color: lightgray;
|
53
|
-
}
|
54
|
-
&.center {
|
55
|
-
position: relative;
|
56
|
-
&:after {
|
57
|
-
right: 5px;
|
58
|
-
position: absolute;
|
59
|
-
}
|
60
|
-
}
|
61
|
-
|
62
|
-
&:not(.asc):not(.desc) {
|
63
|
-
&:after {
|
64
|
-
@include hidden-print;
|
65
|
-
}
|
66
|
-
}
|
67
|
-
&.asc:after {
|
68
|
-
color: gray;
|
69
|
-
content: $fa-var-sort-asc;
|
70
|
-
}
|
71
|
-
&.desc:after {
|
72
|
-
color: gray;
|
73
|
-
content: $fa-var-sort-desc;
|
74
|
-
}
|
75
|
-
}
|
76
|
-
}
|
77
|
-
}
|
78
|
-
.r {
|
79
|
-
margin-right: 10px;
|
80
|
-
page-break-inside: avoid;
|
81
|
-
break-inside: avoid-page;
|
82
|
-
margin-left: 5px;
|
83
|
-
}
|
84
|
-
.grid-body {
|
85
|
-
border-top: 1px solid $table-border-color;
|
86
|
-
overflow: auto;
|
87
|
-
position: relative; // for absolutely positioned row editor
|
88
|
-
flex-grow: 1;
|
89
|
-
height: 1px; // panel needs height to force scroll
|
90
|
-
@media print {
|
91
|
-
overflow: visible;
|
92
|
-
height: initial;
|
93
|
-
}
|
94
|
-
|
95
|
-
.c {
|
96
|
-
align-items: center;
|
97
|
-
}
|
98
|
-
.r {
|
99
|
-
&.focused {
|
100
|
-
outline-style: dotted;
|
101
|
-
outline-width: 2px;
|
102
|
-
outline-color: gray;
|
103
|
-
}
|
104
|
-
&:nth-child(odd) {
|
105
|
-
background-color: $table-bg-accent;
|
106
|
-
}
|
107
|
-
}
|
108
|
-
}
|
109
|
-
|
110
|
-
.toolbar {
|
111
|
-
margin-bottom: 0;
|
112
|
-
border-bottom-left-radius: 0;
|
113
|
-
border-bottom-right-radius: 0;
|
114
|
-
}
|
115
|
-
|
116
|
-
@import "./editors";
|
117
|
-
|
118
|
-
}
|
@@ -1,20 +0,0 @@
|
|
1
|
-
import React from 'react'; // eslint-disable-line no-unused-vars
|
2
|
-
import Button from 'grommet/components/Button';
|
3
|
-
import cn from 'classnames';
|
4
|
-
|
5
|
-
const DisplayModeButton = ({
|
6
|
-
className, label, icon, onClick, active, disabled,
|
7
|
-
}) => (
|
8
|
-
<span className={cn(className, { active })}>
|
9
|
-
<Button
|
10
|
-
plain
|
11
|
-
secondary={active}
|
12
|
-
onClick={onClick}
|
13
|
-
label={label}
|
14
|
-
disabled={disabled}
|
15
|
-
icon={icon}
|
16
|
-
/>
|
17
|
-
</span>
|
18
|
-
);
|
19
|
-
|
20
|
-
export default DisplayModeButton;
|
@@ -1,23 +0,0 @@
|
|
1
|
-
// @flow
|
2
|
-
import React from 'react'; // eslint-disable-line no-unused-vars
|
3
|
-
import { connect } from 'react-redux';
|
4
|
-
import { editMode } from 'ory-editor-core/lib/actions/display';
|
5
|
-
import { isEditMode } from 'ory-editor-core/lib/selector/display';
|
6
|
-
import { createStructuredSelector } from 'reselect';
|
7
|
-
import EditIcon from 'grommet/components/icons/base/Edit';
|
8
|
-
import Button from './Button';
|
9
|
-
|
10
|
-
const Inner = ({ className, isEditMode: isedm, editMode: edm }) => (
|
11
|
-
<Button
|
12
|
-
className={className}
|
13
|
-
icon={<EditIcon />}
|
14
|
-
label="Edit"
|
15
|
-
active={isedm}
|
16
|
-
onClick={edm}
|
17
|
-
/>
|
18
|
-
);
|
19
|
-
|
20
|
-
const mapStateToProps = createStructuredSelector({ isEditMode });
|
21
|
-
const mapDispatchToProps = { editMode };
|
22
|
-
|
23
|
-
export default connect(mapStateToProps, mapDispatchToProps)(Inner);
|
@@ -1,22 +0,0 @@
|
|
1
|
-
import React from 'react'; // eslint-disable-line no-unused-vars
|
2
|
-
import AddIcon from 'grommet/components/icons/base/TableAdd';
|
3
|
-
import { connect } from 'react-redux';
|
4
|
-
import { insertMode } from 'ory-editor-core/lib/actions/display';
|
5
|
-
import { isInsertMode } from 'ory-editor-core/lib/selector/display';
|
6
|
-
import { createStructuredSelector } from 'reselect';
|
7
|
-
import Button from './Button';
|
8
|
-
|
9
|
-
const Inner = ({ className, isInsertMode: isinm, insertMode: inm }) => (
|
10
|
-
<Button
|
11
|
-
className={className}
|
12
|
-
icon={<AddIcon />}
|
13
|
-
label="Add"
|
14
|
-
active={isinm}
|
15
|
-
onClick={inm}
|
16
|
-
/>
|
17
|
-
);
|
18
|
-
|
19
|
-
const mapStateToProps = createStructuredSelector({ isInsertMode });
|
20
|
-
const mapDispatchToProps = { insertMode };
|
21
|
-
|
22
|
-
export default connect(mapStateToProps, mapDispatchToProps)(Inner);
|
@@ -1,22 +0,0 @@
|
|
1
|
-
import React from 'react'; // eslint-disable-line no-unused-vars
|
2
|
-
import GridIcon from 'grommet/components/icons/base/Grid';
|
3
|
-
import { connect } from 'react-redux';
|
4
|
-
import { layoutMode } from 'ory-editor-core/lib/actions/display';
|
5
|
-
import { isLayoutMode } from 'ory-editor-core/lib/selector/display';
|
6
|
-
import { createStructuredSelector } from 'reselect';
|
7
|
-
import Button from './Button';
|
8
|
-
|
9
|
-
const Inner = ({ className, isLayoutMode: islm, layoutMode: lm }) => (
|
10
|
-
<Button
|
11
|
-
className={className}
|
12
|
-
icon={<GridIcon />}
|
13
|
-
label="Layout"
|
14
|
-
active={islm}
|
15
|
-
onClick={lm}
|
16
|
-
/>
|
17
|
-
);
|
18
|
-
|
19
|
-
const mapStateToProps = createStructuredSelector({ isLayoutMode });
|
20
|
-
const mapDispatchToProps = { layoutMode };
|
21
|
-
|
22
|
-
export default connect(mapStateToProps, mapDispatchToProps)(Inner);
|
@@ -1,22 +0,0 @@
|
|
1
|
-
import React from 'react'; // eslint-disable-line no-unused-vars
|
2
|
-
import Devices from 'material-ui/svg-icons/device/devices';
|
3
|
-
import { connect } from 'react-redux';
|
4
|
-
import { previewMode } from 'ory-editor-core/lib/actions/display';
|
5
|
-
import { isPreviewMode } from 'ory-editor-core/lib/selector/display';
|
6
|
-
import { createStructuredSelector } from 'reselect';
|
7
|
-
import Button from './Button';
|
8
|
-
|
9
|
-
const Inner = ({ className, isPreviewMode: ispvm, previewMode: pvm }) => (
|
10
|
-
<Button
|
11
|
-
className={className}
|
12
|
-
icon={<Devices />}
|
13
|
-
label="Preview"
|
14
|
-
active={ispvm}
|
15
|
-
onClick={pvm}
|
16
|
-
/>
|
17
|
-
);
|
18
|
-
|
19
|
-
const mapStateToProps = createStructuredSelector({ isPreviewMode });
|
20
|
-
const mapDispatchToProps = { previewMode };
|
21
|
-
|
22
|
-
export default connect(mapStateToProps, mapDispatchToProps)(Inner);
|
@@ -1,22 +0,0 @@
|
|
1
|
-
import React from 'react'; // eslint-disable-line no-unused-vars
|
2
|
-
import ResizeIcon from 'grommet/components/icons/base/Pan';
|
3
|
-
import { connect } from 'react-redux';
|
4
|
-
import { resizeMode } from 'ory-editor-core/lib/actions/display';
|
5
|
-
import { isResizeMode } from 'ory-editor-core/lib/selector/display';
|
6
|
-
import { createStructuredSelector } from 'reselect';
|
7
|
-
import Button from './Button';
|
8
|
-
|
9
|
-
const Inner = ({ className, isResizeMode: isrsm, resizeMode: rsm }) => (
|
10
|
-
<Button
|
11
|
-
className={className}
|
12
|
-
icon={<ResizeIcon />}
|
13
|
-
label="Resize"
|
14
|
-
active={isrsm}
|
15
|
-
onClick={rsm}
|
16
|
-
/>
|
17
|
-
);
|
18
|
-
|
19
|
-
const mapStateToProps = createStructuredSelector({ isResizeMode });
|
20
|
-
const mapDispatchToProps = { resizeMode };
|
21
|
-
|
22
|
-
export default connect(mapStateToProps, mapDispatchToProps)(Inner);
|
File without changes
|
@@ -1,30 +0,0 @@
|
|
1
|
-
import React from 'react'; // eslint-disable-line no-unused-vars
|
2
|
-
import Header from 'grommet/components/Header';
|
3
|
-
import Provider from 'ory-editor-ui/lib/Provider';
|
4
|
-
import ToggleEdit from './ToggleEdit';
|
5
|
-
import ToggleInsert from './ToggleInsert';
|
6
|
-
import ToggleLayout from './ToggleLayout';
|
7
|
-
import TogglePreview from './TogglePreview';
|
8
|
-
import ToggleResize from './ToggleResize';
|
9
|
-
|
10
|
-
|
11
|
-
const Inner = (props: any) => (
|
12
|
-
<Provider {...props}>
|
13
|
-
<Header
|
14
|
-
wrap
|
15
|
-
|
16
|
-
margin="small"
|
17
|
-
justify="end"
|
18
|
-
pad={{ horizontal: 'small' }}
|
19
|
-
>
|
20
|
-
<ToggleInsert className="insert" />
|
21
|
-
<ToggleEdit className="edit" />
|
22
|
-
<ToggleLayout className="layout" />
|
23
|
-
<ToggleResize className="resize" />
|
24
|
-
<TogglePreview className="preview" />
|
25
|
-
{props.children}
|
26
|
-
</Header>
|
27
|
-
</Provider>
|
28
|
-
);
|
29
|
-
|
30
|
-
export default Inner;
|