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.

Sign up for GitHub

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

Jump to bottom

Reorganize folders within editor #408

Closed
wants to merge 3 commits into from
Closed

Reorganize folders within editor #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe70e90
Move "components" to top level. Reorganize editor specific ones.
mtias Apr 12, 2017
8993b67
Move "modes" to root of editor.
mtias Apr 12, 2017
251adb3
Update import paths.
mtias Apr 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion editor/components/toolbar/index.js → components/block-toolbar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import classNames from 'classnames';
* Internal dependencies
*/
import './style.scss';
import Dashicon from 'components/dashicon';
import Dashicon from 'dashicon';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't dashicon still be under components?


function Toolbar( { controls } ) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here and elsewhere, if we're changing the filename the component name should also change (to BlockToolbar in this case).

if ( ! controls || ! controls.length ) {
Expand Down
0 editor/components/toolbar/style.scss → components/block-toolbar/style.scss
View file
Open in desktop
File renamed without changes.
0 editor/components/button/index.js → components/button/index.js
View file
Open in desktop
File renamed without changes.
0 editor/components/button/style.scss → components/button/style.scss
View file
Open in desktop
File renamed without changes.
0 editor/components/dashicon/index.js → components/dashicon/index.js
View file
Open in desktop
File renamed without changes.
0 editor/components/icon-button/index.js → components/icon-button/index.js
View file
Open in desktop
File renamed without changes.
0 editor/components/icon-button/style.scss → components/icon-button/style.scss
View file
Open in desktop
File renamed without changes.
Empty file added components/index.js
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion editor/header/mode-switcher/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { connect } from 'react-redux';
* Internal dependencies
*/
import './style.scss';
import Dashicon from 'components/dashicon';
import Dashicon from '../../../components/dashicon';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm pretty sure this should still just be components/dashicon - see #386.


/**
* Set of available mode options.
Expand Down
2 changes: 1 addition & 1 deletion editor/header/saved-state/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Internal dependencies
*/
import './style.scss';
import Dashicon from '../../components/dashicon';
import Dashicon from '../../../components/dashicon';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same, we shouldn't need these relative paths any more.


function SavedState() {
return (
Expand Down
8 changes: 4 additions & 4 deletions editor/header/tools/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
* Internal dependencies
*/
import './style.scss';
import Dashicon from '../../components/dashicon';
import IconButton from '../../components/icon-button';
import Inserter from '../../components/inserter';
import Button from '../../components/button';
import Dashicon from '../../../components/dashicon';
import IconButton from '../../../components/icon-button';
import Inserter from 'inserter';
import Button from '../../../components/button';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same, we shouldn't need these relative paths any more. If I'm wrong about that, then it seems like we need to reconsider how the import paths work.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was having issues with the entry points, but I also put this together very roughly to communicate the structure.


function Tools() {
return (
Expand Down
2 changes: 1 addition & 1 deletion editor/components/inserter/index.js → editor/inserter/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Internal dependencies
*/
import InserterMenu from './menu';
import IconButton from 'components/icon-button';
import IconButton from '../../components/icon-button';

class Inserter extends wp.element.Component {
constructor() {
Expand Down
2 changes: 1 addition & 1 deletion editor/components/inserter/menu.js → editor/inserter/menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Internal dependencies
*/
import './style.scss';
import Dashicon from 'components/dashicon';
import Dashicon from '../../components/dashicon';

function InserterMenu() {
const blocks = wp.blocks.getBlocks();
Expand Down
0 editor/components/inserter/style.scss → editor/inserter/style.scss
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions editor/layout/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import { connect } from 'react-redux';
* Internal dependencies
*/
import Header from 'header';
import TextEditor from 'modes/text-editor';
import VisualEditor from 'modes/visual-editor';
import TextEditor from 'text-editor';
import VisualEditor from 'visual-editor';

function Layout( { mode } ) {
return (
Expand Down
0 editor/modes/text-editor/index.js → editor/text-editor/index.js
View file
Open in desktop
File renamed without changes.
0 editor/modes/text-editor/style.scss → editor/text-editor/style.scss
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion editor/modes/visual-editor/block.js → editor/visual-editor/block.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import classnames from 'classnames';
/**
* Internal dependencies
*/
import Toolbar from 'components/toolbar';
import Toolbar from '../../components/block-toolbar';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be BlockToolbar here and in other usage as well.


function VisualEditorBlock( props ) {
const { block } = props;
Expand Down
2 changes: 1 addition & 1 deletion editor/modes/visual-editor/index.js → editor/visual-editor/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { connect } from 'react-redux';
* Internal dependencies
*/
import './style.scss';
import Inserter from 'components/inserter';
import Inserter from 'inserter';
import VisualEditorBlock from './block';

function VisualEditor( { blocks } ) {
Expand Down
0 editor/modes/visual-editor/style.scss → editor/visual-editor/style.scss
View file
Open in desktop
File renamed without changes.
16 changes: 8 additions & 8 deletions languages/gutenberg.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,6 @@ msgstr ""
msgid "Justify"
msgstr ""

#: editor/components/inserter/index.js:29
msgid "Insert block"
msgstr ""

#: editor/components/inserter/menu.js:40
msgid "Search…"
msgstr ""

#: editor/header/mode-switcher/index.js:20
msgid "Visual"
msgstr ""
Expand Down Expand Up @@ -78,4 +70,12 @@ msgstr ""

#: editor/header/tools/index.js:27
msgid "Publish"
msgstr ""

#: editor/inserter/index.js:29
msgid "Insert block"
msgstr ""

#: editor/inserter/menu.js:40
msgid "Search…"
msgstr ""
1 change: 1 addition & 0 deletions webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const config = {
entry: {
i18n: './i18n/index.js',
blocks: './blocks/index.js',
components: './components/index.js',
editor: './editor/index.js',
element: './element/index.js'
},
Expand Down