Don't merge - Review monday

README.md

@@ -1 +1,5 @@
-# kiwi-overflow
+# Kiwi Overflow
+
+This is a Ruby on Rails app built by @webdevjeffus, @deweydell, @luisplaz, and @zlschatz which is an imitation of Stack Overflow.
+
+[Our trello board has images of our schema and working agreement](https://trello.com/b/TKvtoxBm/kiwi-overflow)

kiwi/.rspec

@@ -0,0 +1,3 @@
+--color
+--require spec_helper
+--format documentation

kiwi/Gemfile

@@ -35,14 +35,19 @@ group :development, :test do
   gem 'byebug'
   gem 'pry-rails'
   gem 'pry-nav'
-  gem 'factory_girl'
-  gem 'launchy'
-  gem 'capybara'
+  gem 'factory_girl_rails'
   gem 'database_cleaner'
   gem 'better_errors'
+  gem 'rspec-rails'
+  gem 'shoulda-matchers'
   gem 'faker'
 end
 
+group :test do
+  gem 'launchy'
+  gem 'capybara'
+end
+
 group :development do
   # Access an IRB console on exception pages or by using <%= console %> in views
   gem 'web-console', '~> 2.0'

kiwi/Gemfile.lock

@@ -58,10 +58,14 @@ GEM
     concurrent-ruby (1.0.0)
     database_cleaner (1.5.1)
     debug_inspector (0.0.2)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
     execjs (2.6.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
+    factory_girl_rails (4.5.0)
+      factory_girl (~> 4.5.0)
+      railties (>= 3.0.0)
     faker (1.6.1)
       i18n (~> 0.5)
     globalid (0.3.6)
@@ -127,6 +131,23 @@ GEM
     rake (10.5.0)
     rdoc (4.2.1)
       json (~> 1.4)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-rails (3.4.0)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
     sass (3.4.21)
     sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
@@ -137,6 +158,8 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
+    shoulda-matchers (2.8.0)
+      activesupport (>= 3.0.0)
     slop (3.6.0)
     sprockets (3.5.2)
       concurrent-ruby (~> 1.0)
@@ -170,7 +193,7 @@ DEPENDENCIES
   byebug
   capybara
   database_cleaner
-  factory_girl
+  factory_girl_rails
   faker
   jbuilder (~> 2.0)
   jquery-rails
@@ -179,8 +202,10 @@ DEPENDENCIES
   pry-nav
   pry-rails
   rails (= 4.2.5)
+  rspec-rails
   sass-rails (~> 5.0)
   sdoc (~> 0.4.0)
+  shoulda-matchers
   uglifier (>= 1.3.0)
   web-console (~> 2.0)
 

kiwi/README.rdoc

@@ -1,28 +1,5 @@
 == README
 
-This README would normally document whatever steps are necessary to get the
-application up and running.
+This is a Ruby on Rails app built by @webdevjeffus, @deweydell, @luisplaz, and @zlschatz which is an imitation of Stack Overflow.
 
-Things you may want to cover:
-
-* Ruby version
-
-* System dependencies
-
-* Configuration
-
-* Database creation
-
-* Database initialization
-
-* How to run the test suite
-
-* Services (job queues, cache servers, search engines, etc.)
-
-* Deployment instructions
-
-* ...
-
-
-Please feel free to use a different markup language if you do not plan to run
-<tt>rake doc:app</tt>.
+Our trello board has images of our schema and working agreement: https://trello.com/b/TKvtoxBm/kiwi-overflow

kiwi/app/assets/javascripts/answers.js

@@ -0,0 +1,18 @@
+$(document).on("ready", function(){
+
+  $('#answers-form form').on('submit', function(event){
+    event.preventDefault();
+    var valuesToSubmit = $(this).serialize();
+    $.ajax({
+      url: $('#answers-form form').attr("action"),
+      type: "POST",
+      data: valuesToSubmit,
+    }).done(function(response) {
+      $('#answers-form form textarea').val('');
+      $('.answers-list').append(response);
+    }).fail(function(response) {
+      console.log("FAILURE");
+    });
+  });
+
+});

kiwi/app/assets/javascripts/questions.js

@@ -0,0 +1,14 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.
+// $(document).on("ready", function(){
+// 	$('.question-container a').on( "click", function(e) {
+// 		e.preventDefault();
+// 		var start = $(this).prev().children('.views')[0].innerHTML;
+// 		$(this).prev().children('.views')[0].innerHTML = start+1;
+// 	});
+
+// });
+
+
+
+// 

kiwi/app/assets/javascripts/vote.js

@@ -0,0 +1,8 @@
+$(document).on("ready", function(){
+
+  // $('#up-vote').on("click", function(event){
+  //   event.preventDefault();
+  // })
+
+
+})

kiwi/app/assets/stylesheets/main.css

@@ -0,0 +1,190 @@
+body {
+  font-family: 'Roboto', sans-serif;
+}
+
+header, footer {
+  margin: 0 auto;
+  width: 50%;
+  text-align: center;
+  margin-bottom: 1em;
+}
+
+header {
+  background-color: #E0EEE0;
+  padding: 0px 20px 20px 20px;
+}
+
+nav {
+  margin: 0 auto;
+  padding:0;
+
+}
+
+#kiwi {
+  height: 100px;
+  width: 100px;
+  margin-top: 1em;
+}
+
+#logo {
+  font-weight: 900;
+  margin-bottom: 1em;
+}
+
+nav ul {
+  display: inline;
+  padding: 0;
+}
+
+nav li {
+  display: inline;
+  list-style: none;
+  font-weight: 400;
+  padding: 0 10px 0 10px;
+}
+
+a {
+  text-decoration: none;
+  color: #66CD00;
+}
+
+a:hover {
+  text-decoration: underline;
+  color: green;
+}
+
+main {
+  margin: 0px auto;
+  width: 50%;
+  padding: 0px 20px 20px 20px;
+  border: 1px dotted black;
+}
+
+.question-container {
+  border-bottom: 1px solid gray;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
+}
+
+#question-title {
+  border-bottom: 1px solid gray;
+}
+
+.answers-list {
+  margin-top: 4em;
+}
+
+.answer {
+  padding: 1em;
+  margin-bottom: 1em;
+  background-color: #E0EEE0;
+}
+
+form, #new-user {
+  margin: 1em;
+}
+
+#form {
+  display: inline;
+  width: 90%;
+}
+
+.input-options {
+  display:block;
+  padding:10px;
+}
+
+textarea {
+  margin-top: 3%;
+  margin-bottom: 3%;
+  width: 100%;
+  height: 200px;
+}
+
+.comment {
+  width: 100%;
+  color: gray;
+
+}
+
+.form-button {
+  text-align: center;
+}
+
+p {
+  font-weight: 300;
+}
+
+label{
+  width: 4em;
+  float: left;
+  text-align: right;
+  margin-right: 1.5em;
+  display: block
+}
+
+.question-stats {
+  display: inline;
+  margin-right: 2em;
+}
+
+.question-links {
+  display: inline;
+}
+
+.votes, .answers, .views {
+  display: inline;
+  font-weight: 900;
+  text-align: center;
+}
+.votes-label, .answers-label, .views-label {
+  display: inline;
+  margin-right: 1em;
+}
+
+.vote-container {
+  height: 4em;
+  width: 2em;
+  float: left;
+  margin-right: 1em;
+  margin-bottom: 0.5em;
+  font-size: 1em;
+}
+
+.vote-attributes{
+  list-style: none;
+  text-align: center;
+  width: 100%;
+  height: 100%;
+  margin: auto 0;
+  padding: 0;
+  /*list-style-position: inside;*/
+}
+
+.user-time {
+  font-size: 13px;
+  color: green;
+  font-weight: 300;
+}
+
+.sort-by-menu{
+  display:inline;
+}
+
+.sort-by-nav{
+  display:block-inline;
+  text-align:right;
+}
+
+.sort-by-options{
+  display:inline;
+  text-align:right;
+}
+
+ul li {
+  list-style: none;
+}
+
+#question-content {
+}
+