From e70d3bbda64d5a60d5905c7ad94546f9059d36b5 Mon Sep 17 00:00:00 2001
From: riggraz <riccardo.graziosi97@gmail.com>
Date: Mon, 23 Sep 2019 17:06:32 +0200
Subject: [PATCH] Add default favicon and logo

---
 .env-example                                    |   2 ++
 app/javascript/images/favicon.png               | Bin 0 -> 1957 bytes
 app/javascript/images/logo.png                  | Bin 0 -> 1957 bytes
 app/javascript/packs/application.js             |   2 ++
 app/javascript/stylesheets/general/_navbar.scss |   4 ++++
 app/views/layouts/_header.html.erb              |   5 +++++
 app/views/layouts/application.html.erb          |   2 ++
 config/application.rb                           |   4 ++++
 8 files changed, 19 insertions(+)
 create mode 100644 app/javascript/images/favicon.png
 create mode 100644 app/javascript/images/logo.png

diff --git a/.env-example b/.env-example
index 11a53b5b..090b05d6 100644
--- a/.env-example
+++ b/.env-example
@@ -6,4 +6,6 @@ POSTGRES_PASSWORD=yourpasswordhere
 APP_NAME="You App Name Here"
 
 EMAIL_CONFIRMATION=0
+
+SHOW_LOGO=1
 POSTS_PER_PAGE=15
\ No newline at end of file
diff --git a/app/javascript/images/favicon.png b/app/javascript/images/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3e472fdde471e09cbc2e69e1db5838465d5c9aa
GIT binary patch
literal 1957
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

literal 0
HcmV?d00001

