From 83bec08851496d382a40953f8b66d5024d4a6924 Mon Sep 17 00:00:00 2001 From: fabiodesousa1 Date: Tue, 21 Jun 2016 11:08:16 -0400 Subject: [PATCH 01/15] moved favicon.ico to /images --- public/{ => images}/favicon.ico | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename public/{ => images}/favicon.ico (100%) diff --git a/public/favicon.ico b/public/images/favicon.ico similarity index 100% rename from public/favicon.ico rename to public/images/favicon.ico From 85c2148236b5bef394cda3aa6c1f4eb14afc0d86 Mon Sep 17 00:00:00 2001 From: Janelle Grace Date: Tue, 21 Jun 2016 15:19:48 +0000 Subject: [PATCH 02/15] logo-fix --- Gemfile | 0 Gemfile.lock | 0 Procfile | 0 README.md | 0 Rakefile | 0 app.rb | 0 config.ru | 0 config/environment.rb | 0 models/.keep | 0 models/sample_model.rb | 0 public/favicon.ico | Bin public/images/.keep | 0 public/images/learnco.png | Bin public/javascripts/.keep | 0 public/stylesheets/.keep | 0 public/stylesheets/main.css | 0 spec/spec_helper.rb | 0 views/.keep | 0 views/home.erb | 2 +- views/layout.erb | 0 views/reddit.erb | 0 views/schedule.erb | 0 views/subscribe.erb | 0 23 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 Gemfile mode change 100644 => 100755 Gemfile.lock mode change 100644 => 100755 Procfile mode change 100644 => 100755 README.md mode change 100644 => 100755 Rakefile mode change 100644 => 100755 app.rb mode change 100644 => 100755 config.ru mode change 100644 => 100755 config/environment.rb mode change 100644 => 100755 models/.keep mode change 100644 => 100755 models/sample_model.rb mode change 100644 => 100755 public/favicon.ico mode change 100644 => 100755 public/images/.keep mode change 100644 => 100755 public/images/learnco.png mode change 100644 => 100755 public/javascripts/.keep mode change 100644 => 100755 public/stylesheets/.keep mode change 100644 => 100755 public/stylesheets/main.css mode change 100644 => 100755 spec/spec_helper.rb mode change 100644 => 100755 views/.keep mode change 100644 => 100755 views/layout.erb mode change 100644 => 100755 views/reddit.erb mode change 100644 => 100755 views/schedule.erb mode change 100644 => 100755 views/subscribe.erb diff --git a/Gemfile b/Gemfile old mode 100644 new mode 100755 diff --git a/Gemfile.lock b/Gemfile.lock old mode 100644 new mode 100755 diff --git a/Procfile b/Procfile old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/Rakefile b/Rakefile old mode 100644 new mode 100755 diff --git a/app.rb b/app.rb old mode 100644 new mode 100755 diff --git a/config.ru b/config.ru old mode 100644 new mode 100755 diff --git a/config/environment.rb b/config/environment.rb old mode 100644 new mode 100755 diff --git a/models/.keep b/models/.keep old mode 100644 new mode 100755 diff --git a/models/sample_model.rb b/models/sample_model.rb old mode 100644 new mode 100755 diff --git a/public/favicon.ico b/public/favicon.ico old mode 100644 new mode 100755 diff --git a/public/images/.keep b/public/images/.keep old mode 100644 new mode 100755 diff --git a/public/images/learnco.png b/public/images/learnco.png old mode 100644 new mode 100755 diff --git a/public/javascripts/.keep b/public/javascripts/.keep old mode 100644 new mode 100755 diff --git a/public/stylesheets/.keep b/public/stylesheets/.keep old mode 100644 new mode 100755 diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css old mode 100644 new mode 100755 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb old mode 100644 new mode 100755 diff --git a/views/.keep b/views/.keep old mode 100644 new mode 100755 diff --git a/views/home.erb b/views/home.erb index 19d8743..ddc0cd8 100644 --- a/views/home.erb +++ b/views/home.erb @@ -1,5 +1,5 @@

Startup Sprint!

- +

Subscribe to the Stertup Sprint newsletter

