Merge branch 'clean4'

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
	app/assets/stylesheets/static.css.scss
	app/controllers/sessions_controller.rb
	app/controllers/static_controller.rb
	app/controllers/tournaments_controller.rb
	app/controllers/users_controller.rb
	app/helpers/sessions_helper.rb
	app/models/game.rb
	app/models/user.rb
	app/views/games/index.html.erb
	app/views/tournaments/index.html.erb
	app/views/tournaments/new.html.erb
	app/views/users/_form.html.erb
	app/views/users/index.html.erb
	app/views/users/index.json.jbuilder
	app/views/users/new.html.erb
	app/views/users/show.html.erb
	app/views/users/show.json.jbuilder
	config/routes.rb
	generate.sh

7 files changed, 62 insertions, 0 deletions

diff --git a/app/views/servers/_form.html.erb b/app/views/servers/_form.html.erb
new file mode 100644
index 0000000..b08654b
--- /dev/null
+++ b/app/views/servers/_form.html.erb
@@ -0,0 +1,17 @@
+<%= form_for(@server) do |f| %>
+  <% if @server.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@server.errors.count, "error") %> prohibited this server from being saved:</h2>
+
+      <ul>
+      <% @server.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>
diff --git a/app/views/servers/edit.html.erb b/app/views/servers/edit.html.erb
new file mode 100644
index 0000000..a92cdb5
--- /dev/null
+++ b/app/views/servers/edit.html.erb
@@ -0,0 +1,6 @@
+<h1>Editing server</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @server %> |
+<%= link_to 'Back', servers_path %>
diff --git a/app/views/servers/index.html.erb b/app/views/servers/index.html.erb
new file mode 100644
index 0000000..f45d393
--- /dev/null
+++ b/app/views/servers/index.html.erb
@@ -0,0 +1,25 @@
+<h1>Listing servers</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th></th>
+      <th></th>
+      <th></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @servers.each do |server| %>
+      <tr>
+        <td><%= link_to 'Show', server %></td>
+        <td><%= link_to 'Edit', edit_server_path(server) %></td>
+        <td><%= link_to 'Destroy', server, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br>
+
+<%= link_to 'New Server', new_server_path %>
diff --git a/app/views/servers/index.json.jbuilder b/app/views/servers/index.json.jbuilder
new file mode 100644
index 0000000..2776abc
--- /dev/null
+++ b/app/views/servers/index.json.jbuilder
@@ -0,0 +1,4 @@
+json.array!(@servers) do |server|
+  json.extract! server, :id
+  json.url server_url(server, format: :json)
+end
diff --git a/app/views/servers/new.html.erb b/app/views/servers/new.html.erb
new file mode 100644
index 0000000..0422009
--- /dev/null
+++ b/app/views/servers/new.html.erb
@@ -0,0 +1,5 @@
+<h1>New server</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', servers_path %>
diff --git a/app/views/servers/show.html.erb b/app/views/servers/show.html.erb
new file mode 100644
index 0000000..039cd8f
--- /dev/null
+++ b/app/views/servers/show.html.erb
@@ -0,0 +1,4 @@
+<p id="notice"><%= notice %></p>
+
+<%= link_to 'Edit', edit_server_path(@server) %> |
+<%= link_to 'Back', servers_path %>
diff --git a/app/views/servers/show.json.jbuilder b/app/views/servers/show.json.jbuilder
new file mode 100644
index 0000000..972b1c0
--- /dev/null
+++ b/app/views/servers/show.json.jbuilder
@@ -0,0 +1 @@
+json.extract! @server, :id, :created_at, :updated_at