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
User confirmation ui #66
Merged
Merged
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
596012b
add temporary signup form to get styles integrated into the app
9bb764d
changed the logo and layours page
Josecc d1475c6
added sass files for pages
Josecc 0f1bd74
finished crds, inputs, and variable styles
Josecc f20b81a
uncommented ruby version
Josecc 47e6557
renames users edit to styleguide
nolds9 File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -307,8 +307,5 @@ DEPENDENCIES | |
uglifier (>= 1.3.0) | ||
web-console (~> 2.0) | ||
|
||
RUBY VERSION | ||
ruby 2.3.0p0 | ||
|
||
BUNDLED WITH | ||
1.12.5 |
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# Place all the behaviors and hooks related to the matching controller here. | ||
# All this logic will automatically be available in application.js. | ||
# You can use CoffeeScript in this file: http://coffeescript.org/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
body { | ||
background-color: $background-color; | ||
text-align: center; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
.card { | ||
background-color: #FFF; | ||
margin: 20px auto; | ||
padding: 30px; | ||
border-radius: 10px; | ||
&--body { | ||
@extend .card !optional; | ||
width: 800px; | ||
box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16); | ||
} | ||
&--recipient { | ||
@extend .card !optional; | ||
margin: 20px 18px; | ||
display: inline-block; | ||
width: $card-recipient-width; | ||
background-color: #FFF; | ||
box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.16); | ||
padding: 10px 0; | ||
cursor: pointer; | ||
&--details { | ||
background-color: $input-background-color; | ||
padding: 10px 0; | ||
margin: 10px 0; | ||
} | ||
|
||
&:hover { | ||
box-shadow: 0px 0px 6px 0px $input-click-color; | ||
} | ||
&--selected { | ||
background-color: $input-click-color; | ||
} | ||
} | ||
&--container { | ||
width: 840px; | ||
margin: 0 auto; | ||
} | ||
} |
81 changes: 81 additions & 0 deletions
81
app/assets/stylesheets/default_theme/partials/_inputs.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
input { | ||
font-size: 18px; | ||
font-family: $body-font-family; | ||
width: 296px; | ||
height: 48px; | ||
padding: 0 10px; | ||
margin: 14px; | ||
&[type="password"] { | ||
background-color: $input-background-color; | ||
border: none; | ||
text-align: center; | ||
color: $soft-gray; | ||
&:focus { | ||
outline: none; | ||
} | ||
} | ||
&[type="submit"] { | ||
background-color: #EACC96; | ||
color: #FFF; | ||
border: none; | ||
} | ||
&[type="text"] { | ||
background-color: $input-background-color; | ||
border: none; | ||
text-align: center; | ||
color: $soft-gray; | ||
&:focus { | ||
outline: none; | ||
} | ||
& ~ span { | ||
display: inline-block; | ||
top: 35%; | ||
font-family: $body-font-family; | ||
font-size: 16px; | ||
} | ||
} | ||
&[type="radio"] { | ||
position: absolute; | ||
visibility: hidden; | ||
&:active { | ||
box-shadow: none; | ||
} | ||
} | ||
} | ||
|
||
label { | ||
color: rgba(0,0,0,.45); | ||
font-size: 18px; | ||
font-family: $input-background-color; | ||
} | ||
.toggle { | ||
width: 700px; | ||
display: inline-block; | ||
& > a { | ||
border: none; | ||
border-radius: 0; | ||
padding: 20px; | ||
background-color: $input-background-color; | ||
cursor: pointer; | ||
color: $soft-gray; | ||
|
||
&:hover:not(.checked), &:active:not(.checked), &:focus:not(.checked) { | ||
background-color: darken($input-background-color, 20%) !important; | ||
outline: none; | ||
& ~ .checked { | ||
background-color: $input-toggle-color; | ||
} | ||
} | ||
|
||
& ~ .checked { | ||
background-color: $input-toggle-color; | ||
box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16); | ||
cursor: default; | ||
color: #FFF; | ||
} | ||
} | ||
} | ||
|
||
.text--input--note { | ||
position: relative; | ||
} |
22 changes: 22 additions & 0 deletions
22
app/assets/stylesheets/default_theme/partials/_typography.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
h1 { | ||
font-size: 38px; | ||
font-family: $heading-font-family; | ||
} | ||
|
||
h2 { | ||
font-size: 26px; | ||
font-family: $heading-font-family; | ||
&.decorated { | ||
@extend h2 !optional; | ||
margin: 20px auto; | ||
padding: 20px 0px; | ||
width: 296px; | ||
border-top: solid 1px $soft-gray; | ||
border-bottom: solid 1px $soft-gray; | ||
} | ||
} | ||
|
||
p { | ||
font-size: 18px; | ||
font-family: $body-font-family; | ||
} |
19 changes: 19 additions & 0 deletions
19
app/assets/stylesheets/default_theme/partials/_variables.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
// Default Colors | ||
$input-background-color: rgba(200,192,169, .2); | ||
$body-background-color: rgb(255,255,255); | ||
$input-click-color: rgb(234,204,150); | ||
$background-color: #FBF4ED; | ||
$input-toggle-color: rgba(200,192,169, .92); | ||
$secondary-color: rgba(200,192,166, .45); | ||
$thrird-color: rgba(200,192,166, .75); | ||
|
||
//Default Fonts | ||
$body-font-family: 'Raleway', sans-serif; | ||
$heading-font-family: 'Quicksand', sans-serif; | ||
|
||
//Font colors | ||
$soft-gray: rgba( 0 , 0 , 0 , .45); | ||
|
||
$card-body-width: 800px; | ||
$card-recipient-width: 240px; | ||
$card-body-padding-sides: 40px; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
// Place all the styles related to the users controller here. | ||
// They will automatically be included in application.css. | ||
// You can use Sass (SCSS) here: http://sass-lang.com/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
class UsersController < ApplicationController | ||
def edit | ||
@user = User.new | ||
end | ||
|
||
def update | ||
redirect_to :signup | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
module UsersHelper | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,103 @@ | ||
<section class="card--body"> | ||
<h2 class="">Signup to Share Happiness</h2> | ||
<h2 class="decorated">Signup to Share Happiness</h2> | ||
<p> | ||
Welcome <strong>Mary</strong>! | ||
<br> | ||
If you're feeling kind and want to sign up for this campaign, please create a password. | ||
</p> | ||
|
||
<%= form_for @user, url: 'signup' do |f| %> | ||
<%= label_tag :password %> | ||
<br> | ||
<%= password_field_tag :password %> | ||
<br> | ||
<%= label_tag :password_confirmation %> | ||
<br> | ||
<%= password_field_tag :password_confirmation %> | ||
<br> | ||
<%= f.submit %> | ||
<% end %> | ||
|
||
<div class="btn-group btn-group-justified toggle" role="group" aria-label="..."> | ||
<a type="radio" name="gender" class="btn btn-default">Boy</a> | ||
<a type="radio" name="gender" class="btn btn-default checked">Girl</a> | ||
</div> | ||
<div class="btn-group btn-group-justified toggle" role="group"> | ||
<a type="radio" role="group" name="age-group" class="btn btn-default">0-5</a> | ||
<a type="radio" role="group" name="age-group" class="btn btn-default checked">6-11</a> | ||
<a type="radio" role="group" name="age-group" class="btn btn-default">12-15</a> | ||
<a type="radio" role="group" name="age-group" class="btn btn-default">16-18</a> | ||
<a type="radio" role="group" name="age-group" class="btn btn-default">Adult</a> | ||
</div> | ||
<div class="text--input--note"> | ||
<input type="text" name="gift" placeholder="Enter Specific Items"> | ||
<span style="position: absolute;">(optional)</span> | ||
</div> | ||
</section> | ||
<section class="card--container"> | ||
<div class="card--recipient"> | ||
<div class="card--recipient--details"> | ||
<span>John</span> | ||
</div> | ||
<div class="card--recipient--details"> | ||
<span>Male</span> | ||
</div> | ||
<div class="card--recipient--details"> | ||
<span>17</span> | ||
</div> | ||
<p> | ||
Hoping to get: | ||
<br> | ||
lalala | ||
</p> | ||
</div> | ||
<div class="card--recipient"> | ||
<div class="card--recipient--details"> | ||
<span>John</span> | ||
</div> | ||
<div class="card--recipient--details"> | ||
<span>Male</span> | ||
</div> | ||
<div class="card--recipient--details"> | ||
<span>17</span> | ||
</div> | ||
<p> | ||
Hoping to get: | ||
<br> | ||
lalala | ||
</p> | ||
</div> | ||
<div class="card--recipient"> | ||
<div class="card--recipient--details"> | ||
<span>John</span> | ||
</div> | ||
<div class="card--recipient--details"> | ||
<span>Male</span> | ||
</div> | ||
<div class="card--recipient--details"> | ||
<span>17</span> | ||
</div> | ||
<p> | ||
Hoping to get: | ||
<br> | ||
lalala | ||
</p> | ||
</div> | ||
<div class="card--recipient"> | ||
<div class="card--recipient--details"> | ||
<span>John</span> | ||
</div> | ||
<div class="card--recipient--details"> | ||
<span>Male</span> | ||
</div> | ||
<div class="card--recipient--details"> | ||
<span>17</span> | ||
</div> | ||
<p> | ||
Hoping to get: | ||
<br> | ||
lalala | ||
</p> | ||
</div> | ||
</section> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
require 'rails_helper' | ||
|
||
RSpec.describe UsersController, type: :controller do | ||
|
||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
require 'rails_helper' | ||
|
||
# Specs in this file have access to a helper object that includes | ||
# the UsersHelper. For example: | ||
# | ||
# describe UsersHelper do | ||
# describe "string concat" do | ||
# it "concats two strings with spaces" do | ||
# expect(helper.concat_strings("this","that")).to eq("this that") | ||
# end | ||
# end | ||
# end | ||
RSpec.describe UsersHelper, type: :helper do | ||
pending "add some examples to (or delete) #{__FILE__}" | ||
end |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this be dynamic?