<% if @error == 'email' %> diff --git a/views/layout.erb b/views/layout.erb old mode 100644 new mode 100755 diff --git a/views/reddit.erb b/views/reddit.erb old mode 100644 new mode 100755 diff --git a/views/schedule.erb b/views/schedule.erb old mode 100644 new mode 100755 diff --git a/views/subscribe.erb b/views/subscribe.erb old mode 100644 new mode 100755 From 5219b5d0addf17a0da623a0a6c9bfdf5f349095d Mon Sep 17 00:00:00 2001 From: Olivia Nicolaus Date: Tue, 21 Jun 2016 15:23:34 +0000 Subject: [PATCH 03/15] we fixed the typo --- Gemfile | 0 Gemfile.lock | 0 Procfile | 0 README.md | 0 Rakefile | 0 app.rb | 0 config.ru | 0 config/environment.rb | 0 models/.keep | 0 models/sample_model.rb | 0 public/images/.keep | 0 public/images/favicon.ico | Bin public/images/learnco.png | Bin public/javascripts/.keep | 0 public/stylesheets/.keep | 0 public/stylesheets/main.css | 0 spec/spec_helper.rb | 0 views/.keep | 0 views/home.erb | 2 +- views/layout.erb | 0 views/reddit.erb | 0 views/schedule.erb | 0 views/subscribe.erb | 0 23 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 Gemfile mode change 100644 => 100755 Gemfile.lock mode change 100644 => 100755 Procfile mode change 100644 => 100755 README.md mode change 100644 => 100755 Rakefile mode change 100644 => 100755 app.rb mode change 100644 => 100755 config.ru mode change 100644 => 100755 config/environment.rb mode change 100644 => 100755 models/.keep mode change 100644 => 100755 models/sample_model.rb mode change 100644 => 100755 public/images/.keep mode change 100644 => 100755 public/images/favicon.ico mode change 100644 => 100755 public/images/learnco.png mode change 100644 => 100755 public/javascripts/.keep mode change 100644 => 100755 public/stylesheets/.keep mode change 100644 => 100755 public/stylesheets/main.css mode change 100644 => 100755 spec/spec_helper.rb mode change 100644 => 100755 views/.keep mode change 100644 => 100755 views/layout.erb mode change 100644 => 100755 views/reddit.erb mode change 100644 => 100755 views/schedule.erb mode change 100644 => 100755 views/subscribe.erb diff --git a/Gemfile b/Gemfile old mode 100644 new mode 100755 diff --git a/Gemfile.lock b/Gemfile.lock old mode 100644 new mode 100755 diff --git a/Procfile b/Procfile old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/Rakefile b/Rakefile old mode 100644 new mode 100755 diff --git a/app.rb b/app.rb old mode 100644 new mode 100755 diff --git a/config.ru b/config.ru old mode 100644 new mode 100755 diff --git a/config/environment.rb b/config/environment.rb old mode 100644 new mode 100755 diff --git a/models/.keep b/models/.keep old mode 100644 new mode 100755 diff --git a/models/sample_model.rb b/models/sample_model.rb old mode 100644 new mode 100755 diff --git a/public/images/.keep b/public/images/.keep old mode 100644 new mode 100755 diff --git a/public/images/favicon.ico b/public/images/favicon.ico old mode 100644 new mode 100755 diff --git a/public/images/learnco.png b/public/images/learnco.png old mode 100644 new mode 100755 diff --git a/public/javascripts/.keep b/public/javascripts/.keep old mode 100644 new mode 100755 diff --git a/public/stylesheets/.keep b/public/stylesheets/.keep old mode 100644 new mode 100755 diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css old mode 100644 new mode 100755 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb old mode 100644 new mode 100755 diff --git a/views/.keep b/views/.keep old mode 100644 new mode 100755 diff --git a/views/home.erb b/views/home.erb index 19d8743..e57027d 100644 --- a/views/home.erb +++ b/views/home.erb @@ -1,7 +1,7 @@

Startup Sprint!

-

Subscribe to the Stertup Sprint newsletter

+

Subscribe to the Startup Sprint newsletter

<% if @error == 'email' %>

Please enter a valid email

