Skip to content

Commit

Permalink
Comienzo de tema
Browse files Browse the repository at this point in the history
  • Loading branch information
vtamara committed Apr 28, 2022
1 parent 086d4a8 commit 4aa2b32
Show file tree
Hide file tree
Showing 23 changed files with 418 additions and 77 deletions.
12 changes: 6 additions & 6 deletions .env.plantilla
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ if (test "$BD_CLAVE" = "") then {
export BD_CLAVE=xyz
} fi;
if (test "$BD_DES" = "") then {
export BD_DES=sivel21gen_des
export BD_DES=sifasol_des
} fi;
if (test "$BD_PRUEBA" = "") then {
export BD_PRUEBA=sivel21gen_pru
export BD_PRUEBA=sifasol_pru
} fi;
if (test "$BD_PRO" = "") then {
export BD_PRO=sivel21gen_pro
export BD_PRO=sifasol_pro
} fi;


Expand All @@ -30,10 +30,10 @@ if (test "$CONFIG_HOSTS" = "") then {
export CONFIG_HOSTS="192.168.10.1"
} fi;
if (test "$RUTA_RELATIVA" = "") then {
export RUTA_RELATIVA=/sivel2_1/
export RUTA_RELATIVA=/fasol/si/
} fi;
if (test "$DIRAP" = "") then {
export DIRAP=/var/www/htdocs/sivel2_1
export DIRAP=/var/www/htdocs/si_fasol
} fi;
if (test "$RAILS_ENV" = "") then {
export RAILS_ENV=development
Expand All @@ -57,7 +57,7 @@ if (test "" = "") then { # Puerto para recarga viva

# Despliegue en modo producción con unicorn
if (test "$RC" = "") then {
export RC=sivel2_1
export RC=sifasol
} fi;
if (test "$PUERTOUNICORN" = "") then {
export PUERTOUNICORN=3015
Expand Down
9 changes: 1 addition & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

# Ignore bundler config.
/.bundle
config/database.yml

# Ignore the default SQLite database.
/db/*.sqlite3
Expand All @@ -18,15 +17,9 @@ config/database.yml
*~
*core

public/assets/*
config/initializers/sip.rb
config/application.rb
config/routes.rb
archivos/
public/heb412/
public/sivel2/
public/sivel2_1/
config/initializers/punto_montaje.rb
public/fasol/si/assets/
.byebug_history
app/views/sip/hogar/
bin/u.sh
Expand Down
120 changes: 60 additions & 60 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/kreeti/kt-paperclip.git
revision: 4d95c60665fbb5d453a3f710977a259760996cd9
revision: 7f73b7442743f57fb957b4bb54c1bca11ddd1c72
specs:
kt-paperclip (7.1.1)
activemodel (>= 4.2.0)
Expand Down Expand Up @@ -28,7 +28,7 @@ GIT

GIT
remote: https://github.com/pasosdeJesus/heb412_gen.git
revision: a29d8f4e565d846901ede6197123fd3692672575
revision: 3e07e6dea0075b05244991a4b0efb353a3388cd8
branch: main
specs:
heb412_gen (2.1a1)
Expand All @@ -39,7 +39,7 @@ GIT

GIT
remote: https://github.com/pasosdeJesus/mr519_gen.git
revision: 8caaec2b4010033519d0f96102a719d43d943d21
revision: 134eafef0eb23165f5621c92f64396c7ed99ff96
branch: main
specs:
mr519_gen (2.1a1)
Expand All @@ -48,7 +48,7 @@ GIT

GIT
remote: https://github.com/pasosdeJesus/sip.git
revision: ea573fd43fe023525e692706652f1bac3ffbcacb
revision: d5e642b8080f51c98e5a263c95f1aad2916b177c
branch: main
specs:
sip (2.1a1)
Expand All @@ -66,7 +66,7 @@ GIT

GIT
remote: https://github.com/pasosdeJesus/sivel2_gen.git
revision: d2bcd888de96bae1f5c6f6f1fd8364f3e55828a2
revision: 847bae8c85f8648fd1fd505fe50202790fb6f005
branch: main
specs:
sivel2_gen (2.1a1)
Expand All @@ -93,67 +93,67 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (7.0.2.3)
actionpack (= 7.0.2.3)
activesupport (= 7.0.2.3)
actioncable (7.0.2.4)
actionpack (= 7.0.2.4)
activesupport (= 7.0.2.4)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.2.3)
actionpack (= 7.0.2.3)
activejob (= 7.0.2.3)
activerecord (= 7.0.2.3)
activestorage (= 7.0.2.3)
activesupport (= 7.0.2.3)
actionmailbox (7.0.2.4)
actionpack (= 7.0.2.4)
activejob (= 7.0.2.4)
activerecord (= 7.0.2.4)
activestorage (= 7.0.2.4)
activesupport (= 7.0.2.4)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.2.3)
actionpack (= 7.0.2.3)
actionview (= 7.0.2.3)
activejob (= 7.0.2.3)
activesupport (= 7.0.2.3)
actionmailer (7.0.2.4)
actionpack (= 7.0.2.4)
actionview (= 7.0.2.4)
activejob (= 7.0.2.4)
activesupport (= 7.0.2.4)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.2.3)
actionview (= 7.0.2.3)
activesupport (= 7.0.2.3)
actionpack (7.0.2.4)
actionview (= 7.0.2.4)
activesupport (= 7.0.2.4)
rack (~> 2.0, >= 2.2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.2.3)
actionpack (= 7.0.2.3)
activerecord (= 7.0.2.3)
activestorage (= 7.0.2.3)
activesupport (= 7.0.2.3)
actiontext (7.0.2.4)
actionpack (= 7.0.2.4)
activerecord (= 7.0.2.4)
activestorage (= 7.0.2.4)
activesupport (= 7.0.2.4)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.2.3)
activesupport (= 7.0.2.3)
actionview (7.0.2.4)
activesupport (= 7.0.2.4)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (7.0.2.3)
activesupport (= 7.0.2.3)
activejob (7.0.2.4)
activesupport (= 7.0.2.4)
globalid (>= 0.3.6)
activemodel (7.0.2.3)
activesupport (= 7.0.2.3)
activerecord (7.0.2.3)
activemodel (= 7.0.2.3)
activesupport (= 7.0.2.3)
activestorage (7.0.2.3)
actionpack (= 7.0.2.3)
activejob (= 7.0.2.3)
activerecord (= 7.0.2.3)
activesupport (= 7.0.2.3)
activemodel (7.0.2.4)
activesupport (= 7.0.2.4)
activerecord (7.0.2.4)
activemodel (= 7.0.2.4)
activesupport (= 7.0.2.4)
activestorage (7.0.2.4)
actionpack (= 7.0.2.4)
activejob (= 7.0.2.4)
activerecord (= 7.0.2.4)
activesupport (= 7.0.2.4)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.2.3)
activesupport (7.0.2.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand Down Expand Up @@ -275,7 +275,7 @@ GEM
json (2.6.1)
kgio (2.11.4)
libxml-ruby (3.2.2)
loofah (2.16.0)
loofah (2.17.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
Expand Down Expand Up @@ -332,20 +332,20 @@ GEM
rack (>= 2.0.0)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (7.0.2.3)
actioncable (= 7.0.2.3)
actionmailbox (= 7.0.2.3)
actionmailer (= 7.0.2.3)
actionpack (= 7.0.2.3)
actiontext (= 7.0.2.3)
actionview (= 7.0.2.3)
activejob (= 7.0.2.3)
activemodel (= 7.0.2.3)
activerecord (= 7.0.2.3)
activestorage (= 7.0.2.3)
activesupport (= 7.0.2.3)
rails (7.0.2.4)
actioncable (= 7.0.2.4)
actionmailbox (= 7.0.2.4)
actionmailer (= 7.0.2.4)
actionpack (= 7.0.2.4)
actiontext (= 7.0.2.4)
actionview (= 7.0.2.4)
activejob (= 7.0.2.4)
activemodel (= 7.0.2.4)
activerecord (= 7.0.2.4)
activestorage (= 7.0.2.4)
activesupport (= 7.0.2.4)
bundler (>= 1.15.0)
railties (= 7.0.2.3)
railties (= 7.0.2.4)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
Expand All @@ -359,9 +359,9 @@ GEM
rails-i18n (7.0.3)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
railties (7.0.2.3)
actionpack (= 7.0.2.3)
activesupport (= 7.0.2.3)
railties (7.0.2.4)
actionpack (= 7.0.2.4)
activesupport (= 7.0.2.4)
method_source
rake (>= 12.2)
thor (~> 1.0)
Expand All @@ -370,7 +370,7 @@ GEM
rake (13.0.6)
redcarpet (3.5.1)
redis (4.6.0)
regexp_parser (2.3.0)
regexp_parser (2.3.1)
reline (0.3.1)
io-console (~> 0.5)
responders (3.0.1)
Expand Down
1 change: 1 addition & 0 deletions app/assets/config/manifest.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
//= link_directory ../../../node_modules/chosen-js .png
//= link recursos_sprockets.js
//= link recursos_sprockets.js.map
//= link_directory ../../../vendor/assets/Beau_Rivage .ttf
//= link_tree ../builds
Binary file modified app/assets/images/logo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions app/assets/stylesheets/personaliza.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
@font-face {
font-family: "Beau Rivage";
src: url('/assets/BeauRivage-Regular.ttf') format('truetype');
font-display: swap;
}

body {
font-family: Roboto;
}

/* letra titulos*/
h1 {
font-family: "Beau Rivage", serif;
font-weight: bold;
}
2 changes: 1 addition & 1 deletion app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<% if !current_usuario.nil? %>
<%= despliega_abajo "Documentos" do %>
<%= opcion_menu "Manual",
'https://docs.google.com/document/d/1xr1vtkfpWdpM_VrEbHacm44NiMPCzAIcRUS1ENoBrQU/edit?usp=sharing',
'https://docs.google.com/document/d/1uBGmeAopNSa_eNN8egyjiDYiogKh0AuIAg5l2ewZZNo/edit?usp=sharing',
target: '_blank', desplegable: true %>
<%= opcion_menu "Nube", heb412_gen.sisini_path,
desplegable: true %>
Expand Down
68 changes: 68 additions & 0 deletions config/application.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
require_relative 'boot'
require 'rails/all'

# Requiere gemas listas en el Gemfile, incluyendo las
# limitadas a :test, :development, o :production.
Bundler.require(*Rails.groups)

module Sivel2
class Application < Rails::Application
# Settings in config/environments/* take precedence over those specified here.
config.load_defaults 7.0

config.action_view.form_with_generates_remote_forms = false

# Application configuration should go into files in config/initializers
# -- all .rb files in that directory are automatically loaded.

# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
config.time_zone = 'America/Bogota'

# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
config.i18n.default_locale = :es

config.active_record.schema_format = :sql

puts "CONFIG_HOSTS="+ENV.fetch('CONFIG_HOSTS', 'defensor.info').to_s
config.hosts.concat(
ENV.fetch('CONFIG_HOSTS', 'defensor.info').downcase.split(";"))

config.relative_url_root = ENV.fetch('RUTA_RELATIVA', "/sivel2.1")

config.action_dispatch.default_headers = {
'X-Frame-Options' => 'ALLOW'
}

config.x.origen_cors = ENV.fetch('ORIGEN_CORS','').split(',')
puts "config.x.origen_cors=#{config.x.origen_cors.inspect}"

# sip
config.x.formato_fecha = ENV.fetch('FORMATO_FECHA', 'dd/M/yyyy')

# heb412
config.x.heb412_ruta = Pathname(
ENV.fetch('HEB412_RUTA', Rails.root.join('public', 'heb412').to_s)
)

# sivel2
config.x.sivel2_consulta_web_publica =
(ENV['SIVEL2_CONSWEB_PUBLICA'] && ENV['SIVEL2_CONSWEB_PUBLICA'] != '')

config.x.sivel2_consweb_max = ENV.fetch('SIVEL2_CONSWEB_MAX', 2000)

config.x.sivel2_consweb_pie = ENV.fetch('SIVEL2_CONSWEB_PIE', '')

config.x.sivel2_consweb_epilogo = ENV.fetch(
'SIVEL2_CONSWEB_EPILOGO',
"<br>Si requiere más puede suscribirse a SIVeL Pro"
).html_safe

config.x.sivel2_mapaosm_diasatras = ENV.fetch(
'SIVEL2_MAPAOSM_DIASATRAS', 182
)

end
end

Loading

0 comments on commit 4aa2b32

Please sign in to comment.