Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

ran bundle update to install pg gem and changed back route file to root

  • Loading branch information...
commit a3261b41ceadf2cf90184ac0e2c9251cb3294aa9 1 parent 0b942a8
Anthony Barone authored February 22, 2012
3  Gemfile
@@ -2,9 +2,6 @@ source 'http://rubygems.org'
2 2
 
3 3
 gem 'rails', '3.1.3 '
4 4
 
5  
-# Bundle edge Rails instead:
6  
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
7  
-
8 5
 #gem 'sqlite3-ruby', :require => 'sqlite3'
9 6
 
10 7
 group :production do
2  Gemfile.lock
@@ -53,6 +53,7 @@ GEM
53 53
       treetop (~> 1.4.8)
54 54
     mime-types (1.17.2)
55 55
     multi_json (1.1.0)
  56
+    pg (0.13.2)
56 57
     polyglot (0.3.3)
57 58
     rack (1.3.6)
58 59
     rack-cache (1.1)
@@ -111,6 +112,7 @@ PLATFORMS
111 112
 DEPENDENCIES
112 113
   coffee-rails (~> 3.1.0)
113 114
   jquery-rails
  115
+  pg
114 116
   rails (= 3.1.3)
115 117
   sass-rails (~> 3.1.0)
116 118
   sqlite3-ruby
2  config/routes.rb
@@ -69,7 +69,7 @@
69 69
   # You can have the root of your site routed with "root"
70 70
   # just remember to delete public/index.html.
71 71
   
72  
-  #root :to => "concepts#the_idea"
  72
+  root :to => "concepts#the_idea"
73 73
 
74 74
   # See how all your routes lay out with "rake routes"
75 75
 
