Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
49df009
added test message to index
auroralemieux Jun 13, 2017
c8f779d
added js files (empty)
auroralemieux Jun 14, 2017
b2e289a
added outline of functions and events for all views, built basic mode…
auroralemieux Jun 14, 2017
bc11f76
fix import syntax
botrethewey Jun 14, 2017
549d182
added templates to index.html
botrethewey Jun 14, 2017
19a0928
reset css file
botrethewey Jun 14, 2017
f9d5460
fixing relative paths and template
auroralemieux Jun 14, 2017
e04c387
template indenting now
auroralemieux Jun 14, 2017
50adea8
working on library listing
auroralemieux Jun 14, 2017
d39711c
library is rendering
auroralemieux Jun 15, 2017
fe2240f
mild refactor of library list display
auroralemieux Jun 15, 2017
6ef4960
no search -- refactoring library to fetch inside of app view not app js
auroralemieux Jun 15, 2017
750e895
successfully refactored -- removed app_view and only using single lis…
auroralemieux Jun 15, 2017
be668b4
search is working
auroralemieux Jun 15, 2017
3073045
button conditional working
botrethewey Jun 16, 2017
04bddff
removed unused files
botrethewey Jun 16, 2017
7ea9daa
fixed conditional header
botrethewey Jun 16, 2017
eef7da0
clear the search box when returning to library
botrethewey Jun 16, 2017
7377220
fixed image url error
auroralemieux Jun 16, 2017
302b7d2
library create is working
auroralemieux Jun 16, 2017
2a12b4e
disabled add to library button after click and change to green
auroralemieux Jun 16, 2017
44e0b58
added styling to added movies in search list
auroralemieux Jun 16, 2017
ac70c7e
show details is populating
auroralemieux Jun 16, 2017
73c6636
hide details works
auroralemieux Jun 16, 2017
25e3c8b
refactored movie list render
auroralemieux Jun 16, 2017
0fb93fe
working on inventory
auroralemieux Jun 17, 2017
1af4d82
fixed bug where columns change if search while details shown
auroralemieux Jun 19, 2017
0455f64
added remove from library button
botrethewey Jun 19, 2017
a238548
Merge branch 'bt-remove-from-lib'
botrethewey Jun 19, 2017
c14e6ed
remove from library function working now
botrethewey Jun 19, 2017
c7c8e60
added customer model/collection/views and implemented customer button
auroralemieux Jun 19, 2017
68017d4
customer sorting works
botrethewey Jun 19, 2017
b08ba2e
styling subheader buttons inline
auroralemieux Jun 19, 2017
34ce8aa
changed customer list url to include pagination for all 200 custies
auroralemieux Jun 20, 2017
05141c2
aborted attempt to use poorly written overdue api endpoint
auroralemieux Jun 20, 2017
47213eb
rental form is showing
botrethewey Jun 20, 2017
d20c44e
trying to get rental form to populate
auroralemieux Jun 20, 2017
030d2a8
rental form now shows customers as a drop down
botrethewey Jun 20, 2017
9bbb1a2
fixed sidebar bug
botrethewey Jun 20, 2017
51e628d
create rental is working
auroralemieux Jun 21, 2017
18d5f59
added callbacks for success and error rental checkouts and basic user…
auroralemieux Jun 21, 2017
370107d
styled buttons and header
botrethewey Jun 21, 2017
19e99d3
styling WIP
botrethewey Jun 21, 2017
a71bc47
add style to customers list
botrethewey Jun 21, 2017
0ad8135
styling everything some more
auroralemieux Jun 21, 2017
2ec51c7
fixed rental create bug
botrethewey Jun 21, 2017
6cb1274
side bar gets hidden appropriately
botrethewey Jun 21, 2017
1049cb7
button styling
botrethewey Jun 21, 2017
f17b926
reformatted registered_at date in customer list
auroralemieux Jun 21, 2017
1a7d09d
truncate longer movie titles in the lib
botrethewey Jun 23, 2017
d08a563
showSideBar() has scroll to top feature added
botrethewey Jun 23, 2017
05a17df
larger font for menu buttons aded
botrethewey Jun 23, 2017
1248d48
fixed persisting no movie search results message when searching again…
botrethewey Jun 23, 2017
e3f90a7
added functionality to allow pressing enter from search field to trig…
auroralemieux Jun 23, 2017
1331ec1
added rental manage button to each client list
botrethewey Jun 23, 2017
8d3316a
now shows rentals by the customer
botrethewey Jun 23, 2017
6e2ba9e
added stylying to rental manager
botrethewey Jun 23, 2017
45c39d4
more check-in
botrethewey Jun 23, 2017
37b07c6
fixed rerendering issue
auroralemieux Jun 23, 2017
89c5fa7
added rental changes
botrethewey Jun 23, 2017
0fba7cf
fixed
botrethewey Jun 23, 2017
a0e1a5f
fixed row
botrethewey Jun 23, 2017
b68f37c
last minute styling
botrethewey Jun 23, 2017
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
230 changes: 206 additions & 24 deletions build/css/styles.css
Original file line number Diff line number Diff line change
@@ -1,44 +1,226 @@
@include foundation-everything;
@import url('https://fonts.googleapis.com/css?family=Cutive+Mono|Knewave|Permanent+Marker');

