From d1b9863257a9c6af466d90180a878cde61f14a24 Mon Sep 17 00:00:00 2001 From: karemarsy Date: Fri, 10 Apr 2020 21:33:38 +0200 Subject: [PATCH 1/5] Add some styling on create form Added some styling on create form --- app/views/forms/new.html.erb | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/app/views/forms/new.html.erb b/app/views/forms/new.html.erb index f1a23c2..39cb894 100644 --- a/app/views/forms/new.html.erb +++ b/app/views/forms/new.html.erb @@ -1,5 +1,21 @@ -<%= form_for @form do |f| %> - <%= f.text_field :title %> - <%= f.text_field :thank_you_url %> - <%= f.submit %> -<% end %> +
+
+
+ <%= form_for @form do |f| %> +
+
+ <%= f.text_field :title, class: 'input', placeholder: 'Title' %> +
+
+
+
+ <%= f.text_field :thank_you_url, class: 'input', placeholder: 'Thank you url' %> +
+
+
+ <%= f.submit class: 'button is-primary' %> + <% end %> +
+
+
+
\ No newline at end of file From b34b1456163d612326aebf0d960b28d94c382608 Mon Sep 17 00:00:00 2001 From: karemarsy Date: Mon, 13 Apr 2020 19:10:56 +0200 Subject: [PATCH 2/5] Implement form design --- app/assets/stylesheets/application.css.scss | 10 ++++++ app/views/forms/new.html.erb | 36 ++++++++++++--------- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 0045e6f..e292b0e 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -48,6 +48,16 @@ $light: #fff; height: 100%; } +.content { + padding: 30px 60px 50px; + + &>h1 { + margin-bottom: 40px; + } +} + + + body { min-height: 100vh; } \ No newline at end of file diff --git a/app/views/forms/new.html.erb b/app/views/forms/new.html.erb index 39cb894..6baa484 100644 --- a/app/views/forms/new.html.erb +++ b/app/views/forms/new.html.erb @@ -1,21 +1,27 @@
-
-
- <%= form_for @form do |f| %> -
-
- <%= f.text_field :title, class: 'input', placeholder: 'Title' %> +
+
+
+
+

Create a new form

+ <%= form_for @form do |f| %> +
+
+ <%= f.text_field :title, class: 'input', placeholder: 'Title' %> +
+
+
+
+ <%= f.text_field :thank_you_url, class: 'input', placeholder: 'Thank you url' %> +
+

+
+ <%= f.submit class: 'button is-primary' %> + <% end %> +
-
-
- <%= f.text_field :thank_you_url, class: 'input', placeholder: 'Thank you url' %> -
-
-
- <%= f.submit class: 'button is-primary' %> - <% end %> -
\ No newline at end of file From f5545a54da2600c4c2dd747db2c22a76fb957d35 Mon Sep 17 00:00:00 2001 From: karemarsy Date: Tue, 14 Apr 2020 11:15:01 +0200 Subject: [PATCH 3/5] Remove unnecessary class in column Removed some unnecessary classes and resize the card --- app/views/forms/new.html.erb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/forms/new.html.erb b/app/views/forms/new.html.erb index 6baa484..1229375 100644 --- a/app/views/forms/new.html.erb +++ b/app/views/forms/new.html.erb @@ -1,7 +1,6 @@
-
+

Create a new form

From f8dd4a777e5fc952e79b50bc98eb5d0ad789073a Mon Sep 17 00:00:00 2001 From: karemarsy Date: Tue, 14 Apr 2020 11:28:44 +0200 Subject: [PATCH 4/5] Merge gemfile changes --- Gemfile | 1 + Gemfile.lock | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Gemfile b/Gemfile index 5de7f90..d180982 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby '2.6.1' gem 'rails' +gem 'sqlite3' gem 'pg' gem 'puma' gem 'sass-rails' diff --git a/Gemfile.lock b/Gemfile.lock index eabe759..f1f07fe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -213,6 +213,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) + sqlite3 (1.4.2) thor (1.0.1) thread_safe (0.3.6) tilt (2.0.10) @@ -252,6 +253,7 @@ DEPENDENCIES sentry-raven spring spring-watcher-listen + sqlite3 turbolinks tzinfo-data webpacker From 97db52d2e1a6fc79f501bd8753d0480713fe454f Mon Sep 17 00:00:00 2001 From: Yannick Date: Tue, 14 Apr 2020 11:57:55 +0200 Subject: [PATCH 5/5] Move sqlite3 dependecy into development only --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index e76b5c6..569b399 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,6 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby '2.6.1' gem 'rails' -gem 'sqlite3' gem 'pg' gem 'puma' gem 'sass-rails' @@ -42,6 +41,7 @@ group :development do # Access an interactive console on exception pages or by calling 'console' anywhere in the code. # gem 'web-console' gem 'listen' + gem 'sqlite3' # 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'