From 5362356243a55d3e47a0d01473d2bb2f0fe32b5e Mon Sep 17 00:00:00 2001 From: Melahat Mindivanli Date: Sun, 13 Mar 2016 14:32:40 +0200 Subject: [PATCH 01/14] Added files via upload --- Gemfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Gemfile b/Gemfile index b494e47..5d951fb 100644 --- a/Gemfile +++ b/Gemfile @@ -1,14 +1,20 @@ source 'https://rubygems.org' + # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.2.5.2' # Use sqlite3 as the database for Active Record gem 'sqlite3' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' +gem 'bootstrap-sass' +gem 'autoprefixer-rails' # Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 1.3.0' # Use CoffeeScript for .coffee assets and views +gem 'coffee-rails', '~> 4.1.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'therubyracer', platforms: :ruby # Use jquery as the JavaScript library gem 'jquery-rails' @@ -36,4 +42,7 @@ end group :development do # Access an IRB console on exception pages or by using <%= console %> in views gem 'web-console', '~> 2.0' + + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' end From 8a4b866474a6d16acd4a0f37801de101124dad4f Mon Sep 17 00:00:00 2001 From: Melahat Mindivanli Date: Sun, 13 Mar 2016 14:33:44 +0200 Subject: [PATCH 02/14] Added files via upload --- app/assets/javascripts/application.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index e07c5a8..37106d2 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -14,3 +14,5 @@ //= require jquery_ujs //= require turbolinks //= require_tree . +//= require bootstrap-sprockets +//= require bootstrap-sprockets From 80bc9efd7e545eed03c9d0d60c499a7c664b11ab Mon Sep 17 00:00:00 2001 From: Melahat Mindivanli Date: Sun, 13 Mar 2016 14:34:23 +0200 Subject: [PATCH 03/14] Added files via upload --- app/assets/stylesheets/application.css.scss | 2 ++ app/assets/stylesheets/pages.scss | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 app/assets/stylesheets/application.css.scss create mode 100644 app/assets/stylesheets/pages.scss diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss new file mode 100644 index 0000000..7f8c859 --- /dev/null +++ b/app/assets/stylesheets/application.css.scss @@ -0,0 +1,2 @@ + @import "bootstrap-sprockets"; + @import "bootstrap"; diff --git a/app/assets/stylesheets/pages.scss b/app/assets/stylesheets/pages.scss new file mode 100644 index 0000000..0d6878a --- /dev/null +++ b/app/assets/stylesheets/pages.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the pages controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ From dcd2e0ef4d5e8fceaee93d002a76b66cce37511d Mon Sep 17 00:00:00 2001 From: Melahat Mindivanli Date: Sun, 13 Mar 2016 14:34:56 +0200 Subject: [PATCH 04/14] Added files via upload --- app/controllers/pages_controller.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 app/controllers/pages_controller.rb diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb new file mode 100644 index 0000000..d76051a --- /dev/null +++ b/app/controllers/pages_controller.rb @@ -0,0 +1,11 @@ +class PagesController < ApplicationController + def anasayfa +@movies=Movie.all + end + def hakkimizda + + end + def iletisim + + end + end From 7e10ffe77629075b3a5792d1767e82bd4efbbae0 Mon Sep 17 00:00:00 2001 From: Melahat Mindivanli Date: Sun, 13 Mar 2016 14:35:19 +0200 Subject: [PATCH 05/14] Added files via upload --- app/models/movie.rb | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 app/models/movie.rb diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 0000000..49198a7 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ActiveRecord::Base +end From bbe639cbfc813e6bc96bf864bca86a7a42410dd4 Mon Sep 17 00:00:00 2001 From: Melahat Mindivanli Date: Sun, 13 Mar 2016 14:35:50 +0200 Subject: [PATCH 06/14] Added files via upload --- app/views/layouts/application.html.erb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 2fb82d3..141a864 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,14 +1,13 @@ - Filmci + Movies <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> <%= csrf_meta_tags %> - -<%= yield %> - + <%= render 'shared/navbar' %> + <%= yield %> From 71ff77aa9d5a8d6d4e4c1fe8c3149829fc5e743a Mon Sep 17 00:00:00 2001 From: Melahat Mindivanli Date: Sun, 13 Mar 2016 14:36:56 +0200 Subject: [PATCH 07/14] Create pages --- app/views/pages | 1 + 1 file changed, 1 insertion(+) create mode 100644 app/views/pages diff --git a/app/views/pages b/app/views/pages new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/app/views/pages @@ -0,0 +1 @@ + From 733c6aedaabad365f0fac44cf1fcb47b3e7134fe Mon Sep 17 00:00:00 2001 From: Melahat Mindivanli Date: Sun, 13 Mar 2016 14:37:33 +0200 Subject: [PATCH 08/14] Delete pages --- app/views/pages | 1 - 1 file changed, 1 deletion(-) delete mode 100644 app/views/pages diff --git a/app/views/pages b/app/views/pages deleted file mode 100644 index 8b13789..0000000 --- a/app/views/pages +++ /dev/null @@ -1 +0,0 @@ - From 8f31c8768916cda31ae39646fa512a9b3ea9f803 Mon Sep 17 00:00:00 2001 From: Melahat Mindivanli Date: Sun, 13 Mar 2016 14:37:58 +0200 Subject: [PATCH 09/14] Added files via upload --- app/views/anasayfa.html.erb | 7 +++++++ app/views/hakkimizda.html.erb | 1 + app/views/iletisim.html.erb | 1 + 3 files changed, 9 insertions(+) create mode 100644 app/views/anasayfa.html.erb create mode 100644 app/views/hakkimizda.html.erb create mode 100644 app/views/iletisim.html.erb diff --git a/app/views/anasayfa.html.erb b/app/views/anasayfa.html.erb new file mode 100644 index 0000000..c37f517 --- /dev/null +++ b/app/views/anasayfa.html.erb @@ -0,0 +1,7 @@ +

