Skip to content

Commit cfbf31b

Browse files
authored
WIP - Global UI (decaporg#785)
* update top bar and collections sidebar UI * update collection entries UI * improve global layout * merge search page into collection page * enable new entry button * search fixup * wip -initial editor update * update editor scrolling and markdown toolbar position * wip * editor toolbar progress * editor toolbar wip * finished basic editor toolbar * add standalone toggle component * improve markdown toolbar spacing * add user avatar placeholder * finish markdown toggle styling * refactor icon setup, add new icons * add new icons to markdown editor toolbar * remove extra app container * add markdown active mark style * relation and text widget styling * widget design updates, basic list/object design update * widget style updates, image widget improvements * refactor widget directory, fix file removal * widget focus styles * finish editor widget focus styles * migrate media library modal to react-modal * wip - migrate editor component form to modal * wip - move editor component form to modal * wip - embed plugin forms in the editor * inline shortcode forms working * disable react hot loading, its breaking things * improve shortcode form styles * make shortcode form collapsible, improve styling * add close functionality to shortcode blocks * improve base media library styling * fix shortcode label * migrate unstyled workflow to new UI * wip - reorganizing everything * more work moving everything * finish more moving and eliminating stuff * restructure, remove react-toolbox * wip - removing old stuff, more restructure * finish restructure * wip - css arch * switch back to test repo * update react-datetime to ^2.11.0 * remove leftover react-toolbox button * more restructuring clean-up * fix UI component directory case * wip -css editor control style * wip - consolidate widget styles * wip - use a single control renderer * fixed object values breaking * wip - editor control active styles * pass control wrapper to widgets * ensure branch name is trimmed * wip - improve widget authoring support * import Map to Widget component * refactor toolbar buttons * wip - more widget active styles * break out editor toggle component * add local scroll sync back * update editor toggle icons * limit editor control pane content width * fix editor control spacing * migrate markdown toolbar stickiness to css * fix markdown toolbar border radius * temporarily use test backend * stop markdown toolbar from going to bottom * restore disabled markdown toolbar buttons for raw * test markdown widget without focus styles * more widget updates * remove card visuals from editor * disable dragging editor split off screen * use editorControl component for shortcode fields * make header site link configurable * add configurable collection descriptions * temporarily add example assets * add basic list view * remove outdated css mixins * add and implement search icon * activate quick add menu * visualize usable space in editor view * fix entry close, other improvements * wip - editorial workflow updates * some dropshadow and other CSS tweaks * workflow ui updates * add worfklow card buttons * fix workflow card button handlers * some dropshadow and other CSS tweaks * make workflow board wider * center workflow and collection views * add basic responsiveness * a bunch of fun UI fixes! a BUNCH! (decaporg#875) * give `.nc-entryEditor-toolbar-mainSection` left and right child divs * a bunch of fun UI fixes! a BUNCH! * remove obscure --buttonShadow * revert to test repo * fix not found page styling * allow workflow publishing from any column * disallow publishing from all columns, with feedback * fix new entry button * fix markdown state persisting across entries * enable simple workflow save and new from editor * update slug in address bar when saving new entry * wip - workflow updates, deletion working * add status change functionality to editor * wip - improving status change from editor * editor toolbar back button improvements, loading improvements, cleanup * progress on the media library UI cleanup * remove font smothing css * a quick fix for these buttons * tweaks * progress on media library modal— broken FYI * fix media library functionality, finish migrating footer * remove media library footer files * remove leftover css import * fix media library * editor publishing functionality complete (unstyled) * remove leftover loader var from media library * wip - editor publishing styles * add status dropdown styling * editor toolbar style updates * editor toolbar state improvements * progress on the media library UI cleanup, style improvements * finish editorial workflow editor styling * finish media library styling * fix config * add what-input to optimize focus styling * fix button * fix navigation blocking for simple workflow * improve simple workflow publishing * add avatar dropdown to editor top bar * style github and test-repo auth pages * add git gateway auth page styles * improve editor error styling
1 parent 41af113 commit cfbf31b

File tree

344 files changed

+6963
-7414
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

344 files changed

+6963
-7414
lines changed

.babelrc

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"react"
88
],
99
"plugins": [
10-
"react-hot-loader/babel",
1110
"lodash",
1211
["babel-plugin-transform-builtin-extend", {
1312
"globals": ["Error"]

.storybook/config.js

-8
This file was deleted.

.storybook/webpack.config.js

-1
This file was deleted.

example/config.yml

+4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
backend:
22
name: test-repo
33

4+
display_url: https://example.com
45
media_folder: "assets/uploads"
56

67
collections: # A list of collections the CMS should be able to edit
78
- name: "posts" # Used in routes, ie.: /admin/collections/:slug/edit
89
label: "Post" # Used in the UI, ie.: "New Post"
10+
description: >
11+
The description is a great place for tone setting, high level information, and editing
12+
guidelines that are specific to a collection.
913
folder: "_posts"
1014
slug: "{{year}}-{{month}}-{{day}}-{{slug}}"
1115
create: true # Allow users to create new documents in this collection

example/moby-dick.jpg

346 KB
Loading

package.json

+9-13
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
"build:scripts": "cross-env NODE_ENV=production webpack --config webpack.cli.js",
1212
"add-contributor": "all-contributors add",
1313
"generate-contributors": "all-contributors generate",
14-
"storybook": "start-storybook -p 9001",
15-
"storybook-build": "build-storybook -o dist",
1614
"lint": "npm run lint:js & npm run lint:css",
1715
"lint:js": "eslint .",
1816
"lint:js:fix": "npm run lint:js -- --fix",
@@ -73,7 +71,6 @@
7371
"last 2 ChromeAndroid versions"
7472
],
7573
"devDependencies": {
76-
"@kadira/storybook": "^1.36.0",
7774
"all-contributors-cli": "^4.4.0",
7875
"babel": "^6.5.2",
7976
"babel-cli": "^6.18.0",
@@ -87,7 +84,6 @@
8784
"babel-preset-react": "^6.23.0",
8885
"babel-preset-stage-1": "^6.22.0",
8986
"babel-runtime": "^6.23.0",
90-
"caniuse-lite": "^1.0.30000745",
9187
"cross-env": "^5.0.2",
9288
"css-loader": "^0.28.7",
9389
"cssnano": "^v4.0.0-rc.2",
@@ -110,7 +106,6 @@
110106
"postcss-import": "^11.0.0",
111107
"postcss-loader": "^2.0.7",
112108
"raf": "^3.4.0",
113-
"react-hot-loader": "^3.0.0-beta.7",
114109
"react-test-renderer": "^16.0.0",
115110
"style-loader": "^0.18.2",
116111
"stylefmt": "^4.3.1",
@@ -119,8 +114,8 @@
119114
"stylelint-config-standard": "^13.0.2",
120115
"stylelint-declaration-block-order": "^0.1.0",
121116
"stylelint-declaration-use-variable": "^1.6.0",
117+
"svg-inline-loader": "^0.8.0",
122118
"uglifyjs-webpack-plugin": "^1.0.1",
123-
"url-loader": "^0.5.9",
124119
"webpack": "^3.6.0",
125120
"webpack-dev-server": "^2.9.1",
126121
"webpack-merge": "^4.1.0",
@@ -129,7 +124,6 @@
129124
"dependencies": {
130125
"classnames": "^2.2.5",
131126
"create-react-class": "^15.6.0",
132-
"focus-trap-react": "^3.0.3",
133127
"fuzzy": "^0.1.1",
134128
"gotrue-js": "^0.9.15",
135129
"gray-matter": "^3.0.6",
@@ -140,27 +134,28 @@
140134
"jwt-decode": "^2.1.0",
141135
"localforage": "^1.4.2",
142136
"lodash": "^4.13.1",
143-
"material-design-icons": "^3.0.1",
144137
"mdast-util-definitions": "^1.2.2",
145138
"mdast-util-to-string": "^1.0.4",
146139
"moment": "^2.11.2",
147-
"normalize.css": "^4.2.0",
148140
"prop-types": "^15.5.10",
149141
"react": "^16.0.0",
142+
"react-aria-menubutton": "^5.1.0",
150143
"react-autosuggest": "^9.3.2",
151-
"react-datetime": "^2.6.0",
144+
"react-datetime": "^2.11.0",
152145
"react-dnd": "^2.5.4",
153146
"react-dnd-html5-backend": "^2.5.4",
154147
"react-dom": "^16.0.0",
155148
"react-frame-component": "^2.0.0",
156149
"react-immutable-proptypes": "^2.1.0",
150+
"react-modal": "^3.1.5",
157151
"react-redux": "^4.4.0",
158152
"react-router-dom": "^4.2.2",
159153
"react-router-redux": "^5.0.0-alpha.8",
160-
"react-sidebar": "^2.2.1",
154+
"react-scroll-sync": "^0.4.0",
161155
"react-sortable-hoc": "^0.6.8",
162156
"react-split-pane": "^0.1.66",
163-
"react-toolbox": "^2.0.0-beta.12",
157+
"react-textarea-autosize": "^5.2.0",
158+
"react-toggled": "^1.1.2",
164159
"react-topbar-progress-indicator": "^2.0.0",
165160
"react-transition-group": "^2.2.1",
166161
"react-waypoint": "^7.1.0",
@@ -189,7 +184,8 @@
189184
"unist-builder": "^1.0.2",
190185
"unist-util-visit-parents": "^1.1.1",
191186
"url": "^0.11.0",
192-
"uuid": "^3.1.0"
187+
"uuid": "^3.1.0",
188+
"what-input": "^5.0.3"
193189
},
194190
"optionalDependencies": {
195191
"fsevents": "^1.0.14"

postcss.config.js

+2-12
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,7 @@ const webpack = require('webpack');
33
module.exports = {
44
plugins: [
55
require('postcss-import')({ addDependencyTo: webpack }),
6-
require('postcss-cssnext')({
7-
features: {
8-
customProperties: {
9-
variables: {
10-
"preferred-font": 'inherit', // Override react-toolbox font setting
11-
},
12-
},
13-
},
14-
}),
15-
require('cssnano')({
16-
preset: 'default',
17-
}),
6+
require('postcss-cssnext')(),
7+
require('cssnano')({ preset: 'default' }),
188
],
199
};

src/actions/auth.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { currentBackend } from '../backends/backend';
21
import { actions as notifActions } from 'redux-notifications';
2+
import { currentBackend } from 'Backends/backend';
33

44
const { notifSend } = notifActions;
55

src/actions/collections.js

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import history from 'Routing/history';
2+
import { getCollectionUrl, getNewEntryUrl } from 'Lib/urlHelper';
3+
4+
export function searchCollections(query) {
5+
history.push(`/search/${query}`);
6+
}
7+
8+
export function showCollection(collectionName) {
9+
history.push(getCollectionUrl(collectionName));
10+
}
11+
12+
export function createNewEntry(collectionName) {
13+
history.push(getNewEntryUrl(collectionName));
14+
}

src/actions/config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import yaml from "js-yaml";
22
import { set, defaultsDeep, get } from "lodash";
3-
import { authenticateUser } from "../actions/auth";
4-
import * as publishModes from "../constants/publishModes";
3+
import { authenticateUser } from "Actions/auth";
4+
import * as publishModes from "Constants/publishModes";
55

66
export const CONFIG_REQUEST = "CONFIG_REQUEST";
77
export const CONFIG_SUCCESS = "CONFIG_SUCCESS";

src/actions/editor.js

-22
This file was deleted.

0 commit comments

Comments
 (0)