Commit 10dbf5e8 by Mykhailo Makohin

merge with dev

parents f0b50904 ee2d9f7a
...@@ -19,6 +19,10 @@ gem 'omniauth' ...@@ -19,6 +19,10 @@ gem 'omniauth'
gem 'omniauth-facebook' gem 'omniauth-facebook'
gem 'omniauth-google-oauth2' gem 'omniauth-google-oauth2'
gem 'omniauth-linkedin-oauth2' gem 'omniauth-linkedin-oauth2'
gem 'haml'
gem 'bootstrap-sass'
gem 'gmaps4rails'
gem 'remotipart'
group :development, :test do group :development, :test do
gem 'byebug', platform: :mri gem 'byebug', platform: :mri
......
...@@ -39,8 +39,13 @@ GEM ...@@ -39,8 +39,13 @@ GEM
minitest (~> 5.1) minitest (~> 5.1)
tzinfo (~> 1.1) tzinfo (~> 1.1)
arel (7.1.4) arel (7.1.4)
autoprefixer-rails (9.6.1.1)
execjs
bcrypt (3.1.13) bcrypt (3.1.13)
bindex (0.8.1) bindex (0.8.1)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
builder (3.2.3) builder (3.2.3)
byebug (11.0.1) byebug (11.0.1)
coffee-rails (4.2.2) coffee-rails (4.2.2)
...@@ -65,6 +70,10 @@ GEM ...@@ -65,6 +70,10 @@ GEM
ffi (1.11.1) ffi (1.11.1)
globalid (0.4.2) globalid (0.4.2)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
gmaps4rails (2.1.2)
haml (5.1.2)
temple (>= 0.8.0)
tilt
hashie (3.6.0) hashie (3.6.0)
i18n (1.6.0) i18n (1.6.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
...@@ -146,6 +155,7 @@ GEM ...@@ -146,6 +155,7 @@ GEM
rb-fsevent (0.10.3) rb-fsevent (0.10.3)
rb-inotify (0.10.0) rb-inotify (0.10.0)
ffi (~> 1.0) ffi (~> 1.0)
remotipart (1.4.3)
responders (2.4.1) responders (2.4.1)
actionpack (>= 4.2.0, < 6.0) actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0) railties (>= 4.2.0, < 6.0)
...@@ -160,6 +170,8 @@ GEM ...@@ -160,6 +170,8 @@ GEM
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0) sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3) tilt (>= 1.1, < 3)
sassc (2.2.0)
ffi (~> 1.9)
spring (2.0.2) spring (2.0.2)
activesupport (>= 4.2) activesupport (>= 4.2)
spring-watcher-listen (2.0.1) spring-watcher-listen (2.0.1)
...@@ -172,6 +184,7 @@ GEM ...@@ -172,6 +184,7 @@ GEM
actionpack (>= 4.0) actionpack (>= 4.0)
activesupport (>= 4.0) activesupport (>= 4.0)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
temple (0.8.1)
thor (0.20.3) thor (0.20.3)
thread_safe (0.3.6) thread_safe (0.3.6)
tilt (2.0.9) tilt (2.0.9)
...@@ -197,9 +210,12 @@ PLATFORMS ...@@ -197,9 +210,12 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
bootstrap-sass
byebug byebug
coffee-rails (~> 4.2) coffee-rails (~> 4.2)
devise devise
gmaps4rails
haml
jbuilder (~> 2.5) jbuilder (~> 2.5)
jquery-rails jquery-rails
listen (~> 3.0.5) listen (~> 3.0.5)
...@@ -210,6 +226,7 @@ DEPENDENCIES ...@@ -210,6 +226,7 @@ DEPENDENCIES
omniauth-linkedin-oauth2 omniauth-linkedin-oauth2
puma (~> 3.0) puma (~> 3.0)
rails (~> 5.0.7, >= 5.0.7.2) rails (~> 5.0.7, >= 5.0.7.2)
remotipart
sass-rails (~> 5.0) sass-rails (~> 5.0)
spring spring
spring-watcher-listen (~> 2.0.0) spring-watcher-listen (~> 2.0.0)
......
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid" width="27" height="28" viewBox="0 0 27 28">
<defs>
<style>
.cls-3 {
fill: #cdcdcd;
}
.cls-4 {
fill: #bdbdbd;
}
.cls-5 {
fill: #ffffff;
}
.cls-6 {
fill: #f54b2f;
opacity: 0.5;
}
.cls-7 {
fill: #ffffdd;
}
.cls-8 {
fill: #f2f3be;
}
</style>
</defs>
<g id="group-1">
<path d="M25.000,28.000 C25.000,28.000 2.000,28.000 2.000,28.000 C0.895,28.000 -0.000,27.104 -0.000,26.000 C-0.000,26.000 -0.000,12.000 -0.000,12.000 C-0.000,10.901 0.887,10.010 1.984,10.001 C1.984,10.001 1.692,10.001 1.692,10.001 C1.447,10.001 1.215,9.955 0.998,9.881 C0.998,9.881 11.579,0.685 11.579,0.685 C12.656,-0.251 14.344,-0.251 15.421,0.685 C15.421,0.685 26.003,9.881 26.003,9.881 C25.786,9.955 25.553,10.001 25.308,10.001 C25.308,10.001 25.016,10.001 25.016,10.001 C26.113,10.010 27.000,10.901 27.000,12.000 C27.000,12.000 27.000,26.000 27.000,26.000 C27.000,27.104 26.105,28.000 25.000,28.000 Z" id="path-1" class="cls-3" fill-rule="evenodd"/>
<path d="M2.000,10.000 C2.000,10.000 25.000,10.000 25.000,10.000 C26.105,10.000 27.000,10.895 27.000,12.000 C27.000,12.000 27.000,26.000 27.000,26.000 C27.000,27.104 26.105,28.000 25.000,28.000 C25.000,28.000 2.000,28.000 2.000,28.000 C0.895,28.000 -0.000,27.104 -0.000,26.000 C-0.000,26.000 -0.000,12.000 -0.000,12.000 C-0.000,10.895 0.895,10.000 2.000,10.000 Z" id="path-2" class="cls-4" fill-rule="evenodd"/>
<path d="M25.000,5.000 C25.000,5.000 25.000,20.000 25.000,20.000 C25.000,20.000 7.000,20.000 7.000,20.000 C7.000,20.000 7.000,5.000 7.000,5.000 C7.000,5.000 25.000,5.000 25.000,5.000 Z" id="path-3" class="cls-5" fill-rule="evenodd"/>
<path d="M22.000,15.000 C22.000,15.000 22.000,10.000 22.000,10.000 C22.000,10.000 23.000,10.000 23.000,10.000 C23.000,10.000 23.000,15.000 23.000,15.000 C23.000,15.000 22.000,15.000 22.000,15.000 ZM19.000,7.000 C19.000,7.000 20.000,7.000 20.000,7.000 C20.000,7.000 20.000,18.000 20.000,18.000 C20.000,18.000 19.000,18.000 19.000,18.000 C19.000,18.000 19.000,7.000 19.000,7.000 ZM17.000,7.000 C17.000,7.000 18.000,7.000 18.000,7.000 C18.000,7.000 18.000,18.000 18.000,18.000 C18.000,18.000 17.000,18.000 17.000,18.000 C17.000,18.000 17.000,7.000 17.000,7.000 ZM15.000,7.000 C15.000,7.000 16.000,7.000 16.000,7.000 C16.000,7.000 16.000,18.000 16.000,18.000 C16.000,18.000 15.000,18.000 15.000,18.000 C15.000,18.000 15.000,7.000 15.000,7.000 ZM13.000,7.000 C13.000,7.000 14.000,7.000 14.000,7.000 C14.000,7.000 14.000,18.000 14.000,18.000 C14.000,18.000 13.000,18.000 13.000,18.000 C13.000,18.000 13.000,7.000 13.000,7.000 ZM11.000,7.000 C11.000,7.000 12.000,7.000 12.000,7.000 C12.000,7.000 12.000,18.000 12.000,18.000 C12.000,18.000 11.000,18.000 11.000,18.000 C11.000,18.000 11.000,7.000 11.000,7.000 ZM9.000,7.000 C9.000,7.000 10.000,7.000 10.000,7.000 C10.000,7.000 10.000,18.000 10.000,18.000 C10.000,18.000 9.000,18.000 9.000,18.000 C9.000,18.000 9.000,7.000 9.000,7.000 Z" id="path-4" class="cls-6" fill-rule="evenodd"/>
<path d="M26.710,27.074 C26.889,26.785 26.998,26.449 26.998,26.086 C26.998,26.086 26.998,12.913 26.998,12.913 C26.998,12.656 26.945,12.411 26.850,12.187 C26.850,12.187 17.171,20.113 17.171,20.113 C17.171,20.113 26.710,27.074 26.710,27.074 ZM16.296,20.907 C15.493,21.581 14.498,21.923 13.500,21.923 C12.502,21.923 11.507,21.582 10.703,20.907 C10.703,20.907 1.192,27.848 1.192,27.848 C1.427,27.946 1.686,28.001 1.957,28.001 C1.957,28.001 25.042,28.001 25.042,28.001 C25.314,28.001 25.572,27.946 25.808,27.848 C25.808,27.848 16.296,20.907 16.296,20.907 Z" id="path-5" class="cls-7" fill-rule="evenodd"/>
<path d="M0.149,12.187 C0.055,12.411 0.001,12.656 0.001,12.913 C0.001,12.913 0.001,26.086 0.001,26.086 C0.001,26.449 0.110,26.785 0.290,27.074 C0.290,27.074 9.828,20.113 9.828,20.113 C9.828,20.113 0.149,12.187 0.149,12.187 Z" id="path-6" class="cls-8" fill-rule="evenodd"/>
</g>
</svg>
...@@ -11,6 +11,20 @@ ...@@ -11,6 +11,20 @@
// about supported directives. // about supported directives.
// //
//= require jquery //= require jquery
//= require jquery_ujs //= require jquery-ui
//= require turbolinks //= require jquery.remotipart
//= require bootstrap.min
//= require outdatedbrowser
//= require owl.carousel
//= require pgwslider.min
//= require jquery.royalslider.min
//= require jquery.event.move
//= require jquery.twentytwenty
//= require tooltipster.bundle.min
//= require freewall
//= require underscore
//= require jquery.autocomplete
//= require gmaps/google
//= require infobox
//= require squares
//= require_tree . //= require_tree .
// Action Cable provides the framework to deal with WebSockets in Rails.
// You can generate new channels where WebSocket features live using the rails generate channel command.
//
//= require action_cable
//= require_self
//= require_tree ./channels
(function() {
this.App || (this.App = {});
App.cable = ActionCable.createConsumer();
}).call(this);
/* /*
* This is a manifest file that'll be compiled into application.css, which will include all the files *=require_self
* listed below. */
* @import url("normalize.css");
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, @import url("outdatedBrowser.min.css");
* or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path. @import url("main.css");
* \ No newline at end of file
* You're free to add application-wide styles to this file and they'll appear at the bottom of the
* compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
* files in this directory. Styles in this file should be added after the last require_* statement.
* It is generally better to create a new file per style scope.
*
*= require_tree .
*= require_self
*/
class HomeController < ApplicationController
def index; end
end
\ No newline at end of file
!!!
%html
%head
%meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}
%title Warm City
= csrf_meta_tags
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload'
= javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
%meta{:charset => "utf-8"}
%meta{:content => "", :name => "description"}
%meta{:content => "width=device-width", :name => "viewport"}
%meta{:content => "IE=edge", "http-equiv" => "X-UA-Compatible"}
/Fonts
%link{:href => "//fonts.googleapis.com/css?family=Open+Sans:400,600,700", :rel => "stylesheet", :type => "text/css"}
%link{:href => "//fonts.googleapis.com/css?family=PT+Sans:400,700italic,700,400italic", :rel => "stylesheet", :type => "text/css"}
%link{:href => "//fonts.googleapis.com/css?family=Noto+Serif:400,400italic&subset=latin,cyrillic-ext", :rel => "stylesheet", :type => "text/css"}
%link{:href => "//fonts.googleapis.com/css?family=PT+Sans+Narrow:400,700&subset=cyrillic-ext", :rel => "stylesheet"}
%link{:href => "//fonts.googleapis.com/css?family=Roboto+Slab:300,400&subset=cyrillic-ext", :rel => "stylesheet"}
%link{:href => "//fonts.googleapis.com/css?family=Roboto:300,500&subset=cyrillic-ext", :rel => "stylesheet"}
/Favicons + Touch Icons
%link{:href => "favicons/apple-touch-icon57.png", :rel => "icon", :type => "image/png"}
%link{:href => "favicons/apple-touch-icon57.png", :rel => "apple-touch-icon", :sizes => "57x57"}
%link{:href => "favicons/apple-touch-icon60.png", :rel => "apple-touch-icon", :sizes => "60x60"}
%link{:href => "favicons/apple-touch-icon114.png", :rel => "apple-touch-icon", :sizes => "114x114"}
%link{:href => "favicons/apple-touch-icon120.png", :rel => "apple-touch-icon", :sizes => "120x120"}
%link{:href => "favicons/apple-touch-icon180.png", :rel => "apple-touch-icon", :sizes => "180x180"}
%body
= render 'partials/modal'
- if current_page?(root_path)
= render 'partials/black_header'
- else
= render 'partials/white_header'
= yield
= render 'partials/footer-site'
= render 'partials/footer'
.content
.main_head
.main_head_top.clearfix
.main_menu
%nav.navbar.navbar-default
.container-fluid
.navbar-header
%button.navbar-toggle.collapsed{"aria-expanded" => "false", "data-target" => "#bs-example-navbar-collapse-1", "data-toggle" => "collapse", :type => "button"}
%span.sr-only Toggle navigation
%span.icon-bar
%span.icon-bar
%span.icon-bar
#bs-example-navbar-collapse-1.collapse.navbar-collapse
%ul.nav.navbar-nav
%li
%a{:href => "#"} про палатформу
%li
%a{:href => "#"} Ґранти
%li
%a{:href => "#"} Проекти
%li
%a{:href => "#"} Партнери
%li
%a{:href => "#"} DIGITAL WORKSHOP
%li
%a{:href => "#"} Про нас
%li
%a{:href => "#"} Новини
%li
%a{:href => "#"} Звіти
%li
%a{:href => "#"} connectif
%ul.nav.nav-tabs.nav_btns
%li.active
%a{"data-toggle" => "tab", :href => "#1"} Люди
%li
%a{"data-toggle" => "tab", :href => "#2"} Бізнеси
.show_tip
Ознайомтесь з дружніми бізнесами
які допомагають формувати
та покрищувати наше місто
.login_wrap
%div
%button.login_btn{"data-target" => "#modal3", "data-toggle" => "modal"}
= image_tag ("login.png")
.search_block
%input#search_field.search_field{:placeholder => "Пошук за іменем... ", :type => "text"}/
%button.search_btn
%i.icon.icon_search
\ No newline at end of file
%footer.footer
.footer_top.row
.footer_contacts.col-sm-6
.footer_contacts_item
.footer_contacts_title
адреса:
.footer_contacts_text
м. Івано-Франківськ,
%br/
вул. Січових Стрільців, 12,
%br/
готель "Дністер"
.footer_contacts_item
.footer_contacts_title
e-mail:
.footer_contacts_text
info@warm.if.ua
.footer_btns.col-sm-6
.footer_soc
%a.round_link.soc_link_fb{:href => "#"}
%i.icon.icon_fb
%a.round_link.soc_link_tw{:href => "#"}
%i.icon.icon_tw
.lang
%a.lang_link{:href => "#"} ENG
%a.lang_link.active{:href => "#"} UA
.footer_middle
.footer_subscribe_envelope
.footer_subscribe_text
Дізнавайся про нові проекти та можливості першим
.footer_subscribe_to
.input_styled_wrap
%input.input_styled{:placeholder => "Ваш надійний e-mail", :type => "email"}/
%a.btn.btn_default.btn_sm_size.btn_subscribe{:href => "#"} Підписатись
.footer_bot
.footer_doneby
.footer_doneby_made
%i.icon.icon_logo
Made in Ivano-Frankivsk
.footer_copyright
%span ©
2015 2016 Warm-city. All Rights Reserved
.footer_links
%a.footer_link_item{:href => "https://bvblogic.com/"}
=image_tag ('bvb_logo.png')
%script{:src => "http://maps.googleapis.com/maps/api/js?libraries=geometry&sensor=false&key=AIzaSyCd7M4P6CpmOv7_K1XGn_0JgEa47r97tu4&callback=initMap", :type => "text/javascript"}
:cdata
\ No newline at end of file
#modal.modal.fade.modal_styled{"aria-labelledby" => "modalLabel", :role => "dialog", :tabindex => "-1"}
.modal-dialog{:role => "document"}
.modal-content
.modal-header
.modal-header_top.clearfix
.modal-header_top_bg
.modal-header_steps_wrap
%span.modal-header_step.active крок 1
%span.modal-header_step крок 2
%button.round_link.close{"aria-label" => "Close", "data-dismiss" => "modal", :type => "button"}
%i.icon.icon_close
.modal-header_bot
.row
.col-sm-5
%h3#modalLabel.modal-title Фондування
.col-sm-7.modal-header_bot_amount
.form-group
%label{:for => "id_1"}
%span.asterisk> *
Сума внеску в
%span.currency UAH
%input#id_1.form-control.amount_field{:type => "text", :value => "1 000 000 000"}/
.help_text.absolute
%span.asterisk *
Поля обов'язкові для заповнення
.modal-body.modal-body_pb
.row
.col-sm-9.modal-body_login
%h4.modal_subtitle
Авторизація
.form-group.form_ok
%label{:for => "id_2"}
%span.asterisk> *
Ім'я та прізвище
.field_wrap
%input#id_2.form-control{:type => "text", :value => "Сергій Тосканенок"}/
.form-group.form_error
%label{:for => "id_3"}
%span.asterisk> *
E-mail
.field_wrap
%input#id_3.form-control{:type => "email", :value => "@neomaster@gmail.com"}/
%span.error_text Не коректно введено електронну адресу.
.form-group
%label{:for => "id_4"}
%span.asterisk> *
Населений пункт
.field_wrap
%input#id_4.form-control{:type => "text"}/
.checkbox.checkbox_padd
%input#check1{:name => "check", :type => "checkbox", :value => "check1"}/
%label{:for => "check1"} Підписатись на оновлення
.col-sm-3.modal-body_registration
%h4.modal_subtitle
Швидка реєстрація
.soc_btn_wrap.clearfix
%a.soc_btn.soc_btn_fb{:href => "#"}
%i.icon.icon_fb
%a.soc_btn.soc_btn_tw{:href => "#"}
%i.icon.icon_tw
%a.soc_btn.soc_btn_google{:href => "#"}
%i.icon.icon_google
.text-center
%a.btn.btn_primary{:href => "#"} Далі
#modal2.modal.fade.modal_styled{"aria-labelledby" => "modalLabel", :role => "dialog", :tabindex => "-1"}
.modal-dialog{:role => "document"}
.modal-content
.modal-header
.modal-header_top.clearfix
.modal-header_top_bg
.modal-header_steps_wrap
%span.modal-header_step крок 1
%span.modal-header_step.active крок 2
%button.round_link.close{"aria-label" => "Close", "data-dismiss" => "modal", :type => "button"}
%i.icon.icon_close
.modal-header_bot
.row
.col-sm-5
%h3#modalLabel.modal-title Фондування
.col-sm-7.modal-header_bot_amount
.form-group
%label{:for => "id_1"}
%span.asterisk> *
Сума внеску в
%span.currency UAH
%span.amount_value 1 000 000 000
.modal-body
.help_text Оберіть платіжну систему зручну для вас
.radio
.radio_item
%input#liqpay{:checked => "checked", :name => "payment_system", :type => "radio", :value => "liqpay"}/
%label{:for => "liqpay"}
%img{:alt => "", :src => "img/liqpay.png"}/
.radio_item
%input#webmoney{:name => "payment_system", :type => "radio", :value => "webmoney"}/
%label{:for => "webmoney"}
%img{:alt => "", :src => "img/webmoney.png"}/
.text-center.modal_btns
%a.btn.btn_primary{:href => "#"} оплатити
.nav_link
%a.link{:href => "#"} Назад
#modal3.modal.fade.modal_styled{"aria-labelledby" => "modalLabel", :role => "dialog", :tabindex => "-1"}
.modal-dialog{:role => "document"}
.modal-content
.modal-header
.modal-header_top.clearfix
.modal-header_top_bg
%button.round_link.close{"aria-label" => "Close", "data-dismiss" => "modal", :type => "button"}
%i.icon.icon_close
.modal-header_bot
%h3#modalLabel.modal-title Вхід
.help_text.absolute
%span.asterisk *
Поля обов'язкові для заповнення
.modal-body
.row
.col-sm-9.modal-body_login
%h4.modal_subtitle
Авторизація
.form-group.form_ok
%label{:for => "id_2"}
%span.asterisk> *
Ім'я та прізвище
.field_wrap
%input#id_2.form-control{:type => "text", :value => "Сергій Тосканенок"}/
.form-group.form_error
%label{:for => "id_3"}
%span.asterisk> *
E-mail
.field_wrap
%input#id_3.form-control{:type => "email", :value => "@neomaster@gmail.com"}/
%span.error_text Не коректно введено електронну адресу.
.form-group
%label{:for => "id_4"}
%span.asterisk> *
Населений пункт
.field_wrap
%input#id_4.form-control{:type => "text"}/
.col-sm-3.modal-body_registration
%h4.modal_subtitle
Швидка реєстрація
.soc_btn_wrap.clearfix
%a.soc_btn.soc_btn_fb{:href => "#"}
%i.icon.icon_fb
%a.soc_btn.soc_btn_tw{:href => "#"}
%i.icon.icon_tw
%a.soc_btn.soc_btn_google{:href => "#"}
%i.icon.icon_google
.text-center
%a.btn.btn_primary{:href => "#"} Далі
\ No newline at end of file
%header.header
.container
.main_menu
%a.logo{:href => "#"}
= image_tag ("logo.svg")
%nav.navbar.navbar-default
.container-fluid
.navbar-header
%button.navbar-toggle.collapsed{"aria-expanded" => "false", "data-target" => "#bs-example-navbar-collapse-1", "data-toggle" => "collapse", :type => "button"}
%span.sr-only Toggle navigation
%span.icon-bar
%span.icon-bar
%span.icon-bar
#bs-example-navbar-collapse-1.collapse.navbar-collapse
%ul.nav.navbar-nav
%li
%a{:href => "#"} про палатформу
%li
%a{:href => "#"} Ґранти
%li
%a{:href => "#"} Проекти
%li.active
%a{:href => "#"}
Партнери
%span.sr-only (current)
%li
%a{:href => "#"} DIGITAL WORKSHOP
%li
%a{:href => "#"} Про нас
%li
%a{:href => "#"} Новини
%li
%a{:href => "#"} Звіти
%li
%a{:href => "#"} connectif
# MySQL. Versions 5.0 and up are supported.
#
# Install the MySQL driver
# gem install mysql2
#
# Ensure the MySQL gem is defined in your Gemfile
# gem 'mysql2'
#
# And be sure to use new-style password hashing:
# http://dev.mysql.com/doc/refman/5.7/en/old-client.html
#
default: &default default: &default
adapter: mysql2 adapter: mysql2
encoding: utf8 encoding: utf8
...@@ -21,32 +10,10 @@ development: ...@@ -21,32 +10,10 @@ development:
<<: *default <<: *default
database: appname_development database: appname_development
# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production.
test: test:
<<: *default <<: *default
database: appname_test database: appname_test
# As with config/secrets.yml, you never want to store sensitive information,
# like your database password, in your source code. If your source code is
# ever seen by anyone, they now have access to your database.
#
# Instead, provide the password as a unix environment variable when you boot
# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database
# for a full rundown on how to provide these environment variables in a
# production deployment.
#
# On Heroku and other platform providers, you may have a full connection URL
# available as an environment variable. For example:
#
# DATABASE_URL="mysql2://myuser:mypass@localhost/somedatabase"
#
# You can use this database configuration with:
#
# production:
# url: <%= ENV['DATABASE_URL'] %>
#
production: production:
<<: *default <<: *default
database: appname_production database: appname_production
......
Rails.application.routes.draw do Rails.application.routes.draw do
root 'application#index' root 'home#index'
devise_for :users, controllers: { omniauth_callbacks: 'users/omniauth_callbacks' } devise_for :users, controllers: { omniauth_callbacks: 'users/omniauth_callbacks' }
end end
...@@ -4,6 +4,8 @@ development: ...@@ -4,6 +4,8 @@ development:
GOOGLE_SECRET_KEY: vfJkP71fOkfDKVYa3RgXR3lW GOOGLE_SECRET_KEY: vfJkP71fOkfDKVYa3RgXR3lW
LINKEDIN_CLIENT_ID: 860rz2x1z3udrb LINKEDIN_CLIENT_ID: 860rz2x1z3udrb
LINKEDIN_SECRET_KEY: peK2u8waxWK5h3Bq LINKEDIN_SECRET_KEY: peK2u8waxWK5h3Bq
GOOGLE_MAP_API_KEY: AIzaSyALmxk-nEaCo8KVfJTdAiVFPBKA9s0VnmM
test: test:
secret_key_base: dd24cc39a6555956e85cb7d60612c685b91249ed8760a957b155ced0177eb172674137f73ba33d8b886f14089469703830d76ddbd42a996897d8b77aac43b33a secret_key_base: dd24cc39a6555956e85cb7d60612c685b91249ed8760a957b155ced0177eb172674137f73ba33d8b886f14089469703830d76ddbd42a996897d8b77aac43b33a
......
This source diff could not be displayed because it is too large. You can view the blob instead.
(function($){
$.fn.twentytwenty = function(options) {
var options = $.extend({default_offset_pct: 0.5, orientation: 'horizontal'}, options);
return this.each(function() {
var sliderPct = options.default_offset_pct;
var container = $(this);
var sliderOrientation = options.orientation;
var beforeDirection = (sliderOrientation === 'vertical') ? 'down' : 'left';
var afterDirection = (sliderOrientation === 'vertical') ? 'up' : 'right';
container.wrap("<div class='twentytwenty-wrapper twentytwenty-" + sliderOrientation + "'></div>");
container.append("<div class='twentytwenty-overlay'></div>");
var beforeImg = container.find("img:first");
var afterImg = container.find("img:last");
container.append("<div class='twentytwenty-handle'></div>");
var slider = container.find(".twentytwenty-handle");
slider.append("<span class='twentytwenty-" + beforeDirection + "-arrow'></span>");
slider.append("<span class='twentytwenty-" + afterDirection + "-arrow'></span>");
container.addClass("twentytwenty-container");
beforeImg.addClass("twentytwenty-before");
afterImg.addClass("twentytwenty-after");
var overlay = container.find(".twentytwenty-overlay");
overlay.append("<div class='twentytwenty-before-label'></div>");
overlay.append("<div class='twentytwenty-after-label'></div>");
var calcOffset = function(dimensionPct) {
var w = beforeImg.width();
var h = beforeImg.height();
return {
w: w+"px",
h: h+"px",
cw: (dimensionPct*w)+"px",
ch: (dimensionPct*h)+"px"
};
};
var adjustContainer = function(offset) {
if (sliderOrientation === 'vertical') {
beforeImg.css("clip", "rect(0,"+offset.w+","+offset.ch+",0)");
}
else {
beforeImg.css("clip", "rect(0,"+offset.cw+","+offset.h+",0)");
}
container.css("height", offset.h);
};
var adjustSlider = function(pct) {
var offset = calcOffset(pct);
slider.css((sliderOrientation==="vertical") ? "top" : "left", (sliderOrientation==="vertical") ? offset.ch : offset.cw);
adjustContainer(offset);
}
$(window).on("resize.twentytwenty", function(e) {
adjustSlider(sliderPct);
});
var offsetX = 0;
var imgWidth = 0;
slider.on("movestart", function(e) {
if (((e.distX > e.distY && e.distX < -e.distY) || (e.distX < e.distY && e.distX > -e.distY)) && sliderOrientation !== 'vertical') {
e.preventDefault();
}
else if (((e.distX < e.distY && e.distX < -e.distY) || (e.distX > e.distY && e.distX > -e.distY)) && sliderOrientation === 'vertical') {
e.preventDefault();
}
container.addClass("active");
offsetX = container.offset().left;
offsetY = container.offset().top;
imgWidth = beforeImg.width();
imgHeight = beforeImg.height();
});
slider.on("moveend", function(e) {
container.removeClass("active");
});
slider.on("move", function(e) {
if (container.hasClass("active")) {
sliderPct = (sliderOrientation === 'vertical') ? (e.pageY-offsetY)/imgHeight : (e.pageX-offsetX)/imgWidth;
if (sliderPct < 0) {
sliderPct = 0;
}
if (sliderPct > 1) {
sliderPct = 1;
}
adjustSlider(sliderPct);
}
});
container.find("img").on("mousedown", function(event) {
event.preventDefault();
});
$(window).trigger("resize.twentytwenty");
});
};
})(jQuery);
/*!--------------------------------------------------------------------
JAVASCRIPT "Outdated Browser"
Version: 1.1.0 - 2014
author: Burocratik
website: http://www.burocratik.com
* @preserve
-----------------------------------------------------------------------*/
var outdatedBrowser = function(options) {
//Variable definition (before ajax)
var outdated = document.getElementById("outdated");
// Default settings
this.defaultOpts = {
bgColor: '#f25648',
color: '#ffffff',
lowerThan: 'transform',
languagePath: '../outdatedbrowser/lang/en.html'
}
if (options) {
//assign css3 property to IE browser version
if(options.lowerThan == 'IE8' || options.lowerThan == 'borderSpacing') {
options.lowerThan = 'borderSpacing';
} else if (options.lowerThan == 'IE9' || options.lowerThan == 'boxShadow') {
options.lowerThan = 'boxShadow';
} else if (options.lowerThan == 'IE10' || options.lowerThan == 'transform' || options.lowerThan == '' || typeof options.lowerThan === "undefined") {
options.lowerThan = 'transform';
} else if (options.lowerThan == 'IE11' || options.lowerThan == 'borderImage') {
options.lowerThan = 'borderImage';
}
//all properties
this.defaultOpts.bgColor = options.bgColor;
this.defaultOpts.color = options.color;
this.defaultOpts.lowerThan = options.lowerThan;
this.defaultOpts.languagePath = options.languagePath;
bkgColor = this.defaultOpts.bgColor;
txtColor = this.defaultOpts.color;
cssProp = this.defaultOpts.lowerThan;
languagePath = this.defaultOpts.languagePath;
} else {
bkgColor = this.defaultOpts.bgColor;
txtColor = this.defaultOpts.color;
cssProp = this.defaultOpts.lowerThan;
languagePath = this.defaultOpts.languagePath;
};//end if options
//Define opacity and fadeIn/fadeOut functions
var done = true;
function function_opacity(opacity_value) {
outdated.style.opacity = opacity_value / 100;
outdated.style.filter = 'alpha(opacity=' + opacity_value + ')';
}
// function function_fade_out(opacity_value) {
// function_opacity(opacity_value);
// if (opacity_value == 1) {
// outdated.style.display = 'none';
// done = true;
// }
// }
function function_fade_in(opacity_value) {
function_opacity(opacity_value);
if (opacity_value == 1) {
outdated.style.display = 'block';
}
if (opacity_value == 100) {
done = true;
}
}
//check if element has a particular class
// function hasClass(element, cls) {
// return (' ' + element.className + ' ').indexOf(' ' + cls + ' ') > -1;
// }
var supports = (function() {
var div = document.createElement('div'),
vendors = 'Khtml Ms O Moz Webkit'.split(' '),
len = vendors.length;
return function(prop) {
if ( prop in div.style ) return true;
prop = prop.replace(/^[a-z]/, function(val) {
return val.toUpperCase();
});
while(len--) {
if ( vendors[len] + prop in div.style ) {
return true;
}
}
return false;
};
})();
//if browser does not supports css3 property (transform=default), if does > exit all this
if ( !supports(''+ cssProp +'') ) {
if (done && outdated.style.opacity !== '1') {
done = false;
for (var i = 1; i <= 100; i++) {
setTimeout((function (x) {
return function () {
function_fade_in(x);
};
})(i), i * 8);
}
}
}else{
return;
};//end if
//Check AJAX Options: if languagePath == '' > use no Ajax way, html is needed inside <div id="outdated">
if( languagePath === ' ' || languagePath.length == 0 ){
startStylesAndEvents();
}else{
grabFile(languagePath);
}
//events and colors
function startStylesAndEvents(){
var btnClose = document.getElementById("btnCloseUpdateBrowser");
var btnUpdate = document.getElementById("btnUpdateBrowser");
//check settings attributes
outdated.style.backgroundColor = bkgColor;
//way too hard to put !important on IE6
outdated.style.color = txtColor;
outdated.children[0].style.color = txtColor;
outdated.children[1].style.color = txtColor;
//check settings attributes
btnUpdate.style.color = txtColor;
// btnUpdate.style.borderColor = txtColor;
if (btnUpdate.style.borderColor) btnUpdate.style.borderColor = txtColor;
btnClose.style.color = txtColor;
//close button
btnClose.onmousedown = function() {
outdated.style.display = 'none';
return false;
};
//Override the update button color to match the background color
btnUpdate.onmouseover = function() {
this.style.color = bkgColor;
this.style.backgroundColor = txtColor;
};
btnUpdate.onmouseout = function() {
this.style.color = txtColor;
this.style.backgroundColor = bkgColor;
};
}//end styles and events
// IF AJAX with request ERROR > insert english default
var ajaxEnglishDefault = '<h6>Your browser is out-of-date!</h6>'
+ '<p>Update your browser to view this website correctly. <a id="btnUpdateBrowser" href="http://outdatedbrowser.com/">Update my browser now </a></p>'
+ '<p class="last"><a href="#" id="btnCloseUpdateBrowser" title="Close">&times;</a></p>';
//** AJAX FUNCTIONS - Bulletproof Ajax by Jeremy Keith **
function getHTTPObject() {
var xhr = false;
if (window.XMLHttpRequest) {
xhr = new XMLHttpRequest();
} else if (window.ActiveXObject) {
try {
xhr = new ActiveXObject("Msxml2.XMLHTTP");
} catch(e) {
try {
xhr = new ActiveXObject("Microsoft.XMLHTTP");
} catch(e) {
xhr = false;
}
}
}
return xhr;
};//end function
function grabFile(file) {
var request = getHTTPObject();
if (request) {
request.onreadystatechange = function() {
displayResponse(request);
};
request.open("GET", file, true);
request.send(null);
}
return false;
};//end grabFile
function displayResponse(request) {
var insertContentHere = document.getElementById("outdated");
if (request.readyState == 4) {
if (request.status == 200 || request.status == 304) {
insertContentHere.innerHTML = request.responseText;
}else{
insertContentHere.innerHTML = ajaxEnglishDefault;
}
startStylesAndEvents();
}
return false;
};//end displayResponse
////////END of outdatedBrowser function
};
This source diff could not be displayed because it is too large. You can view the blob instead.
/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
/**
* 1. Set default font family to sans-serif.
* 2. Prevent iOS and IE text size adjust after device orientation change,
* without disabling user zoom.
*/
html {
font-family: sans-serif; /* 1 */
-ms-text-size-adjust: 100%; /* 2 */
-webkit-text-size-adjust: 100%; /* 2 */
}
/**
* Remove default margin.
*/
body {
margin: 0;
}
/* HTML5 display definitions
========================================================================== */
/**
* Correct `block` display not defined for any HTML5 element in IE 8/9.
* Correct `block` display not defined for `details` or `summary` in IE 10/11
* and Firefox.
* Correct `block` display not defined for `main` in IE 11.
*/
article,
aside,
details,
figcaption,
figure,
footer,
header,
hgroup,
main,
menu,
nav,
section,
summary {
display: block;
}
/**
* 1. Correct `inline-block` display not defined in IE 8/9.
* 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
*/
audio,
canvas,
progress,
video {
display: inline-block; /* 1 */
vertical-align: baseline; /* 2 */
}
/**
* Prevent modern browsers from displaying `audio` without controls.
* Remove excess height in iOS 5 devices.
*/
audio:not([controls]) {
display: none;
height: 0;
}
/**
* Address `[hidden]` styling not present in IE 8/9/10.
* Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22.
*/
[hidden],
template {
display: none;
}
/* Links
========================================================================== */
/**
* Remove the gray background color from active links in IE 10.
*/
a {
background-color: transparent;
}
/**
* Improve readability of focused elements when they are also in an
* active/hover state.
*/
a:active,
a:hover {
outline: 0;
}
/* Text-level semantics
========================================================================== */
/**
* Address styling not present in IE 8/9/10/11, Safari, and Chrome.
*/
abbr[title] {
border-bottom: 1px dotted;
}
/**
* Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
*/
b,
strong {
font-weight: bold;
}
/**
* Address styling not present in Safari and Chrome.
*/
dfn {
font-style: italic;
}
/**
* Address variable `h1` font-size and margin within `section` and `article`
* contexts in Firefox 4+, Safari, and Chrome.
*/
h1 {
font-size: 2em;
margin: 0.67em 0;
}
/**
* Address styling not present in IE 8/9.
*/
mark {
background: #ff0;
color: #000;
}
/**
* Address inconsistent and variable font size in all browsers.
*/
small {
font-size: 80%;
}
/**
* Prevent `sub` and `sup` affecting `line-height` in all browsers.
*/
sub,
sup {
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline;
}
sup {
top: -0.5em;
}
sub {
bottom: -0.25em;
}
/* Embedded content
========================================================================== */
/**
* Remove border when inside `a` element in IE 8/9/10.
*/
img {
border: 0;
}
/**
* Correct overflow not hidden in IE 9/10/11.
*/
svg:not(:root) {
overflow: hidden;
}
/* Grouping content
========================================================================== */
/**
* Address margin not present in IE 8/9 and Safari.
*/
figure {
margin: 1em 40px;
}
/**
* Address differences between Firefox and other browsers.
*/
hr {
box-sizing: content-box;
height: 0;
}
/**
* Contain overflow in all browsers.
*/
pre {
overflow: auto;
}
/**
* Address odd `em`-unit font size rendering in all browsers.
*/
code,
kbd,
pre,
samp {
font-family: monospace, monospace;
font-size: 1em;
}
/* Forms
========================================================================== */
/**
* Known limitation: by default, Chrome and Safari on OS X allow very limited
* styling of `select`, unless a `border` property is set.
*/
/**
* 1. Correct color not being inherited.
* Known issue: affects color of disabled elements.
* 2. Correct font properties not being inherited.
* 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
*/
button,
input,
optgroup,
select,
textarea {
color: inherit; /* 1 */
font: inherit; /* 2 */
margin: 0; /* 3 */
}
/**
* Address `overflow` set to `hidden` in IE 8/9/10/11.
*/
button {
overflow: visible;
}
/**
* Address inconsistent `text-transform` inheritance for `button` and `select`.
* All other form control elements do not inherit `text-transform` values.
* Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
* Correct `select` style inheritance in Firefox.
*/
button,
select {
text-transform: none;
}
/**
* 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
* and `video` controls.
* 2. Correct inability to style clickable `input` types in iOS.
* 3. Improve usability and consistency of cursor style between image-type
* `input` and others.
*/
button,
html input[type="button"], /* 1 */
input[type="reset"],
input[type="submit"] {
-webkit-appearance: button; /* 2 */
cursor: pointer; /* 3 */
}
/**
* Re-set default cursor for disabled elements.
*/
button[disabled],
html input[disabled] {
cursor: default;
}
/**
* Remove inner padding and border in Firefox 4+.
*/
button::-moz-focus-inner,
input::-moz-focus-inner {
border: 0;
padding: 0;
}
/**
* Address Firefox 4+ setting `line-height` on `input` using `!important` in
* the UA stylesheet.
*/
input {
line-height: normal;
}
/**
* It's recommended that you don't attempt to style these elements.
* Firefox's implementation doesn't respect box-sizing, padding, or width.
*
* 1. Address box sizing set to `content-box` in IE 8/9/10.
* 2. Remove excess padding in IE 8/9/10.
*/
input[type="checkbox"],
input[type="radio"] {
box-sizing: border-box; /* 1 */
padding: 0; /* 2 */
}
/**
* Fix the cursor style for Chrome's increment/decrement buttons. For certain
* `font-size` values of the `input`, it causes the cursor style of the
* decrement button to change from `default` to `text`.
*/
input[type="number"]::-webkit-inner-spin-button,
input[type="number"]::-webkit-outer-spin-button {
height: auto;
}
/**
* 1. Address `appearance` set to `searchfield` in Safari and Chrome.
* 2. Address `box-sizing` set to `border-box` in Safari and Chrome.
*/
input[type="search"] {
-webkit-appearance: textfield; /* 1 */
box-sizing: content-box; /* 2 */
}
/**
* Remove inner padding and search cancel button in Safari and Chrome on OS X.
* Safari (but not Chrome) clips the cancel button when the search input has
* padding (and `textfield` appearance).
*/
input[type="search"]::-webkit-search-cancel-button,
input[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
/**
* Define consistent border, margin, and padding.
*/
fieldset {
border: 1px solid #c0c0c0;
margin: 0 2px;
padding: 0.35em 0.625em 0.75em;
}
/**
* 1. Correct `color` not being inherited in IE 8/9/10/11.
* 2. Remove padding so people aren't caught out if they zero out fieldsets.
*/
legend {
border: 0; /* 1 */
padding: 0; /* 2 */
}
/**
* Remove default vertical scrollbar in IE 8/9/10/11.
*/
textarea {
overflow: auto;
}
/**
* Don't inherit the `font-weight` (applied by a rule above).
* NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
*/
optgroup {
font-weight: bold;
}
/* Tables
========================================================================== */
/**
* Remove most spacing between table cells.
*/
table {
border-collapse: collapse;
border-spacing: 0;
}
td,
th {
padding: 0;
}
/*!--------------------------------------------------------------------
STYLES "Outdated Browser"
Version: 1.1.0 - 2014
author: Burocratik
website: http://www.burocratik.com
* @preserve
-----------------------------------------------------------------------*/
#outdated{display:none;position:fixed;top:0;left:0;width:100%;height:170px;text-align:center;text-transform:uppercase;z-index:1500;background-color:#f25648;color:#fff}* html #outdated{position:absolute}#outdated h6{font-size:25px;line-height:25px;margin:30px 0 10px}#outdated p{font-size:12px;line-height:12px;margin:0}#outdated #btnUpdateBrowser{display:block;position:relative;padding:10px 20px;margin:30px auto 0;width:230px;color:#fff;text-decoration:none;border:2px solid #fff;cursor:pointer}#outdated #btnUpdateBrowser:hover{color:#f25648;background-color:#fff}#outdated .last{position:absolute;top:10px;right:25px;width:20px;height:20px}#outdated #btnCloseUpdateBrowser{display:block;position:relative;width:100%;height:100%;text-decoration:none;color:#fff;font-size:36px;line-height:36px}
\ No newline at end of file
#!/usr/bin/env ruby_executable_hooks
#
# This file was generated by RubyGems.
#
# The application 'haml' is installed as part of a gem, and
# this file is here to facilitate running it.
#
require 'rubygems'
version = ">= 0.a"
str = ARGV.first
if str
str = str.b[/\A_(.*)_\z/, 1]
if str and Gem::Version.correct?(str)
version = str
ARGV.shift
end
end
if Gem.respond_to?(:activate_bin_path)
load Gem.activate_bin_path('haml', 'haml', version)
else
gem "haml", version
load Gem.bin_path("haml", "haml", version)
end
current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/bindex-0.8.1/ext/skiptrace current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/bindex-0.8.1/ext/skiptrace
<<<<<<< HEAD
/home/mmakogin/.rvm/rubies/ruby-2.3.3/bin/ruby -I /home/mmakogin/.rvm/rubies/ruby-2.3.3/lib/ruby/site_ruby/2.3.0 -r ./siteconf20190829-21053-2s2gic.rb extconf.rb /home/mmakogin/.rvm/rubies/ruby-2.3.3/bin/ruby -I /home/mmakogin/.rvm/rubies/ruby-2.3.3/lib/ruby/site_ruby/2.3.0 -r ./siteconf20190829-21053-2s2gic.rb extconf.rb
=======
/home/mmakogin/.rvm/rubies/ruby-2.3.3/bin/ruby -I /home/mmakogin/.rvm/rubies/ruby-2.3.3/lib/ruby/site_ruby/2.3.0 -r ./siteconf20190904-28794-pmd8ci.rb extconf.rb
>>>>>>> ee2d9f7aa40b6bf61913178600033f52dc7a1fc6
creating Makefile creating Makefile
current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/bindex-0.8.1/ext/skiptrace current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/bindex-0.8.1/ext/skiptrace
...@@ -12,4 +16,8 @@ linking shared-object skiptrace/internal/cruby.so ...@@ -12,4 +16,8 @@ linking shared-object skiptrace/internal/cruby.so
current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/bindex-0.8.1/ext/skiptrace current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/bindex-0.8.1/ext/skiptrace
make "DESTDIR=" install make "DESTDIR=" install
<<<<<<< HEAD
/usr/bin/install -c -m 0755 cruby.so ./.gem.20190829-21053-101w0nn/skiptrace/internal /usr/bin/install -c -m 0755 cruby.so ./.gem.20190829-21053-101w0nn/skiptrace/internal
=======
/usr/bin/install -c -m 0755 cruby.so ./.gem.20190904-28794-11lm8ti/skiptrace/internal
>>>>>>> ee2d9f7aa40b6bf61913178600033f52dc7a1fc6
current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/byebug-11.0.1/ext/byebug current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/byebug-11.0.1/ext/byebug
<<<<<<< HEAD
/home/mmakogin/.rvm/rubies/ruby-2.3.3/bin/ruby -I /home/mmakogin/.rvm/rubies/ruby-2.3.3/lib/ruby/site_ruby/2.3.0 -r ./siteconf20190829-21053-ijsgqh.rb extconf.rb /home/mmakogin/.rvm/rubies/ruby-2.3.3/bin/ruby -I /home/mmakogin/.rvm/rubies/ruby-2.3.3/lib/ruby/site_ruby/2.3.0 -r ./siteconf20190829-21053-ijsgqh.rb extconf.rb
=======
/home/mmakogin/.rvm/rubies/ruby-2.3.3/bin/ruby -I /home/mmakogin/.rvm/rubies/ruby-2.3.3/lib/ruby/site_ruby/2.3.0 -r ./siteconf20190904-28794-jkcmib.rb extconf.rb
>>>>>>> ee2d9f7aa40b6bf61913178600033f52dc7a1fc6
creating Makefile creating Makefile
current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/byebug-11.0.1/ext/byebug current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/byebug-11.0.1/ext/byebug
...@@ -16,4 +20,8 @@ linking shared-object byebug/byebug.so ...@@ -16,4 +20,8 @@ linking shared-object byebug/byebug.so
current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/byebug-11.0.1/ext/byebug current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/byebug-11.0.1/ext/byebug
make "DESTDIR=" install make "DESTDIR=" install
<<<<<<< HEAD
/usr/bin/install -c -m 0755 byebug.so ./.gem.20190829-21053-18ounij/byebug /usr/bin/install -c -m 0755 byebug.so ./.gem.20190829-21053-18ounij/byebug
=======
/usr/bin/install -c -m 0755 byebug.so ./.gem.20190904-28794-oe6oze/byebug
>>>>>>> ee2d9f7aa40b6bf61913178600033f52dc7a1fc6
current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/ffi-1.11.1/ext/ffi_c current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/ffi-1.11.1/ext/ffi_c
<<<<<<< HEAD
/home/mmakogin/.rvm/rubies/ruby-2.3.3/bin/ruby -I /home/mmakogin/.rvm/rubies/ruby-2.3.3/lib/ruby/site_ruby/2.3.0 -r ./siteconf20190829-21053-1iqlvkg.rb extconf.rb /home/mmakogin/.rvm/rubies/ruby-2.3.3/bin/ruby -I /home/mmakogin/.rvm/rubies/ruby-2.3.3/lib/ruby/site_ruby/2.3.0 -r ./siteconf20190829-21053-1iqlvkg.rb extconf.rb
=======
/home/mmakogin/.rvm/rubies/ruby-2.3.3/bin/ruby -I /home/mmakogin/.rvm/rubies/ruby-2.3.3/lib/ruby/site_ruby/2.3.0 -r ./siteconf20190904-28794-ibab7w.rb extconf.rb
>>>>>>> ee2d9f7aa40b6bf61913178600033f52dc7a1fc6
checking for ffi_call() in -lffi... yes checking for ffi_call() in -lffi... yes
checking for ffi_closure_alloc()... yes checking for ffi_closure_alloc()... yes
checking for shlwapi.h... no checking for shlwapi.h... no
...@@ -44,4 +48,8 @@ linking shared-object ffi_c.so ...@@ -44,4 +48,8 @@ linking shared-object ffi_c.so
current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/ffi-1.11.1/ext/ffi_c current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/ffi-1.11.1/ext/ffi_c
make "DESTDIR=" install make "DESTDIR=" install
<<<<<<< HEAD
/usr/bin/install -c -m 0755 ffi_c.so ./.gem.20190829-21053-9dket4 /usr/bin/install -c -m 0755 ffi_c.so ./.gem.20190829-21053-9dket4
=======
/usr/bin/install -c -m 0755 ffi_c.so ./.gem.20190904-28794-10ponnu
>>>>>>> ee2d9f7aa40b6bf61913178600033f52dc7a1fc6
current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/mysql2-0.5.2/ext/mysql2 current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/mysql2-0.5.2/ext/mysql2
<<<<<<< HEAD
/home/mmakogin/.rvm/rubies/ruby-2.3.3/bin/ruby -I /home/mmakogin/.rvm/rubies/ruby-2.3.3/lib/ruby/site_ruby/2.3.0 -r ./siteconf20190829-21053-vow6f.rb extconf.rb /home/mmakogin/.rvm/rubies/ruby-2.3.3/bin/ruby -I /home/mmakogin/.rvm/rubies/ruby-2.3.3/lib/ruby/site_ruby/2.3.0 -r ./siteconf20190829-21053-vow6f.rb extconf.rb
=======
/home/mmakogin/.rvm/rubies/ruby-2.3.3/bin/ruby -I /home/mmakogin/.rvm/rubies/ruby-2.3.3/lib/ruby/site_ruby/2.3.0 -r ./siteconf20190904-28794-1a6m2us.rb extconf.rb
>>>>>>> ee2d9f7aa40b6bf61913178600033f52dc7a1fc6
checking for rb_absint_size()... yes checking for rb_absint_size()... yes
checking for rb_absint_singlebit_p()... yes checking for rb_absint_singlebit_p()... yes
checking for rb_wait_for_single_fd()... yes checking for rb_wait_for_single_fd()... yes
...@@ -57,4 +61,8 @@ linking shared-object mysql2/mysql2.so ...@@ -57,4 +61,8 @@ linking shared-object mysql2/mysql2.so
current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/mysql2-0.5.2/ext/mysql2 current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/mysql2-0.5.2/ext/mysql2
make "DESTDIR=" install make "DESTDIR=" install
<<<<<<< HEAD
/usr/bin/install -c -m 0755 mysql2.so ./.gem.20190829-21053-oofvsg/mysql2 /usr/bin/install -c -m 0755 mysql2.so ./.gem.20190829-21053-oofvsg/mysql2
=======
/usr/bin/install -c -m 0755 mysql2.so ./.gem.20190904-28794-13lpcbi/mysql2
>>>>>>> ee2d9f7aa40b6bf61913178600033f52dc7a1fc6
current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/nio4r-2.5.0/ext/nio4r current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/nio4r-2.5.0/ext/nio4r
<<<<<<< HEAD
/home/mmakogin/.rvm/rubies/ruby-2.3.3/bin/ruby -I /home/mmakogin/.rvm/rubies/ruby-2.3.3/lib/ruby/site_ruby/2.3.0 -r ./siteconf20190829-21053-1sbeqn2.rb extconf.rb /home/mmakogin/.rvm/rubies/ruby-2.3.3/bin/ruby -I /home/mmakogin/.rvm/rubies/ruby-2.3.3/lib/ruby/site_ruby/2.3.0 -r ./siteconf20190829-21053-1sbeqn2.rb extconf.rb
=======
/home/mmakogin/.rvm/rubies/ruby-2.3.3/bin/ruby -I /home/mmakogin/.rvm/rubies/ruby-2.3.3/lib/ruby/site_ruby/2.3.0 -r ./siteconf20190904-28794-q8vpi2.rb extconf.rb
>>>>>>> ee2d9f7aa40b6bf61913178600033f52dc7a1fc6
checking for unistd.h... yes checking for unistd.h... yes
checking for sys/select.h... yes checking for sys/select.h... yes
checking for port_event_t in poll.h... no checking for port_event_t in poll.h... no
...@@ -483,4 +487,8 @@ linking shared-object nio4r_ext.so ...@@ -483,4 +487,8 @@ linking shared-object nio4r_ext.so
current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/nio4r-2.5.0/ext/nio4r current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/nio4r-2.5.0/ext/nio4r
make "DESTDIR=" install make "DESTDIR=" install
<<<<<<< HEAD
/usr/bin/install -c -m 0755 nio4r_ext.so ./.gem.20190829-21053-1xue6ga /usr/bin/install -c -m 0755 nio4r_ext.so ./.gem.20190829-21053-1xue6ga
=======
/usr/bin/install -c -m 0755 nio4r_ext.so ./.gem.20190904-28794-nkwk5z
>>>>>>> ee2d9f7aa40b6bf61913178600033f52dc7a1fc6
current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/nokogiri-1.10.4/ext/nokogiri current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/nokogiri-1.10.4/ext/nokogiri
<<<<<<< HEAD
/home/mmakogin/.rvm/rubies/ruby-2.3.3/bin/ruby -I /home/mmakogin/.rvm/rubies/ruby-2.3.3/lib/ruby/site_ruby/2.3.0 -r ./siteconf20190829-21053-1blgpcl.rb extconf.rb /home/mmakogin/.rvm/rubies/ruby-2.3.3/bin/ruby -I /home/mmakogin/.rvm/rubies/ruby-2.3.3/lib/ruby/site_ruby/2.3.0 -r ./siteconf20190829-21053-1blgpcl.rb extconf.rb
=======
/home/mmakogin/.rvm/rubies/ruby-2.3.3/bin/ruby -I /home/mmakogin/.rvm/rubies/ruby-2.3.3/lib/ruby/site_ruby/2.3.0 -r ./siteconf20190904-28794-18hr11c.rb extconf.rb
>>>>>>> ee2d9f7aa40b6bf61913178600033f52dc7a1fc6
checking if the C compiler accepts ... yes checking if the C compiler accepts ... yes
Building nokogiri using packaged libraries. Building nokogiri using packaged libraries.
Using mini_portile version 2.4.0 Using mini_portile version 2.4.0
...@@ -140,4 +144,8 @@ rm -rf /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/no ...@@ -140,4 +144,8 @@ rm -rf /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/no
current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/nokogiri-1.10.4/ext/nokogiri current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/nokogiri-1.10.4/ext/nokogiri
make "DESTDIR=" install make "DESTDIR=" install
<<<<<<< HEAD
/usr/bin/install -c -m 0755 nokogiri.so ./.gem.20190829-21053-1k9q96i/nokogiri /usr/bin/install -c -m 0755 nokogiri.so ./.gem.20190829-21053-1k9q96i/nokogiri
=======
/usr/bin/install -c -m 0755 nokogiri.so ./.gem.20190904-28794-10ba85g/nokogiri
>>>>>>> ee2d9f7aa40b6bf61913178600033f52dc7a1fc6
current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/puma-3.12.1/ext/puma_http11 current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/puma-3.12.1/ext/puma_http11
<<<<<<< HEAD
/home/mmakogin/.rvm/rubies/ruby-2.3.3/bin/ruby -I /home/mmakogin/.rvm/rubies/ruby-2.3.3/lib/ruby/site_ruby/2.3.0 -r ./siteconf20190829-21053-pmuaso.rb extconf.rb /home/mmakogin/.rvm/rubies/ruby-2.3.3/bin/ruby -I /home/mmakogin/.rvm/rubies/ruby-2.3.3/lib/ruby/site_ruby/2.3.0 -r ./siteconf20190829-21053-pmuaso.rb extconf.rb
=======
/home/mmakogin/.rvm/rubies/ruby-2.3.3/bin/ruby -I /home/mmakogin/.rvm/rubies/ruby-2.3.3/lib/ruby/site_ruby/2.3.0 -r ./siteconf20190904-28794-nmobxe.rb extconf.rb
>>>>>>> ee2d9f7aa40b6bf61913178600033f52dc7a1fc6
checking for BIO_read() in -lcrypto... yes checking for BIO_read() in -lcrypto... yes
checking for SSL_CTX_new() in -lssl... yes checking for SSL_CTX_new() in -lssl... yes
checking for openssl/bio.h... yes checking for openssl/bio.h... yes
...@@ -122,4 +126,8 @@ linking shared-object puma/puma_http11.so ...@@ -122,4 +126,8 @@ linking shared-object puma/puma_http11.so
current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/puma-3.12.1/ext/puma_http11 current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/puma-3.12.1/ext/puma_http11
make "DESTDIR=" install make "DESTDIR=" install
<<<<<<< HEAD
/usr/bin/install -c -m 0755 puma_http11.so ./.gem.20190829-21053-16cikns/puma /usr/bin/install -c -m 0755 puma_http11.so ./.gem.20190829-21053-16cikns/puma
=======
/usr/bin/install -c -m 0755 puma_http11.so ./.gem.20190904-28794-wmj6sz/puma
>>>>>>> ee2d9f7aa40b6bf61913178600033f52dc7a1fc6
current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/sassc-2.2.0/ext
/home/mmakogin/.rvm/rubies/ruby-2.3.3/bin/ruby -I /home/mmakogin/.rvm/rubies/ruby-2.3.3/lib/ruby/site_ruby/2.3.0 -r ./siteconf20190902-25375-1lz7ufi.rb extconf.rb
creating Makefile
current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/sassc-2.2.0/ext
make "DESTDIR=" clean
current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/sassc-2.2.0/ext
make "DESTDIR="
compiling ./libsass/src/cencode.c
compiling ./libsass/src/c99func.c
compiling ./libsass/src/operators.cpp
compiling ./libsass/src/fn_lists.cpp
compiling ./libsass/src/json.cpp
compiling ./libsass/src/inspect.cpp
compiling ./libsass/src/memory/SharedPtr.cpp
compiling ./libsass/src/fn_utils.cpp
compiling ./libsass/src/backtrace.cpp
compiling ./libsass/src/node.cpp
compiling ./libsass/src/fn_miscs.cpp
compiling ./libsass/src/fn_selectors.cpp
compiling ./libsass/src/fn_colors.cpp
compiling ./libsass/src/remove_placeholders.cpp
compiling ./libsass/src/c2ast.cpp
compiling ./libsass/src/util_string.cpp
compiling ./libsass/src/source_map.cpp
compiling ./libsass/src/ast_values.cpp
compiling ./libsass/src/emitter.cpp
compiling ./libsass/src/ast_supports.cpp
compiling ./libsass/src/listize.cpp
compiling ./libsass/src/ast2c.cpp
compiling ./libsass/src/values.cpp
compiling ./libsass/src/lexer.cpp
compiling ./libsass/src/subset_map.cpp
compiling ./libsass/src/to_value.cpp
compiling ./libsass/src/utf8_string.cpp
compiling ./libsass/src/fn_numbers.cpp
compiling ./libsass/src/units.cpp
compiling ./libsass/src/util.cpp
compiling ./libsass/src/color_maps.cpp
compiling ./libsass/src/bind.cpp
compiling ./libsass/src/check_nesting.cpp
compiling ./libsass/src/prelexer.cpp
compiling ./libsass/src/ast.cpp
compiling ./libsass/src/base64vlq.cpp
compiling ./libsass/src/ast_sel_cmp.cpp
compiling ./libsass/src/parser.cpp
compiling ./libsass/src/fn_strings.cpp
compiling ./libsass/src/sass2scss.cpp
compiling ./libsass/src/expand.cpp
compiling ./libsass/src/error_handling.cpp
compiling ./libsass/src/sass_values.cpp
compiling ./libsass/src/fn_maps.cpp
compiling ./libsass/src/sass.cpp
compiling ./libsass/src/constants.cpp
compiling ./libsass/src/position.cpp
compiling ./libsass/src/file.cpp
compiling ./libsass/src/context.cpp
compiling ./libsass/src/ast_sel_unify.cpp
compiling ./libsass/src/plugins.cpp
compiling ./libsass/src/ast_fwd_decl.cpp
compiling ./libsass/src/eval.cpp
compiling ./libsass/src/sass_context.cpp
compiling ./libsass/src/cssize.cpp
compiling ./libsass/src/environment.cpp
compiling ./libsass/src/sass_functions.cpp
compiling ./libsass/src/output.cpp
compiling ./libsass/src/sass_util.cpp
compiling ./libsass/src/ast_selectors.cpp
compiling ./libsass/src/extend.cpp
linking shared-object sassc/libsass.so
current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/sassc-2.2.0/ext
make "DESTDIR=" install
/usr/bin/install -c -m 0755 libsass.so ./.gem.20190902-25375-92qvra/sassc
current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/websocket-driver-0.6.5/ext/websocket-driver current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/websocket-driver-0.6.5/ext/websocket-driver
<<<<<<< HEAD
/home/mmakogin/.rvm/rubies/ruby-2.3.3/bin/ruby -I /home/mmakogin/.rvm/rubies/ruby-2.3.3/lib/ruby/site_ruby/2.3.0 -r ./siteconf20190829-21053-njm1kk.rb extconf.rb /home/mmakogin/.rvm/rubies/ruby-2.3.3/bin/ruby -I /home/mmakogin/.rvm/rubies/ruby-2.3.3/lib/ruby/site_ruby/2.3.0 -r ./siteconf20190829-21053-njm1kk.rb extconf.rb
=======
/home/mmakogin/.rvm/rubies/ruby-2.3.3/bin/ruby -I /home/mmakogin/.rvm/rubies/ruby-2.3.3/lib/ruby/site_ruby/2.3.0 -r ./siteconf20190904-28794-gj8d4p.rb extconf.rb
>>>>>>> ee2d9f7aa40b6bf61913178600033f52dc7a1fc6
creating Makefile creating Makefile
current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/websocket-driver-0.6.5/ext/websocket-driver current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/websocket-driver-0.6.5/ext/websocket-driver
...@@ -12,4 +16,8 @@ linking shared-object websocket_mask.so ...@@ -12,4 +16,8 @@ linking shared-object websocket_mask.so
current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/websocket-driver-0.6.5/ext/websocket-driver current directory: /home/mmakogin/Desktop/projects/warm_city/vendor/cache/ruby/2.3.0/gems/websocket-driver-0.6.5/ext/websocket-driver
make "DESTDIR=" install make "DESTDIR=" install
<<<<<<< HEAD
/usr/bin/install -c -m 0755 websocket_mask.so ./.gem.20190829-21053-193ujsc /usr/bin/install -c -m 0755 websocket_mask.so ./.gem.20190829-21053-193ujsc
=======
/usr/bin/install -c -m 0755 websocket_mask.so ./.gem.20190904-28794-1eb52gj
>>>>>>> ee2d9f7aa40b6bf61913178600033f52dc7a1fc6
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment