From 5ee24d054d515611544e0f68400d9e57d64a500b Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Sat, 16 Dec 2017 16:21:59 +0000 Subject: [PATCH] Move all of the view-only components to their own directory. --- src/Journal.tsx | 4 ++-- src/JournalAddressBook.tsx | 4 ++-- src/JournalCalendar.tsx | 4 ++-- src/Pim.tsx | 8 ++++---- src/PimMain.tsx | 4 ++-- src/{ => components}/AddressBook.tsx | 6 +++--- src/{ => components}/Calendar.tsx | 2 +- src/{ => components}/Contact.tsx | 4 ++-- src/{ => components}/ContactEdit.tsx | 4 ++-- src/{ => components}/Event.tsx | 2 +- src/{ => components}/EventEdit.tsx | 6 +++--- src/{ => components}/JournalEntries.tsx | 6 +++--- src/{ => components}/PimItemHeader.tsx | 2 +- src/{ => components}/SecondaryHeader.tsx | 2 +- 14 files changed, 29 insertions(+), 29 deletions(-) rename src/{ => components}/AddressBook.tsx (92%) rename src/{ => components}/Calendar.tsx (97%) rename src/{ => components}/Contact.tsx (97%) rename src/{ => components}/ContactEdit.tsx (99%) rename src/{ => components}/Event.tsx (97%) rename src/{ => components}/EventEdit.tsx (97%) rename src/{ => components}/JournalEntries.tsx (94%) rename src/{ => components}/PimItemHeader.tsx (94%) rename src/{ => components}/SecondaryHeader.tsx (92%) diff --git a/src/Journal.tsx b/src/Journal.tsx index 4ff8de9..65d7d95 100644 --- a/src/Journal.tsx +++ b/src/Journal.tsx @@ -3,9 +3,9 @@ import { Tabs, Tab } from 'material-ui/Tabs'; import Container from './widgets/Container'; -import SecondaryHeader from './SecondaryHeader'; +import SecondaryHeader from './components/SecondaryHeader'; -import JournalEntries from './JournalEntries'; +import JournalEntries from './components/JournalEntries'; import JournalAddressBook from './JournalAddressBook'; import JournalCalendar from './JournalCalendar'; diff --git a/src/JournalAddressBook.tsx b/src/JournalAddressBook.tsx index 04f6e9c..f2a10c0 100644 --- a/src/JournalAddressBook.tsx +++ b/src/JournalAddressBook.tsx @@ -5,8 +5,8 @@ import * as EteSync from './api/EteSync'; import { routeResolver } from './App'; -import AddressBook from './AddressBook'; -import Contact from './Contact'; +import AddressBook from './components/AddressBook'; +import Contact from './components/Contact'; import { ContactType } from './pim-types'; diff --git a/src/JournalCalendar.tsx b/src/JournalCalendar.tsx index c0a9850..0ccaafb 100644 --- a/src/JournalCalendar.tsx +++ b/src/JournalCalendar.tsx @@ -5,8 +5,8 @@ import { routeResolver } from './App'; import { historyPersistor } from './persist-state-history'; -import Calendar from './Calendar'; -import Event from './Event'; +import Calendar from './components/Calendar'; +import Event from './components/Event'; import { EventType } from './pim-types'; diff --git a/src/Pim.tsx b/src/Pim.tsx index 407fbac..f572eb6 100644 --- a/src/Pim.tsx +++ b/src/Pim.tsx @@ -11,10 +11,10 @@ import { ContactType, EventType } from './pim-types'; import Container from './widgets/Container'; -import ContactEdit from './ContactEdit'; -import Contact from './Contact'; -import EventEdit from './EventEdit'; -import Event from './Event'; +import ContactEdit from './components/ContactEdit'; +import Contact from './components/Contact'; +import EventEdit from './components/EventEdit'; +import Event from './components/Event'; import PimMain from './PimMain'; import { routeResolver } from './App'; diff --git a/src/PimMain.tsx b/src/PimMain.tsx index 231fc24..dd7949a 100644 --- a/src/PimMain.tsx +++ b/src/PimMain.tsx @@ -7,8 +7,8 @@ import * as ICAL from 'ical.js'; import Container from './widgets/Container'; -import AddressBook from './AddressBook'; -import Calendar from './Calendar'; +import AddressBook from './components/AddressBook'; +import Calendar from './components/Calendar'; import { EventType, ContactType } from './pim-types'; diff --git a/src/AddressBook.tsx b/src/components/AddressBook.tsx similarity index 92% rename from src/AddressBook.tsx rename to src/components/AddressBook.tsx index 7f1c8c0..8f3e097 100644 --- a/src/AddressBook.tsx +++ b/src/components/AddressBook.tsx @@ -2,10 +2,10 @@ import * as React from 'react'; import * as colors from 'material-ui/styles/colors'; -import { Avatar } from './widgets/Avatar'; -import { List, ListItem } from './widgets/List'; +import { Avatar } from '../widgets/Avatar'; +import { List, ListItem } from '../widgets/List'; -import { ContactType } from './pim-types'; +import { ContactType } from '../pim-types'; class AddressBook extends React.PureComponent { props: { diff --git a/src/Calendar.tsx b/src/components/Calendar.tsx similarity index 97% rename from src/Calendar.tsx rename to src/components/Calendar.tsx index 3cebf97..6d72673 100644 --- a/src/Calendar.tsx +++ b/src/components/Calendar.tsx @@ -4,7 +4,7 @@ import 'react-big-calendar/lib/css/react-big-calendar.css'; import * as moment from 'moment'; import 'moment/locale/en-gb'; -import { EventType } from './pim-types'; +import { EventType } from '../pim-types'; moment.locale('en-gb'); BigCalendar.momentLocalizer(moment); diff --git a/src/Contact.tsx b/src/components/Contact.tsx similarity index 97% rename from src/Contact.tsx rename to src/components/Contact.tsx index 3fd0104..28fd116 100644 --- a/src/Contact.tsx +++ b/src/components/Contact.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import * as moment from 'moment'; -import { List, ListItem, ListDivider as Divider } from './widgets/List'; +import { List, ListItem, ListDivider as Divider } from '../widgets/List'; import IconHome from 'material-ui/svg-icons/action/home'; import IconDate from 'material-ui/svg-icons/action/date-range'; import CommunicationCall from 'material-ui/svg-icons/communication/call'; @@ -11,7 +11,7 @@ import { indigo500 } from 'material-ui/styles/colors'; import PimItemHeader from './PimItemHeader'; -import { ContactType } from './pim-types'; +import { ContactType } from '../pim-types'; class Contact extends React.PureComponent { props: { diff --git a/src/ContactEdit.tsx b/src/components/ContactEdit.tsx similarity index 99% rename from src/ContactEdit.tsx rename to src/components/ContactEdit.tsx index c5f36c8..7fc2f0b 100644 --- a/src/ContactEdit.tsx +++ b/src/components/ContactEdit.tsx @@ -11,9 +11,9 @@ import IconClear from 'material-ui/svg-icons/content/clear'; import * as uuid from 'uuid'; import * as ICAL from 'ical.js'; -import * as EteSync from './api/EteSync'; +import * as EteSync from '../api/EteSync'; -import { ContactType } from './pim-types'; +import { ContactType } from '../pim-types'; const telTypes = [ {type: 'Home'}, diff --git a/src/Event.tsx b/src/components/Event.tsx similarity index 97% rename from src/Event.tsx rename to src/components/Event.tsx index bb3ac64..440d94d 100644 --- a/src/Event.tsx +++ b/src/components/Event.tsx @@ -5,7 +5,7 @@ import PimItemHeader from './PimItemHeader'; import * as ICAL from 'ical.js'; -import { EventType } from './pim-types'; +import { EventType } from '../pim-types'; function formatDateRange(start: ICAL.Time, end: ICAL.Time) { const mStart = moment(start.toJSDate()); diff --git a/src/EventEdit.tsx b/src/components/EventEdit.tsx similarity index 97% rename from src/EventEdit.tsx rename to src/components/EventEdit.tsx index eeeb13d..9fa2f55 100644 --- a/src/EventEdit.tsx +++ b/src/components/EventEdit.tsx @@ -5,14 +5,14 @@ import TextField from 'material-ui/TextField'; import SelectField from 'material-ui/SelectField'; import MenuItem from 'material-ui/MenuItem'; -import DateTimePicker from './widgets/DateTimePicker'; +import DateTimePicker from '../widgets/DateTimePicker'; import * as uuid from 'uuid'; import * as ICAL from 'ical.js'; -import * as EteSync from './api/EteSync'; +import * as EteSync from '../api/EteSync'; -import { EventType } from './pim-types'; +import { EventType } from '../pim-types'; class EventEdit extends React.PureComponent { state: { diff --git a/src/JournalEntries.tsx b/src/components/JournalEntries.tsx similarity index 94% rename from src/JournalEntries.tsx rename to src/components/JournalEntries.tsx index d733e7b..43402c5 100644 --- a/src/JournalEntries.tsx +++ b/src/components/JournalEntries.tsx @@ -1,7 +1,7 @@ import * as Immutable from 'immutable'; import * as React from 'react'; -import { List, ListItem } from './widgets/List'; +import { List, ListItem } from '../widgets/List'; import Dialog from 'material-ui/Dialog'; import FlatButton from 'material-ui/FlatButton'; import IconAdd from 'material-ui/svg-icons/content/add'; @@ -10,9 +10,9 @@ import IconEdit from 'material-ui/svg-icons/editor/mode-edit'; import * as ICAL from 'ical.js'; -import { EventType, ContactType } from './pim-types'; +import { EventType, ContactType } from '../pim-types'; -import * as EteSync from './api/EteSync'; +import * as EteSync from '../api/EteSync'; class JournalEntries extends React.PureComponent { static defaultProps = { diff --git a/src/PimItemHeader.tsx b/src/components/PimItemHeader.tsx similarity index 94% rename from src/PimItemHeader.tsx rename to src/components/PimItemHeader.tsx index 2ab4dc2..78b0c9c 100644 --- a/src/PimItemHeader.tsx +++ b/src/components/PimItemHeader.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; -import { getPalette } from './App'; +import { getPalette } from '../App'; export default (props: {text: string, backgroundColor?: string, children?: any}) => { const style = { diff --git a/src/SecondaryHeader.tsx b/src/components/SecondaryHeader.tsx similarity index 92% rename from src/SecondaryHeader.tsx rename to src/components/SecondaryHeader.tsx index b4ac7b2..97a6b0e 100644 --- a/src/SecondaryHeader.tsx +++ b/src/components/SecondaryHeader.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; -import { getPalette } from './App'; +import { getPalette } from '../App'; export default (props: {text: string}) => { const style = {