Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1050 commits
Select commit Hold shift + click to select a range
775daa1
Merge pull request #106 from Lambda-School-Labs/codecleanup
moviedatascience May 14, 2020
0608c21
fix movie cards
jvillalp May 14, 2020
3d95b70
updated SearchBar
msinnema33 May 14, 2020
590087f
deleted tester.js
msinnema33 May 14, 2020
e67db04
Merge pull request #107 from Lambda-School-Labs/codecleanup
moviedatascience May 14, 2020
d70f115
updated explore.js
msinnema33 May 14, 2020
0228d7a
updated Navigation.js
msinnema33 May 14, 2020
7bd6841
Merge pull request #108 from Lambda-School-Labs/navigation
moviedatascience May 14, 2020
ac0c862
deleted loginNav and updated ratings/rec/watchlist from master
msinnema33 May 14, 2020
735756d
Merge pull request #109 from Lambda-School-Labs/navigation
moviedatascience May 14, 2020
06af52c
Revert "deleted loginNav and updated ratings/rec/watchlist from master"
jvillalp May 14, 2020
66f8a1b
Merge pull request #111 from Lambda-School-Labs/revert-109-navigation
msinnema33 May 14, 2020
eb1c071
Update App.js
jvillalp May 14, 2020
0f97732
Merge pull request #112 from Lambda-School-Labs/jvillalp-patch-1-1
msinnema33 May 14, 2020
06769d3
Revert "cleanup/Codecleanup"
jvillalp May 14, 2020
6fa8c05
Merge pull request #113 from Lambda-School-Labs/revert-106-codecleanup
msinnema33 May 14, 2020
3d7f964
movie cards evened out, movie images respect space
jvillalp May 14, 2020
740d686
fixes recommendations page
KynexXero May 15, 2020
bb8b9d2
cleaned up recommendation action for explore page
KynexXero May 15, 2020
012742f
clears unused okta state
KynexXero May 15, 2020
6f491c6
Merge branch 'master' into feature/recommendations
KynexXero May 15, 2020
44b23a8
upload functionality
KynexXero May 15, 2020
2c03756
clean up onboarding
jvillalp May 15, 2020
c8d366c
clean up login and dataupload
jvillalp May 15, 2020
364a320
delet onboarding 2
jvillalp May 15, 2020
38c89a8
clean up postonboarding and register components
jvillalp May 15, 2020
76fde56
clean up watchlist
jvillalp May 15, 2020
425de3f
create black border on movei cards on hover
jvillalp May 15, 2020
c91dd70
Merge pull request #114 from Lambda-School-Labs/feature/recommendations
moviedatascience May 15, 2020
057d912
update movie cards in onboarding and search bar
jvillalp May 15, 2020
39f78f5
Merge branch 'master' of github.com:Lambda-School-Labs/Groa-fe into f…
KynexXero May 15, 2020
6f50f59
fixed merge conflicts
jvillalp May 15, 2020
383d245
sets state to correct naming with DS api
KynexXero May 15, 2020
9e0cce0
removes console log on widthfinder
KynexXero May 15, 2020
7e965e7
removes console log not needed
KynexXero May 15, 2020
5463707
removed two imports not used and ran prettier linter
KynexXero May 15, 2020
9c021a7
Merge pull request #116 from Lambda-School-Labs/update-the-moviecard
moviedatascience May 15, 2020
d183cc4
fixed merge conflcits
jvillalp May 15, 2020
0ce1791
Merge pull request #117 from Lambda-School-Labs/feature/explore
moviedatascience May 15, 2020
1282e26
sets recommendations back to use auth
KynexXero May 15, 2020
cca6cc6
pointed action back to back-end
KynexXero May 15, 2020
897d7ab
Merge pull request #119 from Lambda-School-Labs/feature/fix_recommend…
jvillalp May 15, 2020
f39b9fb
change color to blacker on all pages
jvillalp May 15, 2020
5ee08d6
update color of each page
jvillalp May 15, 2020
f589a9c
2 movie cards in each row
jvillalp May 15, 2020
f73f2a4
Merge pull request #122 from Lambda-School-Labs/feature/page-design
moviedatascience May 15, 2020
940a55a
Reduce spacing and boxshadow around cards
moviedatascience May 16, 2020
ea3ebe0
Reduce spacing and boxshadow around movie cards
moviedatascience May 16, 2020
347e6f2
Reducing spacing and box shadow around movie cards
moviedatascience May 16, 2020
bf06203
Reducing spacing and box shadow around movie cards
moviedatascience May 16, 2020
599f86c
Merge pull request #124 from Lambda-School-Labs/spacing-cards
moviedatascience May 16, 2020
2c12bac
added movie titles to onboarding
jvillalp May 18, 2020
80e6a8c
added if statement to register useEffect, added key prop to recommend…
azatecas May 18, 2020
bffda8a
facebook link redirect fix
azatecas May 18, 2020
1cb23ed
Merge pull request #128 from Lambda-School-Labs/minor-tweaks
KynexXero May 18, 2020
f3d0ef9
linter ran
KynexXero May 18, 2020
f82e954
adds description to recommendations
KynexXero May 18, 2020
0316d8e
removed commented styles and ran linter
KynexXero May 18, 2020
249340e
ran linter
KynexXero May 18, 2020
e2d82df
Merge branch 'master' of github.com:Lambda-School-Labs/Groa-fe into f…
KynexXero May 18, 2020
e4180a2
removed unused import and ran linter
KynexXero May 18, 2020
dfac880
removes console log and reload
KynexXero May 18, 2020
dc7f0ea
Merge pull request #129 from Lambda-School-Labs/feature/ratings-fix
moviedatascience May 18, 2020
49e97f6
update descpriton on recommenations page
jvillalp May 18, 2020
f76d3e1
added codeclimate.yml for code climate scores
msinnema33 May 19, 2020
dd435d0
recommendations page has 'not interested' btn
jvillalp May 19, 2020
ff7a9fc
update baseURL back to live server
jvillalp May 19, 2020
8f93ff9
updated base url
jvillalp May 19, 2020
6af4fd4
fixed merge conflicts
jvillalp May 19, 2020
45666a0
on click not interested, close moviecard
jvillalp May 19, 2020
d339636
after login, user redirected to onboarding flow if less than 6 movies…
azatecas May 19, 2020
37ae1ac
axios baseURL updated to env variable instead of localhost
azatecas May 19, 2020
8adbb32
added <=6 total ratings for onboarding flow to complete at 6 ratings …
azatecas May 19, 2020
2a6df00
Merge pull request #130 from Lambda-School-Labs/feature/page-design
msinnema33 May 19, 2020
b4f6b8c
Merge pull request #131 from Lambda-School-Labs/onboarding-rec
msinnema33 May 19, 2020
fd1c20d
created search action
KynexXero May 19, 2020
50c448a
created search reducer
KynexXero May 19, 2020
5919919
ran linter and fixed typo
KynexXero May 19, 2020
af3fc1e
fixed typo
KynexXero May 19, 2020
26da129
removed unused code
KynexXero May 19, 2020
f7613ad
added depencency to useEffect
KynexXero May 19, 2020
ce8c0c7
removed duplicate code
KynexXero May 19, 2020
40f92e6
added dependency to useEffect
KynexXero May 19, 2020
c4593dc
added action and reducer to index
KynexXero May 19, 2020
b4d0b6b
added search action to search bar
KynexXero May 19, 2020
a546c33
Merge pull request #132 from Lambda-School-Labs/codeclimate2
KynexXero May 20, 2020
5424b9a
service providers in state
jvillalp May 20, 2020
188e374
link for service provider display in movie cards
jvillalp May 20, 2020
84e5327
name of provider displayed as button set to link
jvillalp May 20, 2020
c337753
Merge branch 'master' of github.com:Lambda-School-Labs/Groa-fe into f…
KynexXero May 21, 2020
0804660
resolved merge conflict
KynexXero May 21, 2020
851c740
resolved merge conflict
KynexXero May 21, 2020
92753d1
code clean up of unused code
KynexXero May 21, 2020
5a764ea
code clean up of unused code
KynexXero May 21, 2020
b9c082c
ran linter
KynexXero May 21, 2020
4c1696f
removed console.log
KynexXero May 21, 2020
67321bd
removed console.log
KynexXero May 21, 2020
eb727be
adjusted logout button on nav
KynexXero May 21, 2020
687da9a
state for searchBar
KynexXero May 21, 2020
c54ff9e
added query state to onboarding
KynexXero May 21, 2020
c2dcdaa
added query data to explore
KynexXero May 21, 2020
10dc9e2
adjusted action to account for empty search to reset
KynexXero May 21, 2020
e5fc33d
to show search bar in explore page
KynexXero May 21, 2020
82b0310
set empty search from action to reducer
KynexXero May 21, 2020
b0818a5
removed unused imports
KynexXero May 21, 2020
0183404
added comment for commented out code
KynexXero May 21, 2020
21efdf0
began styling of service provider btns
jvillalp May 21, 2020
9e16614
changed font of drop down menu
jvillalp May 21, 2020
5bc5196
Merge pull request #133 from Lambda-School-Labs/feature/search
msinnema33 May 21, 2020
acdfe73
providers appear on explore page
jvillalp May 21, 2020
b31d4af
recommendations also has service providers
jvillalp May 21, 2020
3b68604
providers will not display in watchlist or onboard
jvillalp May 21, 2020
f305cbb
adjust spacing of movie info onboarding
jvillalp May 21, 2020
bce4b52
updated login to fix privacy-policy link
msinnema33 May 21, 2020
110f612
added Typography to privacy-policy to change text color
msinnema33 May 21, 2020
c4f173f
changed text to left align
msinnema33 May 21, 2020
0f666ce
added genres to recommendations pag
jvillalp May 21, 2020
f7216eb
edit axios with auth
jvillalp May 21, 2020
165615b
resolved merge conflict and install 'use-state-with-callback'
jvillalp May 21, 2020
3e484ad
add key to onboarding movie card
jvillalp May 21, 2020
27512fe
proviers dont display on watchlist and onboard
jvillalp May 21, 2020
7900ff9
formated movie card
jvillalp May 21, 2020
84bd0ee
remove duplicate of search reducer in index
jvillalp May 21, 2020
9c44d55
updated link dependency
jvillalp May 21, 2020
ae6b96a
Merge pull request #135 from Lambda-School-Labs/feature/page-design
msinnema33 May 21, 2020
2596369
landing page init
azatecas May 21, 2020
bf7ea43
Merge pull request #134 from Lambda-School-Labs/privacy-policy2
KynexXero May 22, 2020
a181f9c
stars have been designed to align with clicker
jvillalp May 22, 2020
83f0d87
removed commented console.log
jvillalp May 22, 2020
b124f9a
removed console log from ratings
jvillalp May 22, 2020
e88c93b
removed commented code on watchlist
jvillalp May 22, 2020
47e96e2
cleaned up code per ryan on PR#135
jvillalp May 22, 2020
e694907
merged master to this branch
jvillalp May 22, 2020
114f725
Merge pull request #136 from Lambda-School-Labs/feature/stars
msinnema33 May 22, 2020
301ac4e
stars are centered
jvillalp May 22, 2020
a21ac45
caroussel added for recommendations component
azatecas May 23, 2020
aa45f06
carousel styling updated to match groa
azatecas May 23, 2020
81dda99
movie multimodal completed, landing movie silder component functional…
azatecas May 23, 2020
e35305a
Updating the DS API call to /notwatchlist
moviedatascience May 25, 2020
9db2559
landingpage added authentication check, added responsive breakpoints,…
azatecas May 25, 2020
bf888f9
axios base url changed to variable
azatecas May 25, 2020
071d556
Merge pull request #139 from Lambda-School-Labs/landing-page
moviedatascience May 25, 2020
dd5c070
Merge pull request #138 from Lambda-School-Labs/Update-Call-To-notwat…
msinnema33 May 25, 2020
82e22f1
Revert "Updating the DS API call to /notwatchlist"
moviedatascience May 25, 2020
0e45073
Merge pull request #140 from Lambda-School-Labs/revert-138-Update-Cal…
moviedatascience May 25, 2020
310d5d5
adjusted pixel size to match mobile phones
KynexXero May 26, 2020
9c52bfd
fixed modal for mobile
KynexXero May 26, 2020
ccd2a01
adjust movie trailer size on modal for mobile
KynexXero May 26, 2020
724906d
remove console log on widthFinder
KynexXero May 26, 2020
d1644f5
Merge pull request #141 from Lambda-School-Labs/feature/modalSize
msinnema33 May 26, 2020
1f63ebd
update moviecard
jvillalp May 26, 2020
751d512
fixed merge conflcits
jvillalp May 26, 2020
05a9921
removed unused filter method
KynexXero May 26, 2020
98ec4d6
open link in new tab
jvillalp May 26, 2020
04010a1
remove underline on hover
jvillalp May 26, 2020
c5cbdac
styled service btns
jvillalp May 26, 2020
4f38b10
will not close moviecard, if not interested in mov
jvillalp May 26, 2020
4973dec
ran linter
KynexXero May 26, 2020
860135d
Separated ratings by Stars
KynexXero May 26, 2020
239f646
Movie Slider for Ratings page
KynexXero May 26, 2020
5b90cf7
TileBar for Ratings page
KynexXero May 26, 2020
c0245a2
cleaned commented code from Movie card also made service provider lin…
KynexXero May 26, 2020
c1269ec
sass compliar ran
KynexXero May 26, 2020
9c4a536
linter ran
KynexXero May 26, 2020
6382030
updated baseURL
jvillalp May 26, 2020
4299bb4
removed commented out code
jvillalp May 26, 2020
6323396
Merge pull request #142 from Lambda-School-Labs/feature/filterRatings
msinnema33 May 26, 2020
62d9f4d
merge conflict resolved
jvillalp May 26, 2020
720844f
Merge pull request #143 from Lambda-School-Labs/feature/serviceprovid…
moviedatascience May 26, 2020
1b2b070
added conditional for when no ratings are for a star rating
KynexXero May 26, 2020
e234dcd
Merge pull request #145 from Lambda-School-Labs/feature/filterRatings
msinnema33 May 26, 2020
1259e43
switch to 500px for screen width
jvillalp May 26, 2020
0fa47ac
removed name of movie from page
jvillalp May 26, 2020
422e210
cleaned design of movie pages
jvillalp May 26, 2020
471a7cc
Removing typos and exclamation points
moviedatascience May 26, 2020
66b7be1
update service provider btn
jvillalp May 26, 2020
38fd6f5
update movie on onboarding
jvillalp May 26, 2020
a49646c
added title to onboarding page
jvillalp May 26, 2020
65edfb2
resize movie img on modal
jvillalp May 26, 2020
00c7293
Merge pull request #146 from Lambda-School-Labs/feature/moviecard-space
msinnema33 May 26, 2020
1165601
minor tweaks
azatecas May 26, 2020
1929131
axios changed to use backend
azatecas May 26, 2020
5a17b39
Merge branch 'master' into tweaks2
msinnema33 May 26, 2020
0265575
Merge pull request #147 from Lambda-School-Labs/tweaks2
msinnema33 May 27, 2020
bcdbfe5
fixed margins in register page
jvillalp May 27, 2020
ccb7318
updated movie card
jvillalp May 27, 2020
cf20ef1
fixed merged conflicts
jvillalp May 27, 2020
2d9f699
Merge pull request #148 from Lambda-School-Labs/feature/moviecard-space
msinnema33 May 27, 2020
328f633
changed reroute on onboarding
jvillalp May 27, 2020
b3cc2d1
fixed reroute on login action
jvillalp May 27, 2020
fd0563e
update font
jvillalp May 27, 2020
a6ef0e5
fixed font type
jvillalp May 27, 2020
18b941f
Merge pull request #149 from Lambda-School-Labs/feature/moviecard-space
msinnema33 May 27, 2020
b1bf1dd
remove font link
jvillalp May 27, 2020
8bb9c9b
removed bootstrap link. not needed
jvillalp May 27, 2020
3781618
Merge pull request #150 from Lambda-School-Labs/feature/fix-font
msinnema33 May 27, 2020
e25475f
added conditional to force a login and prevent user from beign frozen
azatecas May 27, 2020
8b7238c
Merge pull request #151 from Lambda-School-Labs/registration-bug
KynexXero May 27, 2020
28abe7a
remove previus 'remove from watch list' new added
jvillalp May 28, 2020
13641ba
removed unused imports
KynexXero May 28, 2020
238d2c1
removed unused code/ created remove rating btn / accesibility changes
KynexXero May 28, 2020
8d6e612
added remove ratings action
KynexXero May 28, 2020
86fa9f1
created remove ratings actions
KynexXero May 28, 2020
e9788bb
added remove state to reducer
KynexXero May 28, 2020
893ba73
added placeholder image
KynexXero May 28, 2020
4b9801c
movie cards can be removed from watchlist
jvillalp May 28, 2020
9665562
remove image
KynexXero May 28, 2020
04b2ca4
added accesibility to movie posters
KynexXero May 28, 2020
fa489bb
clean up code, delete action/reducers not needed
jvillalp May 28, 2020
3c25518
watchlist automatically refreshes with btn to remove movie
jvillalp May 28, 2020
280ca7b
add fix to scroll on firefox
KynexXero May 28, 2020
46075ab
edited moviecard
jvillalp May 28, 2020
35a3165
movie card refreshed, but displays next movie modal in line
jvillalp May 28, 2020
9135bca
Merge pull request #154 from Lambda-School-Labs/feature/removeRating
msinnema33 May 28, 2020
6339d4a
fixed padding on where to watch btn
jvillalp May 28, 2020
1f1d37f
changed to baseURL
jvillalp May 28, 2020
f01f578
fixed merge conflicts
jvillalp May 28, 2020
a36844a
movie modal closes when removed from watchlist
jvillalp May 28, 2020
a4d372f
removed commented out code
jvillalp May 28, 2020
123baa9
add where to watch on recommendations page and watchlist
jvillalp May 28, 2020
49a7b51
removed unused code
jvillalp May 28, 2020
db23ac8
fixed text size of headers in each page
jvillalp May 28, 2020
d267eda
fixed issue #152
jvillalp May 28, 2020
aa6538f
fix styling on register page
jvillalp May 28, 2020
10a5c3f
added overflow to paper
KynexXero May 28, 2020
c48fea5
Merge pull request #156 from Lambda-School-Labs/feature/removeRating
msinnema33 May 28, 2020
c722ca8
register navigation styling fixed
jvillalp May 28, 2020
5f43c1e
fixed issue #153
jvillalp May 28, 2020
a2391b3
edit on post onboarding
jvillalp May 28, 2020
b7c65c6
deleted unused scss
jvillalp May 28, 2020
e7e05a6
update title on explore page
jvillalp May 28, 2020
fb690c7
add edits from master
jvillalp May 29, 2020
203f86c
Merge pull request #155 from Lambda-School-Labs/feature/removefromwat…
msinnema33 May 29, 2020
af56473
fixed nav on landing page
jvillalp May 29, 2020
f2728ce
Merge pull request #157 from Lambda-School-Labs/feature/fixlandingpag…
msinnema33 May 29, 2020
669226c
fixed btn on landing page
jvillalp May 29, 2020
14c3fe9
ran linter
KynexXero May 29, 2020
85fa4d8
made it >= to show if there is one movie in state
KynexXero May 29, 2020
cb9a0c4
removed duplicate style
KynexXero May 29, 2020
07fc700
ran linter
KynexXero May 29, 2020
7032dd2
ran linter
KynexXero May 29, 2020
a221ed7
ran linter
KynexXero May 29, 2020
67f9e86
Merge pull request #159 from Lambda-School-Labs/feature/removeRating
jvillalp May 29, 2020
07c4e4f
added imdb rating on recommendations page
jvillalp May 29, 2020
85bc3c5
fixed styling on genre
jvillalp May 29, 2020
98c8eb2
on show ratings on rec. page
jvillalp May 29, 2020
1823862
add imdb rating on recomendations page /10
jvillalp Jun 1, 2020
7a6b322
fixed mrege conflict
jvillalp Jun 1, 2020
33cd776
Merge pull request #160 from Lambda-School-Labs/feature/styling-fixes
msinnema33 Jun 1, 2020
2e54628
Fixing broken privacy policy link
moviedatascience Aug 22, 2020
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
22 changes: 22 additions & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# .codeclimate.yml
version: "2"
checks:
# Disable checks for similar code.
# Because this creates too many false positives.
similar-code:
enabled: false
# Increase the number of lines allowed for a method.
# Because this is more reasonable for JavaScript.
method-lines:
config:
threshold: 50
exclude_patterns:
- "tests/"
- "spec/"
- "**/*.spec.js"
- "**/*.spec.jsx"
- "**/*.spec.ts"
- "**/*.spec.tsx"
- "**/vendor/"
- "**/node_modules/"
-"**/components/layout/privacy-policy.js"
30 changes: 30 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
name: Bug report
about: Create a report to help us improve
title: "[ISSUE_TITLE]"
labels: bug
assignees: ''

---

<!--- Provide a general summary of the issue in the Title above -->

## Expected Behavior
[Describe what what typically happen]

## Current Behavior
[Describe what is currently happening]

## Possible Solution
[If you have a hunch about what could fix the problem put it here]


## Steps to Reproduce
1. Navigate to [place problem is happening]
2. [First action].
3. Click on the [secondary action]
4. Observer the [issue].

## Context (Environment)

[Include whether issue takes place on mobile, which browser, and any other environmental variables which may affect the issue.]
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/node_modules
/.pnp
.pnp.js
.env

# testing
/coverage
Expand Down
247 changes: 147 additions & 100 deletions README.md

Large diffs are not rendered by default.

Loading