Permalink
Browse files

index page

  • Loading branch information...
micahbrich committed Dec 22, 2009
1 parent b482fdb commit d0aaa1375705c503b8fd4534893d057c668e5c97
@@ -24,7 +24,7 @@ def gettr
@post.update_attributes!(:url => photo.url, :title => photo.title, :description => photo.description, :created_at => photo.posted_at, :updated_at => photo.updated_at, :image => photo.large.url, :thumb => photo.small.url, :flickr_id => photo.id )
end
end
- redirect_to root_path
+ redirect_to blog_root_path
else
redirect_to login_path
end
@@ -6,7 +6,7 @@ def create
session[:password] = params[:password]
if session[:password] == @password
flash[:notice] = "Successfully logged in"
- redirect_to root_path
+ redirect_to blog_root_path
else
flash[:notice] = "Sorry, wrong password!"
redirect_to login_path
@@ -15,9 +15,9 @@
<body>
- <h1><%= link_to @site_name, root_path %></h1>
+ <h1><%= link_to @site_name, blog_root_path %></h1>
<ul id="menu">
- <li id="home"><%= link_to 'home', root_path %></li>
+ <li id="home"><%= link_to 'home', blog_root_path %></li>
<li id="archive"><%= link_to 'archive', archive_path %></li>
<li id="about"><%= link_to 'about', about_path %></li>
<li id="rss"><%= link_to 'feed', feed_path([:xml]) %></li>
View
@@ -74,7 +74,7 @@
end
#flickr
-# require 'fleakr'
+require 'fleakr'
# # ar_mailer
# require 'action_mailer/ar_mailer'
View
@@ -3,15 +3,15 @@
# The priority is based upon order of creation: first created -> highest priority.
# Sample of regular route:
- map.archive '/archive', :controller => 'posts', :action => 'archive'
- map.feed '/feed', :controller => 'posts', :action => 'feed'
- map.feed '/imagefeed', :controller => 'posts', :action => 'image_feed'
- map.feed '/imagefeed.:format', :controller => 'posts', :action => 'image_feed'
- map.feed '/feed.:format', :controller => 'posts', :action => 'feed'
- map.about '/about', :controller => 'posts', :action => 'about'
+ map.archive '/blog/archive', :controller => 'posts', :action => 'archive'
+ map.feed '/blog/feed', :controller => 'posts', :action => 'feed'
+ map.feed '/blog/imagefeed', :controller => 'posts', :action => 'image_feed'
+ map.feed '/blog/imagefeed.:format', :controller => 'posts', :action => 'image_feed'
+ map.feed '/blog/feed.:format', :controller => 'posts', :action => 'feed'
+ map.about '/blog/about', :controller => 'posts', :action => 'about'
- map.gettr '/gettr', :controller => 'posts', :action => 'gettr'
- map.resources :posts, :collection => { :feed => :get, :archive => :get, :gettr => :put }, :has_many => :comments
+ map.gettr '/blog/gettr', :controller => 'posts', :action => 'gettr'
+ map.resources :posts, :collection => { :feed => :get, :archive => :get, :gettr => :put }, :has_many => :comments, :as => 'blog'
map.resources :sessions
map.login '/login', :controller => 'sessions', :action => 'new'
@@ -45,7 +45,7 @@
# end
# You can have the root of your site routed with map.root -- just remember to delete public/index.html.
- map.root :controller => "posts"
+ map.blog_root '/blog', :controller => "posts"
# See how all your routes lay out with "rake routes"
View
@@ -1,30 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-
- <title>a future flickr blog!</title>
- <style type="text/css" media="screen">
- div#flickr {
- text-align:center;
- font: 12px "Lucida Grande", "Trebuchet MS", Verdana, sans-serif;
- margin:auto;
- margin-top:15%;
- width:564px;
- }
- #flickr p {
- margin-top:10%;
- }
- </style>
-</head>
-
-<body>
-
-<div id="flickr"><img src="images/flickr.png"/>
- <p>thou shalt power me!</p>
-</div>
-
-</body>
-</html>
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -0,0 +1,50 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta name="description" content="the home base of one micah rich.">
+ <meta name="keywords" content="micah rich, micah, rich, micah makes art, micah plays guitar, micah makes, micah makes photography, micah takes photos, a good company, micah b rich, micahbrich">
+ <title>micah makes all manner of things</title>
+ <link rel="stylesheet" href="stylesheets/story.css" type="text/css" />
+
+</head>
+
+<body>
+<ul>
+ <h2>Micah's Goals <span class="pretty">for 2009</span></h2>
+ <li><a href="http://www.weareagoodcompany.com">make a company</a></li>
+ <li><a href="http://www.micahplaysguitar.com">play guitar</a></li>
+ <li><a href="http://www.micahrich.com/blog/">take photos</a></li>
+ <li><a href="http://www.twitter.com/micahbrich">socialize</a></li>
+</ul>
+<div id="story">
+ <p>once upon a time, there was a boy.</p>
+ <p>his called himself micah, and he was exactly twenty-three years old
+on
+his 23<sup>rd</sup> birthday. he lived all over the place –
+sometimes new york, one time in boston, and sometimes in sunny california. he liked to think of moving around like an adventure.</p>
+ <p>on the first day of the first month of the year 2009, he and <a href="http://www.hadilaksono.com">his friend caroline</a> started working as <a href="http://www.weareagoodcompany.com">A Good Company</a>, so that they could play and have fun all the time. they still do to this very day.</p>
+ <p>sometimes, micah played <a href="http://www.micahplaysguitar.com">guitar</a>, writing songs and singing them. he liked it, but didn't do it enough. he vowed that this would change.</p>
+ <p>and on every single day, except, of course, for the days in which he did not, micah wrote down what happened to him in a very secret <a href="http://www.micahrich.com/blog/">journal</a>. he'd take photographs, too, and only his most precious of friends were allowed to read it and see them.</p>
+
+ <p>then one day, micah decided it wasn't enough. he wanted to share fun links and talk to his pals! so he found a little bird that would <a href="http://www.twitter.com/micahbrich">"tweet, tweet!"</a> and tell everyone what he was doing! oh, that bird sure was a rascal, but he and micah grew to be good friends.</p>
+
+ <p>and that's the whole story. micah never grew up, and never stopped playing. to this day, micah sings songs and makes websites; to this day micah moves around and whispers to his bird-friends. to this day, micah is a happy little guy.</p>
+
+ <p>the end.</p>
+
+
+</div>
+<script type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+try {
+var pageTracker = _gat._getTracker("UA-2279213-2");
+pageTracker._trackPageview();
+} catch(err) {}</script>
+</body>
+</html>
@@ -0,0 +1,91 @@
+* { margin:0; padding:0; }
+
+BODY {
+ width: 650px;
+ margin: auto;
+ font: bold 62.5% Helvetica, "Helvetica Neue", Arial, Geneva, sans-serif;
+ background-color: #ff8b81;
+}
+
+html {
+}
+
+ul {
+ height: 285px;
+ background: url(../images/micah.png) no-repeat -90px 0;
+ padding-left: 250px;
+ padding-top: 130px;
+ margin-top: 20px;
+ margin-bottom: 20px;
+}
+
+ul h2 {
+ text-transform: lowercase;
+ color: #fff;
+ font-size: 4em;
+ margin-bottom: .5em;
+ text-shadow: #cb6f67 -1px -1px 0;
+}
+
+ul li {
+ font-size: 1.8em;
+ list-style-type: none;
+ line-height: 2;
+ list-style-image: url(../images/check.png);
+ list-style-position: inside;
+}
+
+li a {
+ color: #fafafa;
+ text-decoration: line-through;
+ opacity: 0.75;
+ text-shadow: #000000 0 0 0;
+
+}
+
+a {
+ color: #fff;
+ font-style: italic;
+ text-decoration: none;
+}
+
+span.pretty {
+ font: italic normal 40% Georgia, "Times New Roman", Times, serif;
+ vertical-align: 5px;
+ margin-left: 5px;
+}
+
+li a:hover {
+ text-decoration: none;
+ opacity: 1;
+}
+
+p {
+ text-align: justify;
+ color: #7f322b;
+ font: normal normal 1.2em/1.5em Georgia, "Times New Roman", Times, serif;
+ margin-bottom: 1.6em;
+}
+
+div#story {
+ -webkit-column-count:2;
+ -webkit-column-gap:4.5em;
+ -webkit-column-rule: 1px solid #ea7f76;
+ -moz-column-count:2;
+ -moz-column-gap:4.5em;
+ -moz-column-rule: 1px solid #ea7f76;
+ width: 526px;
+ margin-bottom: 4em;
+}
+
+a:hover {
+ text-decoration: underline;
+}
+
+a:visited {
+ text-decoration: line-through;
+}
+
+ {
+
+}

0 comments on commit d0aaa13

Please sign in to comment.