bootstrap-ruby · ghost · May 14, 2019 · May 14, 2019 · May 14, 2019 · May 14, 2019
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
 
 gem 'sinatra'
+gem 'thin'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,8 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    daemons (1.3.1)
+    eventmachine (1.2.7)
     mustermann (1.0.1)
     rack (2.0.3)
     rack-protection (2.0.0)
@@ -10,13 +12,18 @@ GEM
       rack (~> 2.0)
       rack-protection (= 2.0.0)
       tilt (~> 2.0)
+    thin (1.7.2)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0, >= 1.0.4)
+      rack (>= 1, < 3)
     tilt (2.0.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   sinatra
+  thin
 
 BUNDLED WITH
-   1.16.0
+   1.17.2
diff --git a/README.md b/README.md
@@ -1,24 +1,23 @@
-Hello!
-====
+# Hello
 
-This is a demonstrator for [Sinatra](http://www.sinatrarb.com/) and [Twitter Bootstrap](http://getbootstrap.com/).
+This is a demonstrator for [Sinatra](http://www.sinatrarb.com/) and [Bootstrap](http://getbootstrap.com/).
 
 Use it as a boilerplate to start your own apps.
 
-Go!
-===
+## Go
 
 Download and run sinatra-bootstrap:
 
     git clone https://github.com/bootstrap-ruby/sinatra-bootstrap
 
     cd sinatra-bootstrap
-    bundle install             # To install sinatra
 
-    bundle exec ruby app.rb    # To run the sample
+    bundle install        # To install sinatra
 
-Then open [http://localhost:4567/](http://localhost:4567/)
+    bundle exec rackup    # To run the sample
 
-What's next?
-============
-- Try the rerun gem to restart Sinatra automatically when you change source files: https://github.com/alexch/rerun
+Then open [http://localhost:9292/](http://localhost:9292/)
+
+## What's next
+
+- Try the rerun gem to restart Sinatra automatically when you change source files: <https://github.com/alexch/rerun>
diff --git a/app.rb b/app.rb
@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'sinatra'
 
 configure do
@@ -24,7 +23,7 @@ def username
 end
 
 get '/login/form' do
-  erb :login_form
+  erb :login_form, :layout => :layout
 end
 
 post '/login/attempt' do

diff --git a/config.ru b/config.ru
@@ -1,2 +1,7 @@
+require 'rubygems'
+require 'bundler'
 require './app'
+
+Bundler.require
+
 run Sinatra::Application
diff --git a/views/layout.erb b/views/layout.erb
@@ -7,36 +7,36 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
     <!-- Bootstrap CSS -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta.2/css/bootstrap.min.css" integrity="sha384-PsH8R72JQ3SOdhVi3uxftmaW6Vc51MKb0q5P2rRUpPvrszuE4W1povHYgTpBfshb" crossorigin="anonymous">
-  </head>
+  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+	<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+	</head>
   <body>
 		<div class="container">
-
 			<nav class="navbar navbar-expand-lg navbar-light bg-light">
 				<a class="navbar-brand" href="/">Sinatra + Twitter Bootstrap</a>
 				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
 					<span class="navbar-toggler-icon"></span>
 				</button>
-
+			
 				<div class="collapse navbar-collapse" id="navbarSupportedContent">
 					<ul class="navbar-nav mr-auto">
 						<li class="nav-item active">
 							<a class="nav-link" href="/">Home <span class="sr-only">(current)</span></a>
 						</li>
-						<li class="nav-item dropdown">
-							<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-								<%=username%>
-							</a>
-							<div class="dropdown-menu" aria-labelledby="navbarDropdown">
-								<a class="dropdown-item" href="/login/form">Login</a>
-								<div class="dropdown-divider"></div>
-								<a class="dropdown-item" href="/logout">Logout</a>
-							</div>
-						</li>
 					</ul>
+					<div class="nav-item dropdown text-right">
+						<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+							<%= username %>
+						</a>
+						<div class="dropdown-menu" aria-labelledby="navbarDropdown">
+							<a class="dropdown-item" href="/login/form">Log in</a>
+							<div class="dropdown-divider"></div>
+							<a class="dropdown-item" href="/logout">Log out</a>
+						</div>
+					</div>
 				</div>
 			</nav>
-
+			
 			<div>
 				<%if @error then %>
 						<div class="alert alert-error"><%=@error%></div>
@@ -47,9 +47,9 @@
 		</div>
     <!-- Optional JavaScript -->
     <!-- jQuery first, then Popper.js, then Bootstrap JS -->
-    <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.3/umd/popper.min.js" integrity="sha384-vFJXuSJphROIrBnz7yo7oB41mKfc8JzQZiCq4NCceLEaO4IHwicKwpJf9c9IpFgh" crossorigin="anonymous"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta.2/js/bootstrap.min.js" integrity="sha384-alpBpkh1PFOepccYVYDB4do5UnbKysX5WZXm3XxPqe5iKTfUKjNkCk9SaVuEZflJ" crossorigin="anonymous"></script>
+		<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
+		<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
   </body>
 </html>
 
diff --git a/views/login_form.erb b/views/login_form.erb
@@ -1,4 +1,4 @@
 <form action='/login/attempt' method='post' class="form-inline well">
   <input type="text" name='username' placeholder="username" autofocus>
-  <input class="btn primary" type='submit' value='log in'>
+  <input class="btn btn-outline-primary ml-4" type='submit' value='log in'>
 </form>