Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
149 commits
Select commit Hold shift + click to select a range
1886f37
feat(all): init tracker, remove unwanted
rustamyusupov Jan 3, 2018
c92fb70
feat(package.json, yarn, Html): add react-bootstrap
rustamyusupov Jan 3, 2018
ddbb193
feat(variables, base, App): test bootstrap
rustamyusupov Jan 3, 2018
3d7a252
refactor(base): remove unwanted colon
rustamyusupov Jan 4, 2018
1da2589
feat(package, yarn, client): add Split.js
rustamyusupov Jan 4, 2018
834ffe8
feat(Split): add Split component
rustamyusupov Jan 4, 2018
91115ec
feat(Iframe): add Iframe component
rustamyusupov Jan 4, 2018
d25480d
feat(App): add Split, Iframe
rustamyusupov Jan 4, 2018
770f4fd
refactor(noun, formatAmount, PageMain, Iframe): remove unwanted compo…
rustamyusupov Jan 4, 2018
eb02187
fix(routes): remove PageMain container
rustamyusupov Jan 5, 2018
0c4ea9e
feat(UserPanel): add UserPanel component
rustamyusupov Jan 5, 2018
39036d1
feat(LeftPanel): add LeftPanel component
rustamyusupov Jan 5, 2018
19fdae7
feat(App): add users panel
rustamyusupov Jan 5, 2018
68c2734
feat(Text): add Text component
rustamyusupov Jan 6, 2018
b9be9e8
fix(Text): import styles
rustamyusupov Jan 6, 2018
1477aed
feat(Tasks): add Tasks component
rustamyusupov Jan 6, 2018
9d30fd1
feat(Title): add Title component
rustamyusupov Jan 6, 2018
473e525
feat(WorkDay): add WorkDay component
rustamyusupov Jan 6, 2018
59cfab8
feat(App): add workday with tasks
rustamyusupov Jan 6, 2018
adfc94e
feat(package.json): install latest redux-form
rustamyusupov Jan 25, 2018
a88e520
feat(yarn): update packages
rustamyusupov Jan 25, 2018
a432633
refactor(basket, panel): remove unwanted modules
rustamyusupov Jan 25, 2018
633442f
fix(package.json, yarn.lock, create, DevTools): fix redux dev tools
rustamyusupov Jan 25, 2018
1865c8f
feat(Auth): add store, container and component
rustamyusupov Jan 25, 2018
9c04732
feat(App): add Auth component
rustamyusupov Jan 25, 2018
50b3ea5
refactor(App): align auth component
rustamyusupov Jan 25, 2018
36454f4
feat(Auth): change input borders
rustamyusupov Jan 25, 2018
2e9144b
feat(package.json, yarn.lock): upgrade axios
rustamyusupov Jan 27, 2018
c6e5639
feat(userData): add user data store
rustamyusupov Jan 27, 2018
2d223f7
feat(reducer, auth, Auth): get user data by token
rustamyusupov Jan 27, 2018
ad58dcb
feat(package.json, yarn.lock): upgrade ramda
rustamyusupov Jan 27, 2018
a8f5165
feat(auth): add set auth success and failure methods
rustamyusupov Jan 27, 2018
a6a332c
feat(userData): set auth after fetch data
rustamyusupov Jan 27, 2018
d4803ea
refactor(auth): rename authorization
rustamyusupov Jan 27, 2018
15e481e
feat(App): show content depend on isAuthorized
rustamyusupov Jan 27, 2018
731d7e6
feat(Auth): show authorization error
rustamyusupov Jan 27, 2018
e889ce8
fix(Tasks): remove botton white space
rustamyusupov Jan 27, 2018
908a535
feat(WorkDay): add top indent
rustamyusupov Jan 27, 2018
a884789
feat(package.json, yarn.lock): upgrade react-cookie
rustamyusupov Jan 28, 2018
bae4796
feat(package.json, yarn.lock): install js-cookie
rustamyusupov Jan 29, 2018
cd5a813
feat(auth, App): save token to cookie, fetch token when init app
rustamyusupov Jan 29, 2018
65224b9
feat(users, reducer): add users store
rustamyusupov Feb 4, 2018
9f81f1d
feat(UserPanel): add container
rustamyusupov Feb 4, 2018
d81525c
feat(userData): fetch users when success
rustamyusupov Feb 4, 2018
3dc5b2c
refactor(Auth): code style
rustamyusupov Feb 4, 2018
3590244
feat(App): fetch user data async
rustamyusupov Feb 4, 2018
82ac1a0
feat(config): add user list
rustamyusupov Feb 5, 2018
2b29618
feat(userData): save user id
rustamyusupov Feb 5, 2018
2de2835
fix(UserPanel): set min width
rustamyusupov Feb 5, 2018
33ead13
feat(users): get filtered users
rustamyusupov Feb 5, 2018
fd1a910
feat(UserPanel): add user click handler
rustamyusupov Feb 5, 2018
12896a3
feat(config): change default users
rustamyusupov Feb 17, 2018
3b21cdf
feat(routes): add user:id route
rustamyusupov Feb 17, 2018
8652531
refactor(App): code style
rustamyusupov Feb 17, 2018
fdbbedf
feat(auth): add token in success
rustamyusupov Feb 17, 2018
344802d
feat(UserPanel): change button with link react router
rustamyusupov Feb 17, 2018
f475894
feat(reducer): add reports
rustamyusupov Feb 17, 2018
152a14c
fix(auth): save token
rustamyusupov Feb 17, 2018
3d4a8c8
feat(userData): send token to set auth success
rustamyusupov Feb 17, 2018
52c2e06
feat(users): get user uid
rustamyusupov Feb 17, 2018
0446598
feat(User): init container/component
rustamyusupov Feb 17, 2018
c8d867e
feat(reports): init store
rustamyusupov Feb 17, 2018
a79bcd4
feat(package.json, yarn.lock): update moment
rustamyusupov Feb 21, 2018
f72cc61
feat(reports, User): add dates request params
rustamyusupov Feb 21, 2018
6a49610
feat(reports): init prepare tasks
rustamyusupov Feb 21, 2018
14872ae
feat(reports): init prepare tasks data
rustamyusupov Feb 23, 2018
574c164
feat(config, reports): get task id by template from config
rustamyusupov Feb 26, 2018
08a7c0e
feat(reports): convert and sort tasks
rustamyusupov Feb 26, 2018
3f19ff6
fix(Text): remove default margin
rustamyusupov Feb 26, 2018
6239758
feat(UserPanel): set font size
rustamyusupov Feb 26, 2018
a255045
feat(App, User, WorkDay, Tasks): render tasks
rustamyusupov Feb 26, 2018
c014e44
feat(reports): format duration
rustamyusupov Feb 27, 2018
7ca57d5
fix(WorkDay): fix component height
rustamyusupov Feb 27, 2018
a2228a8
fix(reports): change task group
rustamyusupov Feb 27, 2018
6514efc
feat(WorkDay): add textarea bottom indent
rustamyusupov Mar 3, 2018
89cbdd2
feat(config): add tasks url prefix
rustamyusupov Mar 3, 2018
d875acd
feat(tasks, Tasks): add tasks store and container
rustamyusupov Mar 3, 2018
0829c3a
feat(reducer, Tasks): set active task by click on it
rustamyusupov Mar 3, 2018
7a183f7
feat(reports, User, App): show active task
rustamyusupov Mar 3, 2018
db77d37
fix(User): fix console error
rustamyusupov Mar 3, 2018
b256c7f
feat(App): show blank when no task selected
rustamyusupov Mar 3, 2018
264d9c5
feat(User): show blank when no tasks user
rustamyusupov Mar 3, 2018
f44aec4
fix(App): fix panel separator height
rustamyusupov Mar 3, 2018
fd1b7a2
fix(Split): change min height
rustamyusupov Mar 3, 2018
2cfcae9
feat(App): redirect to main when first render
rustamyusupov Mar 3, 2018
5dc3999
feat(App, WorkDay, User, Tasks): add tasks blank styles
rustamyusupov Mar 3, 2018
5bca202
fix(App, User): show last ten days activities
rustamyusupov Mar 17, 2018
6df4b5b
feat(package.json, yarn.lock): upgrade redux-form
rustamyusupov Mar 17, 2018
64f7d0e
feat(workday, reducer): add workday store
rustamyusupov Mar 17, 2018
055383d
feat(WorkDay, User): save workday comment
rustamyusupov Mar 17, 2018
6123528
feat(storage): add local storage util class
rustamyusupov Mar 18, 2018
234a301
feat(workday, WorkDay): save comments to local storage
rustamyusupov Mar 18, 2018
d7236ad
feat(comments): add comments store
rustamyusupov Mar 20, 2018
91a4bd0
feat(preventRenderWhileLoading, workday, reducer, User, WorkDay): wra…
rustamyusupov Mar 20, 2018
d2138dc
refactor(WorkDay, User): remove unwanted workday container
rustamyusupov Mar 20, 2018
b99fbca
feat(config): add relef task template
rustamyusupov Mar 20, 2018
7edf557
feat(User): add active user link style
rustamyusupov Mar 20, 2018
5c4fb29
feat(server): add tracker to allowed origins
rustamyusupov Mar 22, 2018
a9a6eac
feat(config, server): add api toggl server proxy
rustamyusupov Mar 22, 2018
27bee43
refactor(users, userData, reports): change request urls
rustamyusupov Mar 22, 2018
8d52237
feat(config): add chocolate projects
rustamyusupov Mar 22, 2018
6d7d77a
fix(config, App): fix chocolate project tasks url
rustamyusupov Mar 22, 2018
a502cf4
feat(package, package-lock): add react-autosize-textarea
rustamyusupov Mar 22, 2018
ff6e45b
feat(WorkDay): remove comment field border, add autoheight
rustamyusupov Mar 22, 2018
5b0fe39
fix(User): remove console warning, default days to load – 14
rustamyusupov Mar 22, 2018
65d5509
feat(User, Iframe): add separated panels scroll
rustamyusupov Mar 22, 2018
5690909
feat(reports, WorkDay, User, Tasks): add total day time
rustamyusupov Mar 22, 2018
f099ab5
refactor(selector): move prepare report data
rustamyusupov Mar 28, 2018
07b757d
feat(reports, User): add load more tasks
rustamyusupov Mar 28, 2018
8ce0f54
feat(projects, reducer): add projects store
rustamyusupov Apr 3, 2018
51e2e37
feat(userData): fetch projects after login
rustamyusupov Apr 3, 2018
871dfc1
refactor(routes): change user route
rustamyusupov Apr 3, 2018
762a307
feat(userData): fetch all users after login
rustamyusupov Apr 3, 2018
09f4f67
feat(users): fetch project users
rustamyusupov Apr 3, 2018
66f7dce
feat(UserPanel): add project select, show users by select project
rustamyusupov Apr 3, 2018
f21a3c7
fix(User): fix load more
rustamyusupov Apr 4, 2018
b81a5ca
feat(App, Iframe): add reload button to iframe
rustamyusupov Apr 5, 2018
b8b167a
add RELEFOP regular expression for trello
Imater Apr 6, 2018
1324d39
fix(UserPanel): change project placeholder
rustamyusupov Apr 7, 2018
e3be7ea
feat(users): sort users in user panel
rustamyusupov Apr 7, 2018
87b7441
feat(Tasks): add task number
rustamyusupov Apr 7, 2018
6be1ea7
feat(package.json, yarn.lock): add moment-duration-format package
rustamyusupov Apr 7, 2018
bb40d1b
feat(Text): add nowrap prop
rustamyusupov Apr 7, 2018
71c5503
feat(reports): change duration format
rustamyusupov Apr 7, 2018
1fc4ad2
fix(Tasks): remove wrap duration
rustamyusupov Apr 7, 2018
f5de223
fix(Tasks): align time
rustamyusupov Apr 7, 2018
c0cb12e
feat(WorkDay): change day duration style
rustamyusupov Apr 7, 2018
c76861c
feat(reports): change date format, add day of week
rustamyusupov Apr 7, 2018
38c3298
feat(reports, Tasks): set bold for task's name
rustamyusupov Apr 10, 2018
446b3bf
feat(Html, Iframe): add home icon button
rustamyusupov Apr 10, 2018
3ab76cc
feat(Iframe): add task total time
rustamyusupov Apr 10, 2018
97d3cb3
feat(tasks, Tasks, App): show task total time by click
rustamyusupov Apr 10, 2018
c8a14b8
feat(Iframe): add url
rustamyusupov Apr 10, 2018
cdf34b4
feat(copy): copy to clipboard
rustamyusupov Apr 10, 2018
1d91372
feat(package.json, yarn.lock): update react-portal
rustamyusupov Apr 10, 2018
c9c8121
feat(Iframe): copy url to clipboard
rustamyusupov Apr 10, 2018
05f310b
feat(tasks): get items
rustamyusupov Apr 10, 2018
0ba48b7
feat(App, Iframe): show task panel
rustamyusupov Apr 10, 2018
31c8c6a
fix(User): save comments
rustamyusupov Apr 12, 2018
b476671
fix(User): save comments
rustamyusupov Apr 12, 2018
bb90238
fix(User, WorkDay): save comments
rustamyusupov Apr 12, 2018
164734a
fix(WorkDay): set correct field name
rustamyusupov Apr 21, 2018
c6bc64f
fix(UserPanel): set default project
rustamyusupov Apr 21, 2018
5790df4
feat(Auth, LeftPanel, Split, Text, Title): refactor empty line before…
rustamyusupov Apr 24, 2018
c64a39f
refactor(Auth, LeftPanel, Split, Text, Title): add empty line before …
rustamyusupov Apr 24, 2018
a753d4e
feat(Tasks): highlight task line when hover
rustamyusupov Apr 26, 2018
8ce7c89
Merge branch 'tracker' of github.com:Imater/4team into tracker
rustamyusupov Apr 26, 2018
63ac46b
Lama project support
Imater Apr 27, 2018
ebd66f4
Update config.js
Imater Apr 27, 2018
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
20,312 changes: 20,312 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

