upgrade

.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

.ruby-version

@@ -1 +1 @@
-ruby-2.5.5
+2.6.5

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'

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)
+    bcrypt (3.1.13)
-    bindex (0.7.0)
+    bindex (0.8.1)
-    bootsnap (1.4.4)
+    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)
+    crass (1.0.5)
-    devise (4.6.2)
+    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)
+    inherited_resources (1.11.0)
-      actionpack (>= 5.0, < 6.0)
+      actionpack (>= 5.0, < 6.1)
       has_scope (~> 0.6)
-      railties (>= 5.0, < 6.0)
+      railties (>= 5.0, < 6.1)
-      responders (~> 2.0)
+      responders (>= 2, < 4)
-    jquery-rails (4.3.3)
+    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)
+    minitest (5.13.0)
-    msgpack (1.2.10)
+    msgpack (1.3.1)
     mysql2 (0.5.2)
-    nio4r (2.3.1)
+    nio4r (2.5.2)
-    nokogiri (1.10.3)
+    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)
+    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.2, >= 2.2.2)
+      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)
+    rake (13.0.1)
-    ransack (2.1.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)
+    responders (3.0.0)
-      actionpack (>= 4.2.0, < 6.0)
+      actionpack (>= 5.0)
-      railties (>= 4.2.0, < 6.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)
+    sass-rails (5.1.0)
-      railties (>= 4.0.0, < 6)
+      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)
+    sassc (2.2.1)
-      activesupport (>= 4.2)
+      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)
+    websocket-extensions (0.1.4)
-    will_paginate (3.1.7)
+    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

README.md

@@ -1,24 +1,16 @@
 # Ambiente Já!
 
-This README would normally document whatever steps are necessary to get the
+### = fase#01
-application up and running.
 
-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
+[   ] Fix informativo links
-
-* Services (job queues, cache servers, search engines, etc.)
-
-* Deployment instructions
-
-* ...

app/assets/javascripts/application.js

@@ -14,8 +14,8 @@
 
 
 $(document).ready(function(){
-  var msnry = new Masonry( '#infos', {
+  // var msnry = new Masonry( '#infos', {
-    columnWidth: 180,
+  //   columnWidth: 180,
-    itemSelector: '.card'
+  //   itemSelector: '.card'
-  });
+  // });
 });

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{
+#all{
-  background-color: green;
+  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;
+  /* color: black; */
-  width: 200px;
+  border-top: 1px solid lightgray;
-  float: left;
+  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;
 }

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

app/views/layouts/application.haml

@@ -11,5 +11,7 @@
 
   %body
 
-    %h1= "Ambiente Já!"
+    #all
+      #topo
+        = link_to (image_tag "logo.png"), "/"
       = yield

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}")
+      %span.link= link_to i.titulo.html_safe, CGI.unescapeHTML("/informativo/#{i.id}")
-      .date= "#{i.data_inc}"
+      %p.tags= i.tags
+      .date= "#{i.data_inc} | #{i.operador_inc.downcase.capitalize}"
 
 #nav
   = will_paginate @informativos

app/views/page/informativo.haml

@@ -1,3 +1,15 @@
-!= @informativo.Descricao
+// :javascript
-%hr
+//   $(document).ready(function(){
-!= ap @informativo
+//     $("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

config/environments/development.rb

@@ -27,6 +27,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
 

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