Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DishBish by Olivia #46

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
93a75b1
first commit of empty recipe app
secretsharer May 3, 2017
6cffcec
first commit of empty recipe app
secretsharer May 3, 2017
efdce43
Fixed Foundation in Gemfile.
secretsharer May 3, 2017
31b424d
A push before branching
secretsharer May 3, 2017
32508c2
Added homepages controller with method stubs
secretsharer May 3, 2017
6f1bafb
recipes controller with method stubs
secretsharer May 3, 2017
d61778d
added lib recipe.rb, method stub
secretsharer May 3, 2017
081280b
Added index and show routes and views, still erroring. Will continue …
secretsharer May 3, 2017
e18a78b
updated routes, moved code to homepages controller, added form
secretsharer May 3, 2017
6ada65b
added route, linkto paths and form for search, homepage success
secretsharer May 3, 2017
19a43ad
images now appearing for top ten
secretsharer May 4, 2017
94243a4
added will_paginate gem, applied pagination method
secretsharer May 4, 2017
0c6f86b
installed foundation, put in preliminary styling. last push before ne…
secretsharer May 4, 2017
bf4076f
oops - I began doing the show pasge on the sass branch - gonna swtich…
secretsharer May 4, 2017
b687c77
Wrote self.show method and url set up
secretsharer May 5, 2017
30ba216
show page working
secretsharer May 5, 2017
91e9638
nutrient table for show page
secretsharer May 5, 2017
5d12ed4
external link to recipe source working now, thanks, chris
secretsharer May 5, 2017
462b4cb
grid layout FINALLY working, changed row/columns
secretsharer May 5, 2017
7c2c369
additions to form button
secretsharer May 5, 2017
96ad9f8
a push before pulling, testing begins
secretsharer May 6, 2017
3abef74
got rid of emoji asset files
secretsharer May 6, 2017
5b8b59d
test template fomr slack api excer
secretsharer May 6, 2017
820fb3a
Much in the way of hours of styling struggle, and still and oversized…
secretsharer May 9, 2017
f611b5a
Small changes to the input box and the text
secretsharer May 9, 2017
d8b6f35
fixed the extra header problem
secretsharer May 9, 2017
4a554bd
added padding and margins, fixed show page, added attribution
secretsharer May 9, 2017
600761a
fixed some alignment issues
secretsharer May 9, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
recipes controller with method stubs
secretsharer committed May 3, 2017

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 6f1bafb613a00761f9d35257f5c7b201f4c02d43
3 changes: 3 additions & 0 deletions app/assets/javascripts/recipes.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/stylesheets/recipes.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place all the styles related to the recipes controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
17 changes: 17 additions & 0 deletions app/controllers/recipes_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
class RecipesController < ApplicationController

def index
end

def create; end


def edit; end


def update; end


def destroy; end

end
2 changes: 2 additions & 0 deletions app/helpers/recipes_helper.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
module RecipesHelper
end
7 changes: 7 additions & 0 deletions test/controllers/recipes_controller_test.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
require "test_helper"

describe RecipesController do
# it "must be a real test" do
# flunk "Need real tests"
# end
end