18 changes: 11 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@kadira/storybook-addon-knobs": "^1.7.1",
"@storybook/react": "3.2.5",
"autoprefixer": "^7.1.4",
"axios": "^0.16.2",
"axios": "0.17.1",
"babel-polyfill": "^6.23.0",
"body-parser": "^1.17.1",
"bson-objectid": "^1.1.5",
Expand All @@ -72,11 +72,13 @@
"identity-obj-proxy": "^3.0.0",
"jest": "^21.2.1",
"jest-cli": "^21.2.1",
"js-cookie": "^2.2.0",
"kladrapi-for-node": "github:wormen/kladrapi-for-nodejs",
"lodash.debounce": "^4.0.8",
"memoizee": "^0.4.5",
"method-override": "^2.3.8",
"moment": "^2.18.1",
"moment": "2.20.1",
"moment-duration-format": "^2.2.2",
"passport": "^0.3.2",
"passport-github2": "^0.1.9",
"piping": "^1.0.0-rc.4",
Expand All @@ -93,12 +95,14 @@
"prop-types": "^15.5.10",
"pure-render-decorator": "^1.2.1",
"raf": "^3.3.2",
"ramda": "^0.24.1",
"ramda": "0.25.0",
"raw-loader": "^0.5.1",
"react": "^15.6.1",
"react-addons-perf": "^15.4.2",
"react-autosize-textarea": "^3.0.2",
"react-bootstrap": "^0.31.5",
"react-container-query": "0.6.0",
"react-cookie": "^0.4.6",
"react-cookie": "2.1.2",
"react-datepicker": "^0.52.0",
"react-dom": "^15.6.1",
"react-fontawesome": "^1.6.1",
Expand All @@ -109,7 +113,7 @@
"react-lazy-cache": "^3.0.1",
"react-lazy-load": "^3.0.12",
"react-parallax": "^1.4.1",
"react-portal": "^3.1.0",
"react-portal": "^4.1.4",
"react-redux": "https://github.com/Imater/react-redux/tarball/54306c8b15b3e77db247b7d0842fa1efc3f5574a",
"react-redux-perfomance": "^5.0.7",
"react-render-logger": "^1.0.1",
Expand All @@ -129,15 +133,15 @@
"redux-devtools": "^3.4.0",
"redux-devtools-dock-monitor": "^1.1.2",
"redux-devtools-log-monitor": "^1.3.0",
"redux-form": "^7.0.3",
"redux-form": "7.3.0",
"redux-loop": "2.2.2",
"remote-redux-devtools": "^0.5.12",
"reselect": "^3.0.1",
"scrollbarwidth": "^0.1.0",
"serialize-javascript": "^1.1.2",
"serve-favicon": "^2.4.2",
"socket.io": "^2.0.3",
"socket.io-client": "^2.0.3",
"split.js": "^1.3.5",
"superagent": "^3.5.2",
"transform-loader": "^0.2.3",
"url-loader": "^0.5.9",
Expand Down
3 changes: 2 additions & 1 deletion src/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ import { useScroll } from 'react-router-scroll'
import cookie from 'react-cookie'
import Perf from 'react-addons-perf'
import { Provider as ProviderTunnel } from 'react-tunnel'
import Split from 'split.js'
import getRoutes from './routes'

