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

pull request for review #1

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source 'https://rubygems.org'

gem 'rubocop'
ruby '2.1.1'
gem 'sinatra'
27 changes: 10 additions & 17 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
GEM
remote: https://rubygems.org/
specs:
ast (2.0.0)
astrolabe (1.3.0)
parser (>= 2.2.0.pre.3, < 3.0)
parser (2.2.0.pre.4)
ast (>= 1.1, < 3.0)
slop (~> 3.4, >= 3.4.5)
powerpack (0.0.9)
rainbow (2.0.0)
rubocop (0.26.1)
astrolabe (~> 1.3)
parser (>= 2.2.0.pre.4, < 3.0)
powerpack (~> 0.0.6)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.4)
ruby-progressbar (1.6.0)
slop (3.6.0)
mini_portile (0.6.0)
rack (1.5.2)
rack-protection (1.5.3)
rack
sinatra (1.4.5)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4)
tilt (1.4.1)

PLATFORMS
ruby

DEPENDENCIES
rubocop
sinatra
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: bundle exec ruby isthe2018worldcuphappening.rb -p $PORT
16 changes: 3 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
# Single-Purpose Site
# Single-Purpose Site

Create a single-purpose website using [Sinatra](http://www.sinatrarb.com/) that tells the user one thing, a la [isitchristmas.com](https://isitchristmas.com/). Surprise and delight us – creativity is encouraged. Example inputs:
This app lets you know if it is time for the 2018 World Cup yet.

* The current date
* The time
* The weather
* Whether Kanye West's most recent tweets mention Kanye West
* *etc*
[<img src="cup.jpeg">](http://www.fifa.com/worldcup/russia2018/)

**Deploy the application to Heroku**, and **submit a pull request** to this repository. Include:

* All the necessary files
* In the README:
* Setup instructions
* A link to the live app on Heroku
Binary file added cup.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions isthe2018worldcuphappening.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
require 'rubygems'
require 'sinatra'

get '/' do

if Date.parse('2018-6-8') > Date.today
#if Date.parse('2014-10-14') > Date.today
erb :nyet
else
erb :da
end
end
7 changes: 7 additions & 0 deletions views/da.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<br><br><br><br>

<h2><center>Is it now time for the 2018 World Cup in Russia?</center></h2>
<br>

<h1><center>DA</center></h1>

7 changes: 7 additions & 0 deletions views/nyet.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<br><br><br><br>

<h2><center>Is it now time for the 2018 World Cup in Russia?</center></h2>
<br>

<h1><center>NYET</center></h1>