Skip to content

Commit

Permalink
Merge branch 'release/2.3.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
ilya-lopukhin committed Nov 24, 2017
2 parents cfe71df + 0bdb236 commit b73d523
Show file tree
Hide file tree
Showing 73 changed files with 525 additions and 913 deletions.
6 changes: 1 addition & 5 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@
// Actually this plugins already included in stage-0 and babel-preset-env
// But we need it here because of ordering https://babeljs.io/docs/plugins/#plugin-preset-ordering
"transform-class-properties",
"transform-es2015-classes",
["flow-runtime", {
"assert": true,
"annotate": true
}]
"transform-es2015-classes"
]
}
}
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ app/bundle.js
app/bundle.js.map
app/style.css
app/style.css.map
app/report.html
report.html
dist
dll
main.js
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
<a name=""></a>
# (2017-11-23)


### Bug Fixes

* fix storage flow types ([426d49f](https://github.com/web-pal/chronos-app-jira/commit/426d49f))



<a name="2.3.3"></a>
## [2.3.3](https://github.com/web-pal/chronos-app-jira/compare/2.3.1...2.3.3) (2017-11-22)

Expand Down
83 changes: 0 additions & 83 deletions app/components/AutoDismissFlag/AutoDismissFlag.jsx

This file was deleted.

3 changes: 3 additions & 0 deletions app/components/Calendar/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import Calendar from './Calendar';

export default Calendar;
3 changes: 3 additions & 0 deletions app/components/Flex/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import Flex from './Flex';

export default Flex;
12 changes: 6 additions & 6 deletions app/components/Flex/styled/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import styled from 'styled-components2';

export const Flex = styled.div`
display: flex;
flex-direction: ${props => props.column ? 'column' : 'row'};
flex-wrap: ${props => props.wrap ? 'wrap' : 'nowrap'};
align-items: ${props => {
flex-direction: ${props => (props.column ? 'column' : 'row')};
flex-wrap: ${props => (props.wrap ? 'wrap' : 'nowrap')};
align-items: ${(props) => {
if (props.alignCenter) {
return 'center';
}
Expand All @@ -14,15 +14,15 @@ export const Flex = styled.div`
if (props.alignStart) {
return 'flex-start';
}
return props.alignItems || 'normal'
return props.alignItems || 'normal';
}};
justify-content: ${props => {
justify-content: ${(props) => {
if (props.spaceBetween) {
return 'space-between';
}
if (props.spaceAround) {
return 'space-around';
}
return props.justifyContent || 'normal'
return props.justifyContent || 'normal';
}};
`;
5 changes: 0 additions & 5 deletions app/components/Img/Img.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,4 @@ Img.propTypes = {
className: PropTypes.string.isRequired,
};

Img.defaultProps = {
img: '',
className: '',
};

export default Img;
3 changes: 3 additions & 0 deletions app/components/Img/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import Img from './Img';

export default Img;
3 changes: 3 additions & 0 deletions app/components/Placeholders/IssueCommentPlaceholder/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import IssueCommentPlaceholder from './IssueCommentPlaceholder';

export default IssueCommentPlaceholder;
3 changes: 3 additions & 0 deletions app/components/Placeholders/IssueItemPlaceholder/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import IssueItemPlaceholder from './IssueItemPlaceholder';

export default IssueItemPlaceholder;
3 changes: 3 additions & 0 deletions app/components/Placeholders/IssueViewPlaceholder/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import IssueViewPlaceholder from './IssueViewPlaceholder';

export default IssueViewPlaceholder;
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
import React from 'react';
import type { StatelessFunctionalComponent, Node } from 'react';

import { RecentItems, RecentItemsBlock, RecentItemsList } from './styled';

import IssueItemPlaceholder from '../IssueItemPlaceholder/IssueItemPlaceholder';
import Flex from '../../Flex/Flex';

import {
RecentItems,
RecentItemsBlock,
TimestampPlaceholderContainer,
TimestampPlaceholder,
} from './styled';
Expand Down
3 changes: 3 additions & 0 deletions app/components/Placeholders/RecentItemsPlaceholder/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import RecentItemsPlaceholder from './RecentItemsPlaceholder';

export default RecentItemsPlaceholder;
4 changes: 4 additions & 0 deletions app/components/Placeholders/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export IssueCommentPlaceholder from './IssueCommentPlaceholder';
export IssueItemPlaceholder from './IssueItemPlaceholder';
export IssueViewPlaceholder from './IssueViewPlaceholder';
export RecentItemsPlaceholder from './RecentItemsPlaceholder';
3 changes: 3 additions & 0 deletions app/components/SingleSelect/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import SingleSelect from './SingleSelect';

export default SingleSelect;
3 changes: 3 additions & 0 deletions app/components/TextField/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import TextField from './TextField';

export default TextField;
15 changes: 8 additions & 7 deletions app/components/Virtualized/AutosizableList.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
import React, { PropTypes } from 'react';
// @flow
import React from 'react';
import { AutoSizer, List } from 'react-virtualized';

const AutosizableList = props =>
type Props = {
listProps: any,
autoSized?: boolean,
};

const AutosizableList = (props: Props) =>
<AutoSizer
{...props}
>
Expand All @@ -14,11 +20,6 @@ const AutosizableList = props =>
)}
</AutoSizer>;

AutosizableList.propTypes = {
listProps: PropTypes.object.isRequired,
autoSized: PropTypes.bool,
};

AutosizableList.defaultProps = {
autoSized: false,
};
Expand Down
13 changes: 7 additions & 6 deletions app/components/Virtualized/InfiniteLoadingList.jsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
import React, { PropTypes } from 'react';
// @flow
import React from 'react';
import { InfiniteLoader } from 'react-virtualized';

import AutosizableList from './AutosizableList';

const InfiniteLoadingList = props =>
type Props = {
listProps: any
};

const InfiniteLoadingList = (props: Props) =>
<InfiniteLoader {...props} >
{({ onRowsRendered, registerChild }) => (
<AutosizableList
Expand All @@ -17,8 +22,4 @@ const InfiniteLoadingList = props =>
)}
</InfiniteLoader>;

InfiniteLoadingList.propTypes = {
listProps: PropTypes.object.isRequired,
};

export default InfiniteLoadingList;
2 changes: 2 additions & 0 deletions app/components/Virtualized/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export AutosizableList from './AutosizableList';
export InfiniteLoadingList from './InfiniteLoadingList';
11 changes: 0 additions & 11 deletions app/components/index.js

This file was deleted.

15 changes: 15 additions & 0 deletions app/components/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
export Flex from './Flex';
export {
AutosizableList,
InfiniteLoadingList,
} from './Virtualized';
export {
IssueCommentPlaceholder,
IssueItemPlaceholder,
IssueViewPlaceholder,
RecentItemsPlaceholder,
} from './Placeholders';
export Img from './Img';
export Calendar from './Calendar';
export TextField from './TextField';
export SingleSelect from './SingleSelect';
5 changes: 2 additions & 3 deletions app/containers/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ import { connect } from 'react-redux';
import { getAuthorized } from 'selectors';
import type { Node, StatelessFunctionalComponent } from 'react';

import AuthForm from './AuthForm/AuthForm';
import Main from './Main/Main';

import { AppWrapper } from 'styles';
import AuthForm from './AuthForm';
import Main from './Main';

import type { State } from '../types';

Expand Down
24 changes: 18 additions & 6 deletions app/containers/AuthForm/AuthForm.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// @flow
// goal: https://dribbble.com/shots/3768074-Modal-windows
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
Expand All @@ -9,7 +8,12 @@ import storage from 'electron-json-storage';
import { Flex } from 'components';
import { logoShadowed } from 'data/assets';
import { profileActions, uiActions } from 'actions';
import { getAuthFormStep, getLoginError, getLoginFetching, getIsPaidUser } from 'selectors';
import {
getAuthFormStep,
getLoginError,
getLoginFetching,
getIsPaidUser,
} from 'selectors';
import type {
LoginRequest,
LoginOAuthRequest,
Expand All @@ -22,10 +26,18 @@ import type {

import { validate } from './validation';

import TeamStep from './Steps/TeamStep';
import EmailStep from './Steps/EmailStep';

import { Hint, ContentOuter, Container, Logo, LoginInfo } from './styled';
import {
EmailStep,
TeamStep,
} from './Steps';

import {
Hint,
ContentOuter,
Container,
Logo,
LoginInfo,
} from './styled';

type Props = {
loginRequest: LoginRequest,
Expand Down
2 changes: 2 additions & 0 deletions app/containers/AuthForm/Steps/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export EmailStep from './EmailStep';
export TeamStep from './TeamStep';
3 changes: 3 additions & 0 deletions app/containers/AuthForm/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import AuthForm from './AuthForm';

export default AuthForm;
Loading

0 comments on commit b73d523

Please sign in to comment.