<% end %> diff --git a/views/layout.erb b/views/layout.erb old mode 100644 new mode 100755 diff --git a/views/reddit.erb b/views/reddit.erb old mode 100644 new mode 100755 diff --git a/views/schedule.erb b/views/schedule.erb old mode 100644 new mode 100755 diff --git a/views/subscribe.erb b/views/subscribe.erb old mode 100644 new mode 100755 From a4d76ce4d139e3877f142f1fc0cfdf794ccd5f72 Mon Sep 17 00:00:00 2001 From: hotstoddy Date: Tue, 21 Jun 2016 13:37:43 -0400 Subject: [PATCH 04/15] Incorrect email addresses save input value of name --- app.rb | 3 ++- views/home.erb | 26 +++++++++++++++++--------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/app.rb b/app.rb index 68e111c..3d089b8 100755 --- a/app.rb +++ b/app.rb @@ -3,6 +3,7 @@ class App < Sinatra::Base get '/' do @error = params['error'] + @full_name = params['full_name'] erb :home end @@ -11,7 +12,7 @@ class App < Sinatra::Base @email = params[:email] if !@email.match(/.+@.+/) - redirect to('/?error=email') + redirect to('/?error=email&full_name='+@full_name) end erb :subscribe diff --git a/views/home.erb b/views/home.erb index 3f96028..e668b48 100644 --- a/views/home.erb +++ b/views/home.erb @@ -3,12 +3,20 @@

Subscribe to the Startup Sprint newsletter

<% if @error == 'email' %> -

Please enter a valid email

-<% end %> -
- - - - - -
+

<%= @full_name %>, please enter a valid email

+
+ + required> + + + +
+<%else%> +
+ + + + + +
+<% end %> \ No newline at end of file From 88e86229b61374f6137fb6f42f6ccfdb246613f1 Mon Sep 17 00:00:00 2001 From: hotstoddy Date: Tue, 21 Jun 2016 13:50:06 -0400 Subject: [PATCH 05/15] Redirects /home to root url --- app.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app.rb b/app.rb index 3d089b8..3e8b6da 100755 --- a/app.rb +++ b/app.rb @@ -7,6 +7,10 @@ class App < Sinatra::Base erb :home end + get '/home' do + redirect to('/') + end + post '/subscribe' do @full_name = params[:full_name] @email = params[:email] From ead144595d28d7bb31cad6279dda90911ca612a7 Mon Sep 17 00:00:00 2001 From: Stephen Kita Date: Tue, 21 Jun 2016 17:55:50 +0000 Subject: [PATCH 06/15] formats schedue to two columns --- public/stylesheets/main.css | 17 +++++++++++++++++ views/home.erb | 0 views/schedule.erb | 27 +++++++++++++++------------ 3 files changed, 32 insertions(+), 12 deletions(-) mode change 100644 => 100755 views/home.erb mode change 100755 => 100644 views/schedule.erb diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css index 3c995a6..0d3149a 100755 --- a/public/stylesheets/main.css +++ b/public/stylesheets/main.css @@ -1,3 +1,20 @@ +/* + * From csslayout +*/ + +#container1 { + float:left; + width:100%; +} +#col1 { + float:left; + width:50%; +} +#col2 { + float:left; + width:50%; +} + /* * What follows is the result of much research on cross-browser styling. * Credit left inline and big thanks to Nicolas Gallagher, Jonathan Neal, diff --git a/views/home.erb b/views/home.erb old mode 100644 new mode 100755 diff --git a/views/schedule.erb b/views/schedule.erb old mode 100755 new mode 100644 index 3ef5281..769ed5d --- a/views/schedule.erb +++ b/views/schedule.erb @@ -1,18 +1,21 @@
-
-

Today

-
    - <% @today.each do |item| %> -
  1. <%= item.first %>: <%= item.last %>
    2. - <% end %> -
-
-
+
+
+ +
+

Today

+ <% @today.each do |item| %> +

<%= item.first %>: <%= item.last %>

+ <% end %> +
+ +

Tomorrow

-
    <% @tomorrow.each do |item| %> -
  1. <%= item.first %>: <%= item.last %>
    2. +

    <%= item.first %>: <%= item.last %>

    <% end %> -
