From 5f349305a19860dc0b4acb1ef7c5462266d802c0 Mon Sep 17 00:00:00 2001
From: Raymon Johnstone <johnstor@gmail.com>
Date: Tue, 20 May 2014 20:07:22 -0400
Subject: [PATCH] Walkthrough for ubuntu added, as well as our lost default
 database file readded

---
 Walkthrough For Ubuntu Install         | 99 ++++++++++++++++++++++++++
 app/assets/stylesheets/application.css |  2 +-
 app/assets/stylesheets/users.css.scss  |  3 +-
 app/views/users/edit.html.erb          |  3 +-
 config/database.default.yml            | 21 ++++++
 5 files changed, 124 insertions(+), 4 deletions(-)
 create mode 100644 Walkthrough For Ubuntu Install
 create mode 100644 config/database.default.yml

diff --git a/Walkthrough For Ubuntu Install b/Walkthrough For Ubuntu Install
new file mode 100644
index 00000000..a4a4ddf2
--- /dev/null
+++ b/Walkthrough For Ubuntu Install	
@@ -0,0 +1,99 @@
+Firstly this walkthrough is done with a 14.04 32bit install of Ubuntu.
+
+All Commands are quoted with "" which are not to be included in the command.
+
+All commands that I could are terminal based.
+
+Lets check if all updates for the system are installed first
+
+in terminal type
+
+"sudo apt-get update"
+
+now we need to install git
+
+"sudo apt-get install git"
+
+lets get our RVM installed (Ruby Version Manager) now this is fun because the package you will get from apt-get is outdated.
+
+so we are going to use CURL to get RVM
+
+"sudo apt-get install curl"
+
+then lets install RVM with curl like this
+
+"curl -L get.rvm.io | bash -s stable"
+
+"PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting"
+
+"[[ -s "$HOME/.profile" ]] && source "$HOME/.profile""
+
+"[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm""
+
+"source ~/.rvm/scripts/rvm"
+
+now we can actually install RVM
+
+"rvm requirements"
+
+running this will check your system for requirements as well so you will need to put your system password in.
+
+alright now we can download metamaps from the master using git
+
+"git clone https://github.com/Connoropolous/metamaps_gen002.git"
+
+now there is a couple other things we are going to need which is nodejs, postgresql, libpq-dev and redis-server
+
+"sudo apt-get install nodejs"
+
+"sudo apt-get install postgresql"
+
+"sudo apt-get install libpq-dev"
+
+"sudo apt-get install redis-server"
+
+Install the specific version of ruby needed *Note you will get a warning about this being an outdated version*
+
+"rvm install ruby-1.9.3-p125"
+
+Now we also need to rename your database file which is in ./config/database.default.yml to database.yml
+
+now run
+
+"bundle install" 
+
+in your top lvl directory for metamaps this is a lengthy process so you might want to go and make a coffee or something :)
+
+alright now we need to make sure your postgres password is the same as it is listed in the DB file so we are going to set it by
+
+"sudo -u postgres psql"
+
+Select postgres like this
+
+"\password postgres"
+
+Then to quit
+
+"\q"
+
+now we can run the rake install and db creation
+
+"rake db:create"
+
+"rake db:schema:load"
+
+"rake db:fixtures:load"
+
+Execute the server : "rails s"
+
+and dont forget to run realtime too open a new terminal
+
+navigate to ./realtime and run 
+
+"nodejs realtime-server.js"
+
+Now your all set enjoy your personal server of metamaps :)
+
+
+
+
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 36e380f4..169ac95e 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -354,7 +354,7 @@ font-family: 'LatoRegular';
 
 label, select, input, textarea {
   display:block;
-}
+  }
 
 label {
   margin-top:10px;
diff --git a/app/assets/stylesheets/users.css.scss b/app/assets/stylesheets/users.css.scss
index ff75b57e..829f76f8 100644
--- a/app/assets/stylesheets/users.css.scss
+++ b/app/assets/stylesheets/users.css.scss
@@ -2,6 +2,7 @@
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
 
+
 .allMetacodes {
   float:left;
 }
@@ -62,4 +63,4 @@
 
 .editMetacodes li.toggledOff {
   opacity: 0.4;
-}
\ No newline at end of file
+}
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 1e21f9ff..30ed5dcd 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -7,13 +7,12 @@
 <% content_for :title, @user.name + "'s Settings | Metamaps" %>  
 <%= formula_form_for @user, url: user_url do |form| %>
 <h1 class="index">Your Settings</h1>
-  
 
   <h3>Edit Account</h3>
   <%= form.input :name, label: "Name", class: "name" %>
   <%= form.input :email, label: "Email", class: "email" %>
   <%= form.input :password, label: "Password", class: "password" %>
-  <%= form.submit "Update", class: "update" %>  
+  <%= form.submit "Update", class: "update" %>
   
 <% end %>
 
diff --git a/config/database.default.yml b/config/database.default.yml
new file mode 100644
index 00000000..6705ca8f
--- /dev/null
+++ b/config/database.default.yml
@@ -0,0 +1,21 @@
+development:
+  min_messages: WARNING
+  adapter: postgresql
+  host: 127.0.0.1
+  port: 5432
+  encoding: unicode
+  database: metamap002_development
+  pool: 5
+  username: postgres
+  password: "3112"
+
+production:
+  min_messages: WARNING
+  adapter: postgresql
+  host: ec2-107-21-107-194.compute-1.amazonaws.com
+  port: 5432
+  encoding: unicode
+  database: ddcrn2lgphjk9k
+  pool: 5
+  username: qqpckkahytovwv
+  password: "njeP6cMA8EjM9ukHk9s3ReOdy7"