diff --git a/.gitignore b/.gitignore
index 5e1422c..ac15da4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
*.gem
*.rbc
/.config
+/config/secrets.yml
+/config/database.yml
+/log/
/coverage/
/InstalledFiles
/pkg/
diff --git a/Gemfile b/Gemfile
index 0b9a659..ef69159 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,55 +1,33 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
"https://github.com/#{repo_name}.git"
end
+gem "rails", "~> 5.0.2"
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.0.2'
-# Use sqlite3 as the database for Active Record
-gem 'bcrypt', '3.1.7'
-#
-gem 'sqlite3'
-# Use Puma as the app server
-gem 'puma', '~> 3.0'
-# Use SCSS for stylesheets
-gem 'sass-rails', '~> 5.0'
-# Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
-# Use CoffeeScript for .coffee assets and views
-gem 'coffee-rails', '~> 4.2'
-# See https://github.com/rails/execjs#readme for more supported runtimes
-# gem 'therubyracer', platforms: :ruby
+gem "bcrypt", "3.1.7"
-# Use jquery as the JavaScript library
-gem 'jquery-rails'
-# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
-gem 'turbolinks', '~> 5'
-# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.5'
-# Use Redis adapter to run Action Cable in production
-# gem 'redis', '~> 3.0'
-# Use ActiveModel has_secure_password
-# gem 'bcrypt', '~> 3.1.7'
-
-# Use Capistrano for deployment
-# gem 'capistrano-rails', group: :development
+gem "bootstrap-sass","3.3.7"
+gem "sqlite3"
+gem "puma", "~> 3.0"
+gem "sass-rails", "~> 5.0"
+gem "uglifier", ">= 1.3.0"
+gem "coffee-rails", "~> 4.2"
+gem "jquery-rails"
+gem "turbolinks", "~> 5"
+gem "jbuilder", "~> 2.5"
group :development, :test do
- # Call 'byebug' anywhere in the code to stop execution and get a debugger console
- gem 'byebug', platform: :mri
+ gem "byebug", platform: :mri
end
group :development do
- # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
- gem 'web-console', '>= 3.3.0'
- gem 'listen', '~> 3.0.5'
- # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
- gem 'spring'
- gem 'spring-watcher-listen', '~> 2.0.0'
+ gem "web-console", ">= 3.3.0"
+ gem "listen", "~> 3.0.5"
+ gem "spring"
+ gem "spring-watcher-listen", "~> 2.0.0"
end
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
diff --git a/Gemfile.lock b/Gemfile.lock
index 9c3aa73..7fb48ab 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -39,7 +39,12 @@ GEM
minitest (~> 5.1)
tzinfo (~> 1.1)
arel (7.1.4)
+ autoprefixer-rails (6.7.7)
+ execjs
bcrypt (3.1.7)
+ bootstrap-sass (3.3.7)
+ autoprefixer-rails (>= 5.2.1)
+ sass (>= 3.3.4)
builder (3.2.3)
byebug (9.0.6)
coffee-rails (4.2.1)
@@ -156,6 +161,7 @@ PLATFORMS
DEPENDENCIES
bcrypt (= 3.1.7)
+ bootstrap-sass (= 3.3.7)
byebug
coffee-rails (~> 4.2)
jbuilder (~> 2.5)
diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png
new file mode 100644
index 0000000..f9fa0a0
Binary files /dev/null and b/app/assets/images/rails.png differ
diff --git a/app/assets/stylesheets/custom.scss b/app/assets/stylesheets/custom.scss
new file mode 100644
index 0000000..d2a9c30
--- /dev/null
+++ b/app/assets/stylesheets/custom.scss
@@ -0,0 +1,181 @@
+@import "bootstrap-sprockets";
+@import "bootstrap";
+
+/* mixins, variables, etc. */
+
+$gray-medium-light: #eaeaea;
+
+@mixin box_sizing
+{
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+}
+
+/* miscellaneous */
+
+.debug_dump {
+ clear: both;
+ float: left;
+ width: 100%;
+ margin-top: 45px;
+ @include box_sizing;
+}
+
+/* universal */
+
+body {
+ padding-top: 60px;
+}
+
+section {
+ overflow: auto;
+}
+
+textarea {
+ resize: vertical;
+}
+
+.center {
+ text-align: center;
+ h1 {
+ margin-bottom: 10px;
+ }
+}
+
+/* typography */
+
+h1, h2, h3, h4, h5, h6 {
+ line-height: 1;
+}
+
+h1 {
+ font-size: 3em;
+ letter-spacing: -2px;
+ margin-bottom: 30px;
+ text-align: center;
+}
+
+h2 {
+ font-size: 1.2em;
+ letter-spacing: -1px;
+ margin-bottom: 30px;
+ text-align: center;
+ font-weight: normal;
+ color: $gray-light;
+}
+
+p {
+ font-size: 1.1em;
+ line-height: 1.7em;
+}
+
+/* header */
+
+#logo
+{
+ float: left;
+ margin-right: 10px;
+ font-size: 1.7em;
+ color: white;
+ text-transform: uppercase;
+ letter-spacing: -1px;
+ padding-top: 9px;
+ font-weight: bold;
+ &:hover {
+ color: white;
+ text-decoration: none;
+ }
+}
+
+/* footer */
+
+footer
+{
+ margin-top: 45px;
+ padding-top: 5px;
+ border-top: 1px solid $gray-medium-light;
+ color: $gray-light;
+ a {
+ color: $gray;
+ &:hover {
+ color: $gray-darker;
+ }
+ }
+ small {
+ float: left;
+ }
+ ul {
+ float: right;
+ list-style: none;
+ li {
+ float: left;
+ margin-left: 15px;
+ }
+ }
+}
+
+/* sidebar */
+
+aside {
+ section.user_info {
+ margin-top: 20px;
+ }
+ section {
+ padding: 10px 0;
+ margin-top: 20px;
+ &:first-child {
+ border: 0;
+ padding-top: 0;
+ }
+ span {
+ display: block;
+ margin-bottom: 3px;
+ line-height: 1;
+ }
+ h1 {
+ font-size: 1.4em;
+ text-align: left;
+ letter-spacing: -1px;
+ margin-bottom: 3px;
+ margin-top: 0px;
+ }
+ }
+}
+
+.gravatar {
+ float: left;
+ margin-right: 10px;
+}
+
+.gravatar_edit {
+ margin-top: 15px;
+}
+
+/* forms */
+
+input, textarea, select, .uneditable-input {
+ border: 1px solid #bbb;
+ width: 100%;
+ margin-bottom: 15px;
+ @include box_sizing;
+}
+
+input {
+ height: auto !important;
+}
+
+#error_explanation {
+ color: red;
+ ul {
+ color: red;
+ margin: 0 0 30px 0;
+ }
+}
+
+.field_with_errors {
+ @extend .has-error;
+ .form-control {
+ color: $state-danger-text;
+ }
+}
diff --git a/app/controllers/static_pages_controller.rb b/app/controllers/static_pages_controller.rb
new file mode 100644
index 0000000..657fed4
--- /dev/null
+++ b/app/controllers/static_pages_controller.rb
@@ -0,0 +1,13 @@
+class StaticPagesController < ApplicationController
+ def home
+ end
+
+ def help
+ end
+
+ def about
+ end
+
+ def sign_up
+ end
+end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
new file mode 100644
index 0000000..4c06243
--- /dev/null
+++ b/app/controllers/users_controller.rb
@@ -0,0 +1,26 @@
+class UsersController < ApplicationController
+ def new
+ @user = User.new
+ end
+
+ def show
+ @user = User.find params[:id]
+ end
+
+ def create
+ @user = User.new user_params
+ if @user.save
+ flash[:success] = "Welcome to the Sample App!"
+ redirect_to @user
+ else
+ render :new
+ end
+ end
+
+ private
+
+ def user_params
+ params.require(:user).permit :name, :email, :phonenumber, :birthday,
+ :password, :password_confirmation
+ end
+end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index de6be79..3fe034a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,2 +1,10 @@
module ApplicationHelper
+ def full_title page_title = ""
+ base_title = "Ruby on Rails Tutorial Sample App"
+ if page_title.empty?
+ base_title
+ else
+ page_title + " | " + base_title
+ end
+ end
end
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
new file mode 100644
index 0000000..a78aef1
--- /dev/null
+++ b/app/helpers/users_helper.rb
@@ -0,0 +1,7 @@
+module UsersHelper
+ def gravatar_for user, size: 80
+ gravatar_id = Digest::MD5::hexdigest user.email.downcase
+ gravatar_url = "https://secure.gravatar.com/avatar/#{gravatar_id}?s=#{size}"
+ image_tag gravatar_url, alt: user.name, class: "gravatar"
+ end
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 0895f08..d6d24a6 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -15,7 +15,7 @@ class User < ApplicationRecord
private
def check_phonenumber
- if self.phonenumber && self.phonenumber[0] != '0'
+ if self.phonenumber && self.phonenumber[0] != "0"
self.errors.add :phonenumber,"Must begin with 0"
end
if self.phonenumber && self.phonenumber.length != 10
@@ -26,7 +26,7 @@ def check_phonenumber
def check_birthday
if self.birthday &&
(self.birthday.year < Time.now.year - 90 ||
- self.birthday.year > Time.now.year -7)
+ self.birthday.year > Time.now.year - 7)
self.errors.add :birthday, "Year must from 90 years ago to 7 years ago"
end
end
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
new file mode 100644
index 0000000..ae5eb0e
--- /dev/null
+++ b/app/views/layouts/_footer.html.erb
@@ -0,0 +1,13 @@
+
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
new file mode 100644
index 0000000..d0c7406
--- /dev/null
+++ b/app/views/layouts/_header.html.erb
@@ -0,0 +1,12 @@
+
diff --git a/app/views/layouts/_rails_default.html.erb b/app/views/layouts/_rails_default.html.erb
new file mode 100644
index 0000000..c718a11
--- /dev/null
+++ b/app/views/layouts/_rails_default.html.erb
@@ -0,0 +1,3 @@
+<%= csrf_meta_tags %>
+<%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track": "reload" %>
+<%= javascript_include_tag "application", "data-turbolinks-track": "reload" %>
diff --git a/app/views/layouts/_shim.html.erb b/app/views/layouts/_shim.html.erb
new file mode 100644
index 0000000..e976db3
--- /dev/null
+++ b/app/views/layouts/_shim.html.erb
@@ -0,0 +1,4 @@
+
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 8f96c78..485a8ee 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,14 +1,21 @@
- TestUserModel
- <%= csrf_meta_tags %>
-
- <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
- <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
+ <%= full_title yield :title %>
+ |Ruby on Rails Tutorial Sample App
+ <%= render "layouts/rails_default" %>
+ <%= render "layouts/shim" %>
- <%= yield %>
+ <%= render "layouts/header" %>
+
+ <% flash.each do |message_type, message| %>
+
<%= message %>
+ <% end %>
+ <%= yield %>
+ <%= render "layouts/footer" %>
+ <%= debug params if Rails.env.development? %>
+
+
+ The form contains <%= pluralize @user.errors.count, "error" %>.
+
+
+ <% @user.errors.full_messages.each do |msg| %>
+ - <%= msg %>
+ <% end %>
+
+
About
+
+ The Ruby on Rails
+ Tutorial is a
+ book and
+ screencast series
+ to teach web development with
+ Ruby on Rails.
+ This is the sample application for the tutorial.
+
diff --git a/app/views/static_pages/help.html.erb b/app/views/static_pages/help.html.erb
new file mode 100644
index 0000000..1f99a56
--- /dev/null
+++ b/app/views/static_pages/help.html.erb
@@ -0,0 +1,9 @@
+<% provide :title, "Help" %>
+ Help
+
+ Get help on the Ruby on Rails Tutorial at the
+ Rails Tutorial help section.
+
+ To get help on this sample app, see the
+ Ruby on Rails Tutorialbook.
+
diff --git a/app/views/static_pages/home.html.erb b/app/views/static_pages/home.html.erb
new file mode 100644
index 0000000..e6df456
--- /dev/null
+++ b/app/views/static_pages/home.html.erb
@@ -0,0 +1,11 @@
+<%provide :title, "Home"%>
+
+
Welcome to Sample App
+
+ This is the home page for the
+ Ruby on Rails Tutorial sample application.
+
+ <%= link_to "Sign up now!", "#", class: "btn btn-lg btn-primary"%>
+
Sign up
+
+
+
+ <%= form_for @user do |f| %>
+ <%= render "shared/error_messages" %>
+
+ <%= f.label :name %>
+ <%= f.text_field :name, class: "form-control" %>
+
+ <%= f.label :email %>
+ <%= f.text_field :email, class: "form-control" %>
+
+ <%= f.label :phonenumber %>
+ <%= f.text_field :phonenumber, class: "form-control" %>
+
+ <%= f.label :birthday %>
+ <%= f.date_field :birthday, class: "form-control" %>
+
+ <%= f.label :password %>
+ <%= f.password_field :password, class: "form-control" %>
+
+ <%= f.label :password_confirmation, "Confirmation" %>
+ <%= f.password_field :password_confirmation, class: "form-control" %>
+
+ <%= f.submit "Create my account", class: "btn btn-primary" %>
+ <% end %>
+
+
+
+