+ +
+
From b87cccdc8dcaf7a48ae228b492ddeec72664edb3 Mon Sep 17 00:00:00 2001 From: fabiodesousa1 Date: Tue, 21 Jun 2016 14:01:19 -0400 Subject: [PATCH 07/15] added city field to subscribe --- app.rb | 4 +++- views/home.erb | 4 ++++ views/subscribe.erb | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app.rb b/app.rb index 3d089b8..d785912 100755 --- a/app.rb +++ b/app.rb @@ -4,15 +4,17 @@ class App < Sinatra::Base get '/' do @error = params['error'] @full_name = params['full_name'] + @city = params['city'] erb :home end post '/subscribe' do @full_name = params[:full_name] @email = params[:email] + @city = params[:city] if !@email.match(/.+@.+/) - redirect to('/?error=email&full_name='+@full_name) + redirect to('/?error=email&full_name='+@full_name+'&city='+@city) end erb :subscribe diff --git a/views/home.erb b/views/home.erb index e668b48..9853b00 100644 --- a/views/home.erb +++ b/views/home.erb @@ -9,6 +9,8 @@ required> + + > <%else%> @@ -17,6 +19,8 @@ + + <% end %> \ No newline at end of file diff --git a/views/subscribe.erb b/views/subscribe.erb index 6a5d527..9bc0e21 100755 --- a/views/subscribe.erb +++ b/views/subscribe.erb @@ -1,3 +1,3 @@

Thanks for subscribing <%= @full_name %>

- +

Your city is <%=@city%>

