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

#36 Creates search/drinks page #111

Merged
merged 30 commits into from
Oct 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
7fb981b
#8 Sets up carousel elm app
Cleop Oct 10, 2018
e4c2bae
Merge branch 'drinks-card' into elm-carousel
Cleop Oct 11, 2018
8ba2d88
#8 Displays drinks cards in elm
Cleop Oct 11, 2018
d9cde74
Adds elm-stuff to ignore
Cleop Oct 11, 2018
20f3c63
#8 Completes carousel functionality
Cleop Oct 12, 2018
3dbed65
#8 Starts adding swipe functionality
Cleop Oct 12, 2018
cc9e9d9
#104 Starts landing page styling
Cleop Oct 12, 2018
59801f6
#104 Basic styling of the landing page
Cleop Oct 15, 2018
e49b9b3
#8 Fixes swiping bugs for carousel
Cleop Oct 15, 2018
feea13c
#106 Makes drink name box translucent
Cleop Oct 15, 2018
de464ca
#104 Adds cropped images and fixes bugs
Cleop Oct 16, 2018
963956d
#104 Updates copy wording
Cleop Oct 16, 2018
ba755a4
#35 Updates logo asset
Cleop Oct 16, 2018
34f7ab9
#36 Creates drinks page
Cleop Oct 16, 2018
b501400
#35 Adds Venues to nav and creates page route
Cleop Oct 16, 2018
8fa3abf
#104 Adds drink type buttons and styles them
Cleop Oct 17, 2018
0fc5cd6
#37 Creates schema for drink type
Cleop Oct 17, 2018
2dc1769
adds brands table
Danwhy Oct 17, 2018
f6d887b
#37 Filters by drink type from landing page buttons
Cleop Oct 17, 2018
14b1ac8
Resolves merge conflicts
Cleop Oct 17, 2018
4b6bd11
Resolves bugs occurring from merging
Cleop Oct 17, 2018
df189f0
#37 Sets up elm app for search
Cleop Oct 17, 2018
dd423de
allows updating of drinks in venue, #63
Danwhy Oct 18, 2018
31d81db
#37 Filters drinks by type from landing page
Cleop Oct 18, 2018
7c8b051
adds styling and js for add drinks page, #63
Danwhy Oct 18, 2018
2b47fdf
adds drink styles, #105
Danwhy Oct 19, 2018
ad0fba0
styles index page tables
Danwhy Oct 19, 2018
c570d22
#37 Completes filter by drink type functionality
Cleop Oct 19, 2018
41d9787
Merge branch 'master' into search-drinks-page
Cleop Oct 19, 2018
7f963e6
Merge branch 'update-drinks' into search-drinks-page
Cleop Oct 19, 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
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,9 @@ npm-debug.log
/config/*.secret.exs

.DS_Store
.elixir_ls/

elm-stuff/

/assets/js/main.js

.elixir_ls/
10 changes: 8 additions & 2 deletions assets/brunch-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,22 @@ exports.config = {
// Phoenix paths configuration
paths: {
// Dependencies and current project directories to watch
watched: ["static", "css", "js", "vendor"],
watched: ["static", "css", "js", "vendor", "elm"],
// Where to compile files to
public: "../priv/static"
},

// Configure your plugins
plugins: {
elmBrunch: {
mainModules: ["elm/DrinksCarousel.elm", "elm/Search.elm"],
outputFolder: "js",
outputFile: "main.js",
makeParameters: ["--debug"]
},
babel: {
// Do not use ES6 compiler in vendor code
ignore: [/vendor/]
ignore: [/vendor/, /main\.js/]
}
},

Expand Down
171 changes: 166 additions & 5 deletions assets/css/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -35,32 +35,64 @@ form {
color: #333333;
}

.bg-cs-black {
background-color: #333333;
}

.cs-pink {
color: #E30B5D;
}

.b--cs-light-pink {
border-color: #FBE2DB;
.bg-cs-pink {
background-color: #E30B5D;
}

.b--cs-pink {
border-color: #E30B5D;
}

.bg-cs-light-pink {
background-color: #FBE2DB;
}

.b--cs-light-pink {
border-color: #FBE2DB;
}

.bg-cs-yellow {
background-color: #FFB700;
}

.bg-cs-light-gray {
background-color:#EBEBEB;
}

.bg-cs-light-gray-hover:hover {
background-color:#EBEBEB;
}

.b--cs-light-gray {
border-color:#EBEBEB;
}

.bg-sheer-white {
background: rgba(255, 255, 255, 0.5);
}

/* Line heights to correspond with tachyons font classes */

.lh1 {
line-height: 4rem; /* 64px */
}

