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

Ampers: Katie and Sara #8

Open
wants to merge 62 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
7f2507c
files updated by the initial setup
kcforsman Jun 18, 2018
db24a52
bundle install changes to package json
CheerOnMars Jun 18, 2018
480d5db
Merge branch 'master' of https://github.com/kcforsman/video-store-con…
CheerOnMars Jun 18, 2018
4a58ee7
created a components folder and created customer component js and css…
kcforsman Jun 18, 2018
8e7982b
created files for the CustomerDetails and CustomerList components, bo…
kcforsman Jun 18, 2018
6e9e61c
added logic to CustomerList to make api call to retrieve list of cust…
kcforsman Jun 18, 2018
c2823ed
added props validation and render content to the Customer Component
kcforsman Jun 18, 2018
65a2d2d
finished implementing logic for displaying basic customer details to …
kcforsman Jun 18, 2018
f7f72dc
add movie and rental library component files
CheerOnMars Jun 18, 2018
6f5d9c3
small changes
CheerOnMars Jun 18, 2018
784fca9
added Katies customers files
CheerOnMars Jun 19, 2018
49c611f
added navigation functionality to a Navigation component by allowing …
kcforsman Jun 19, 2018
6307660
Merge branch 'master' of https://github.com/kcforsman/video-store-con…
kcforsman Jun 19, 2018
a2a1f9b
removed unused axios and PropTypes from the beginning of the differen…
kcforsman Jun 19, 2018
3565f84
created needed components to finish rendering navigation. those compo…
kcforsman Jun 19, 2018
cd9968d
revise movie components to render on app
CheerOnMars Jun 19, 2018
9793000
minor spacing change
CheerOnMars Jun 19, 2018
86d5041
Merge branch 'master' of https://github.com/kcforsman/video-store-con…
CheerOnMars Jun 19, 2018
0c8d80a
added release date fields and image to movie components
CheerOnMars Jun 19, 2018
c50c44d
changed the initial state of the App so that the search element rende…
kcforsman Jun 19, 2018
918ae39
added the Checkout component to render customer and movie selection f…
kcforsman Jun 19, 2018
c648403
added selection button component to project then implemented a series…
kcforsman Jun 19, 2018
f302d63
translated all logic used for costumer components to select a custome…
kcforsman Jun 19, 2018
ef621fd
add search functionality
CheerOnMars Jun 19, 2018
670dec9
implemented basic logic to handle checking out a rental, still need t…
kcforsman Jun 19, 2018
d7ae8da
Merge branch 'master' of https://github.com/kcforsman/video-store-con…
kcforsman Jun 19, 2018
bf66f29
changed index.html title
CheerOnMars Jun 19, 2018
d1d677f
removed all unused imports from the beginning of files, deleted unuse…
kcforsman Jun 19, 2018
ff0d5ff
Merge branch 'master' of https://github.com/kcforsman/video-store-con…
kcforsman Jun 19, 2018
ad29335
removed unused imports from Movie Results component
kcforsman Jun 19, 2018
2145283
finished initial styling of the header of the app wich includes styli…
kcforsman Jun 20, 2018
016dd81
adjusted header margins once more
kcforsman Jun 20, 2018
1668ee0
added styling to the main content and list containers
kcforsman Jun 20, 2018
cfa5f56
implemented alignment for the list item arrangement of result details…
kcforsman Jun 20, 2018
a7f105f
added styling to movie component to align and arrange presentation of…
kcforsman Jun 20, 2018
c1f6c0e
added styling to the customer details component
kcforsman Jun 20, 2018
63c0e77
finished styling search bar component and that finishes styling for t…
kcforsman Jun 20, 2018
950bc3f
deleted all unused css files and removed the import from the correspo…
kcforsman Jun 20, 2018
46c59be
utilized React Router to create dynamic url paths while navigating th…
kcforsman Jun 20, 2018
2da637b
changed a placeholder in the SearchBar from Enter Search Terms to Ent…
kcforsman Jun 20, 2018
984b705
Merge branch 'master' into ReactRouter
kcforsman Jun 20, 2018
d7ea9bc
added logic to display error from requdsts to the API and an invalid …
kcforsman Jun 20, 2018
4f5c605
added logic to display messages from api calls and user interaction o…
kcforsman Jun 21, 2018
94588d7
resolved merge conflict between the ReactRouter app.js and original
kcforsman Jun 21, 2018
65c99c9
altered MovieSearch to clear previous search results when a new searc…
kcforsman Jun 21, 2018
1db9d91
Merge branch 'master' into ReactRouter
kcforsman Jun 21, 2018
324539b
altered styling for a slightly bigger screen
kcforsman Jun 21, 2018
48ad589
figured out how to pass props to a component rendered by a route with…
kcforsman Jun 21, 2018
c3e8323
add fuctionality to add movie to library
CheerOnMars Jun 21, 2018
3804f01
removed unused method
CheerOnMars Jun 21, 2018
97b269b
code alignment shift, no funcationality
kcforsman Jun 22, 2018
615f97c
Merge branch 'master' into ReactRouter
kcforsman Jun 22, 2018
3a1a48f
prevent movies with duplicate names from being added to the library
CheerOnMars Jun 22, 2018
0e94e53
Merge branch 'master' of https://github.com/kcforsman/video-store-con…
CheerOnMars Jun 22, 2018
4fe1e15
added logic to the Movie component and RentalLibrary to display a mov…
kcforsman Jun 22, 2018
28b37e5
dealt with merge in Movie Component to handle the display for availib…
kcforsman Jun 22, 2018
eed08ab
Merge branch 'ReactRouter'
kcforsman Jun 22, 2018
98eee81
removed logic to prevent duplicates from the front end
CheerOnMars Jun 22, 2018
251c855
Merge branch 'master' of https://github.com/kcforsman/video-store-con…
CheerOnMars Jun 22, 2018
00dcfd5
Merge branch 'master' of https://github.com/kcforsman/video-store-con…
kcforsman Jun 22, 2018
b9e9376
removed unused props and added required props as needed to correct fo…
kcforsman Jun 22, 2018
51b1586
fix typo
CheerOnMars Jun 22, 2018
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
Prev Previous commit
Next Next commit
added styling to the customer details component
  • Loading branch information
kcforsman committed Jun 20, 2018
commit c1f6c0e623afb60242a307206145bbe7cb8850cd
9 changes: 9 additions & 0 deletions src/components/CustomerDetails.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
p {
margin: 0;
padding: 0;
}

p:first-child {
margin-bottom: 2px;
font-size: 1.2em;
}
8 changes: 4 additions & 4 deletions src/components/CustomerDetails.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ class CustomerDetails extends Component {
render() {

return (
<dl>
<dt><strong>Name:</strong> { this.props.name }</dt>
<dd><strong>Phone Number:</strong> {this.props.phone}</dd>
<section>
<p><strong>Name:</strong> { this.props.name }</p>
<p><strong>Phone Number:</strong> {this.props.phone}</p>
{ this.displayCredit() }
</dl>
</section>
)
}

Expand Down