diff --git a/app/assets/stylesheets/main.css.erb b/app/assets/stylesheets/main.css.erb index 20538f4..3f17434 100644 --- a/app/assets/stylesheets/main.css.erb +++ b/app/assets/stylesheets/main.css.erb @@ -2049,3 +2049,74 @@ input, select, textarea { .gradient header { margin: 0 0 1.25em 0; } + +/* FORMS */ + +.form-style-8{ + font-family: 'Open Sans Condensed', arial, sans; + width: 500px; + padding: 30px; + background: #FFFFFF; + margin: 50px auto; + box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.22); + -moz-box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.22); + -webkit-box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.22); + +} +.form-style-8 h2{ + /*background: #4D4D4D;*/ + text-transform: uppercase; + font-family: 'Open Sans Condensed', sans-serif; + color: #797979; + font-size: 18px; + font-weight: 100; + padding: 20px; + margin: -30px -30px 30px -30px; +} +.form-style-8 input[type="text"], +.form-style-8 input[type="date"], +.form-style-8 input[type="datetime"], +.form-style-8 input[type="email"], +.form-style-8 input[type="number"], +.form-style-8 input[type="search"], +.form-style-8 input[type="time"], +.form-style-8 input[type="url"], +.form-style-8 input[type="password"], +.form-style-8 textarea, +.form-style-8 select +{ + box-sizing: border-box; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + outline: none; + display: block; + width: 100%; + padding: 7px; + border: none; + border-bottom: 1px solid #ddd; + background: transparent; + margin-bottom: 10px; + font: 16px Arial, Helvetica, sans-serif; + height: 45px; +} +.form-style-8 input[type="button"], +.form-style-8 input[type="submit"]{ + -moz-box-shadow: inset 0px 1px 0px 0px #45D6D6; + -webkit-box-shadow: inset 0px 1px 0px 0px #45D6D6; + box-shadow: inset 0px 1px 0px 0px #45D6D6; + background-color: #2CBBBB; + border: 1px solid #27A0A0; + display: inline-block; + cursor: pointer; + color: #FFFFFF; + font-family: 'Open Sans Condensed', sans-serif; + font-size: 14px; + padding: 8px 18px; + text-decoration: none; + text-transform: uppercase; +} +.form-style-8 input[type="button"]:hover, +.form-style-8 input[type="submit"]:hover { + background:linear-gradient(to bottom, #34CACA 5%, #30C9C9 100%); + background-color:#34CACA; +} diff --git a/app/controllers/admin/all_page_controller.rb b/app/controllers/admin/all_page_controller.rb index bc7e392..4ef6ffe 100644 --- a/app/controllers/admin/all_page_controller.rb +++ b/app/controllers/admin/all_page_controller.rb @@ -147,6 +147,7 @@ class Admin::AllPageController < ApplicationController end private + def all_page_params params.require(:all_page).permit(:name, :article_id, :title, :type_of, :full_text) end diff --git a/app/controllers/newsletter_controller.rb b/app/controllers/newsletter_controller.rb index fe16698..ebb18c5 100644 --- a/app/controllers/newsletter_controller.rb +++ b/app/controllers/newsletter_controller.rb @@ -2,15 +2,39 @@ # Getting Newsletter emails class NewsletterController < ApplicationController + def index; end def new + @pages = PublishedPage.where('type_of != 3').order('priority ASC') + @ss = ScSetting.first @new_email = NewEmail.new + end def create - @new_email = NewEmail.new + if params[:new_email][:email].blank? + @new_email = NewEmail.new + @ready_to_download = false + else + @new_email = NewEmail.where(email: params[:new_email][:email]).first + @new_email ||= NewEmail.new(new_email_params) + @new_email.active = true + @new_email.accepted = Time.now + @new_email.save + @ready_to_download = true + end + end + + def get_file + send_file("#{Rails.root}/storage/CFRP1.pdf") end def destroy; end + + private + + def new_email_params + params.require(:new_email).permit(:email) + end end diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 05bf2c3..d8ffb6b 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -1,8 +1,7 @@ class SiteController < ApplicationController #include RecaptchaVerifier def index - @try_me = "id='content'" if params['wer'].to_i == 2 - @pages = PublishedPage.where('type_of != 3').order('priority ASC') + pages_get @ss = ScSetting.first pg_name = 'index' if cookies.encrypted[:visited].blank? @@ -20,21 +19,22 @@ class SiteController < ApplicationController def show pages_get - @page = PublishedPage.where('id = ? OR slug = ?',params[:id],params[:id]).first - if cookies.encrypted[:visited].blank? - cookies.permanent.encrypted[:visited] = JSON.generate([@page.id]) - @page.increment!(:number_of_views) - else - arr = JSON.parse(cookies.encrypted[:visited]) - if !arr.include?(@page.id) - arr << @page.id - cookies.permanent.encrypted[:visited] = JSON.generate(arr) - @page.increment!(:number_of_views) - end - end - - if @page.blank? + @page = PublishedPage.where('id = ? OR slug = ?', params[:id], params[:id]).first + if @page.nil? redirect_to '/404.html' + else + + if cookies.encrypted[:visited].blank? + cookies.permanent.encrypted[:visited] = JSON.generate([@page.id]) + @page.increment!(:number_of_views) + else + arr = JSON.parse(cookies.encrypted[:visited]) + if !arr.include?(@page.id) + arr << @page.id + cookies.permanent.encrypted[:visited] = JSON.generate(arr) + @page.increment!(:number_of_views) + end + end end end diff --git a/app/views/newsletter/_create.html.erb b/app/views/newsletter/_create.html.erb new file mode 100644 index 0000000..cf27e58 --- /dev/null +++ b/app/views/newsletter/_create.html.erb @@ -0,0 +1,7 @@ +
+
+

Dziękujemy za zapisanie się do newslettera

+

Zobacz jak można wykorzystać Wzmocnienia strukturalne CFRP

+ <%= link_to 'Pobierz plik', { controller: :newsletter, action: :get_file }, { remote: false } %> +
+
diff --git a/app/views/newsletter/_new.html.erb b/app/views/newsletter/_new.html.erb new file mode 100644 index 0000000..e3efc57 --- /dev/null +++ b/app/views/newsletter/_new.html.erb @@ -0,0 +1,7 @@ +
+

Zapisz się do newslettera

+ <%= form_tag({ controller: :newsletter, action: :create }, remote: true) do %> + <%= email_field :new_email, :email, placeholder: 'Email' %> + <%= submit_tag 'Zapisz się' %> + <% end %> +
diff --git a/app/views/newsletter/create.html.erb b/app/views/newsletter/create.html.erb deleted file mode 100644 index 6dcad57..0000000 --- a/app/views/newsletter/create.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Newsletter#create

-

Find me in app/views/newsletter/create.html.erb

diff --git a/app/views/newsletter/create.js.erb b/app/views/newsletter/create.js.erb new file mode 100644 index 0000000..07e88d7 --- /dev/null +++ b/app/views/newsletter/create.js.erb @@ -0,0 +1,5 @@ +<% if @ready_to_download %> + $('#newsletter_box').html("<%= escape_javascript(render('/newsletter/create')) %>"); +<% else %> + $('#newsletter_box').html("<%= escape_javascript(render('/newsletter/new')) %>"); +<% end %> diff --git a/app/views/newsletter/new.html.erb b/app/views/newsletter/new.html.erb index f951722..6ee5062 100644 --- a/app/views/newsletter/new.html.erb +++ b/app/views/newsletter/new.html.erb @@ -1,2 +1,14 @@ -

Newsletter#new

-

Find me in app/views/newsletter/new.html.erb

+ +
+
+
+
+
+
+ <%= render 'new' %> +
+
+
+
+
+
diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb index a347f52..2153555 100644 --- a/app/views/site/index.html.erb +++ b/app/views/site/index.html.erb @@ -1,4 +1,4 @@ -
> +
@@ -7,16 +7,22 @@

WITAMY W AKADEMII TECHNOLOGI

- Już niedługo powstanie tu pierwszy w Polsce internetowy kurs wzmacniania konstrukcji włóknami węglowymi CFRP. Jeżeli nie jesteś zainteresowany nowoczesnymi metodami wzmacniania budowli, innowacyjnymi materiałami, nie jesteś inżynierem albo technikiem budownictwa, architektem, bądź wschodzącą gwiazdą budowlanki na studiach, to nie klikaj w przycisk. + Już niedługo powstanie tu + pierwszy w Polsce + internetowy kurs wzmacniania konstrukcji włóknami węglowymi CFRP. Jeżeli nie jesteś zainteresowany + nowoczesnymi metodami + wzmacniania budowli, + innowacyjnymi + materiałami, nie jesteś inżynierem albo technikiem budownictwa, architektem, bądź + wschodzącą gwiazdą + budowlanki na studiach, to nie klikaj w przycisk.

- JESTEM CIEKAW + <%= link_to 'JESTEM CIEKAW', { controller: :newsletter, action: :new }, { remote: false, class: "button-large", style: 'color:white;' } %> -
- +
diff --git a/config/routes.rb b/config/routes.rb index 4e03207..245d5f7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,5 @@ Rails.application.routes.draw do + get 'newsletter/get_file' resources :newsletter, only: %i[index new create destroy] namespace :admin do namespace :articles do diff --git a/storage/CFRP1.pdf b/storage/CFRP1.pdf new file mode 100644 index 0000000..2153e14 Binary files /dev/null and b/storage/CFRP1.pdf differ