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.

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

Merge dev in master? #39

Open
wants to merge 41 commits into
base: master
Choose a base branch
from
Open

Merge dev in master? #39

wants to merge 41 commits into from

Conversation

HamidAghdaee
Copy link

No description provided.

simona1 and others added 30 commits August 2, 2017 10:07
* Add flow as a dependency and setup a `.flowconfig file`

* Add a Clock React component and test with flow

* Minimal styling for the messages view

* Implement basic styles for the Messages view

* Refactor to comply with ESLint rules

* Add shallow component testing

* Uninstall `semantic-ui-css` module and add CDN link into `index.html`
* Add flow as a dependency and setup a `.flowconfig file`

* Add a Clock React component and test with flow

* Minimal styling for the messages view

* Implement basic styles for the Messages view

* Refactor to comply with ESLint rules

* Add shallow component testing

* Uninstall `semantic-ui-css` module and add CDN link into `index.html`

* Resolve merge conflict

* Modify Toolbar component to receive props

* Prepare images and colors for Messages view

* MessageList reads from a seeds file, `messages.json`

* Add `Message` component and new tests for the refactored components

* Minor bug fix
* Add flow as a dependency and setup a `.flowconfig file`

* Add a Clock React component and test with flow

* Minimal styling for the messages view

* Implement basic styles for the Messages view

* Refactor to comply with ESLint rules

* Add shallow component testing

* Uninstall `semantic-ui-css` module and add CDN link into `index.html`

* Resolve merge conflict

* Modify Toolbar component to receive props

* Prepare images and colors for Messages view

* MessageList reads from a seeds file, `messages.json`

* Add `Message` component and new tests for the refactored components

* Minor bug fix

* Update dependencies

* Basic LoginView

* Basic LoginView

* Add minimal `socket.io` code, address lint and flow issues

* LoginView component code removed from App code

* Refactor code and begin redux

* Rudimentary store and actions

* Remove unused variables

* Remove obsolete file

* Cleanup unneeded files and organize images in their own directory

* Scores mapped to emojis

* Refactor to fix flow and lint errors & redux store so far

* Add more actions and update emoji images

* Add action for displaying score

* Partial redux refactor

* Complete test for LoginView.jsx

* Communicating with server via `socket.io`

* Remove unnecessary files

* Complete first test for Actions.js

* Remove unnecessary files and code

* Address console warnings

* Add function to map a score to an object with color and emoji keys

* Add testing functionality for most of the actions

* Scaffolded out all tests for reducers and completed 4 tests

* Remove caret from redux-testkit dependency

* Toolbar changes colors to match score

* Complete tests for reducers that are missing corresponding actions

* Toolbar changes both color and emoji to indicate sentiment

* flip index.js

* Replace image for slack icon

* Swap file for slack icon to fix previous merge bugs

* Minor edits

* Add middleware

* Clean-up lint errors and test fetches

* Configured store with connect

* Refactored MessageList

* LoginView reafctored

* Cleanup unnecessary code

* Export action creators as individual functions and debug

* flip to localtunnel

* flip to localtunnel

* Moved Actions to their own directory

* Move Reducers to their own directory

* Move Components to their own directory

* Add Constants and Utils directories

* Fix linting errors

* Partial test and linting fixes

* Refactor reducers tests

* Refactor Actions tests

* Rename `Types.js` to `index.js` under FlowTypes & edit import statements

* Rename `convertScoreToColorAndEmoji.js` to `index.js` and edit references to it

* Rename `connectWithSlackHref.jsx` to `index.js`and edit reference to it

* Move code related to sockets into its own file

* Add TODO

* Fix Actions test for 'RECEIVED_CHANNEL_LIST' action

* Clean-up code and add flow annotations to Reducers

* Add TODOs for tests
* Add widgetId to App

* Add with all views working

* Add with score data and sentiments working

* Fix linting errors
* Add widgetId to App

* Add with all views working

* Add with score data and sentiments working

* Fix linting errors

* Fix flow errors

* Fix linting errors

