started implementing user

Gemfile.lock

@@ -52,7 +52,7 @@ GEM
     faraday (0.6.1)
       addressable (~> 2.2.4)
       multipart-post (~> 1.1.0)
-      rack (>= 1.1.0, < 2)
+      rack (< 2, >= 1.1.0)
     gem_plugin (0.2.3)
     haml (3.1.2)
     haml-rails (0.3.4)

app/controllers/users_controller.rb

@@ -1,8 +1,12 @@
 class UsersController < ApplicationController
   def show
-    @user = User.find params[:id]
-    puts @user.inspect
+    @user = User.find params[:user]
     render :partial => "show", :locals => { :user => @user }
   end
+  
+  def edit
+    @user = User.find params[:user]
+    render :partial => "edit", :locals => { :user => @user }
+  end
 
 end

app/views/layouts/application.html.haml

@@ -27,13 +27,13 @@
     #block
     #bg_stripe
     #site
-      #uuser{:style=>"display:none;"}
+      #uuser{:style=>"display:block; color:#ddd;"}
         - if user_signed_in?
-          %span.bold= "YEAH! ICH BIN DRIN!"
+          =link_to "Profile", "/#!/users/#{current_user.id}"
+          =link_to "Logout", "/#!/logout"
         - else
-          =link_to "Sign In", new_user_session_path
-          =link_to "Sign Up", new_user_registration_path
-        =link_to "Sign Out", destroy_user_session_path
+          =link_to "Login", "/#!/login"
+          =link_to "Register", "/#!/register"
       #head
         %h1= link_to image_tag("nine-minutes.png"), "/#!/home"
         = render :partial=>"layouts/player"

app/views/users/_edit.html.haml

@@ -1,2 +1,12 @@
-%h1 Users#edit
-%p Find me in app/views/users/edit.html.haml
+#user_left
+  =image_tag validate_avatar_url(user.avatar.url), :class => "picture"
+  .information
+    %p{:style=>"display:block; color:#ddd;"}
+      %h1{:style=>"color:#ddd;"}= current_user.username || current_user.email
+    %br
+
+.tabs.tabs_js.w02
+  %ul.nav
+    %li profile settings
+  .content
+    %div EDIT - bla bla bla

app/views/users/_show.html.haml

@@ -2,6 +2,9 @@
   =image_tag validate_avatar_url(user.avatar.url), :class => "picture"
   .information
     %h1= user.username
+    %p{:style=>"display:block; color:#ddd;"}
+      =link_to "Profil editieren", "/#!/users/#{current_user.id}/edit"
+    %br
     %ul.nav
       %li=image_tag "icons/artist-info.png"
       %li=image_tag "icons/artist-links.png"

config/routes.rb

@@ -19,7 +19,9 @@ Nineminutes::Application.routes.draw do
   match "/more_albums", :to => "artists#more_albums"
   match "/more_artists", :to => "search#more_artists"
   match "/more_charts", :to => "charts#more"
-  get "artists/", :to => "artists#index"
+  #get "artists/", :to => "artists#index"
+  match "/users/:user", :to => "users#show"
+  match "/users/:user/edit", :to => "users#edit"
 
   match "/autocomplete", :to => "search#autocomplete"
   match "/album_info", :to => "artists#album_info"
@@ -27,7 +29,7 @@ Nineminutes::Application.routes.draw do
   
   #resources :artists, :constraints => { :id => /.*/ }
   resources :search
-  resources :users, :only => [ :show ]
+  #resources :users, :only => [ :show ]
   
   get "home/", :to => "home#show"
   get "charts/", :to => "charts#index"

db/schema.rb

@@ -9,6 +9,7 @@
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
 # It's strongly recommended to check this file into your version control system.
+
 ActiveRecord::Schema.define(:version => 20110606000240) do
 
   create_table "artists", :force => true do |t|

public/javascripts/ajax/routes.js

@@ -47,4 +47,10 @@ $(document).ready(function(){
     show_flash(false);
     load_site_request(user_path, this.params['user']);
   });
+  
+  // User Edit Page
+  Path.map(hashbang+user_path+":user/edit").to(function(){
+    show_flash(false);
+    load_site_request(user_path, this.params['user'] + "/edit");
+  });
 });