Home From 92674dde06ec8d4f8f88a54d1a79d9a0c4e5b575 Mon Sep 17 00:00:00 2001 From: fabiodesousa1 Date: Tue, 21 Jun 2016 14:15:55 -0400 Subject: [PATCH 08/15] added a copy of favicon to public directory to see if it'll work on Heroku --- public/favicon.ico | Bin 0 -> 32038 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100755 public/favicon.ico diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100755 index 0000000000000000000000000000000000000000..4153693a29b988f5de8f463d2c72a99c5bc9afc8 GIT binary patch literal 32038 zcmeHw2bi5#dFFs229gaX1a=`yARE{vy8+BX0E3AOK?aNgV+Vt)Y)dY(t!ArP74=aW zm64|R-ZZ`U-h1yenm(iHGm@rg?wj{LqbrYvBrt-6Jehf(PyfCD{mc2j^R@GpBO9Cd z*?hp}{`+ls{G81fAGEPqVPj)+_uY%%gT7#6vzF&R_qnUz@3OJ^6f|HxeHE`r-M^}L}90V=`C!Do{ zvm?$D&Ip_Y4zL$E3eG~$G~jRsr>t<6pU>LgHk>?TkK?CL;>d~P3x|#!86`gXgq?(M z5dItCeFsSg{qeIvxNFWIBi>=QcE<)e)&<|d03;+QAtyf%MJ2^3DJwNlTv}qj7Zw+x zpr{b}g$2kh$T!zz=j9?RHwT$H*~rMwLV8vv(lRrUnvsr_^fV-=r6MUc1&Jxi=Gk$H z35ZRMM@&K-qT^!`6(@+fEr^VXMp$Gx{DK0Yc_J;YkPZXHFPQK%!p8}Q20RLX(d6fZ zl%pr@CcXT8ESVg8ePbiKdb-iw(}VL}UFhiSM0-aE+S=RE+SZ2V)>bsNG^4S(2@Oq+ zyuJZ-4fUw0uS0chEvjm2P+47timFPKS6ZP0rR8NPB;B&JvXGIQiVV^ugY?lmMLW?@ zG#BWzm8Saby?|&RpOlEe&=B#Vh5S5091{sYA^ZhFxJ%ye;k-u>_o=|pU`u&r1$ugW z(LXSN_RbE2lkm{_GC@T-N(JTRC?PHe$Q#9i(oz&z`GY)DNYM8({#Htyi^&(o*%`=7 zNkC$700K`PhnMYsc-kI-|Cv*WBG09hHwws8)@KzI6&e1r(&D`wMKAGRcyyFx*GhvB z;w)K^KKLYIpY8EuBbxVe&eh=15C(<@4er&oHHPQ&IdIe36`Uru?q=z8HkGBRR#Ui@8CS7+v3@_(!M3s=pP z=DUD;LDy!HpJPIT;D2N1R(e}Tsv--rLUClGD75$Qh1k?L~_ zajr*^;AxMHP(KtM2u_CGpX%#;_FM8+{fZ1cU_R_^A^X;$2LTUD!#vmzu}Bl@G~5HgOMgcZS>M)$myR6F9E?CY+!D zI(%RI4uUt_Zy<2}{qS3RAN)5yglOBBP#AU=wOP@q&re2cWg$B2t5IK4glf{XM)F5K z5N$>48{zlc&Pf*Hs1IbX$OF;^vhPvHPMugtNJ%2zBbb_+!sytT;RERa>AS{e(V*7I zzUFr+4Kx<9R}l90WAI;lKh8e&WjH+bC3wGb4;^!5J-2Mm>kF7?&-yt+)M_{P45tpYYF+Vqp(ZPOH=VhUo`mv1f(ffa2{6!z} z0OcICaaV}D>_PoW+Fao@IW>uk7cahx2Hib9XzOSnQZz zh04e?XwC`8aA!T{XJ-J51(!Ld`a;@?bAd>Yi9#Od@OJRep#GH%P}j@XDkJpB9}&+^ zU!2C}nHd99)6<3z1_lR>4HOL;nwpGVlm3_O&m+yGn_6iPWfPl7gM8U}KX+t%>?dxk z5WD9w_`G%>oSyrd0k_rPCQtkvxh|Vf>i=sLdv8a9+a?rwZAV4uQ8XlbqpKnVmHUm&|`T@sGB%KeZrVO|m~n{I6WO zVn8&IOvoO{7dYSD#kp=XzD|{q_d4`aPxkfq(_VC=ydV!Tj&>-I_CR-85~`w|kmj@< z2`4rn$$k^koOdAZ*y{-0{tF}@TZLke%_wr)NE)m~zVkX1d2U5n;C>Vb+9KEIFtQ2h zZhMjDwhswTzlPhE7jSyR%Lw=NHonrW@Vwb?*W~~BHTmB{T`&=HF3k8mGn6~czlE}Q zWnsa{!X)Wp_<%I%>h8Wq1L;QT%%KYx(B0LA!lZbld!0seW++BFs?k?pgqHjS&Sf;p zqTLaHd@XtZal{>X7KLt`Q601wl>xg^=CcjO?r)*c^-bivzJ-(%YYd-+?_G(I9lwI# zrbiL5{YiLlUx|~i{u17Hwn(E7eIp#Lez$b}^}p*}Y(l(QqtNDSU9gVu&-`4(b<2Wu z+1U6PW@l&3{2LmO7cO7EjLFGKgX=XuXlpa{8Xq4wwCN%(a-+gf7~+EN(nL%Rc3|$( z6sAY1KdNaTgHIvdVKWLnwxd4c7+T^;r!RY#>bkJ}9!GWN? zlkU$Y+(Xd1a0hu{K>nZf+4#gbtb8CI5IbQM_rN+nv*@ymF0t;Y#(%Idf|MUo1sG?^+d$Ze?`z+ zKSIFz74UfJJ8)Y0bvQorRh)hDOR)dt|HbKF{UaP#-3#ZnKZoPCb%+fQyS7$XN(ZZr z4+se|a;|ljctU(18gWi*PWgYm#CbE}uL$yizfK+qpiP+Y3ktNz#)+>r@8Si4?1ABP zgL^aeeib^-Q%7H-y`-M(e9) zxKJ8_!J<&~=Le!S!GXHqB{Sb1FaI;#R(}UBFMRVI{N*=1{bkbPD{y%3pWw9SM{wHm z8e&6(Z>j@@Zwz_B-P;SEzCO@;FeLn(_+I}181eNceDx~sS_Az#;fI7su9-*OygV%# z^q1xThz7EY@{1Ssf1~knwD!^3NIFv2baDPuy`9PbPUtL7L{CL3#ycu-X{ZC223s-R zUW}=xEKD|}VWK_-V>JmFsfb2LnmZDYtb*5T4;mZc{?fg0eeoXpir+By(vg0H>+@fO z%X44FnWyfC%bFj+edl^4aQ<`Yd)>?z5DkR4Y@1>Z^l=u5`!I0~BYdCm5rS|RypQlv zg3bq!KSs4))H?OjrAtO0v<{Z7Gd>ReAjwHfTdUy>*^GYjLUyP>3Ml_A>Hg>~io{5L z2Btg9Ff-VK+5URWc9meZvk)^K`MB7UOzY>uSw^k@Q)hj+mkzY%1oO$NM^Gn^-~ei)>@ilC zirL<3ER1%-GSULeKn)i9D>2_gx^xs^tTq`kxE&KeE$OOdLUei|CNY_44&JkS~u(6f%{5x;)c_&FUpVVLQuf@QQFnCt<@I)LFuSS~c;$`I+>RgO{eNlm0ZVh*fC=(a}@ zx%&wu9DD|G`+kM6Ek8E05xVn9B%RrcfL&ZuoH>RP&bu`xq4Qp zeEP;2r`Av}u14IEmyvRIEB&X<2-xxjT-HC0q!549a6MdW;!KPWaBV1^t@xbQM^>4T zT~NHu#lv0vulUzig5=yf?bnVvN02?(MLjX3xSZ^ubiZu>=-B8Y4F<>uOK2c}P`_Qd zGLH$`#?quXH2Ml@PH!Xm>=wum@_Ky*oL*W1{{veYL(1Y>V=?Y#;%!&gomw9& zE@fnb{2_S|{;r-LR{XaSzq^F%^?y1?P#kb0^+gY3B^LR;vi-7g*V8~gfb5^}m+w1G z`#48h^-@1nr6;1TGz$}h-I$xXgz1q13^tYFLUS=L^)+B&asZf}1{UUES(wL_%Tt)@ zYoXmpLV1)ka=Z>ucHTn7zUSf17>Th3FWw9HH=jjnupgSJm!ykY=z}RfAz7@guQzLO z$%JBbk_X{0`>(hc=f8`%y+QbkgV)KvXu

