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

Commits on Aug 2, 2017

  1. Basic React components (#1)

    * 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`
    simona1 authored and Hamid Aghdaee committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    20fe7fc View commit details
    Browse the repository at this point in the history
  2. Refactor static components (#2)

    * 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
    simona1 authored and Hamid Aghdaee committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    68ee41c View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2017

  1. Latest version with todos for tests (#3)

    * 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
    simona1 authored and Hamid Aghdaee committed Aug 24, 2017
    Configuration menu
    Copy the full SHA
    9b14c8d View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2017

  1. Add .npmrc file (#6)

    meghanprestemon authored and Hamid Aghdaee committed Aug 29, 2017
    Configuration menu
    Copy the full SHA
    a845859 View commit details
    Browse the repository at this point in the history
  2. Dashboard refactor (#7)

    * Add widgetId to App
    
    * Add with all views working
    
    * Add with score data and sentiments working
    
    * Fix linting errors
    SSabu authored and Hamid Aghdaee committed Aug 29, 2017
    Configuration menu
    Copy the full SHA
    cbd0d86 View commit details
    Browse the repository at this point in the history
  3. Dashboard refactor (#8)

    * 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
    simona1 authored and Hamid Aghdaee committed Aug 29, 2017
    Configuration menu
    Copy the full SHA
    6c6add3 View commit details
    Browse the repository at this point in the history
  4. add npm lib folder. remove unsused .babelrc file since this was causi…

    …ng an error building the npm lib
    Hamid Aghdaee committed Aug 29, 2017
    Configuration menu
    Copy the full SHA
    9e3a98b View commit details
    Browse the repository at this point in the history
  5. recreate .babelrc, install its dependencies

    Hamid Aghdaee committed Aug 29, 2017
    Configuration menu
    Copy the full SHA
    811d951 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2017

  1. Env file (#5)

    * Initial dashboard integration
    
    * Second dashboard integration commit
    
    * Move hard coded url to .env file
    
    * Remove env file from gitignore
    Sanderson239 authored and Hamid Aghdaee committed Aug 30, 2017
    Configuration menu
    Copy the full SHA
    a73b8ca View commit details
    Browse the repository at this point in the history
  2. Refactor to communicate with api (#11)

    * 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
    tylerlan authored and Hamid Aghdaee committed Aug 30, 2017
    Configuration menu
    Copy the full SHA
    59a775e View commit details
    Browse the repository at this point in the history
  3. fixed linting errors

    Hamid Aghdaee committed Aug 30, 2017
    Configuration menu
    Copy the full SHA
    3a227a5 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2017

  1. add .eslintignore file to get eslint not to hang

    Hamid Aghdaee committed Aug 31, 2017
    Configuration menu
    Copy the full SHA
    0b2d8f5 View commit details
    Browse the repository at this point in the history
  2. CI / CD created (#14)

    * Create codeship-services.yml
    
    * Add scripts to create npm module for widget
    
    * Add codeship steps
    
    * Clone down entire slack-api
    Gwillison415 authored and joshwyatt committed Aug 31, 2017
    Configuration menu
    Copy the full SHA
    1af3f9a View commit details
    Browse the repository at this point in the history
  3. Latest api refactor (#13)

    * 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
    simona1 authored and Hamid Aghdaee committed Aug 31, 2017
    Configuration menu
    Copy the full SHA
    37ef5bb View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2017

  1. Communicate with API (#15)

    * 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
    tylerlan authored and Hamid Aghdaee committed Sep 3, 2017
    Configuration menu
    Copy the full SHA
    b6d441d View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2017

  1. Realtime updating with message and user info (#16)

    * Change display of user info on message
    
    * Add notes to message components to inform future development using message objects
    
    * Update snapshot test
    tylerlan authored and Hamid Aghdaee committed Sep 6, 2017
    Configuration menu
    Copy the full SHA
    6333eac View commit details
    Browse the repository at this point in the history
  2. Sentiment analysis integration (#18)

    * 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
    tylerlan authored and Hamid Aghdaee committed Sep 6, 2017
    Configuration menu
    Copy the full SHA
    4aa2fd3 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2017

  1. Slack path re-name (#17)

    * 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
    Gwillison415 authored and Hamid Aghdaee committed Sep 8, 2017
    Configuration menu
    Copy the full SHA
    ef23b40 View commit details
    Browse the repository at this point in the history
  2. Update package.json to remove extra space.

    Hamid Aghdaee authored Sep 8, 2017
    Configuration menu
    Copy the full SHA
    b5647e3 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2017

  1. Modify styling for fields inside the Message component (#20)

    simona1 authored and Hamid Aghdaee committed Sep 11, 2017
    Configuration menu
    Copy the full SHA
    d3ae357 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2017

  1. Add scrollbar to MessageList and modify css to reflect this change (#21)

    * Modify styling for fields inside the Message component
    
    * Change MessageList component to include a vertical scrollbar
    Add styling for the scrollbar
    Update widget packages
    simona1 authored and Hamid Aghdaee committed Sep 13, 2017
    Configuration menu
    Copy the full SHA
    c46454e View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2017

  1. Fixed lint and flow errors (#22)

    * 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
    simona1 authored and Hamid Aghdaee committed Sep 14, 2017
    Configuration menu
    Copy the full SHA
    0771ba1 View commit details
    Browse the repository at this point in the history
  2. Background color for messages responds to changes in score (#23)

    * 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
    simona1 authored and Hamid Aghdaee committed Sep 14, 2017
    Configuration menu
    Copy the full SHA
    1c8b8ae View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2017

  1. Fixes classNames that was just a color to refactor as slack-color. Wa…

    …s conflicting with other widgets in dashboard. (#24)
    danielmarcgardner authored and Hamid Aghdaee committed Sep 15, 2017
    Configuration menu
    Copy the full SHA
    06d3a29 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2017

  1. Fix reducers tests (#26)

    * 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
    simona1 authored and joshwyatt committed Sep 19, 2017
    Configuration menu
    Copy the full SHA
    3a5a553 View commit details
    Browse the repository at this point in the history
  2. Update npm module (#28)

    * 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
    simona1 authored and joshwyatt committed Sep 19, 2017
    Configuration menu
    Copy the full SHA
    26a27fb View commit details
    Browse the repository at this point in the history
  3. Update npm start to run up api (#27)

    ronanfitz authored and joshwyatt committed Sep 19, 2017
    Configuration menu
    Copy the full SHA
    87c2970 View commit details
    Browse the repository at this point in the history
  4. Snapshot update (#29)

    * 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
    simona1 authored and joshwyatt committed Sep 19, 2017
    Configuration menu
    Copy the full SHA
    7ef716f View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2017

  1. Temporary solution to failing test (#30)

    * 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
    simona1 authored and joshwyatt committed Sep 21, 2017
    Configuration menu
    Copy the full SHA
    05cc725 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2017

  1. Made a separate component to handle processing of timestamp with Mome…

    …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 authored and Hamid Aghdaee committed Sep 22, 2017
    Configuration menu
    Copy the full SHA
    0bc8cb3 View commit details
    Browse the repository at this point in the history
  2. Logout button for slack-spa (#32)

    * 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
    simona1 authored and Hamid Aghdaee committed Sep 22, 2017
    Configuration menu
    Copy the full SHA
    10a23f1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    db305d5 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2017

  1. Configuration menu
    Copy the full SHA
    7b3e331 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    433b1ea View commit details
    Browse the repository at this point in the history
  3. Complete codeship CD steps

    joshwyatt committed Sep 24, 2017
    Configuration menu
    Copy the full SHA
    a408f13 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    65bfcf6 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2017

  1. Login (#35)

    * Implement checking if logged to OAuth in by asking server
    
    * Implement logout from OAuth
    johanbmk authored and joshwyatt committed Sep 25, 2017
    Configuration menu
    Copy the full SHA
    39676ff View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d327be6 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2017

  1. add scroll to bottom to messageslist, exclude broken tests

    Hamid Aghdaee committed Sep 27, 2017
    Configuration menu
    Copy the full SHA
    ac456e4 View commit details
    Browse the repository at this point in the history
  2. update npm package version

    Hamid Aghdaee committed Sep 27, 2017
    Configuration menu
    Copy the full SHA
    11f6733 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2017

  1. Merge pull request #38 from simona1/readme

    Description for slack-spa readme
    Gwillison415 authored Nov 30, 2017
    Configuration menu
    Copy the full SHA
    b11dd4a View commit details
    Browse the repository at this point in the history