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

Ports - Sopheary & Jillianne #29

Open
wants to merge 82 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
7b7be75
setup
sophearychiv Jun 24, 2019
b279d1a
framework for react router added
jillirami Jun 24, 2019
f7baa84
Merge branch 'master' of https://github.com/sophearychiv/video-store-…
jillirami Jun 24, 2019
90b5507
added components folder
sophearychiv Jun 25, 2019
9022317
able to import list of movies and customers from api to view
jillirami Jun 25, 2019
6123822
added Search component
sophearychiv Jun 25, 2019
bdb5920
Merge branch 'master' of https://github.com/sophearychiv/video-store-…
sophearychiv Jun 25, 2019
2f683b1
added error section
sophearychiv Jun 25, 2019
95d4f78
able to see all movies, and select movie
jillirami Jun 25, 2019
3d3c501
able to see all movies, and select movie
jillirami Jun 25, 2019
4663000
show search results
sophearychiv Jun 25, 2019
e9c9e07
fixed conflicts
sophearychiv Jun 25, 2019
c351088
able to chose a movie and customer for rental, and show details for e…
jillirami Jun 26, 2019
781d0bf
merged conflicts on main app page
jillirami Jun 26, 2019
c73f9e9
fixing error in search bar
sophearychiv Jun 26, 2019
694e84a
Merge branch 'master' of https://github.com/sophearychiv/video-store-…
sophearychiv Jun 26, 2019
9be0edb
refactored search page
sophearychiv Jun 26, 2019
52e9dd0
feature to add movie to the rental library
sophearychiv Jun 26, 2019
48c4913
fixed the search results
sophearychiv Jun 26, 2019
a7cf987
doesn't allow existing movies to be added to the rental library
sophearychiv Jun 26, 2019
77747a3
working on rental feature
jillirami Jun 26, 2019
55cfc47
able to rent a movie
jillirami Jun 26, 2019
e712ceb
moved errer section higher on app
jillirami Jun 26, 2019
ca9aca5
added styles
sophearychiv Jun 26, 2019
636e2ef
fixed issues with customer selection
sophearychiv Jun 26, 2019
24d5fc6
fixed brand link
sophearychiv Jun 26, 2019
764ae95
able to view rental response
jillirami Jun 26, 2019
82de611
removed unused code
jillirami Jun 26, 2019
878a4fc
Merge branch 'master' into rentaljr
jillirami Jun 26, 2019
57963bb
Merge pull request #1 from sophearychiv/rentaljr
jillirami Jun 26, 2019
9fd478f
remove type
jillirami Jun 26, 2019
5679e73
removed Home component
sophearychiv Jun 26, 2019
b3a2dd9
now have a rental object state in app
jillirami Jun 26, 2019
89f8949
rental object state in app able to be viewed
jillirami Jun 27, 2019
84961a8
more stylings
sophearychiv Jun 27, 2019
36c27ce
able to check in movie most recent checkout movie
jillirami Jun 27, 2019
a5e97ac
added more styles to the library
sophearychiv Jun 27, 2019
dd89e0b
more stylings for search results
sophearychiv Jun 27, 2019
35cf2ce
attempt at overdue movies feature
jillirami Jun 27, 2019
8784883
merges resolved
jillirami Jun 27, 2019
dafd0e4
trying to fix viewing movie details
sophearychiv Jun 27, 2019
bc165e7
Merge branch 'master' of https://github.com/sophearychiv/video-store-…
sophearychiv Jun 27, 2019
a199867
able to view overdue movies
jillirami Jun 27, 2019
e16e0ee
styled view details in library
sophearychiv Jun 27, 2019
2da85b9
styled view details in library
sophearychiv Jun 27, 2019
c352602
fixed image sizes and cleaned up comments
sophearychiv Jun 27, 2019
2aedf3b
changed overview in search results
sophearychiv Jun 27, 2019
f49292a
able to view rentals per each customer
jillirami Jun 27, 2019
d39cfdf
removed old unused code
jillirami Jun 27, 2019
26e164d
fixed problem with image url
sophearychiv Jun 27, 2019
d6dd091
show Selected button when the movie is selected in the library
sophearychiv Jun 28, 2019
5046ea0
able to view each customers rentals now
jillirami Jun 28, 2019
5274073
merges complete, error in view of customer rentals
jillirami Jun 28, 2019
4d64fc1
able to view correct customer rentals
jillirami Jun 28, 2019
bfc1719
theme and styling for navigation and front page added
jillirami Jun 28, 2019
38c59cd
select and deselect movie
sophearychiv Jun 28, 2019
038f7fc
fixed deselecting bug
sophearychiv Jun 28, 2019
d491e1d
select and deselect customer
sophearychiv Jun 28, 2019
5154a87
changed movie details to show data from the api
sophearychiv Jun 28, 2019
3c691f1
clicking on logo will reset state
sophearychiv Jun 28, 2019
bf20d9c
fixed customer rentals
sophearychiv Jun 28, 2019
cdfae53
fixed rentals link and button stylings
sophearychiv Jun 28, 2019
7b91086
changed back to /rentals after accidentally added /rentals/overdue
sophearychiv Jun 28, 2019
fc877e8
added customer id
sophearychiv Jun 28, 2019
45f2eac
corrected flex view on header and nav
jillirami Jun 28, 2019
c6af748
Merge branch 'master' of https://github.com/sophearychiv/video-store-…
jillirami Jun 28, 2019
9cad92c
change font of body of app
jillirami Jun 28, 2019
acc9584
styling added for active rental section
jillirami Jun 28, 2019
aef9dda
button colors changed to black
jillirami Jun 28, 2019
1efa5ca
all button colors ammended
jillirami Jun 28, 2019
50544ea
added headers to Customer Rentals
sophearychiv Jun 28, 2019
bdd65d5
Merge branch 'master' of https://github.com/sophearychiv/video-store-…
sophearychiv Jun 28, 2019
3488116
formatted overdue movies page
jillirami Jun 28, 2019
83027d9
Merge branch 'master' of https://github.com/sophearychiv/video-store-…
jillirami Jun 28, 2019
3ce6a56
removed bullets on overdue movies
jillirami Jun 28, 2019
bb88c82
formatting for overdue movies
jillirami Jun 28, 2019
9f5604f
removed bulltes in Overdue movies
sophearychiv Jun 28, 2019
34d66e0
customer page css
jillirami Jun 28, 2019
9c04a83
coloring of navigation links
jillirami Jun 28, 2019
fbc6323
styling on library page
jillirami Jun 28, 2019
fbc626f
styling added to all pages'
jillirami Jun 28, 2019
c145a5a
final styling for rental section
jillirami Jun 28, 2019
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
407 changes: 407 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,30 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"axios": "^0.19.0",
"bootstrap": "^4.3.1",
"react": "^16.8.6",
"react-bootstrap": "^1.0.0-beta.9",
"react-dom": "^16.8.6",
"react-router-dom": "^5.0.1",
"react-scripts": "3.0.1"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
}
}
93 changes: 78 additions & 15 deletions src/App.css
Original file line number Diff line number Diff line change
@@ -1,28 +1,91 @@
.App {
@import url('https://fonts.googleapis.com/css?family=Limelight&display=swap');

.nav_container {
background: #300701 url("https://i.kinja-img.com/gawker-media/image/upload/s--m9daP_xN--/c_scale,f_auto,fl_progressive,q_80,w_800/unsnbwg2cke5spzlpsuy.jpg") no-repeat center top;
background-size: 100% 180%;
display: flex;
flex-direction: column;
height: 15rem;
}

.brand {
display: flex;
flex-direction: row;
justify-content: center;
text-shadow:
-1px -1px 0 white,
1px -1px 0 white,
-1px 1px 0 white,
1px 1px 0 white;
color: black;
font-size: 6rem;
text-decoration-line: none;
margin-left: 1rem;
text-align: center;
margin-top: 20px;
font-family: 'Limelight', cursive;
}

.App-logo {
animation: App-logo-spin infinite 20s linear;
height: 80px;
.nav {
display: flex;
justify-content: center;
}

.App-header {
background-color: #222;
height: 150px;
padding: 20px;
.nav_link {
font-family: 'Limelight', cursive;
color: white;
text-shadow:
-1px -1px 0 #000,
1px -1px 0 #000,
-1px 1px 0 #000,
1px 1px 0 #000;
font-size: 2rem;
text-decoration: none;
padding-left: 15px;
padding-right: 15px;
}

.nav_link:first-child {
border-left: none;
}

.App-title {
font-size: 1.5em;
.nav_link:hover {
color: red;
text-shadow:
-1px -1px 0 #990708,
1px -1px 0 #990708,
-1px 1px 0 #990708,
1px 1px 0 #990708;
text-decoration: none;
}

.App-intro {
font-size: large;
.brand:hover {
color: #990708;
text-shadow:
-1px -1px 0 red,
1px -1px 0 red,
-1px 1px 0 red,
1px 1px 0 red;
text-decoration: none;
}

@keyframes App-logo-spin {
from { transform: rotate(0deg); }
to { transform: rotate(360deg); }
#rentalSection {
border-top: 10px solid black;
background: white;
padding-bottom: 15px;
}

.currently-selected {
font-size: 1em;
text-align: center;
margin-left: 500px;
margin-right: 500px;
background-color: #FEE1A8;
border: 4px dotted black;
margin-top: 1rem;
padding: 15px;
}

.rentalHeader {
font-size: 2em;
}
Loading