Skip to content

Refactor/mix recs#67

Merged
danielkang674 merged 15 commits intodevfrom
refactor/mix-recs
Oct 19, 2018
Merged

Refactor/mix recs#67
danielkang674 merged 15 commits intodevfrom
refactor/mix-recs

Conversation

@WalkerJG33
Copy link
Copy Markdown
Contributor

No description provided.

@ghost ghost assigned WalkerJG33 Oct 19, 2018
@ghost ghost added the in progress label Oct 19, 2018
Copy link
Copy Markdown
Contributor

@danielkang674 danielkang674 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kill the double quotes

@danielkang674 danielkang674 merged commit b0bc347 into dev Oct 19, 2018
@ghost ghost removed the in progress label Oct 19, 2018
@danielkang674 danielkang674 deleted the refactor/mix-recs branch October 19, 2018 16:42
danielkang674 added a commit that referenced this pull request Oct 19, 2018
* Readme

* Feautre/redis caching (#33)

* staging changes for merge

* Added redis caching for server

* added online caching

* removed uncessary redis connection

* fixing for PR

* fixed tests

* bug fixing

* Devops circleci and rebuild prune

* Refactor/devops prune (#34)

* Readme

* Devops circleci and rebuild prune

* circle ci to docker cloud

* indent

* no pulling

* deploy and wget rebuild

* Feature/api db testing (#41)

* started watson

* staging changes

* Feature/good reads (#42)

* starting work on goodReads

* added book routes and formatters

* added and fixed ability to get recs based off of tv shows.

* added watson skeleton service and route

* fixed recs rendering on login (#43)

* merge conflict with rebuild (#44)

* Feature/book recs by genre (#45)

* merge conflict with rebuild

* Get books by Genre and Change XML to JSON node module

* stagin changes

* added getByGenre for all mediums

* Filtering complete (#47)

* Refactor/production links (#48)

* merge conflict with rebuild

* ENV for DB production

* Feature/watson (#50)

* fixed recs rendering on login

* working watson connection with dummy data. Added vuechartjs

* working watson with live data

* Feature/redis for tv (#51)

* Filtering complete

* added redis to tv

* Feature/limit data (#53)

* Filtering complete

* added redis to tv

* added package

* Added flexible limiting function for data

* Bug/fixinfiniteloop (#54)

* merge conflict with rebuild

* should be fixed

* Feature/more redis (#55)

* Filtering complete

* added redis to tv

* added package

* added redis chachin route

* lol more console.log

* changed limiting function and added cache route

* Bug/auth callback (#59)

* merge conflict with rebuild

* Mergemaster13 (#49)

* Readme

* Feautre/redis caching (#33)

* staging changes for merge

* Added redis caching for server

* added online caching

* removed uncessary redis connection

* fixing for PR

* fixed tests

* bug fixing

* Devops circleci and rebuild prune

* Refactor/devops prune (#34)

* Readme

* Devops circleci and rebuild prune

* circle ci to docker cloud

* indent

* no pulling

* deploy and wget rebuild

* Feature/api db testing (#41)

* started watson

* staging changes

* Feature/good reads (#42)

* starting work on goodReads

* added book routes and formatters

* added and fixed ability to get recs based off of tv shows.

* added watson skeleton service and route

* fixed recs rendering on login (#43)

* merge conflict with rebuild (#44)

* Feature/book recs by genre (#45)

* merge conflict with rebuild

* Get books by Genre and Change XML to JSON node module

* stagin changes

* added getByGenre for all mediums

* Filtering complete (#47)

* Refactor/production links (#48)

* merge conflict with rebuild

* ENV for DB production

* Mergemaster15 (#57)

* Readme

* Feautre/redis caching (#33)

* staging changes for merge

* Added redis caching for server

* added online caching

* removed uncessary redis connection

* fixing for PR

* fixed tests

* bug fixing

* Devops circleci and rebuild prune

* Refactor/devops prune (#34)

* Readme

* Devops circleci and rebuild prune

* circle ci to docker cloud

* indent

* no pulling

* deploy and wget rebuild

* Feature/api db testing (#41)

* started watson

* staging changes

* Feature/good reads (#42)

* starting work on goodReads

* added book routes and formatters

* added and fixed ability to get recs based off of tv shows.

* added watson skeleton service and route

* fixed recs rendering on login (#43)

* merge conflict with rebuild (#44)

* Feature/book recs by genre (#45)

* merge conflict with rebuild

* Get books by Genre and Change XML to JSON node module

* stagin changes

* added getByGenre for all mediums

* Filtering complete (#47)

* Refactor/production links (#48)

* merge conflict with rebuild

* ENV for DB production

* Feature/watson (#50)

* fixed recs rendering on login

* working watson connection with dummy data. Added vuechartjs

* working watson with live data

* Feature/redis for tv (#51)

* Filtering complete

* added redis to tv

* Feature/limit data (#53)

* Filtering complete

* added redis to tv

* added package

* Added flexible limiting function for data

* Bug/fixinfiniteloop (#54)

* merge conflict with rebuild

* should be fixed

* Feature/more redis (#55)

* Filtering complete

* added redis to tv

* added package

* added redis chachin route

* lol more console.log

* changed limiting function and added cache route

* Callback redirect to home route

* Bug/auth callback (#61)

* merge conflict with rebuild

* Mergemaster13 (#49)

* Readme

* Feautre/redis caching (#33)

* staging changes for merge

* Added redis caching for server

* added online caching

* removed uncessary redis connection

* fixing for PR

* fixed tests

* bug fixing

* Devops circleci and rebuild prune

* Refactor/devops prune (#34)

* Readme

* Devops circleci and rebuild prune

* circle ci to docker cloud

* indent

* no pulling

* deploy and wget rebuild

* Feature/api db testing (#41)

* started watson

* staging changes

* Feature/good reads (#42)

* starting work on goodReads

* added book routes and formatters

* added and fixed ability to get recs based off of tv shows.

* added watson skeleton service and route

* fixed recs rendering on login (#43)

* merge conflict with rebuild (#44)

* Feature/book recs by genre (#45)

* merge conflict with rebuild

* Get books by Genre and Change XML to JSON node module

* stagin changes

* added getByGenre for all mediums

* Filtering complete (#47)

* Refactor/production links (#48)

* merge conflict with rebuild

* ENV for DB production

* Mergemaster15 (#57)

* Readme

* Feautre/redis caching (#33)

* staging changes for merge

* Added redis caching for server

* added online caching

* removed uncessary redis connection

* fixing for PR

* fixed tests

* bug fixing

* Devops circleci and rebuild prune

* Refactor/devops prune (#34)

* Readme

* Devops circleci and rebuild prune

* circle ci to docker cloud

* indent

* no pulling

* deploy and wget rebuild

* Feature/api db testing (#41)

* started watson

* staging changes

* Feature/good reads (#42)

* starting work on goodReads

* added book routes and formatters

* added and fixed ability to get recs based off of tv shows.

* added watson skeleton service and route

* fixed recs rendering on login (#43)

* merge conflict with rebuild (#44)

* Feature/book recs by genre (#45)

* merge conflict with rebuild

* Get books by Genre and Change XML to JSON node module

* stagin changes

* added getByGenre for all mediums

* Filtering complete (#47)

* Refactor/production links (#48)

* merge conflict with rebuild

* ENV for DB production

* Feature/watson (#50)

* fixed recs rendering on login

* working watson connection with dummy data. Added vuechartjs

* working watson with live data

* Feature/redis for tv (#51)

* Filtering complete

* added redis to tv

* Feature/limit data (#53)

* Filtering complete

* added redis to tv

* added package

* Added flexible limiting function for data

* Bug/fixinfiniteloop (#54)

* merge conflict with rebuild

* should be fixed

* Feature/more redis (#55)

* Filtering complete

* added redis to tv

* added package

* added redis chachin route

* lol more console.log

* changed limiting function and added cache route

* Callback redirect to home route

* Bug/auth callback (#60)

* Readme

* Feautre/redis caching (#33)

* staging changes for merge

* Added redis caching for server

* added online caching

* removed uncessary redis connection

* fixing for PR

* fixed tests

* bug fixing

* Devops circleci and rebuild prune

* Refactor/devops prune (#34)

* Readme

* Devops circleci and rebuild prune

* circle ci to docker cloud

* indent

* no pulling

* deploy and wget rebuild

* Feature/api db testing (#41)

* started watson

* staging changes

* Feature/good reads (#42)

* starting work on goodReads

* added book routes and formatters

* added and fixed ability to get recs based off of tv shows.

* added watson skeleton service and route

* fixed recs rendering on login (#43)

* merge conflict with rebuild

* merge conflict with rebuild (#44)

* Feature/book recs by genre (#45)

* merge conflict with rebuild

* Get books by Genre and Change XML to JSON node module

* stagin changes

* added getByGenre for all mediums

* Filtering complete (#47)

* Refactor/production links (#48)

* merge conflict with rebuild

* ENV for DB production

* Feature/watson (#50)

* fixed recs rendering on login

* working watson connection with dummy data. Added vuechartjs

* working watson with live data

* Feature/redis for tv (#51)

* Filtering complete

* added redis to tv

* Feature/limit data (#53)

* Filtering complete

* added redis to tv

* added package

* Added flexible limiting function for data

* Bug/fixinfiniteloop (#54)

* merge conflict with rebuild

* should be fixed

* Feature/more redis (#55)

* Filtering complete

* added redis to tv

* added package

* added redis chachin route

* lol more console.log

* changed limiting function and added cache route

* Callback redirect to home route

* star route uses express static

* Feature/watson (#63)

* fixed recs rendering on login

* working watson connection with dummy data. Added vuechartjs

* working watson with live data

* working user Profile

* working wtason integration recs

* Refactor/destroy console logs (#66)

* merge conflict with rebuild

* Destroy console logs

* Refactor/mix recs (#67)

* Filtering complete

* added redis to tv

* added package

* added redis chachin route

* lol more console.log

* changed limiting function and added cache route

* stashing

* staging for changes

* moved some logic from server to client

* Refactor/formatting (#68)

* Filtering complete

* added redis to tv

* added package

* added redis chachin route

* lol more console.log

* changed limiting function and added cache route

* stashing

* staging for changes

* moved some logic from server to client

* changed formatting

* remove logs
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.

2 participants