window.Perf = Perf
window.Split = Split

const dest = document.getElementById('content')
const store = createStore(browserHistory, { cookie }, window.__data)
Expand Down Expand Up @@ -96,4 +98,3 @@ if (process.env.NODE_ENV !== 'production') {
// console.log(`renderEnd_${this.props.id}`);
// }
}

54 changes: 54 additions & 0 deletions src/components/Auth/Auth.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import React, { PureComponent, PropTypes as pt } from 'react'
import { Field } from 'redux-form'
import cn from 'classnames'

import styles from './Auth.styl'

export default class Auth extends PureComponent {
static propTypes = {
isAuthorized: pt.bool,
submitSucceeded: pt.bool,
handleSubmit: pt.func.isRequired
}

static defaultProps = {
handleSubmit: () => {}
}

renderInput = field => {
const { isAuthorized, submitSucceeded } = this.props
const { type, placeholder, input } = field
const isError = !isAuthorized && submitSucceeded

return (
<input
className={cn(styles.input, {
[styles.input_error]: isError
})}
type={type}
placeholder={placeholder}
{...input}
/>
)
}

render() {
const { handleSubmit } = this.props

return (
<form
className={styles.auth}
onSubmit={handleSubmit}
>
<Field
name='token'
type='text'
placeholder='API token'
component={this.renderInput}
/>

<button className={styles.submit} />
</form>
)
}
}
17 changes: 17 additions & 0 deletions src/components/Auth/Auth.styl
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
.auth
display block

.input
padding-right 5px
padding-left 5px
width 260px
height 30px
text-align center
border none
border-bottom 1px solid gray

&_error
border-color red

.submit
display none
1 change: 1 addition & 0 deletions src/components/Auth/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from './Auth'
50 changes: 0 additions & 50 deletions src/components/IconTabs/IconTabs.js

This file was deleted.

32 changes: 0 additions & 32 deletions src/components/IconTabs/IconTabs.mock.jsx

This file was deleted.

37 changes: 0 additions & 37 deletions src/components/IconTabs/IconTabs.stories.js

This file was deleted.

35 changes: 0 additions & 35 deletions src/components/IconTabs/IconTabs.styl

This file was deleted.

9 changes: 0 additions & 9 deletions src/components/IconTabs/IconTabs.test..js

This file was deleted.

1 change: 0 additions & 1 deletion src/components/IconTabs/index.js

This file was deleted.

Loading