.lh2 {
line-height: 3.375rem; /* 54px */
}

.lh3 {
line-height: 2.5rem; /* 40px */
}

.lh4 {
line-height: 2rem; /* 32px */
}
Expand All @@ -73,6 +105,18 @@ form {
line-height: 1.25rem; /* 20px */
}

/* Font Size */

.f4-5 {
font-size: 1.15rem;
}

/* Heights */

.h4-5 {
height: 14rem;
}

/* AutoForm Classes */

.control-label {
Expand Down Expand Up @@ -120,7 +164,7 @@ form {
text-align: center;
font-size: 1rem; /* 16px */
line-height: 1.5rem; /* 24px */
color: #2E304F;
color: #333333;
border: none;
padding: 0.5rem 1.5rem; /* 8px, 24px */
border-radius: .25rem
Expand Down Expand Up @@ -160,8 +204,31 @@ form {
width: 5rem;
}

.h-30rem {
height: 30rem;
@media (min-width: 30rem) {
.w-sixth-ns {
width: 16.6%;
}
}

.h-25rem {
height: 25rem;
}

.h-27rem {
height: 27rem;
}

.pt-3rem {
padding-top: 3rem;
}

@media (max-width: 30rem) {
.pb-3rem-s {
padding-bottom: 3rem;
}
.mt-30rem-s {
margin-top: 30rem;
}
}

/* Venue Sign up - adding custom drinks */
Expand Down Expand Up @@ -221,3 +288,97 @@ form {
}

/* End of drinks card 'flipping' */

/* Landing page bg images */
.bg-hero {
background-image: url("/images/hero-image.png");
background-repeat: no-repeat;
object-fit: cover;
background-position: center;
background-size: cover;
height: 70vh;
}

.bg-nominate-venue {
background-image: url("/images/nominate-venue-img.jpg");
background-repeat: no-repeat;
object-fit: cover;
background-position: 0 30%;
background-size: cover;
height: 30rem;
}

@media (min-width: 30em) {
.bg-nominate-venue {
height: 13rem;
}
}

@media (min-width: 48em) {
.bg-hero {
height: 107vh;
}
}

.bg-newsletter {
background-image: url("/images/newsletter-image.png");
background-repeat: no-repeat;
background-position: center;
background-size: cover;
height: 32rem;
}

.black-gradient {
background: -moz-linear-gradient(left, rgba(51,51,51,1) 0%, rgba(49,49,49,1) 1%, rgba(0,0,0,0.85) 31%, rgba(0,0,0,0.75) 50%, rgba(255,255,255,0.5) 100%); /* FF3.6-15 */
background: -webkit-linear-gradient(left, rgba(51,51,51,1) 0%,rgba(49,49,49,1) 1%,rgba(0,0,0,0.85) 31%,rgba(0,0,0,0.75) 50%,rgba(255,255,255,0.5) 100%); /* Chrome10-25,Safari5.1-6 */
background: linear-gradient(to right, rgba(51,51,51,1) 0%,rgba(49,49,49,1) 1%,rgba(0,0,0,0.85) 31%,rgba(0,0,0,0.75) 50%,rgba(255,255,255,0.5) 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#333333', endColorstr='#80ffffff',GradientType=1 ); /* IE6-9 */
}

/* Landing page bg images END */

.absolute-center {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}

@media (max-width: 30em) {
.absolute-center-s {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}

.absolute-horizontal-center-s {
position: absolute;
left: 50%;
transform: translate(-50%, 0);
}

.bottom-4-s {
bottom: 4rem;
}
}

.absolute-vertical-center {
position: absolute;
top: 50%;
transform: translate(0, -50%);
}

@media (min-width: 60em){
.absolute-vertical-center-ns {
position: absolute;
top: 50%;
transform: translate(0, -50%);
}
}

#brand-search {
background-image: url("/images/search-icon.svg");
background-position: right 5px top 5px;
background-repeat: no-repeat;
}
26 changes: 26 additions & 0 deletions assets/elm.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"type": "application",
"source-directories": [
"elm"
],
"elm-version": "0.19.0",
"dependencies": {
"direct": {
"NoRedInk/elm-json-decode-pipeline": "1.0.0",
"elm/browser": "1.0.0",
"elm/core": "1.0.0",
"elm/html": "1.0.0",
"elm/http": "1.0.0",
"elm/json": "1.0.0"
},
"indirect": {
"elm/time": "1.0.0",
"elm/url": "1.0.0",
"elm/virtual-dom": "1.0.2"
}
},
"test-dependencies": {
"direct": {},
"indirect": {}
}
}
Loading