Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP - Global UI #785

Merged
merged 134 commits into from
Dec 7, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
134 commits
Select commit Hold shift + click to select a range
f362b21
update top bar and collections sidebar UI
erquhart Oct 17, 2017
058b3e5
update collection entries UI
erquhart Oct 23, 2017
046fd9f
improve global layout
erquhart Oct 23, 2017
af4bf5d
merge search page into collection page
erquhart Nov 3, 2017
aa39c07
enable new entry button
erquhart Nov 3, 2017
fcb3ccd
search fixup
erquhart Nov 3, 2017
393b7b2
wip -initial editor update
erquhart Nov 4, 2017
925abd8
update editor scrolling and markdown toolbar position
erquhart Nov 6, 2017
65f54a8
wip
erquhart Nov 6, 2017
23e803c
editor toolbar progress
erquhart Nov 8, 2017
69a6f5a
editor toolbar wip
erquhart Nov 8, 2017
5446b85
finished basic editor toolbar
erquhart Nov 8, 2017
2c89892
add standalone toggle component
erquhart Nov 9, 2017
4e6adda
improve markdown toolbar spacing
erquhart Nov 10, 2017
09cad80
add user avatar placeholder
erquhart Nov 10, 2017
62ae33d
finish markdown toggle styling
erquhart Nov 10, 2017
5f454b4
refactor icon setup, add new icons
erquhart Nov 10, 2017
06cd5c3
add new icons to markdown editor toolbar
erquhart Nov 11, 2017
fcac527
remove extra app container
erquhart Nov 11, 2017
91111d9
add markdown active mark style
erquhart Nov 11, 2017
aa19f3e
relation and text widget styling
erquhart Nov 11, 2017
3080e71
widget design updates, basic list/object design update
erquhart Nov 14, 2017
2636b04
widget style updates, image widget improvements
erquhart Nov 14, 2017
402b58f
refactor widget directory, fix file removal
erquhart Nov 14, 2017
26ddcca
widget focus styles
erquhart Nov 14, 2017
1cc8ce1
finish editor widget focus styles
erquhart Nov 15, 2017
dee3eaf
migrate media library modal to react-modal
erquhart Nov 15, 2017
2923ff1
wip - migrate editor component form to modal
erquhart Nov 15, 2017
a0aa43c
wip - move editor component form to modal
erquhart Nov 16, 2017
81f3c4b
wip - embed plugin forms in the editor
erquhart Nov 16, 2017
84e8680
inline shortcode forms working
erquhart Nov 16, 2017
66d2fdb
disable react hot loading, its breaking things
erquhart Nov 17, 2017
2acc8cb
improve shortcode form styles
erquhart Nov 17, 2017
6e4829e
make shortcode form collapsible, improve styling
erquhart Nov 17, 2017
99c158a
add close functionality to shortcode blocks
erquhart Nov 17, 2017
5d45086
improve base media library styling
erquhart Nov 17, 2017
fe5eedf
fix shortcode label
erquhart Nov 17, 2017
172a003
migrate unstyled workflow to new UI
erquhart Nov 18, 2017
1832724
wip - reorganizing everything
erquhart Nov 18, 2017
a72b3f9
more work moving everything
erquhart Nov 20, 2017
8cb8a7d
finish more moving and eliminating stuff
erquhart Nov 21, 2017
132447a
restructure, remove react-toolbox
erquhart Nov 22, 2017
5e388c8
wip - removing old stuff, more restructure
erquhart Nov 22, 2017
2fc6bb8
finish restructure
erquhart Nov 30, 2017
ff25f82
wip - css arch
erquhart Nov 30, 2017
6f84b62
switch back to test repo
erquhart Nov 30, 2017
b282de2
update react-datetime to ^2.11.0
erquhart Nov 30, 2017
8ada998
remove leftover react-toolbox button
erquhart Nov 30, 2017
01cef5b
more restructuring clean-up
erquhart Nov 30, 2017
f2e1b1e
fix UI component directory case
erquhart Nov 30, 2017
d9fb8f5
wip -css editor control style
erquhart Dec 1, 2017
999310d
wip - consolidate widget styles
erquhart Dec 1, 2017
3e0698d
wip - use a single control renderer
erquhart Dec 1, 2017
648e97f
fixed object values breaking
erquhart Dec 1, 2017
ac0a2b8
wip - editor control active styles
erquhart Dec 2, 2017
34dd020
pass control wrapper to widgets
erquhart Dec 2, 2017
39a7131
ensure branch name is trimmed
erquhart Dec 2, 2017
59e84e6
wip - improve widget authoring support
erquhart Dec 2, 2017
aaa9c0d
import Map to Widget component
erquhart Dec 3, 2017
f48d968
refactor toolbar buttons
erquhart Dec 3, 2017
762ff84
wip - more widget active styles
erquhart Dec 3, 2017
06c2e3e
break out editor toggle component
erquhart Dec 4, 2017
34c627c
add local scroll sync back
erquhart Dec 4, 2017
3918c9e
update editor toggle icons
erquhart Dec 4, 2017
11fd54f
limit editor control pane content width
erquhart Dec 4, 2017
5e71774
fix editor control spacing
erquhart Dec 4, 2017
72b6157
migrate markdown toolbar stickiness to css
erquhart Dec 4, 2017
72b4bd4
fix markdown toolbar border radius
erquhart Dec 4, 2017
3812863
temporarily use test backend
erquhart Dec 4, 2017
bfe2bd4
stop markdown toolbar from going to bottom
erquhart Dec 5, 2017
a2ac09f
restore disabled markdown toolbar buttons for raw
erquhart Dec 5, 2017
0d99b7c
test markdown widget without focus styles
erquhart Dec 5, 2017
9e3fe6f
more widget updates
erquhart Dec 5, 2017
5553310
remove card visuals from editor
erquhart Dec 5, 2017
d473f99
disable dragging editor split off screen
erquhart Dec 5, 2017
19fb560
use editorControl component for shortcode fields
erquhart Dec 5, 2017
98d5597
make header site link configurable
erquhart Dec 5, 2017
086cbec
add configurable collection descriptions
erquhart Dec 5, 2017
f939821
temporarily add example assets
erquhart Dec 5, 2017
a9dad97
add basic list view
erquhart Dec 5, 2017
af9e6c5
remove outdated css mixins
erquhart Dec 5, 2017
317a278
add and implement search icon
erquhart Dec 5, 2017
7989043
activate quick add menu
erquhart Dec 5, 2017
32facdb
visualize usable space in editor view
erquhart Dec 5, 2017
cec2244
fix entry close, other improvements
erquhart Dec 5, 2017
41b7c9a
wip - editorial workflow updates
erquhart Dec 5, 2017
cb25398
some dropshadow and other CSS tweaks
Dec 6, 2017
384a46b
workflow ui updates
erquhart Dec 6, 2017
500a38f
add worfklow card buttons
erquhart Dec 6, 2017
705262c
fix workflow card button handlers
erquhart Dec 6, 2017
498c98e
some dropshadow and other CSS tweaks
Dec 6, 2017
2e2a32c
make workflow board wider
erquhart Dec 6, 2017
6a0f0fe
center workflow and collection views
erquhart Dec 6, 2017
adc9047
add basic responsiveness
erquhart Dec 6, 2017
1501fdb
a bunch of fun UI fixes! a BUNCH! (#875)
Dec 6, 2017
d0fe95d
revert to test repo
erquhart Dec 6, 2017
442a18c
fix not found page styling
erquhart Dec 6, 2017
45a8821
allow workflow publishing from any column
erquhart Dec 6, 2017
1490886
disallow publishing from all columns, with feedback
erquhart Dec 6, 2017
f4a72c4
fix new entry button
erquhart Dec 6, 2017
e7f6cc9
fix markdown state persisting across entries
erquhart Dec 6, 2017
890ddb4
enable simple workflow save and new from editor
erquhart Dec 6, 2017
0aef09d
update slug in address bar when saving new entry
erquhart Dec 7, 2017
9441c18
wip - workflow updates, deletion working
erquhart Dec 7, 2017
7a8c985
add status change functionality to editor
erquhart Dec 7, 2017
fe8d430
wip - improving status change from editor
erquhart Dec 7, 2017
5a9ec33
editor toolbar back button improvements, loading improvements, cleanup
Dec 6, 2017
aac3faa
progress on the media library UI cleanup
Dec 7, 2017
7ceb7cb
remove font smothing css
Dec 7, 2017
073d62b
a quick fix for these buttons
Dec 7, 2017
c7f62c7
tweaks
Dec 7, 2017
551b74c
progress on media library modal— broken FYI
Dec 7, 2017
6012d78
fix media library functionality, finish migrating footer
erquhart Dec 7, 2017
3940ff8
remove media library footer files
erquhart Dec 7, 2017
a3eb4fd
remove leftover css import
erquhart Dec 7, 2017
f876e01
fix media library
erquhart Dec 7, 2017
f6811cd
editor publishing functionality complete (unstyled)
erquhart Dec 7, 2017
6c8f06e
remove leftover loader var from media library
erquhart Dec 7, 2017
fbf752a
wip - editor publishing styles
erquhart Dec 7, 2017
8cdaf0d
add status dropdown styling
erquhart Dec 7, 2017
150c6df
editor toolbar style updates
erquhart Dec 7, 2017
3d54567
editor toolbar state improvements
erquhart Dec 7, 2017
e294f7c
progress on the media library UI cleanup, style improvements
Dec 7, 2017
be9b538
finish editorial workflow editor styling
erquhart Dec 7, 2017
8c1cff4
finish media library styling
erquhart Dec 7, 2017
5124069
fix config
erquhart Dec 7, 2017
11f990d
add what-input to optimize focus styling
erquhart Dec 7, 2017
3db6029
fix button
erquhart Dec 7, 2017
639f7e3
fix navigation blocking for simple workflow
erquhart Dec 7, 2017
d47ca93
improve simple workflow publishing
erquhart Dec 7, 2017
39e4ca6
add avatar dropdown to editor top bar
erquhart Dec 7, 2017
e3a33b9
style github and test-repo auth pages
erquhart Dec 7, 2017
f7365ae
add git gateway auth page styles
erquhart Dec 7, 2017
f1e12cb
improve editor error styling
erquhart Dec 7, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"react"
],
"plugins": [
"react-hot-loader/babel",
"lodash",
["babel-plugin-transform-builtin-extend", {
"globals": ["Error"]
Expand Down
8 changes: 0 additions & 8 deletions .storybook/config.js

This file was deleted.

1 change: 0 additions & 1 deletion .storybook/webpack.config.js

This file was deleted.

4 changes: 4 additions & 0 deletions example/config.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
backend:
name: test-repo

display_url: https://example.com
media_folder: "assets/uploads"

collections: # A list of collections the CMS should be able to edit
- name: "posts" # Used in routes, ie.: /admin/collections/:slug/edit
label: "Post" # Used in the UI, ie.: "New Post"
description: >
The description is a great place for tone setting, high level information, and editing
guidelines that are specific to a collection.
folder: "_posts"
slug: "{{year}}-{{month}}-{{day}}-{{slug}}"
create: true # Allow users to create new documents in this collection
Expand Down
Binary file modified example/moby-dick.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 9 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
"build:scripts": "cross-env NODE_ENV=production webpack --config webpack.cli.js",
"add-contributor": "all-contributors add",
"generate-contributors": "all-contributors generate",
"storybook": "start-storybook -p 9001",
"storybook-build": "build-storybook -o dist",
"lint": "npm run lint:js & npm run lint:css",
"lint:js": "eslint .",
"lint:js:fix": "npm run lint:js -- --fix",
Expand Down Expand Up @@ -73,7 +71,6 @@
"last 2 ChromeAndroid versions"
],
"devDependencies": {
"@kadira/storybook": "^1.36.0",
"all-contributors-cli": "^4.4.0",
"babel": "^6.5.2",
"babel-cli": "^6.18.0",
Expand All @@ -87,7 +84,6 @@
"babel-preset-react": "^6.23.0",
"babel-preset-stage-1": "^6.22.0",
"babel-runtime": "^6.23.0",
"caniuse-lite": "^1.0.30000745",
"cross-env": "^5.0.2",
"css-loader": "^0.28.7",
"cssnano": "^v4.0.0-rc.2",
Expand All @@ -110,7 +106,6 @@
"postcss-import": "^11.0.0",
"postcss-loader": "^2.0.7",
"raf": "^3.4.0",
"react-hot-loader": "^3.0.0-beta.7",
"react-test-renderer": "^16.0.0",
"style-loader": "^0.18.2",
"stylefmt": "^4.3.1",
Expand All @@ -119,8 +114,8 @@
"stylelint-config-standard": "^13.0.2",
"stylelint-declaration-block-order": "^0.1.0",
"stylelint-declaration-use-variable": "^1.6.0",
"svg-inline-loader": "^0.8.0",
"uglifyjs-webpack-plugin": "^1.0.1",
"url-loader": "^0.5.9",
"webpack": "^3.6.0",
"webpack-dev-server": "^2.9.1",
"webpack-merge": "^4.1.0",
Expand All @@ -129,7 +124,6 @@
"dependencies": {
"classnames": "^2.2.5",
"create-react-class": "^15.6.0",
"focus-trap-react": "^3.0.3",
"fuzzy": "^0.1.1",
"gotrue-js": "^0.9.15",
"gray-matter": "^3.0.6",
Expand All @@ -140,27 +134,28 @@
"jwt-decode": "^2.1.0",
"localforage": "^1.4.2",
"lodash": "^4.13.1",
"material-design-icons": "^3.0.1",
"mdast-util-definitions": "^1.2.2",
"mdast-util-to-string": "^1.0.4",
"moment": "^2.11.2",
"normalize.css": "^4.2.0",
"prop-types": "^15.5.10",
"react": "^16.0.0",
"react-aria-menubutton": "^5.1.0",
"react-autosuggest": "^9.3.2",
"react-datetime": "^2.6.0",
"react-datetime": "^2.11.0",
"react-dnd": "^2.5.4",
"react-dnd-html5-backend": "^2.5.4",
"react-dom": "^16.0.0",
"react-frame-component": "^2.0.0",
"react-immutable-proptypes": "^2.1.0",
"react-modal": "^3.1.5",
"react-redux": "^4.4.0",
"react-router-dom": "^4.2.2",
"react-router-redux": "^5.0.0-alpha.8",
"react-sidebar": "^2.2.1",
"react-scroll-sync": "^0.4.0",
"react-sortable-hoc": "^0.6.8",
"react-split-pane": "^0.1.66",
"react-toolbox": "^2.0.0-beta.12",
"react-textarea-autosize": "^5.2.0",
"react-toggled": "^1.1.2",
"react-topbar-progress-indicator": "^2.0.0",
"react-transition-group": "^2.2.1",
"react-waypoint": "^7.1.0",
Expand Down Expand Up @@ -189,7 +184,8 @@
"unist-builder": "^1.0.2",
"unist-util-visit-parents": "^1.1.1",
"url": "^0.11.0",
"uuid": "^3.1.0"
"uuid": "^3.1.0",
"what-input": "^5.0.3"
},
"optionalDependencies": {
"fsevents": "^1.0.14"
Expand Down
14 changes: 2 additions & 12 deletions postcss.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,7 @@ const webpack = require('webpack');
module.exports = {
plugins: [
require('postcss-import')({ addDependencyTo: webpack }),
require('postcss-cssnext')({
features: {
customProperties: {
variables: {
"preferred-font": 'inherit', // Override react-toolbox font setting
},
},
},
}),
require('cssnano')({
preset: 'default',
}),
require('postcss-cssnext')(),
require('cssnano')({ preset: 'default' }),
],
};
2 changes: 1 addition & 1 deletion src/actions/auth.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { currentBackend } from '../backends/backend';
import { actions as notifActions } from 'redux-notifications';
import { currentBackend } from 'Backends/backend';

const { notifSend } = notifActions;

Expand Down
14 changes: 14 additions & 0 deletions src/actions/collections.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import history from 'Routing/history';
import { getCollectionUrl, getNewEntryUrl } from 'Lib/urlHelper';

export function searchCollections(query) {
history.push(`/search/${query}`);
}

export function showCollection(collectionName) {
history.push(getCollectionUrl(collectionName));
}

export function createNewEntry(collectionName) {
history.push(getNewEntryUrl(collectionName));
}
4 changes: 2 additions & 2 deletions src/actions/config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import yaml from "js-yaml";
import { set, defaultsDeep, get } from "lodash";
import { authenticateUser } from "../actions/auth";
import * as publishModes from "../constants/publishModes";
import { authenticateUser } from "Actions/auth";
import * as publishModes from "Constants/publishModes";

export const CONFIG_REQUEST = "CONFIG_REQUEST";
export const CONFIG_SUCCESS = "CONFIG_SUCCESS";
Expand Down
22 changes: 0 additions & 22 deletions src/actions/editor.js

This file was deleted.

Loading