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

Dionisia - Edges - Munchies #46

Open
wants to merge 37 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
47b0d9c
initial rails setup
larachan15 Oct 30, 2018
f8053f8
added gems and keys
larachan15 Oct 31, 2018
c2249b1
set up lib file and added recipe controller
larachan15 Oct 31, 2018
b03b349
set up homepage, index and show pages
larachan15 Nov 2, 2018
ba016df
Merge pull request #1 from larachan15/dionisia-work
larachan15 Nov 2, 2018
a7a8cc9
search box working on homepage
larachan15 Nov 2, 2018
0cef764
Merge pull request #2 from larachan15/dionisia-work
larachan15 Nov 2, 2018
9a29532
index page with link on label working. Show page is not
larachan15 Nov 3, 2018
2602c3f
Merge pull request #3 from larachan15/dionisia-work
larachan15 Nov 3, 2018
126ca5d
show is still not working
larachan15 Nov 3, 2018
db09717
Merge pull request #4 from larachan15/dionisia-work
larachan15 Nov 3, 2018
49ed1b3
fixed controller, refactored some code in api_wrapper
larachan15 Nov 4, 2018
8889f49
Merge pull request #5 from larachan15/dionisia-work
larachan15 Nov 4, 2018
34d3160
fixed error in routes
larachan15 Nov 4, 2018
9b443e1
fixed inconsistencies in wrapper and controller
larachan15 Nov 4, 2018
c41ad0d
Merge pull request #6 from larachan15/dionisia-work
larachan15 Nov 4, 2018
45dc21b
show page finally working, some css added
larachan15 Nov 6, 2018
731a8ad
some styling on index page
larachan15 Nov 6, 2018
0b45ee8
homepage done
larachan15 Nov 6, 2018
5db4a73
Merge pull request #7 from larachan15/dionisia-work
larachan15 Nov 6, 2018
fb43738
show page finished
larachan15 Nov 6, 2018
b1c722c
show page mostly done with working link
larachan15 Nov 6, 2018
d7b9ba8
Merge pull request #8 from larachan15/dionisia-work
larachan15 Nov 6, 2018
5877028
show page finally done
larachan15 Nov 6, 2018
7459a5b
Merge pull request #9 from larachan15/dionisia-work
larachan15 Nov 6, 2018
2823e48
tests done, all passing
larachan15 Nov 7, 2018
2f2c0d8
Merge pull request #10 from larachan15/dionisia-work
larachan15 Nov 7, 2018
81ac689
modified gem file
larachan15 Nov 7, 2018
6fec56b
Merge branch 'master' of https://github.com/larachan15/api-muncher
larachan15 Nov 7, 2018
23bda50
Remove pry
larachan15 Nov 7, 2018
9fad33a
fixed background image for mobile app
larachan15 Nov 8, 2018
36e54bc
mobile background fix
larachan15 Nov 8, 2018
5d607b1
css
larachan15 Nov 8, 2018
858cfb9
mobile response stuff
larachan15 Nov 8, 2018
2c5049c
css stuff
larachan15 Nov 9, 2018
2d5d5a6
hopefully this css stuff works
larachan15 Nov 9, 2018
dbeb933
stuff
larachan15 Nov 9, 2018
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
29 changes: 29 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore bundler config.
/.bundle

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
!/log/.keep
!/tmp/.keep

# Ignore uploaded files in development
/storage/*
!/storage/.keep

/node_modules
/yarn-error.log

/public/assets
.byebug_history

# Ignore master key for decrypting credentials and more.
/config/master.key

.env
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ruby-2.5.1
87 changes: 87 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.5.1'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.1'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 3.11'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'mini_racer', platforms: :ruby

# Use CoffeeScript for .coffee assets and views
# gem 'coffee-rails', '~> 4.2'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem 'turbolinks', '~> 5'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.5'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use ActiveStorage variant
# gem 'mini_magick', '~> 4.8'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.1.0', require: false

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
gem 'minitest-vcr'
gem 'webmock'
gem 'dotenv-rails'
end

group :development do
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
gem 'web-console', '>= 3.3.0'
gem 'listen', '>= 3.0.5', '< 3.2'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
end

group :test do
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '>= 2.15'
gem 'selenium-webdriver'
# Easy installation and use of chromedriver to run system tests with Chrome
gem 'chromedriver-helper'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gem 'jquery-rails'
gem 'jquery-turbolinks'
gem 'bootstrap', '~> 4.1.3'
group :development, :test do
gem 'pry-rails'
end

group :development do
gem 'better_errors'
gem 'binding_of_caller'
gem 'guard'
gem 'guard-minitest'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end

gem 'httparty'
gem 'will_paginate', '~> 3.1.0'
Loading