main {
background: lightblue;
* {
font-family: 'Cutive Mono', monospace;
}
.row {
max-width: 100%;
}
body {
margin: 0 10% 2% 10%;
}

header {
background-color: lightgreen;
padding: 0.5rem;
.tableouter {
position: relative;
overflow-x: scroll;
border-bottom: black solid 1px;
}

#completed-checkbox {
display: inline;
.tableinner {
height: 400px;
overflow-y: scroll;
}

label {
display: inline;


#hide-rental-manager {
float: right;
}

button.success {
margin-right: 1.2rem;
display: inline;
#manager-header {
float: left;
margin: 15px 0 0 15px;
}

#rentals-table {
clear: both;
overflow: scroll;
margin-bottom: 15px;
}

#manage-rental {
background-color: black;
color: white;
}

#rentals-list {
color:black;
text-align: center;
}

aside.create-tasklist {
background-color: navy;
color: #FFFFFF;
#manage-rental * {
font-family: 'Cutive Mono', monospace;
font-size: 1rem;
}
aside label {
color: #FFFFFF;








#header-buttons {
text-align: center;
}

.completed {
text-decoration: line-through;
#header-buttons button, #search-button {
font-family: 'Cutive Mono', monospace;
font-size: 1.1em;
}

div {
section#search-stuff * {
display: inline;
}
/*
* {
border-style: solid;

#side-bar {
padding-top: 20px;
text-align: center;
margin-bottom: 10%;
}

#query {
max-width: 250px;
margin: 0;
}

button#search-button.button, #hide-details {
width: 180px;
}

#library-subheader, #search-subheader, #customers-subheader, #bad-search-subheader {
font-family: 'Cutive Mono', monospace;
text-align: center;
margin: 2% 0;
border-top: dashed 1px black;
border-bottom: dashed 1px black;
}

.button {
margin: 2px;
background-color: black;
color: #fefefe;
font-family: 'Cutive Mono', monospace;
}

.button:hover, .button:focus{
background-color: deeppink;
color: #fefefe;
}

section.movie-card {
padding-top: 10px;
text-align: center;
height: 450px;
position: relative;
}

.movie-card img:hover{
opacity: 0.3;
}

.movie-card img {
width: 200px;
height: 300px;
overflow: hidden;
}

.movie-card .button, #confirm-rental, #cancel-rental, #hide-details {
border-radius: 25px;
background-color: #fefefe;
color: black;
border: 1px solid black;
width: 90px;
height: 40px;
margin: 2px 5px;
}

.movie-card .button:hover, #confirm-rental:hover, #cancel-rental:hover, #hide-details:hover {
color: deeppink;
border: 1px solid deeppink;
}

.movie-card button.add-library {
width: 160px;
}

h4.movie.small-title {
font-size: 1em;
font-family: 'Cutive Mono', monospace;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}

.movie-card .container {
height: 25px;
margin: 15px 0;
}

#rent-header, #rent-movie-title, section#movie-details h3 {
font-family: 'Knewave', cursive;
}

#rent-movie-title {
text-decoration: underline;
}
header h1 {
font-family: 'Knewave', cursive;
font-size: 7.0em;
text-align: center;
text-shadow: 10px 3px deeppink;
border-bottom: 1px solid black;
}

main {
background-color: white;
}

.grayed_out {
filter: grayscale(100%);
opacity: .5;
}

.added-movie {
border: black dashed 1px;
}

.second-header {
text-align: center;
}

#cust-name-sort:hover, #cust-pcode-sort:hover, #cust-reg-at-sort:hover {
cursor: pointer;
text-decoration: underline;
}


.success {
padding-top: 20px;
color: green;
}
*/

.movie.small-poster:hover, .movie.small-title:hover {
cursor: pointer;
}


.failure {
padding-top: 20px;
color: red;
}

footer {
margin-top: 30px;
text-align: center;
clear: both;
}

footer img {
height: 60px;
}

/*td, #fields td {
text-align: center;
}*/
Loading