From 7f95679baedcb33d2e1f51fdde48a1028ff85279 Mon Sep 17 00:00:00 2001 From: Polo Date: Tue, 26 Nov 2019 00:30:53 +0200 Subject: [PATCH] upgrade --- .gitignore | 17 ----- .ruby-version | 2 +- Gemfile | 2 +- Gemfile.lock | 96 ++++++++++++++----------- README.md | 22 ++---- app/assets/images/logo.png | Bin 0 -> 12155 bytes app/assets/javascripts/application.js | 8 +-- app/assets/stylesheets/application.css | 62 ++++++++++++---- app/models/informativo.rb | 13 +++- app/views/layouts/application.haml | 8 ++- app/views/page/home.haml | 5 +- app/views/page/informativo.haml | 18 ++++- config/environments/development.rb | 2 + config/initializers/assets.rb | 1 + masonry.pkgd.min.js | 9 --- 15 files changed, 153 insertions(+), 112 deletions(-) create mode 100644 app/assets/images/logo.png delete mode 100644 masonry.pkgd.min.js diff --git a/.gitignore b/.gitignore index 7703bf6..c753546 100644 --- a/.gitignore +++ b/.gitignore @@ -1,26 +1,9 @@ -# Ignore bundler config. /.bundle /vendor -# Ignore the default SQLite database. -/db/*.sqlite3 -/db/*.sqlite3-journal - -# Ignore all logfiles and tempfiles. /log/* /tmp/* -!/log/.keep -!/tmp/.keep /config/database.yml - -# Ignore uploaded files in development -/storage/* -!/storage/.keep - /node_modules /yarn-error.log - /public/assets .byebug_history - -# Ignore master key for decrypting credentials and more. -/config/master.key diff --git a/.ruby-version b/.ruby-version index f967d3c..57cf282 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.5.5 \ No newline at end of file +2.6.5 diff --git a/Gemfile b/Gemfile index 5a31f96..a6709ad 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.5.5' +ruby '2.6.5' gem 'rails', '~> 5.2.3' gem 'puma', '~> 3.11' diff --git a/Gemfile.lock b/Gemfile.lock index 648d6d2..bd3fd75 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,16 +24,16 @@ GEM erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activeadmin (2.0.0) + activeadmin (2.4.0) arbre (~> 1.2, >= 1.2.1) formtastic (~> 3.1) formtastic_i18n (~> 0.4) inherited_resources (~> 1.7) jquery-rails (~> 4.2) kaminari (~> 1.0, >= 1.0.1) - railties (>= 5.0, < 6.0) + railties (>= 5.0, < 6.1) ransack (~> 2.1, >= 2.1.1) - sass (~> 3.4) + sassc-rails (~> 2.1) sprockets (>= 3.0, < 4.1) sprockets-es6 (~> 0.9, >= 0.9.2) activejob (5.2.3) @@ -62,9 +62,9 @@ GEM babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) execjs (~> 2.0) - bcrypt (3.1.12) - bindex (0.7.0) - bootsnap (1.4.4) + bcrypt (3.1.13) + bindex (0.8.1) + bootsnap (1.4.5) msgpack (~> 1.0) builder (3.2.3) byebug (11.0.1) @@ -76,35 +76,35 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.1.5) - crass (1.0.4) - devise (4.6.2) + crass (1.0.5) + devise (4.7.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 6.0) + railties (>= 4.1.0) responders warden (~> 1.2.3) - erubi (1.8.0) + erubi (1.9.0) execjs (2.7.0) - ffi (1.11.1) + ffi (1.11.3) formtastic (3.1.5) actionpack (>= 3.2.13) formtastic_i18n (0.6.0) globalid (0.4.2) activesupport (>= 4.2.0) - haml (5.1.1) + haml (5.1.2) temple (>= 0.8.0) tilt has_scope (0.7.2) actionpack (>= 4.1) activesupport (>= 4.1) - i18n (1.6.0) + i18n (1.7.0) concurrent-ruby (~> 1.0) - inherited_resources (1.10.0) - actionpack (>= 5.0, < 6.0) + inherited_resources (1.11.0) + actionpack (>= 5.0, < 6.1) has_scope (~> 0.6) - railties (>= 5.0, < 6.0) - responders (~> 2.0) - jquery-rails (4.3.3) + railties (>= 5.0, < 6.1) + responders (>= 2, < 4) + jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -124,7 +124,7 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.2.3) + loofah (2.3.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -133,15 +133,17 @@ GEM mimemagic (~> 0.3.2) method_source (0.9.2) mimemagic (0.3.3) - mini_mime (1.0.1) + mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.11.3) - msgpack (1.2.10) + minitest (5.13.0) + msgpack (1.3.1) mysql2 (0.5.2) - nio4r (2.3.1) - nokogiri (1.10.3) + nio4r (2.5.2) + nokogiri (1.10.5) mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) + polyamorous (2.3.0) + activerecord (>= 5.0) puma (3.12.1) rack (2.0.7) rack-test (1.1.0) @@ -162,40 +164,48 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) railties (5.2.3) actionpack (= 5.2.3) activesupport (= 5.2.3) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rake (12.3.2) - ransack (2.1.1) + rake (13.0.1) + ransack (2.3.0) actionpack (>= 5.0) activerecord (>= 5.0) activesupport (>= 5.0) i18n + polyamorous (= 2.3.0) rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) - responders (2.4.1) - actionpack (>= 4.2.0, < 6.0) - railties (>= 4.2.0, < 6.0) + responders (3.0.0) + actionpack (>= 5.0) + railties (>= 5.0) ruby_dep (1.5.0) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.7) - railties (>= 4.0.0, < 6) + sass-rails (5.1.0) + railties (>= 5.2.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - spring (2.0.2) - activesupport (>= 4.2) + sassc (2.2.1) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt + spring (2.1.0) spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) spring (>= 1.2, < 3.0) @@ -210,13 +220,13 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - temple (0.8.1) + temple (0.8.2) thor (0.20.3) thread_safe (0.3.6) - tilt (2.0.9) + tilt (2.0.10) tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.1.20) + uglifier (4.2.0) execjs (>= 0.3.0, < 3) warden (1.2.8) rack (>= 2.0.6) @@ -225,10 +235,10 @@ GEM activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) - websocket-driver (0.7.0) + websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) - will_paginate (3.1.7) + websocket-extensions (0.1.4) + will_paginate (3.2.1) PLATFORMS ruby @@ -253,7 +263,7 @@ DEPENDENCIES will_paginate RUBY VERSION - ruby 2.5.5p157 + ruby 2.6.5p114 BUNDLED WITH - 2.0.1 + 1.17.2 diff --git a/README.md b/README.md index 3b2fdfa..8aa0637 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,16 @@ # Ambiente Já! -This README would normally document whatever steps are necessary to get the -application up and running. +### = fase#01 -Things you may want to cover: +[ x ] Re-estructure old database -* Ruby version +[ x ] Setup web application -* System dependencies +[ x ] List articles @ sketch design -* Configuration -* Database creation +### = fase#02 -* Database initialization +[...] New design -* How to run the test suite - -* Services (job queues, cache servers, search engines, etc.) - -* Deployment instructions - -* ... +[ ] Fix informativo links diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..8487538a0e19575580a966cd63e3096946cfb00e GIT binary patch literal 12155 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 JRU%;+@IS>E*dG7@ literal 0 HcmV?d00001 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 4cba2f8..bec4452 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -14,8 +14,8 @@ $(document).ready(function(){ - var msnry = new Masonry( '#infos', { - columnWidth: 180, - itemSelector: '.card' - }); + // var msnry = new Masonry( '#infos', { + // columnWidth: 180, + // itemSelector: '.card' + // }); }); diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 7460701..e926403 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1,35 +1,69 @@ body { padding: 20px; font-family: 'Inconsolata', monospace; - background-color: #f5fff1; + background-color: #fff; + color: #4c4e4d; } -a { +a{ + text-decoration: none; + color: #4c4e4d; + font-size: 17px; + font-weight: bold; +} +a:hover { color:black; } -p:hover{ - background-color: green; +#all{ + width: 900px; + margin: 0px auto; + margin-top: 35px; } -.card:hover{ - background-color: green; + +.tags{ + font-size: 13px; + margin: 5px 0px 5px 0px; +} +h2{ + margin: 0px +} +h3{ + text-align: right; + font-size:15px; +} + +#topo{ + background-color: #8bf712; + width: 100%; + text-align: center; + display: inline-block; + top: 0px; + left: 0px; + position: absolute; + font-size: 10px; + height: 35px; + border-bottom: 1px solid lightgray } .card{ - color: black; - width: 200px; - float: left; + /* color: black; */ + border-top: 1px solid lightgray; + padding-top: 10px; + padding-bottom: 10px; + /* width: 200px; */ + /* float: left; border: 2px solid green; margin: 10px; padding: 25px; font-size: 22px; text-align: center; - box-shadow: 8px 8px 3px #1a54027a; + box-shadow: 8px 8px 3px #1a54027a; */ } .date{ - font-size: 14px; + font-size: 13px; color: gray; - padding-top: 15px + padding-top: 10px } @@ -38,5 +72,7 @@ p:hover{ width: 100%; text-align: center; padding: 10px; - font-size: 19px + font-size: 19px; + background-color: #8bf712; + border: 1px solid gray; } diff --git a/app/models/informativo.rb b/app/models/informativo.rb index e69bc0d..73dfc53 100644 --- a/app/models/informativo.rb +++ b/app/models/informativo.rb @@ -1,4 +1,15 @@ class Informativo < ApplicationRecord self.table_name = "informativo" - # paginates_per 10 + paginates_per 10 + + def tags + tags = [] + tags << self.tag1 + tags << self.tag2 + tags << self.tag3 + tags = tags.uniq.join(", ").downcase + tags.chop! if tags[tags.size-1]=="," + tags + end + end diff --git a/app/views/layouts/application.haml b/app/views/layouts/application.haml index ce2d386..ff0f4f9 100644 --- a/app/views/layouts/application.haml +++ b/app/views/layouts/application.haml @@ -6,10 +6,12 @@ = csrf_meta_tags = csp_meta_tag = stylesheet_link_tag "https://fonts.googleapis.com/css?family=Inconsolata&display=swap" - = stylesheet_link_tag 'application', media: 'all' + = stylesheet_link_tag 'application', media: 'all' = javascript_include_tag 'application' %body - %h1= "Ambiente Já!" - = yield + #all + #topo + = link_to (image_tag "logo.png"), "/" + = yield diff --git a/app/views/page/home.haml b/app/views/page/home.haml index 0fb2771..1fb288c 100644 --- a/app/views/page/home.haml +++ b/app/views/page/home.haml @@ -3,8 +3,9 @@ #infos - @informativos.each do |i| .card - %span.link= link_to i.titulo, CGI.unescapeHTML("/informativo/#{i.id}") - .date= "#{i.data_inc}" + %span.link= link_to i.titulo.html_safe, CGI.unescapeHTML("/informativo/#{i.id}") + %p.tags= i.tags + .date= "#{i.data_inc} | #{i.operador_inc.downcase.capitalize}" #nav = will_paginate @informativos diff --git a/app/views/page/informativo.haml b/app/views/page/informativo.haml index 8691de5..59f4af0 100644 --- a/app/views/page/informativo.haml +++ b/app/views/page/informativo.haml @@ -1,3 +1,15 @@ -!= @informativo.Descricao -%hr -!= ap @informativo +// :javascript +// $(document).ready(function(){ +// $("a").each(function(a){ +// a.href = a.href.replace("http://localhost:3000/informativo/%22", "").replace("\"", ""); +// }) +// }); + +#todo + %h2= @informativo.titulo.html_safe + .tags= @informativo.tags + .date= @informativo.data_inc + -# %p= "Por #{@informativo.operador_inc}" + != @informativo.Descricao.gsub(""", "\"") + -# %hr + -# != ap @informativo diff --git a/config/environments/development.rb b/config/environments/development.rb index 1311e3e..371d87c 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -26,6 +26,8 @@ Rails.application.configure do config.cache_store = :null_store end + + config.serve_static_assets = true # Store uploaded files on the local file system (see config/storage.yml for options) config.active_storage.service = :local diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index c6ac1d5..d5ce4a1 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -7,6 +7,7 @@ Rails.application.config.assets.version = '1.0' # Rails.application.config.assets.paths << Emoji.images_path # Add Yarn node_modules folder to the asset load path. Rails.application.config.assets.paths << Rails.root.join('node_modules') +Rails.application.config.assets.paths << Rails.root.join('public/images') Rails.application.config.assets.precompile += %w(application.js application.css) # Precompile additional assets. # application.js, application.css, and all non-JS/CSS in the app/assets diff --git a/masonry.pkgd.min.js b/masonry.pkgd.min.js deleted file mode 100644 index 53386ae..0000000 --- a/masonry.pkgd.min.js +++ /dev/null @@ -1,9 +0,0 @@ -/*! - * Masonry PACKAGED v4.2.2 - * Cascading grid layout library - * https://masonry.desandro.com - * MIT License - * by David DeSandro - */ - -!function(t,e){"function"==typeof define&&define.amd?define("jquery-bridget/jquery-bridget",["jquery"],function(i){return e(t,i)}):"object"==typeof module&&module.exports?module.exports=e(t,require("jquery")):t.jQueryBridget=e(t,t.jQuery)}(window,function(t,e){"use strict";function i(i,r,a){function h(t,e,n){var o,r="$()."+i+'("'+e+'")';return t.each(function(t,h){var u=a.data(h,i);if(!u)return void s(i+" not initialized. Cannot call methods, i.e. "+r);var d=u[e];if(!d||"_"==e.charAt(0))return void s(r+" is not a valid method");var l=d.apply(u,n);o=void 0===o?l:o}),void 0!==o?o:t}function u(t,e){t.each(function(t,n){var o=a.data(n,i);o?(o.option(e),o._init()):(o=new r(n,e),a.data(n,i,o))})}a=a||e||t.jQuery,a&&(r.prototype.option||(r.prototype.option=function(t){a.isPlainObject(t)&&(this.options=a.extend(!0,this.options,t))}),a.fn[i]=function(t){if("string"==typeof t){var e=o.call(arguments,1);return h(this,t,e)}return u(this,t),this},n(a))}function n(t){!t||t&&t.bridget||(t.bridget=i)}var o=Array.prototype.slice,r=t.console,s="undefined"==typeof r?function(){}:function(t){r.error(t)};return n(e||t.jQuery),i}),function(t,e){"function"==typeof define&&define.amd?define("ev-emitter/ev-emitter",e):"object"==typeof module&&module.exports?module.exports=e():t.EvEmitter=e()}("undefined"!=typeof window?window:this,function(){function t(){}var e=t.prototype;return e.on=function(t,e){if(t&&e){var i=this._events=this._events||{},n=i[t]=i[t]||[];return-1==n.indexOf(e)&&n.push(e),this}},e.once=function(t,e){if(t&&e){this.on(t,e);var i=this._onceEvents=this._onceEvents||{},n=i[t]=i[t]||{};return n[e]=!0,this}},e.off=function(t,e){var i=this._events&&this._events[t];if(i&&i.length){var n=i.indexOf(e);return-1!=n&&i.splice(n,1),this}},e.emitEvent=function(t,e){var i=this._events&&this._events[t];if(i&&i.length){i=i.slice(0),e=e||[];for(var n=this._onceEvents&&this._onceEvents[t],o=0;oe;e++){var i=h[e];t[i]=0}return t}function n(t){var e=getComputedStyle(t);return e||a("Style returned "+e+". Are you running this code in a hidden iframe on Firefox? See https://bit.ly/getsizebug1"),e}function o(){if(!d){d=!0;var e=document.createElement("div");e.style.width="200px",e.style.padding="1px 2px 3px 4px",e.style.borderStyle="solid",e.style.borderWidth="1px 2px 3px 4px",e.style.boxSizing="border-box";var i=document.body||document.documentElement;i.appendChild(e);var o=n(e);s=200==Math.round(t(o.width)),r.isBoxSizeOuter=s,i.removeChild(e)}}function r(e){if(o(),"string"==typeof e&&(e=document.querySelector(e)),e&&"object"==typeof e&&e.nodeType){var r=n(e);if("none"==r.display)return i();var a={};a.width=e.offsetWidth,a.height=e.offsetHeight;for(var d=a.isBorderBox="border-box"==r.boxSizing,l=0;u>l;l++){var c=h[l],f=r[c],m=parseFloat(f);a[c]=isNaN(m)?0:m}var p=a.paddingLeft+a.paddingRight,g=a.paddingTop+a.paddingBottom,y=a.marginLeft+a.marginRight,v=a.marginTop+a.marginBottom,_=a.borderLeftWidth+a.borderRightWidth,z=a.borderTopWidth+a.borderBottomWidth,E=d&&s,b=t(r.width);b!==!1&&(a.width=b+(E?0:p+_));var x=t(r.height);return x!==!1&&(a.height=x+(E?0:g+z)),a.innerWidth=a.width-(p+_),a.innerHeight=a.height-(g+z),a.outerWidth=a.width+y,a.outerHeight=a.height+v,a}}var s,a="undefined"==typeof console?e:function(t){console.error(t)},h=["paddingLeft","paddingRight","paddingTop","paddingBottom","marginLeft","marginRight","marginTop","marginBottom","borderLeftWidth","borderRightWidth","borderTopWidth","borderBottomWidth"],u=h.length,d=!1;return r}),function(t,e){"use strict";"function"==typeof define&&define.amd?define("desandro-matches-selector/matches-selector",e):"object"==typeof module&&module.exports?module.exports=e():t.matchesSelector=e()}(window,function(){"use strict";var t=function(){var t=window.Element.prototype;if(t.matches)return"matches";if(t.matchesSelector)return"matchesSelector";for(var e=["webkit","moz","ms","o"],i=0;is?"round":"floor";r=Math[a](r),this.cols=Math.max(r,1)},n.getContainerWidth=function(){var t=this._getOption("fitWidth"),i=t?this.element.parentNode:this.element,n=e(i);this.containerWidth=n&&n.innerWidth},n._getItemLayoutPosition=function(t){t.getSize();var e=t.size.outerWidth%this.columnWidth,i=e&&1>e?"round":"ceil",n=Math[i](t.size.outerWidth/this.columnWidth);n=Math.min(n,this.cols);for(var o=this.options.horizontalOrder?"_getHorizontalColPosition":"_getTopColPosition",r=this[o](n,t),s={x:this.columnWidth*r.col,y:r.y},a=r.y+t.size.outerHeight,h=n+r.col,u=r.col;h>u;u++)this.colYs[u]=a;return s},n._getTopColPosition=function(t){var e=this._getTopColGroup(t),i=Math.min.apply(Math,e);return{col:e.indexOf(i),y:i}},n._getTopColGroup=function(t){if(2>t)return this.colYs;for(var e=[],i=this.cols+1-t,n=0;i>n;n++)e[n]=this._getColGroupY(n,t);return e},n._getColGroupY=function(t,e){if(2>e)return this.colYs[t];var i=this.colYs.slice(t,t+e);return Math.max.apply(Math,i)},n._getHorizontalColPosition=function(t,e){var i=this.horizontalColIndex%this.cols,n=t>1&&i+t>this.cols;i=n?0:i;var o=e.size.outerWidth&&e.size.outerHeight;return this.horizontalColIndex=o?i+t:this.horizontalColIndex,{col:i,y:this._getColGroupY(i,t)}},n._manageStamp=function(t){var i=e(t),n=this._getElementOffset(t),o=this._getOption("originLeft"),r=o?n.left:n.right,s=r+i.outerWidth,a=Math.floor(r/this.columnWidth);a=Math.max(0,a);var h=Math.floor(s/this.columnWidth);h-=s%this.columnWidth?0:1,h=Math.min(this.cols-1,h);for(var u=this._getOption("originTop"),d=(u?n.top:n.bottom)+i.outerHeight,l=a;h>=l;l++)this.colYs[l]=Math.max(d,this.colYs[l])},n._getContainerSize=function(){this.maxY=Math.max.apply(Math,this.colYs);var t={height:this.maxY};return this._getOption("fitWidth")&&(t.width=this._getContainerFitWidth()),t},n._getContainerFitWidth=function(){for(var t=0,e=this.cols;--e&&0===this.colYs[e];)t++;return(this.cols-t)*this.columnWidth-this.gutter},n.needsResizeLayout=function(){var t=this.containerWidth;return this.getContainerWidth(),t!=this.containerWidth},i}); \ No newline at end of file