Anasayfa

+

List of Movies

+
    + <% @movies.each do |movie| %> +
  • <%= movie.title %>
    • +<% end %> +
diff --git a/app/views/hakkimizda.html.erb b/app/views/hakkimizda.html.erb new file mode 100644 index 0000000..3f2ee31 --- /dev/null +++ b/app/views/hakkimizda.html.erb @@ -0,0 +1 @@ +

Hakkımızda

diff --git a/app/views/iletisim.html.erb b/app/views/iletisim.html.erb new file mode 100644 index 0000000..8b840d5 --- /dev/null +++ b/app/views/iletisim.html.erb @@ -0,0 +1 @@ +

İletişim

From 94a25fff23147aa001ed6989572d5125e77a64ac Mon Sep 17 00:00:00 2001 From: Melahat Mindivanli Date: Sun, 13 Mar 2016 14:38:21 +0200 Subject: [PATCH 10/14] Added files via upload --- app/views/_navbar.html.erb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 app/views/_navbar.html.erb diff --git a/app/views/_navbar.html.erb b/app/views/_navbar.html.erb new file mode 100644 index 0000000..b4e8168 --- /dev/null +++ b/app/views/_navbar.html.erb @@ -0,0 +1,5 @@ + From 1e68c7c43b31562ac35481cce7c2a5c6d4dad851 Mon Sep 17 00:00:00 2001 From: Melahat Mindivanli Date: Sun, 13 Mar 2016 14:39:08 +0200 Subject: [PATCH 11/14] Added files via upload --- config/routes.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 3f66539..241f826 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,7 @@ Rails.application.routes.draw do + root "pages#anasayfa",as: :anasayfa + get "/hakkimizda",to:"pages#hakkimizda",as: :hakkimizda + get "/iletisim",to:"pages#iletisim",as: :iletisim # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". From c084959342f72a6884f2563e4ddc71654f7a5c31 Mon Sep 17 00:00:00 2001 From: Melahat Mindivanli Date: Sun, 13 Mar 2016 14:39:39 +0200 Subject: [PATCH 12/14] Added files via upload --- db/development.sqlite3 | Bin 0 -> 7168 bytes db/schema.rb | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 db/development.sqlite3 create mode 100644 db/schema.rb diff --git a/db/development.sqlite3 b/db/development.sqlite3 new file mode 100644 index 0000000000000000000000000000000000000000..d6100b4c45a1360d50abcb3161007eca9591bfd9 GIT binary patch literal 7168 zcmeHLzfU7a6yCMDbB}b6+``*l(_rB-%**lvr z%3L$p^OTDkEMvqlP2&Rq!!Q#44|UxZr~62M9Cqf7@m<4&G4*TgP125-KN#_^;%~$r z(I9I77J>DVhhtBknA;k61@m7D%HfXBUIt9oh94h%xKXmJC8*lZ$|V?@J1Nm+XLi3Z&0ThL@8BSm-l0#OBw~rN_n(?4Pq}p1Q6M>ix#QRN znTtCvuPY3F^lu5`eQdTW%P+P{gvLVYV@Te$JPB(RNZv9MVtL4vAEJ;FW@79qIg;q* z_HR9i4QA&rjb9=E8kba9n`ZnsgRZDW2t)|nYXsghW2t;LH!e4)MF{i}csrhYG+6%+NMpwT2=$3x*Pj}75dskc_Z)$T-FI^{{<}d})FK2T1pWsI zjGFOrvv-OU58wY|=9Uptbc@=5gTUwS#72$O>Ej6_X4{)yjiZ1H)2}?$*!27+J=vWW zOm@DPbuRdEjY0eTxZb{yfKKPEDG&x1rP4tE+Op8ZgU*@TIfDf}@I%g6NkoLQ5>CRcFMK&y0 z^J}QcA*X#IMEe5lXA7{$h0Ez&E;F!k;^*+c^%y2;Dm&1LHGV#+8=J{fFE@KsDrsw8| zG*&ThWvqN*-kR>7|HY;ax}p{#@Xru9eIBP0{&FWbP9`FX3L7K&U|RnCkup53G7pyQs8c5t|SD*hC^;q7n(*VMxCP3}|yAvCCGP${w4wkk^S5nw|>WzzJ05c3j Date: Sun, 13 Mar 2016 14:40:21 +0200 Subject: [PATCH 13/14] Added files via upload --- db/20160313004727_add_movies_to_archive.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 db/20160313004727_add_movies_to_archive.rb diff --git a/db/20160313004727_add_movies_to_archive.rb b/db/20160313004727_add_movies_to_archive.rb new file mode 100644 index 0000000..8cd2175 --- /dev/null +++ b/db/20160313004727_add_movies_to_archive.rb @@ -0,0 +1,12 @@ +class AddMoviesToArchive < ActiveRecord::Migration + def change + create_table :movies do |t| + t.string :title + t.text :description + t.string :director + t.string :country + t.integer :date + t.timestamps null: false + end + end +end From 3e8867963e218ffaefb61819d7f8716aa6059134 Mon Sep 17 00:00:00 2001 From: Melahat Mindivanli Date: Mon, 14 Mar 2016 15:16:49 +0200 Subject: [PATCH 14/14] Update _navbar.html.erb --- app/views/_navbar.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/_navbar.html.erb b/app/views/_navbar.html.erb index b4e8168..d71b8a5 100644 --- a/app/views/_navbar.html.erb +++ b/app/views/_navbar.html.erb @@ -1,5 +1,5 @@