* Add .npmrc file (#6)

* Dashboard refactor (#7)

* Add widgetId to App

* Add with all views working

* Add with score data and sentiments working

* Fix linting errors

* Add widgetId to App

* Add with all views working

* Add with score data and sentiments working

* Fix linting errors

* Fix flow errors

* Fix linting errors

* Check code and fix erros after rebasing
* Initial dashboard integration

* Second dashboard integration commit

* Move hard coded url to .env file

* Remove env file from gitignore
* Tweak spacing and incorperate socket

* Refactor components map state to props and add method for fetching messages for channel

* Add routes to get channels and messages for channels

* Update actions tests

* Fix check for old messages

* Remove carets

* Add todo notes on temporary solutions

* Add todos to set info as environmental variables
* Create codeship-services.yml

* Add scripts to create npm module for widget

* Add codeship steps

* Clone down entire slack-api
* Add widgetId to App

* Add with all views working

* Add with score data and sentiments working

* Fix linting errors

* Fix flow errors

* Fix linting errors

* Add widgetId to App

* Add with all views working

* Add with score data and sentiments working

* Fix linting errors

* Fix flow errors

* Fix linting errors

* Check code and fix erros after rebasing

* Move functions making API calls into their own file

* Api Refactor so far

* Yarn install in the widget-lib

* Refactor fetchChannels

* Refactor fetchMessagesForChannel

* Switch to localhost for testing
Sync changes

* Fix fetchChannels
Note: channelNames is an array as `actions.channels` is an array; channelData is an object. Refer to `FlowTypes` if in doubt.

* Continue sync and refactor

* Sync code in MessageList

* Sync Toolbar code

* Fix discrepancies in tests for actions

* Clean-up linting errors

* Address comments for PR

* Add Flow type for SLACK_API class
* Configure fetch methods to communicate with api and more concise

* Configure fetch methods to communicate with api and more concise

* Fix use of fetch messages api call

* Fix data extraction for channel list and messages received

* Connect to local tunnel url

* Add env to gitignore

* Move environmental variables to .env.development and take .env out of .gitignore

* Move socket to app component

* Fix linting

* Write TODO for env bug

* Add enviornmental variable for api url
* Change display of user info on message

* Add notes to message components to inform future development using message objects

* Update snapshot test
* Change display of user info on message

* Add notes to message components to inform future development using message objects

* Update snapshot test

* Add action creator for fetching sentiment score from the database when a new channel is selected

* Add action to fetch sentiment score for a channel from the db and update the store

* Add static method for making an api call to fetch score for a channel from db

* Replicate process for adding new score to update store when score is received from the db

* Fix test for fetch channels

* Add test for fetch messages for channel

* Add test for fetch score for channel

* Remove superfluous code

* Test that channels are stored

* Test that messages are stored for a channel

* Test that score is stored for a channel

* Update message snapshot test

* Add snapshot test for message list

* Add snapshot test for toolbar
* Create codeship-services.yml

* Add scripts to create npm module for widget

* Add codeship steps

* Clone down entire slack-api

* Refactor build script and export

* Fix merge conflict

* Add es2015 to package.json

* Finalize PR
* Modify styling for fields inside the Message component

* Change MessageList component to include a vertical scrollbar
Add styling for the scrollbar
Update widget packages
* Modify styling for fields inside the Message component

* Change MessageList component to include a vertical scrollbar
Add styling for the scrollbar
Update widget packages

* Fix lint and flow errors, add todos to obsoleted tests

* Fix broken tests, clean-up flow and lint errors
* Modify styling for fields inside the Message component

* Change MessageList component to include a vertical scrollbar
Add styling for the scrollbar
Update widget packages

* Fix lint and flow errors, add todos to obsoleted tests

* Fix broken tests, clean-up flow and lint errors

* Background color in the message list reflects selected score channel
Clear of flow and lint errors
All tests pass

* Remove console logs
…s conflicting with other widgets in dashboard. (#24)
* Modify styling for fields inside the Message component

* Change MessageList component to include a vertical scrollbar
Add styling for the scrollbar
Update widget packages

* Fix lint and flow errors, add todos to obsoleted tests

* Fix broken tests, clean-up flow and lint errors

* Background color in the message list reflects selected score channel
Clear of flow and lint errors
All tests pass

* Remove console logs

* Fix reducers tests
* Modify styling for fields inside the Message component

* Change MessageList component to include a vertical scrollbar
Add styling for the scrollbar
Update widget packages

* Fix lint and flow errors, add todos to obsoleted tests

* Fix broken tests, clean-up flow and lint errors

* Background color in the message list reflects selected score channel
Clear of flow and lint errors
All tests pass

* Remove console logs

* Fix reducers tests
* Modify styling for fields inside the Message component

* Change MessageList component to include a vertical scrollbar
Add styling for the scrollbar
Update widget packages

* Fix lint and flow errors, add todos to obsoleted tests

* Fix broken tests, clean-up flow and lint errors

* Background color in the message list reflects selected score channel
Clear of flow and lint errors
All tests pass

* Remove console logs

* Fix reducers tests

* Minor edit in the test to provoke a change in snapshot
* Modify styling for fields inside the Message component

* Change MessageList component to include a vertical scrollbar
Add styling for the scrollbar
Update widget packages

* Fix lint and flow errors, add todos to obsoleted tests

* Fix broken tests, clean-up flow and lint errors

* Background color in the message list reflects selected score channel
Clear of flow and lint errors
All tests pass

* Remove console logs

* Fix reducers tests

* Minor edit in the test to provoke a change in snapshot

* Update test input and snapshot
…nt.js (#31)

* Modify styling for fields inside the Message component

* Change MessageList component to include a vertical scrollbar
Add styling for the scrollbar
Update widget packages

* Fix lint and flow errors, add todos to obsoleted tests

* Fix broken tests, clean-up flow and lint errors

* Background color in the message list reflects selected score channel
Clear of flow and lint errors
All tests pass

* Remove console logs

* Fix reducers tests

* Minor edit in the test to provoke a change in snapshot

* Update test input and snapshot

* Update npm module

* Make a separate component for handling timestamps

* Update snapshots, clean-up commented out code

* Fix port number in `.env.development`
simona1 and others added 11 commits September 22, 2017 14:40
* Modify styling for fields inside the Message component

* Change MessageList component to include a vertical scrollbar
Add styling for the scrollbar
Update widget packages

* Fix lint and flow errors, add todos to obsoleted tests

* Fix broken tests, clean-up flow and lint errors

* Background color in the message list reflects selected score channel
Clear of flow and lint errors
All tests pass

* Remove console logs

* Fix reducers tests

* Minor edit in the test to provoke a change in snapshot

* Update test input and snapshot

* Update npm module

* Make a separate component for handling timestamps

* Update snapshots, clean-up commented out code

* Fix port number in `.env.development`

* Add  a logout button on the Toolbar
Add action for disconnectting from slack
Add reducer to match the disconnect from slack action
Add new tests for these changes
* Implement checking if logged to OAuth in by asking server

* Implement logout from OAuth
Description for slack-spa readme
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.