239  public/index.html
... ...
@@ -1,239 +0,0 @@
1  
-<!DOCTYPE html>
2  
-<html>
3  
-  <head>
4  
-    <title>Ruby on Rails: Welcome aboard</title>
5  
-    <style type="text/css" media="screen">
6  
-      body {
7  
-        margin: 0;
8  
-        margin-bottom: 25px;
9  
-        padding: 0;
10  
-        background-color: #f0f0f0;
11  
-        font-family: "Lucida Grande", "Bitstream Vera Sans", "Verdana";
12  
-        font-size: 13px;
13  
-        color: #333;
14  
-      }
15  
-
16  
-      h1 {
17  
-        font-size: 28px;
18  
-        color: #000;
19  
-      }
20  
-
21  
-      a  {color: #03c}
22  
-      a:hover {
23  
-        background-color: #03c;
24  
-        color: white;
25  
-        text-decoration: none;
26  
-      }
27  
-
28  
-
29  
-      #page {
30  
-        background-color: #f0f0f0;
31  
-        width: 750px;
32  
-        margin: 0;
33  
-        margin-left: auto;
34  
-        margin-right: auto;
35  
-      }
36  
-
37  
-      #content {
38  
-        float: left;
39  
-        background-color: white;
40  
-        border: 3px solid #aaa;
41  
-        border-top: none;
42  
-        padding: 25px;
43  
-        width: 500px;
44  
-      }
45  
-
46  
-      #sidebar {
47  
-        float: right;
48  
-        width: 175px;
49  
-      }
50  
-
51  
-      #footer {
52  
-        clear: both;
53  
-      }
54  
-
55  
-
56  
-      #header, #about, #getting-started {
57  
-        padding-left: 75px;
58  
-        padding-right: 30px;
59  
-      }
60  
-
61  
-
62  
-      #header {
63  
-        background-image: url("images/rails.png");
64  
-        background-repeat: no-repeat;
65  
-        background-position: top left;
66  
-        height: 64px;
67  
-      }
68  
-      #header h1, #header h2 {margin: 0}
69  
-      #header h2 {
70  
-        color: #888;
71  
-        font-weight: normal;
72  
-        font-size: 16px;
73  
-      }
74  
-
75  
-
76  
-      #about h3 {
77  
-        margin: 0;
78  
-        margin-bottom: 10px;
79  
-        font-size: 14px;
80  
-      }
81  
-
82  
-      #about-content {
83  
-        background-color: #ffd;
84  
-        border: 1px solid #fc0;
85  
-        margin-left: -55px;
86  
-        margin-right: -10px;
87  
-      }
88  
-      #about-content table {
89  
-        margin-top: 10px;
90  
-        margin-bottom: 10px;
91  
-        font-size: 11px;
92  
-        border-collapse: collapse;
93  
-      }
94  
-      #about-content td {
95  
-        padding: 10px;
96  
-        padding-top: 3px;
97  
-        padding-bottom: 3px;
98  
-      }
99  
-      #about-content td.name  {color: #555}
100  
-      #about-content td.value {color: #000}
101  
-
102  
-      #about-content ul {
103  
-        padding: 0;
104  
-        list-style-type: none;
105  
-      }
106  
-
107  
-      #about-content.failure {
108  
-        background-color: #fcc;
109  
-        border: 1px solid #f00;
110  
-      }
111  
-      #about-content.failure p {
112  
-        margin: 0;
113  
-        padding: 10px;
114  
-      }
115  
-
116  
-
117  
-      #getting-started {
118  
-        border-top: 1px solid #ccc;
119  
-        margin-top: 25px;
120  
-        padding-top: 15px;
121  
-      }
122  
-      #getting-started h1 {
123  
-        margin: 0;
124  
-        font-size: 20px;
125  
-      }
126  
-      #getting-started h2 {
127  
-        margin: 0;
128  
-        font-size: 14px;
129  
-        font-weight: normal;
130  
-        color: #333;
131  
-        margin-bottom: 25px;
132  
-      }
133  
-      #getting-started ol {
134  
-        margin-left: 0;
135  
-        padding-left: 0;
136  
-      }
137  
-      #getting-started li {
138  
-        font-size: 18px;
139  
-        color: #888;
140  
-        margin-bottom: 25px;
141  
-      }
142  
-      #getting-started li h2 {
143  
-        margin: 0;
144  
-        font-weight: normal;
145  
-        font-size: 18px;
146  
-        color: #333;
147  
-      }
148  
-      #getting-started li p {
149  
-        color: #555;
150  
-        font-size: 13px;
151  
-      }
152  
-
153  
-
154  
-      #sidebar ul {
155  
-        margin-left: 0;
156  
-        padding-left: 0;
157  
-      }
158  
-      #sidebar ul h3 {
159  
-        margin-top: 25px;
160  
-        font-size: 16px;
161  
-        padding-bottom: 10px;
162  
-        border-bottom: 1px solid #ccc;
163  
-      }
164  
-      #sidebar li {
165  
-        list-style-type: none;
166  
-      }
167  
-      #sidebar ul.links li {
168  
-        margin-bottom: 5px;
169  
-      }
170  
-
171  
-    </style>
172  
-    <script type="text/javascript">
173  
-      function about() {
174  
-        info = document.getElementById('about-content');
175  
-        if (window.XMLHttpRequest)
176  
-          { xhr = new XMLHttpRequest(); }
177  
-        else
178  
-          { xhr = new ActiveXObject("Microsoft.XMLHTTP"); }
179  
-        xhr.open("GET","rails/info/properties",false);
180  
-        xhr.send("");
181  
-        info.innerHTML = xhr.responseText;
182  
-        info.style.display = 'block'
183  
-      }
184  
-    </script>
185  
-  </head>
186  
-  <body>
187  
-    <div id="page">
188  
-      <div id="sidebar">
189  
-        <ul id="sidebar-items">
190  
-          <li>
191  
-            <h3>Browse the documentation</h3>
192  
-            <ul class="links">
193  
-              <li><a href="http://api.rubyonrails.org/">Rails API</a></li>
194  
-              <li><a href="http://stdlib.rubyonrails.org/">Ruby standard library</a></li>
195  
-              <li><a href="http://corelib.rubyonrails.org/">Ruby core</a></li>
196  
-              <li><a href="http://guides.rubyonrails.org/">Rails Guides</a></li>
197  
-            </ul>
198  
-          </li>
199  
-        </ul>
200  
-      </div>
201  
-
202  
-      <div id="content">
203  
-        <div id="header">
204  
-          <h1>Welcome aboard</h1>
205  
-          <h2>You&rsquo;re riding Ruby on Rails!</h2>
206  
-        </div>
207  
-
208  
-        <div id="about">
209  
-          <h3><a href="rails/info/properties" onclick="about(); return false">About your application&rsquo;s environment</a></h3>
210  
-          <div id="about-content" style="display: none"></div>
211  
-        </div>
212  
-
213  
-        <div id="getting-started">
214  
-          <h1>Getting started</h1>
215  
-          <h2>Here&rsquo;s how to get rolling:</h2>
216  
-
217  
-          <ol>
218  
-            <li>
219  
-              <h2>Use <code>rails generate</code> to create your models and controllers</h2>
220  
-              <p>To see all available options, run it without parameters.</p>
221  
-            </li>
222  
-
223  
-            <li>
224  
-              <h2>Set up a default route and remove or rename this file</h2>
225  
-              <p>Routes are set up in config/routes.rb.</p>
226  
-            </li>
227  
-
228  
-            <li>
229  
-              <h2>Create your database</h2>
230  
-              <p>Run <code>rake db:migrate</code> to create your database. If you're not using SQLite (the default), edit <code>config/database.yml</code> with your username and password.</p>
231  
-            </li>
232  
-          </ol>
233  
-        </div>
234  
-      </div>
235  
-
236  
-      <div id="footer">&nbsp;</div>
237  
-    </div>
238  
-  </body>
239  
-</html>

0 notes on commit a3261b4

Please sign in to comment.
Something went wrong with that request. Please try again.