From 6359895d9c3d27b441a2c357c35c36290a8f92e4 Mon Sep 17 00:00:00 2001 From: elisabetperezbautista Date: Fri, 21 Aug 2020 03:22:08 +0000 Subject: [PATCH 1/2] Files added --- Gemfile.lock | 95 ++++++++++++++++++++++++++++++++++++++++++++ app/actions.rb | 3 ++ app/views/index.html | 38 ++++++++++++++++++ 3 files changed, 136 insertions(+) create mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..54439e8d3 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,95 @@ +GEM + remote: https://rubygems.org/ + specs: + activemodel (4.2.11.3) + activesupport (= 4.2.11.3) + builder (~> 3.1) + activerecord (4.2.11.3) + activemodel (= 4.2.11.3) + activesupport (= 4.2.11.3) + arel (~> 6.0) + activesupport (4.2.11.3) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + arel (6.0.4) + backports (3.18.1) + bond (0.5.1) + builder (3.2.4) + coderay (1.1.3) + concurrent-ruby (1.1.7) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + method_source (1.0.0) + minitest (5.14.1) + multi_json (1.15.0) + mustermann (1.1.1) + ruby2_keywords (~> 0.0.1) + nio4r (2.5.2) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + puma (4.3.5) + nio4r (~> 2.0) + rack (2.2.3) + rack-protection (2.0.8.1) + rack + rack-test (0.6.3) + rack (>= 1.0) + rake (13.0.1) + ripl (0.7.1) + bond (~> 0.5.1) + ripl-multi_line (0.3.1) + ripl (>= 0.3.6) + ripl-rack (0.2.1) + rack (>= 1.0) + rack-test (~> 0.6.2) + ripl (>= 0.7.0) + ruby2_keywords (0.0.2) + shotgun (0.9.2) + rack (>= 1.0) + sinatra (2.0.8.1) + mustermann (~> 1.0) + rack (~> 2.0) + rack-protection (= 2.0.8.1) + tilt (~> 2.0) + sinatra-activerecord (2.0.18) + activerecord (>= 4.1) + sinatra (>= 1.0) + sinatra-contrib (2.0.8.1) + backports (>= 2.8.2) + multi_json + mustermann (~> 1.0) + rack-protection (= 2.0.8.1) + sinatra (= 2.0.8.1) + tilt (~> 2.0) + sqlite3 (1.3.13) + thread_safe (0.3.6) + tilt (2.0.10) + tux (0.3.0) + ripl (>= 0.3.5) + ripl-multi_line (>= 0.2.4) + ripl-rack (>= 0.2.0) + sinatra (>= 1.2.1) + tzinfo (1.2.7) + thread_safe (~> 0.1) + +PLATFORMS + ruby + +DEPENDENCIES + activerecord (~> 4.2.0) + activesupport + pry + puma + rake + shotgun + sinatra + sinatra-activerecord + sinatra-contrib + sqlite3 (~> 1.3.6) + tux + +BUNDLED WITH + 2.1.4 diff --git a/app/actions.rb b/app/actions.rb index e69de29bb..a79f85f32 100755 --- a/app/actions.rb +++ b/app/actions.rb @@ -0,0 +1,3 @@ +get '/' do + File.read(File.join('app/views', 'index.html')) +end \ No newline at end of file diff --git a/app/views/index.html b/app/views/index.html index e69de29bb..b1a3e9ca9 100644 --- a/app/views/index.html +++ b/app/views/index.html @@ -0,0 +1,38 @@ + + + + + + + Spain + + +
+

I love travelling

+
+
+
+
+ + + post from sharky_j + +
+ 0 likes + 0 comments +
+
    +
  • +

    + sharky_j: Out for the long weekend... too embarrassed to show y'all the beach bod! +

    +
    • +
+
+
+ + \ No newline at end of file From 0ed43c5793fafdfb63c78aaa75f75318ec66005b Mon Sep 17 00:00:00 2001 From: elisabetperezbautista Date: Wed, 26 Aug 2020 03:25:25 +0000 Subject: [PATCH 2/2] CSS changes --- app/views/index.html | 47 +++++++++++++++++++++++++++++++++++++- public/stylesheets/app.css | 23 +++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletion(-) diff --git a/app/views/index.html b/app/views/index.html index b1a3e9ca9..911250f2b 100644 --- a/app/views/index.html +++ b/app/views/index.html @@ -3,7 +3,9 @@ + + Spain @@ -11,7 +13,7 @@

I love travelling

-
+
+
> + + + finstagram post from kirk_whalum + +
+ 0 likes + 0 comments +
+
    +
  • +

    + kirk_whalum: #weekendvibes +

    +
    • +
+
+
+ + + finstagram post from marlin_peppa + +
+ 0 likes + 0 comments +
+
    +
  • +

    + marlin_peppa: lunchtime! ;) +

    +
    • +
+
+
\ No newline at end of file diff --git a/public/stylesheets/app.css b/public/stylesheets/app.css index e69de29bb..0d43bcb47 100755 --- a/public/stylesheets/app.css +++ b/public/stylesheets/app.css @@ -0,0 +1,23 @@ +header { + background-color: white; + padding: 16px; +} + +.finstagram-post { + margin-bottom: 48px; +} + +.finstagram-post user-info img { + border-radius: 50% +} + +body { + font-family: 'Roboto Condensed', sans-serif; +} + +a.photo { + transition: padding 0.5s; + } +a.photo:hover{ + padding: 10px; + } \ No newline at end of file