4-uZ>wGH0>z6-)px=k|h4h^o#0{Otu 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 a7xVrBzAVN>6&GEE-}cB%#$v74>iBOnhHv=* literal 0 HcmV?d00001 From 70594dc4c943ff70e4fb3bcc30f25dd586e73679 Mon Sep 17 00:00:00 2001 From: Olivia Nicolaus Date: Tue, 21 Jun 2016 18:50:48 +0000 Subject: [PATCH 09/15] added video --- app.rb | 12 ++++++++++-- views/schedule.erb | 0 views/youtube.erb | 3 +++ 3 files changed, 13 insertions(+), 2 deletions(-) mode change 100755 => 100644 app.rb mode change 100644 => 100755 views/schedule.erb create mode 100755 views/youtube.erb diff --git a/app.rb b/app.rb old mode 100755 new mode 100644 index 9613700..b69cb7b --- a/app.rb +++ b/app.rb @@ -8,10 +8,10 @@ class App < Sinatra::Base erb :home end - get '/home' do + get '/home' do redirect to('/') end - + post '/subscribe' do @full_name = params[:full_name] @email = params[:email] @@ -75,3 +75,11 @@ def fib(n) # TODO: calculate fib end end + +# in app.rb +class App + get '/youtube' do + "Hello World" + erb :youtube + end +end diff --git a/views/schedule.erb b/views/schedule.erb old mode 100644 new mode 100755 diff --git a/views/youtube.erb b/views/youtube.erb new file mode 100755 index 0000000..5dc3789 --- /dev/null +++ b/views/youtube.erb @@ -0,0 +1,3 @@ + + From 54f6b619b563831510df9f64da9711c14e9be4a1 Mon Sep 17 00:00:00 2001 From: Olivia Nicolaus Date: Tue, 21 Jun 2016 19:02:55 +0000 Subject: [PATCH 10/15] training pic --- app.rb | 7 +++++++ views/training.erb | 2 ++ 2 files changed, 9 insertions(+) mode change 100644 => 100755 app.rb create mode 100644 views/training.erb diff --git a/app.rb b/app.rb old mode 100644 new mode 100755 index b69cb7b..4378456 --- a/app.rb +++ b/app.rb @@ -83,3 +83,10 @@ class App erb :youtube end end + +class App + get '/training' do + "Hello World" + erb :training + end +end diff --git a/views/training.erb b/views/training.erb new file mode 100644 index 0000000..f945050 --- /dev/null +++ b/views/training.erb @@ -0,0 +1,2 @@ +

"Flatiron School + Venture for America"

