reorganized helper modules in ui folder

src/income/AppComponent.tsx

@@ -3,7 +3,7 @@ import * as ReactDOM from 'react-dom'
 import BillDbModel from '../common/models/BillDbModel'
 import FilterComponent from './FilterComponent'
 import TableComponent from './TableComponent'
-import { dateFormatterYearView, dateFormatterMonthView, currencyFormatter } from '../common/helpers/formatters'
+import { dateFormatterYearView, dateFormatterMonthView, currencyFormatter } from '../common/ui/formatters'
 import { asc, desc } from '../common/helpers/sorters'
 import { round } from  '../common/helpers/math'
 import * as moment from 'moment'

src/income/TableComponent.tsx

@@ -2,7 +2,7 @@ import * as React from 'react'
 import * as ReactDOM from 'react-dom'
 import { BootstrapTable, TableHeaderColumn, Options } from 'react-bootstrap-table'
 import BillDbModel from '../common/models/BillDbModel'
-import { dateFormatterView, currencyFormatter } from '../common/helpers/formatters'
+import { dateFormatterView, currencyFormatter } from '../common/ui/formatters'
 import t from '../common/helpers/i18n'
 
 interface Props {

src/main/BillsEditorComponent.tsx

@@ -12,7 +12,7 @@ import { billExists } from '../common/services/billsService'
 import { listBillTypes, getBillTypeById, createBillType } from '../common/services/billTypesService'
 import { listCustomers, createCustomer, getCustomerById, deleteCustomerById } from '../common/services/customersService'
 import t from '../common/helpers/i18n'
-import { numberFormatterDb, numberFormatterView, dateFormatterView, dateFormatterDb, getFilename } from '../common/helpers/formatters'
+import { numberFormatterDb, numberFormatterView, dateFormatterView, dateFormatterDb, getFilename } from '../common/ui/formatters'
 import Textarea from 'react-textarea-autosize'
 
 const Datetime = require('react-datetime')

src/main/BillsTableComponent.tsx

@@ -2,8 +2,8 @@ import * as React from 'react'
 import * as ReactDOM from 'react-dom'
 import { BootstrapTable, TableHeaderColumn, CellEditClickMode, SelectRowMode, Options } from 'react-bootstrap-table'
 import BillDbModel from '../common/models/BillDbModel'
-import { dateFormatterView, currencyFormatter } from '../common/helpers/formatters'
-import { preventDragAndDrop } from '../common/helpers/dom' 
+import { dateFormatterView, currencyFormatter } from '../common/ui/formatters'
+import { preventDragAndDrop } from '../common/ui/dom'
 import t from '../common/helpers/i18n'
 
 interface Props {

src/main/ExpensesEditorComponent.tsx

@@ -6,7 +6,7 @@ import ExpenseType from '../common/models/ExpenseTypeModel'
 import { expenseExists } from '../common/services/expensesService'
 import { listExpenseTypes, getExpenseTypeById, createExpenseType } from '../common/services/expenseTypesService'
 import t from '../common/helpers/i18n'
-import { numberFormatterDb, numberFormatterView, dateFormatterView, dateFormatterDb } from '../common/helpers/formatters'
+import { numberFormatterDb, numberFormatterView, dateFormatterView, dateFormatterDb } from '../common/ui/formatters'
 import { stringIsEmpty } from '../common/helpers/text'
 import { getNetAmount, getVatAmount, getPreTaxAmount, hasDecimals } from '../common/helpers/math'
 import Textarea from 'react-textarea-autosize'

src/main/ExpensesTableComponent.tsx

@@ -2,8 +2,8 @@ import * as React from 'react'
 import * as ReactDOM from 'react-dom'
 import { BootstrapTable, TableHeaderColumn, CellEditClickMode, SelectRowMode, Options } from 'react-bootstrap-table'
 import ExpenseDbModel from '../common/models/ExpenseDbModel'
-import { dateFormatterView, currencyFormatter, percentageFormatter, numberFormatterView } from '../common/helpers/formatters'
-import { preventDragAndDrop } from '../common/helpers/dom'
+import { dateFormatterView, currencyFormatter, percentageFormatter, numberFormatterView } from '../common/ui/formatters'
+import { preventDragAndDrop } from '../common/ui/dom'
 import t from '../common/helpers/i18n'
 import { getNetAmount, getVatAmount, hasDecimals } from '../common/helpers/math'
 

src/main/FileViewComponent.tsx

@@ -1,9 +1,9 @@
 import * as React from 'react'
 import File from '../common/models/FileModel'
-import { getFilename } from '../common/helpers/formatters'
+import { getFilename } from '../common/ui/formatters'
 import { open } from '../common/providers/fileProvider'
 import { shortenFilename } from '../common/helpers/text'
-import { getFileIconHtml } from '../common/helpers/icons'
+import { getFileIconHtml } from '../common/ui/icons'
 import t from '../common/helpers/i18n'
 
 interface Props {
@@ -19,7 +19,7 @@ export default class FileViewComponent extends React.Component<Props, {}> {
 
   getFileList() {
     let fileList = []
-    
+
     for (let i = 0; i < this.props.files.length; i++) {
       const file = this.props.files[i]
 

src/stats/AppComponent.tsx

@@ -1,15 +1,15 @@
 import * as React from 'react'
 import * as ReactDOM from 'react-dom'
-import FilterComponent, { SELECT_TYPE_ALL } from './FilterComponent'
+import BillsFilterComponent, { SELECT_TYPE_ALL } from './BillsFilterComponent'
 import BillDbModel from '../common/models/BillDbModel'
 import BillTypeModel from '../common/models/BillTypeModel'
 import Customer from '../common/models/CustomerModel'
-import TableComponent from './TableComponent'
-import PanelComponent from './PanelComponent'
-import ChartComponent from './ChartComponent'
+import BillsTableComponent from './BillsTableComponent'
+import BillsPanelComponent from './BillsPanelComponent'
+import BillsChartComponent from './BillsChartComponent'
 import t from '../common/helpers/i18n'
 import { asc, desc } from '../common/helpers/sorters'
-import { dateFormatterYearView } from '../common/helpers/formatters'
+import { dateFormatterYearView } from '../common/ui/formatters'
 import * as moment from 'moment'
 import { getAverage, round } from '../common/helpers/math'
 
@@ -206,7 +206,7 @@ export default class AppComponent extends React.Component<Props, {}> {
 
   getTypesPieChartData(): number[] {
     let typeSums = {}
-    
+
     for (let type of this.props.billTypes) {
       typeSums[type.type] = 0
     }
@@ -230,7 +230,7 @@ export default class AppComponent extends React.Component<Props, {}> {
 
   getTypesIncomePieChartData(): number[] {
     let typeSums = {}
-    
+
     for (let type of this.props.billTypes) {
       typeSums[type.type] = 0
     }
@@ -277,7 +277,7 @@ export default class AppComponent extends React.Component<Props, {}> {
         return true
       }
     }
-    
+
     return false
   }
 
@@ -291,7 +291,7 @@ export default class AppComponent extends React.Component<Props, {}> {
     return (
       <div>
 
-        <FilterComponent
+        <BillsFilterComponent
           years={this.getAvailableYears()}
           billTypes={this.props.billTypes}
           handleYearChange={element => this.setState({selectedYear: element.target.value})}
@@ -302,27 +302,27 @@ export default class AppComponent extends React.Component<Props, {}> {
           billDateToUse={this.state.billDateToUse}
         />
 
-        <TableComponent data={this.getTableData()} />
+        <BillsTableComponent data={this.getTableData()} />
 
         <div className="panel-container">
           <div className="row">
             <div className="col-xs-1" />
-          
+
             <div className="col-xs-12 col-sm-4 panel-display">
-              <PanelComponent title={t('Jahresumsatz')} value={this.getTotal()} icon="fa-line-chart" />
+              <BillsPanelComponent title={t('Jahresumsatz')} value={this.getTotal()} icon="fa-line-chart" />
             </div>
 
             <div className="col-xs-2" />
 
             <div className="col-xs-12 col-sm-4 panel-display">
-              <PanelComponent title={t('Unbezahlte Rechnungen')} value={this.getTotalUnpaid()} icon="fa-hourglass-1" />
+              <BillsPanelComponent title={t('Unbezahlte Rechnungen')} value={this.getTotalUnpaid()} icon="fa-hourglass-1" />
             </div>
 
-            <div className="col-xs-1" />            
+            <div className="col-xs-1" />
           </div>
         </div>
 
-        <ChartComponent
+        <BillsChartComponent
           lineChartLabels={this.getLineChartLabels()}
           lineChartDatePaidData={this.getLineChartData()}
           typesPieChartLabels={this.getTypesPieChartLabels()}

src/stats/ChartComponent.tsx → src/stats/BillsChartComponent.tsx

@@ -31,7 +31,7 @@ const colors = [
   '246, 41, 106'
 ]
 
-export default class ChartComponent extends React.Component<Props, State> {
+export default class BillsChartComponent extends React.Component<Props, State> {
 
   refs: {
     typesPiechart;

src/stats/FilterComponent.tsx → src/stats/BillsFilterComponent.tsx

@@ -16,7 +16,7 @@ interface Props {
   changeBillDateToUse
 }
 
-export default class FilterComponent extends React.Component<Props, {}> {
+export default class BillsFilterComponent extends React.Component<Props, {}> {
 
   constructor(props) {
     super(props)
@@ -68,7 +68,7 @@ export default class FilterComponent extends React.Component<Props, {}> {
     this.props.changeBillDateToUse(dateField)
   }
 
-  render() {  
+  render() {
     return (
       <form id="filter-container">
         <label htmlFor="year">{t('Jahr')}</label>
@@ -94,14 +94,14 @@ export default class FilterComponent extends React.Component<Props, {}> {
             /> {t('Rechnungsdatum')}
           </label>
         </p>
-        
+
       </form>
     )
   }
 
   componentWillReceiveProps(nextProps: Props) {
     const selectedYearNotAvailable = (nextProps.years.indexOf(nextProps.selectedYear) === -1)
-    
+
     if (selectedYearNotAvailable) {
       let closestYear = nextProps.years.length >= 1
         ? nextProps.years[0]

src/stats/PanelComponent.tsx → src/stats/BillsPanelComponent.tsx

@@ -9,7 +9,7 @@ interface Props {
   icon: string
 }
 
-export default class PanelComponent extends React.Component<Props, {}> {
+export default class BillsPanelComponent extends React.Component<Props, {}> {
 
   constructor(props) {
     super(props)
@@ -32,7 +32,7 @@ export default class PanelComponent extends React.Component<Props, {}> {
             /> €
           </div>
 
-          <div className="panel-title">{this.props.title}</div>            
+          <div className="panel-title">{this.props.title}</div>
         </div>
       </div>
     )

src/stats/TableComponent.tsx → src/stats/BillsTableComponent.tsx

@@ -1,14 +1,14 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom'
 import { BootstrapTable, TableHeaderColumn, CellEditClickMode, SelectRowMode, Options } from 'react-bootstrap-table'
-import { currencyFormatter } from '../common/helpers/formatters'
+import { currencyFormatter } from '../common/ui/formatters'
 import t from '../common/helpers/i18n'
 
 interface Props {
   data: any[];
 }
 
-export default class TableComponent extends React.Component<Props, {}> {
+export default class BillsTableComponent extends React.Component<Props, {}> {
 
   constructor(props) {
     super(props)
@@ -29,8 +29,8 @@ export default class TableComponent extends React.Component<Props, {}> {
       noDataText: t('Keine Einträge'),
       sizePerPage: 5
     }
-        
-    return (  
+
+    return (
       <div id="table-container">
         <BootstrapTable
           data={this.props.data}

test/common/helpers/formatterTest.ts → test/common/ui/formatterTest.ts

@@ -1,4 +1,4 @@
-import { numberFormatterDb, numberFormatterView, dateFormatterView, dateFormatterDb, currencyFormatter } from '../../../src/common/helpers/formatters'
+import { numberFormatterDb, numberFormatterView, dateFormatterView, dateFormatterDb, currencyFormatter } from '../../../src/common/ui/formatters'
 import { expect } from 'chai'
 
 describe('formatters', () => {
@@ -56,7 +56,7 @@ describe('formatters', () => {
       const result = currencyFormatter(123.45)
       expect(result).to.equal('123,45 €')
     })
-    it('should convert a number to a string with two fraction digits', () => { 
+    it('should convert a number to a string with two fraction digits', () => {
       expect(currencyFormatter(123)).to.equal('123,00 €')
       expect(currencyFormatter(123.4)).to.equal('123,40 €')
     })