diff --git a/app/javascript/images/logo.png b/app/javascript/images/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3e472fdde471e09cbc2e69e1db5838465d5c9aa
GIT binary patch
literal 1957
zcmV;W2U_@vP)<h;3K|Lk000e1NJLTq002M$002M;1ONa40ARUQ00004XF*Lt006O%
z3;baP0000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00002
zVoOIv0063uBQgL0010qNS#tmY4#WTe4#WYKD-Ig~000McNliru;|UiIH7#+feG&iw
z26IV7K~!kowV7#bR8<tmf0R<`7EqC5H(P`T3bF;$$RdFP5rRTk15u!gfd~;0L8D;{
z2vs2jQCdO+N)sBbY@$Kb2*naBmNdZv0V#`A!IC0E%e2z=`C-nxb7$Ur)0uX9?uX91
zXZfFZ?>o!A1rKGihi<erJ<3)_+Ox7Ts9_BeZ3Z6BV(wtD(Vks`fq}tUGTQ_`le2<Q
zV#ki4PS^$phe-)3cmjJg>n=K2MFwgD1_rgPq+>|HJF=2mAM5?BVl#yGpC(qp3$2Eq
zNQGw6v_8cuxLjCsc#9fM<p<JR4BmsUHB0x&=4JW4#45a5SeZa72Q<ZcvWW>AJcjqF
z*Q^{M6&NK?*;a**h4qv?kD^>t|BKnQ3j+Rmu4&pA887qwWM+$1WrwhOs+kCub5}D{
zM1KG}kii?|ah!50sGyu<<gt_t`L_FWLesj-axJr@$!w0Z1HHUv<H@H<8EarWyZOiG
zi}sA$>?Vf>_1r{0@m}`QogG*&tY<8or}@PZ(%&d!n8nsm;jJ|%!W64Yy|XX<$`JBw
zciKfImAGtqc?_o5GHceFzs-qo#kwJX`?AkRDV()rY0tGBp_r4L<G##9k<L(tF^*^@
zl|>b+X!Nnw#|KTL-YN-uQyj;%Wi4kRop7Q~EcA+<ABppkI4qnVR^>2mV_;CDy#=Ik
zMVYH+zP4pf6vhIomCj`?svufYa+Q5Z?-iw)YGxo+%GBp{X%^h1E_|W%su-Z=XUSZ?
zz1k#UpON=WSMU#58Zfv?%Xpw%=q+n=MrJ11tAz812)qI$@TaPaV}phV7{`6FP)R&6
zPoA#O-bv+ERj-Gr*uTf97Qq7y=U=gMnhaHv=Q=C2r&KMvS%^jk3};7~ssNi7PdUFo
zKpOY7FlyqZR>1?z^~#QS?E=u7#%QhC)>gxVr_LJGF**>10ulc$L@imQYDNnJ5l@j_
zYhX}F-~k5HC=J;Y%?sy<x49vM2iPfAKWR=dLB4=HLFBzaC{9`%7mxcF+#;TC2q`?k
zhhlk?KcPtFXXwv}@oH`TeA-jQ%g;g%52&-zBxjLA5pl|X;RHfXnQnA*!Dv?Ns}5B^
zg0EQJEPOVFb|*g|Op09%QTD3S{pP<2>1O=9un_};FCAR?ND!vlE1N0vIa}@ql~7kX
z!f#eGD{T4W{ipa+$$+W0+$gO#w0FVd;!%e$y{lx|Q}zI!bMXz1@E#+57BYsPgn!nn
zZ*<cmTo&#T3w#={lg~Lx$OiR9S{-=S=4f$;Jq*`mqB(}ad53J4#3c-ldKph-H5Y6w
zTaPR(b3EakCrbrjEW0eNwuh40slg9mzjjRX9!sps+k~}?Z&f$w85fvHFqBN8cBV8N
zy;G`Nw)qSX2`d(WI9_D0S9fGk5MY67#{#cYbrUCfn*oFau`+kSs#Yc~v`(?i<Fsb#
zs@>g=4@Ihm#(iGiM4A`>mNcmrs+MIs$T}v_S$m&}s-rQu*GyB@SvyJBuwJv%nF*}p
zATA6HZuu%k`|MXErL0g_brGyqL0ZEQNBAg;m4zanl-U$kP^v=E96ssz3EOYAiDH!(
zN2qgBHOUSR6e`URq@IkU*zz&Dhfj0Xjcx3s%yOS+U~pVccfGhNGbd~--h7`R8$^+f
zwOY#9$2O;qqaDdiCzs#7l<JrbKtJW+YZlEo6*KM|uq>~eSA&b>FpVSvrWD@Qt{9t`
zCT88wHziy>v|X)E7%)Ry_)EMKNH=Up;bckJc-qwCwz;gU+zHmv6X?Pnk*Z>DfNhK;
zC2~%TtpOkd^Vp)(n=-o-fHkUUCA1FQO#@{)E9G6xNY|5+nXY;R;Z(}D^$!I+!1rQ)
zG60J$oA9tixqDS63;(-7Ob50<xsv}DvL84qv$J_fes!0q{|10XN-JdKxjX3##5fl2
z89=&h*tNi3uK8OpfChHRuLXYPE&z+<1}v9`(5(PGCPl<WqMsG$LxS83)zLMS@Bp8x
zKr<cqnb9&1DF=3`wkG71DygQ4sRH7;Q#Bj<#j^kPsuG5jwyNyr<bZiCx4A9gA=;<E
zwL0J)6~X+2C$K1RQ!R76uI4@Wz54mV#Vl&tW(5GoN;J5~bxJ7l>Y-gNyj2a#h1-r{
zSk0KWh6hNZz|!FvG_toPwJ(@|#p%?YnT#NjBn&FKP7wuMX^El#0e}Wtl7ucqF#rGn
zC3HntbYx+4WjbSWWnpw>05UK!IV~_bEiyAyF*G_gGdeUiD=;uRFfir;85;lq03~!q
zSaf7zbY(hiZ)9m^c>ppnF*z+TIW00XR53I<H8VOiH7hVMIxsMoT%o4`000?uMObuG
rZ)S9NVRB^vcXxL#X>MzCV_|S*E^l&Yo9;Xs00000NkvXXu0mjfJq=%v

literal 0
HcmV?d00001

diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index c494485d..caf4caa6 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -10,6 +10,8 @@ require("channels")
 
 require("./bootstrap_custom")
 require("../stylesheets/main")
+require("../images/favicon.png")
+require("../images/logo.png")
 
 // Uncomment to copy all static images under ../images to the output folder and reference
 // them with the image_pack_tag helper in views (e.g <%= image_pack_tag 'rails.png' %>)
diff --git a/app/javascript/stylesheets/general/_navbar.scss b/app/javascript/stylesheets/general/_navbar.scss
index c08f4571..37ed79b9 100644
--- a/app/javascript/stylesheets/general/_navbar.scss
+++ b/app/javascript/stylesheets/general/_navbar.scss
@@ -18,6 +18,10 @@
     font-weight: 700;
   }
 
+  .logo img {
+    width: 48px;
+  }
+
   .boardsNav {
     .nav-item {
       @extend
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 1ec01108..bb34729e 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -1,5 +1,10 @@
 <nav class="navbar navbar-expand-md navbar-light">
   <div class="container">
+    <%=
+      if Rails.application.show_logo?
+        link_to image_tag(asset_pack_path('media/images/logo.png')), root_path, class: 'logo navbar-brand'
+      end
+    %>
     <%= link_to Rails.application.name, root_path, class: 'navbar-brand' %>
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index c73ad129..cfaca72e 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -10,6 +10,8 @@
 
     <%= stylesheet_pack_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
+
+    <%= favicon_link_tag asset_pack_path('media/images/favicon.png') %>
   </head>
 
   <body>
diff --git a/config/application.rb b/config/application.rb
index 6b51a91b..56c979a4 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -24,6 +24,10 @@ module App
       ENV["EMAIL_CONFIRMATION"] == "1"
     end
 
+    def show_logo?
+      ENV["SHOW_LOGO"] == "1"
+    end
+
     def posts_per_page
       ENV["POSTS_PER_PAGE"].to_i
     end