+Spongebob From 8e039c80cf4ffef3ac6b9024a3170f0056559614 Mon Sep 17 00:00:00 2001 From: Olivia Nicolaus Date: Tue, 21 Jun 2016 19:32:53 +0000 Subject: [PATCH 11/15] added the reddit feed --- app.rb | 9 ++++++++- views/reddit.erb | 1 + views/redditfeed.erb | 1 + views/training.erb | 0 4 files changed, 10 insertions(+), 1 deletion(-) mode change 100755 => 100644 views/reddit.erb create mode 100755 views/redditfeed.erb mode change 100644 => 100755 views/training.erb diff --git a/app.rb b/app.rb index 4378456..d4bb4ea 100755 --- a/app.rb +++ b/app.rb @@ -87,6 +87,13 @@ class App class App get '/training' do "Hello World" - erb :training + erb :training + end +end + +class App + get '/reddit' do + "hello world" + erb :reddit end end diff --git a/views/reddit.erb b/views/reddit.erb old mode 100755 new mode 100644 index e69de29..45339fe --- a/views/reddit.erb +++ b/views/reddit.erb @@ -0,0 +1 @@ + diff --git a/views/redditfeed.erb b/views/redditfeed.erb new file mode 100755 index 0000000..45339fe --- /dev/null +++ b/views/redditfeed.erb @@ -0,0 +1 @@ + diff --git a/views/training.erb b/views/training.erb old mode 100644 new mode 100755 From b774d332a5d209630583a4ae7ddc751671e569eb Mon Sep 17 00:00:00 2001 From: Janelle Grace Date: Tue, 21 Jun 2016 19:37:17 +0000 Subject: [PATCH 12/15] rainbow --- app.rb | 7 +++++-- views/home.erb | 0 2 files changed, 5 insertions(+), 2 deletions(-) mode change 100755 => 100644 app.rb mode change 100644 => 100755 views/home.erb diff --git a/app.rb b/app.rb old mode 100755 new mode 100644 index 68e111c..e63dfd5 --- a/app.rb +++ b/app.rb @@ -49,8 +49,12 @@ class App < Sinatra::Base erb :schedule end -end + get '/rainbow' do + erb :rainbow + end + +end class App < Sinatra::Base get '/fib/:n' do # TODO: implement an algorithm to calculate the fibonacci sequence at @@ -63,7 +67,6 @@ class App < Sinatra::Base # separated names. Randomize this list of names and display it as an # ordered list (
    ). 5 points end - def fib(n) # TODO: calculate fib end diff --git a/views/home.erb b/views/home.erb old mode 100644 new mode 100755 From a1ddc95c3f64060b317c4897c420046eb10967ce Mon Sep 17 00:00:00 2001 From: Janelle Grace Date: Tue, 21 Jun 2016 19:46:57 +0000 Subject: [PATCH 13/15] added rainbow --- app.rb | 0 views/rainbow.erb | 7 +++++++ views/reddit.erb | 0 3 files changed, 7 insertions(+) mode change 100644 => 100755 app.rb create mode 100644 views/rainbow.erb mode change 100644 => 100755 views/reddit.erb diff --git a/app.rb b/app.rb old mode 100644 new mode 100755 diff --git a/views/rainbow.erb b/views/rainbow.erb new file mode 100644 index 0000000..9edd106 --- /dev/null +++ b/views/rainbow.erb @@ -0,0 +1,7 @@ +
    ​ +
    +
    +
    +
    +
    +
    diff --git a/views/reddit.erb b/views/reddit.erb old mode 100644 new mode 100755 From 2fbf78258a0a0a413a4b742d0c474f6cbe168813 Mon Sep 17 00:00:00 2001 From: Janelle Grace Date: Tue, 21 Jun 2016 20:11:37 +0000 Subject: [PATCH 14/15] menu --- views/home.erb | 11 +++++++++-- views/rainbow.erb | 0 2 files changed, 9 insertions(+), 2 deletions(-) mode change 100755 => 100644 views/home.erb mode change 100644 => 100755 views/rainbow.erb diff --git a/views/home.erb b/views/home.erb old mode 100755 new mode 100644 index 9853b00..a505db3 --- a/views/home.erb +++ b/views/home.erb @@ -13,7 +13,7 @@ > -<%else%> +<%else%>
    @@ -23,4 +23,11 @@
    -<% end %> \ No newline at end of file +<% end %> +
      +
    • Schedule
      • +
    • Rainbow
      • +
    • Reddit
      • +
    • Training
      • +
    • Youtube
      • +
        diff --git a/views/rainbow.erb b/views/rainbow.erb old mode 100644 new mode 100755 From d8c2b86acfb18ac4d73c5ba15859f0083342737b Mon Sep 17 00:00:00 2001 From: Janelle Grace Date: Tue, 21 Jun 2016 20:22:12 +0000 Subject: [PATCH 15/15] menu --- views/home.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/views/home.erb b/views/home.erb index a505db3..d3f51a1 100644 --- a/views/home.erb +++ b/views/home.erb @@ -25,9 +25,9 @@ <% end %>