From d84d04498bb8efa9a72bcdad926b353b39d762af Mon Sep 17 00:00:00 2001
From: Niklas_Koehnecke <niklas.koehnecke@gmail.com>
Date: Mon, 19 Nov 2018 18:56:57 +0100
Subject: [PATCH] rough design for startpage

---
 app/views/devise/sessions/new.html.erb    | 74 ++++++++++++++++-------
 app/views/layouts/application.html.erb    |  2 +-
 spec/views/landing/index.html.erb_spec.rb |  7 ---
 3 files changed, 52 insertions(+), 31 deletions(-)
 delete mode 100644 spec/views/landing/index.html.erb_spec.rb

diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index caeb1955..8c40a726 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,34 +1,62 @@
-<h2>Log in</h2>
 
 <% flash.each do |key, value| %>
-  <%= content_tag :div, value, class: "flash #{key}" %>
+  <div class="alert alert-danger">
+  <%= content_tag :div, value %>
+    </div>
 <% end %>
 
-<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
-  <div class="field">
-    <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
-  </div>
+<div class='row'>
+<div class='col-7'>
+  <li>
+    <ul>This website does stuff</ul>
+    <ul>some more stuff</ul>
+    <ul>LOROR IPSUM</ul>
+    <ul>LOROR IPSUM</ul>
+    <ul>LOROR IPSUM</ul>
+    <ul>LOROR IPSUM</ul>
+  </li>
+</div>
+<div class='col-5'>
+<div class='card' >
 
-  <div class="field">
-    <%= f.label :password %><br />
-    <%= f.password_field :password, autocomplete: "current-password" %>
+  <div class="card-header">
+    <h2>Log in</h2>
   </div>
 
-  <% if devise_mapping.rememberable? -%>
-    <div class="field">
-      <%= f.check_box :remember_me %>
-      <%= f.label :remember_me %>
-    </div>
-  <% end -%>
 
-  <div class="actions">
-    <%= f.submit "Log in" %>
+
+  <div class="card-body">
+    <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
+      <div class="form-group input-group">
+        <%= f.email_field :email, autofocus: true, autocomplete: "email", placeholder: :email, class: 'form-control' %>
+      </div>
+
+      <div class="form-group input-group">
+        <%= f_password_field = f.password_field :password, autocomplete: "current-password", placeholder: :password, class: 'form-control'
+            f_password_field %>
+      </div>
+
+      <% if devise_mapping.rememberable? -%>
+        <div class="form-group">
+          <div class="form-check">
+            <%= f.check_box :remember_me, class: 'form-check-input' %>
+            <%= f.label :remember_me, class: 'form-check-label' %>
+          </div>
+        </div>
+      <% end -%>
+      <div class="form-group actions">
+        <%= f.submit "Log in", class: 'btn btn-block btn-primary float-right' %>
+        <button class='btn btn-block btn-secondary float-right' id="oauth">Sign in using OAuth</button>
+      </div>
+
+    <% end -%>
+
   </div>
-<% end %>
 
-<div>
-  <button id="oauth">Sign in using OAuth</button>
+  <div class='card-footer'>
+    <%= render "devise/shared/links" %>
+  </div>
 </div>
-
-<%= render "devise/shared/links" %>
+</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 31cefb02..524698bb 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -12,7 +12,7 @@
     <div id="content">
       <%= render "navbar" %>
       <div class="container" style="margin-top: 50px">
-        <div class="col-md-12">
+        <div class="col-lg-12">
           <%= yield %>
         </div>
         <%= yield :modals %>
diff --git a/spec/views/landing/index.html.erb_spec.rb b/spec/views/landing/index.html.erb_spec.rb
deleted file mode 100644
index 16a0e191..00000000
--- a/spec/views/landing/index.html.erb_spec.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe 'landing/index.html.erb', type: :view do
-  pending "add some examples to (or delete) #{__FILE__}"
-end