Swich from slim back to erb'

hoitomt · Mar 24, 2015 · 0196aee · 0196aee
1 parent b1a5615
commit 0196aee
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 37 deletions.
diff --git a/Gemfile b/Gemfile
@@ -14,7 +14,6 @@ gem 'sdoc', '~> 0.4.0', group: :doc
 gem 'pg'
 gem 'puma'
 gem 'dotenv-rails'
-gem 'slim'
 gem 'faraday'
 
 group :development, :test do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -150,9 +150,6 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
-    slim (3.0.3)
-      temple (~> 0.7.3)
-      tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
     spin (0.7.1)
     spring (1.3.3)
@@ -166,7 +163,6 @@ GEM
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.10)
-    temple (0.7.5)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
@@ -206,7 +202,6 @@ DEPENDENCIES
   rails (= 4.2.0)
   sass-rails (~> 5.0)
   sdoc (~> 0.4.0)
-  slim
   spin
   spring
   sqlite3

diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb
@@ -0,0 +1,23 @@
+<nav class="navbar navbar-default navbar-fixed-top">
+  <div class="container-fluid">
+    <div class="navbar-header">
+      <button class="navbar-toggle" data-toggle="collapse" data-target="#navbar-main">
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <%= link_to "Stock Portfolio", root_path, class:"navbar-brand" %>
+      </button>
+      <div id="navbar-main" class="navbar-collapse collapse">
+        <ul class="nav navbar-nav">
+          <li><%= link_to "Portfolio", '#' %></li>
+        </ul>
+        <form class="navbar-form navbar-right" role="search">
+          <div class="form-group">
+            <input class="form-control" type="text" placeholder="Search">
+          </div>
+          <input type="submit" class="btn btn-default" value="Submit">
+        </form>
+      </div>
+    </div>
+  </div>
+</nav>
diff --git a/app/views/layouts/_navigation.slim b/app/views/layouts/_navigation.slim
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -0,0 +1,15 @@
+<!doctype html>
+<html>
+<head>
+  <title>Stock Portfolio API</title>
+  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
+  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+  <%= render 'layouts/navigation' %>
+  <div class="container">
+    <%= yield %>
+  </div>
+</body>
+</html>
diff --git a/app/views/layouts/application.slim b/app/views/layouts/application.slim
diff --git a/app/views/pages/index.html.erb b/app/views/pages/index.html.erb
@@ -0,0 +1,4 @@
+<h1>Stock Portfolio API</h1>
+<% unless signed_in? %>
+  <%= link_to "Log in with Github", github_login_path %>
+<% end %>
diff --git a/app/views/pages/index.slim b/app/views/pages/index.slim
diff --git a/app/views/pages/test.html.erb b/app/views/pages/test.html.erb
@@ -0,0 +1 @@
+<h1>Welcome, you are in the club</h1>
diff --git a/app/views/pages/test.slim b/app/views/pages/test.slim