From 25f3011c54506ebf7038680e2928e2076bcc98d7 Mon Sep 17 00:00:00 2001
From: Chris Kankiewicz <Chris@ChrisKankiewicz.com>
Date: Fri, 31 Jan 2020 15:18:40 -0700
Subject: [PATCH] Moved views out of resources folder and removed pre-compiled
 resouces from release artifacts

---
 Makefile                                         |   9 ++++++---
 app/assets/.gitignore                            |   1 -
 app/resources/images/favicon.dark.png            | Bin 0 -> 1928 bytes
 app/resources/images/favicon.light.png           | Bin 0 -> 1889 bytes
 app/src/Providers/TwigProvider.php               |   2 +-
 app/{resources => }/views/404.twig               |   0
 app/{resources => }/views/components/file.twig   |   0
 app/{resources => }/views/components/footer.twig |   0
 .../views/components/google-analytics.twig       |   0
 app/{resources => }/views/components/header.twig |   0
 app/{resources => }/views/components/readme.twig |   0
 .../views/components/scroll-to-top.twig          |   0
 app/{resources => }/views/index.twig             |   0
 app/{resources => }/views/layouts/app.twig       |   0
 webpack.mix.js                                   |   2 ++
 15 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 app/resources/images/favicon.dark.png
 create mode 100644 app/resources/images/favicon.light.png
 rename app/{resources => }/views/404.twig (100%)
 rename app/{resources => }/views/components/file.twig (100%)
 rename app/{resources => }/views/components/footer.twig (100%)
 rename app/{resources => }/views/components/google-analytics.twig (100%)
 rename app/{resources => }/views/components/header.twig (100%)
 rename app/{resources => }/views/components/readme.twig (100%)
 rename app/{resources => }/views/components/scroll-to-top.twig (100%)
 rename app/{resources => }/views/index.twig (100%)
 rename app/{resources => }/views/layouts/app.twig (100%)

diff --git a/Makefile b/Makefile
index c19cbbf..5e9808c 100644
--- a/Makefile
+++ b/Makefile
@@ -20,15 +20,18 @@ test: # Run coding standards/static analysis checks and tests
 tunnel: # Expose the application via secure tunnel
 	@ngrok http -host-header=rewrite http://directory-lister.local:80
 
+clear-assets: # Clear the compiled assets
+	@rm app/assets/* -rfv
+
 clear-cache: # Clear the application cache
 	@rm app/cache/* -rfv
 
 tar: # Generate tarball
-	@tar --verbose --create --gzip --exclude-vcs --exclude app/cache/* \
+	@tar --verbose --create --gzip --exclude-vcs  --exclude app/cache/* --exclude app/resources \
 		--file artifacts/$(ARTIFACT_NAME).tar.gz $(ARTIFACT_FILES)
 
 zip: # Generate zip file
-	@zip --exclude "*.git*" --exclude "app/cache/**" \
+	@zip --verbose --exclude "*.git*" "app/cache/**" "app/resources/*" \
 		--recurse-paths artifacts/$(ARTIFACT_NAME).zip $(ARTIFACT_FILES)
 
-artifacts: production tar zip # Generate release artifacts
+artifacts: clear-assets production tar zip # Generate release artifacts
diff --git a/app/assets/.gitignore b/app/assets/.gitignore
index 84c1711..d6b7ef3 100644
--- a/app/assets/.gitignore
+++ b/app/assets/.gitignore
@@ -1,3 +1,2 @@
 *
-!/images/
 !.gitignore
diff --git a/app/resources/images/favicon.dark.png b/app/resources/images/favicon.dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..b54f5dfa34e0be2c1779625e5547a0772d258dd9
GIT binary patch
literal 1928
zcmV;32Y2|1P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru<N*W-5)hbEeB1y42Ng*~
zK~#9!<(q9#RM#2Df6v_oS4EPNg^V?wq)j6hOxjrEBsIK6L2c8fcE*|FOqCi#Q;=Y0
z;xy^>1Cwu&))EzrFrk`uu+w&uj%}I>rXUo?PBpeRSjkjvv{MIMUJS~zdw1{C4}kTB
zm)&KTW#Rv6@1AqdJ<tE1=Q+>Ixk7~Td|qpcfj<*8UC<>Ui-Au8cLNE--L3(BK(B~&
zDArlQX!ohD<&FB4U6GuhL}JjQwM~y17Wp8#3h9%0jtaD^NWED8Lwg%?PE1<@O4c1u
zRKKTCVGHnuh`cW4j0is)aM<?O9)7ZaS`hH!nzkgb<ts(BWO!*$1$qT``{Rt)_r06Z
z8zll%iq<rLN0c7}$wUV|qP*%{nYpK|Ospv*plD6w=S7W!z*m?aXf<rU&3oQkbuQur
z6z4XrN2GSxiccr>gA`WQXZ|uG1eBGjaiy*KC%|^5GemYJKasH`P?ZRXfU*tk@vcw0
z52$KBv4J|XdwxOn$>rvx2`Jmp9)IPk>mA^$#1KSz*V{9H{X`@f6IpuKRaZ@{2|w&X
zeJ$QOaImaQjgSc_&THPKu!$Ijs^)jKHNO^;3T(@5+Mpu8Vg^7}H&!)d9}1X&l6CJt
zX!-3YfxDO)xN2F(vVBK0&Ih0ZDwf~=)(jFJ;4U$&14FUZ1S_C8w|Og~HRBo%8>Brx
zhdJ|X_<a@~CkAnc9GWN(ERExyh4FW^oImZRw^PGOL_uYJ*1<6ecyUczk{7cB#W~(6
zU&?W?_2m^euK#qngSRU?Lz>akTb-=kkT$xbf8`n#J3gT2a@Yvyit}2j6-_yPBY)U$
zZZ+|4N5whOD2{oy+pg^)&nWxphsJD6N={&V`7(aJ{|r8JbjQx;RW6=2@eBm?xD<1a
zya2p<2LUDPjwf1v&$g*nPRHE1aodxU6ZqbbR*c)n)!EN$#is&OLzU7k-}v)SNAd|b
zjG+2Gg;N;MhZW9y7m&K#5oq_Mxo+QcqwNBlW7*8#u9g!x%Fo`S0!3?^9#e~@A@4Cs
z4jy<oa66zDeBADfVxT};$?9W|?m3!u$_`*y<WFX^Nnf^z^ks_z?(ZJ(vSa=6sIC~l
z!A9VeF|-qt$1H=uY5?Q;yw((uG-e;ZSeV`Dv=0?6CYK!^ber_`To1UvXV5n-7J=Pi
zWZDgM>13VF4_Yr$SN<O&RA-5xA&_)K(bTYMRa8UX;GZv|sfHjAMRVepFZG3G9M|Q+
zP~xz~c2#jA8Z`pmDsSi8rK#MLoDkCers=1x;R5GQnZd6@!D&ZyK{Qvur4B#kMQ5U;
zg2DoW|Cgv|A9RR-Sq+1s!wIt!LcblAengX^HHXhEv5{YzN|N(VP5evazxnOHE>t6?
z0{wOobt&8*Edn;}NN3@Fqt{tiJ+lNcgm)@CBSV7XvLo^ls$Y&40b>b2f~UTo%HvOc
z7Rx_+N^Iboht~R!dH+!G{)CEl*e%tL>F&VJn;$=BTSB6P^#zY`zP*hLr+q=10O>Fc
zkq>8rJxjUI5rPV6yWvw?%TP*S@(LAIgC4v$Yni6D*x#sM*|jb2Si2H>O6-vpi@3KU
zaEH?4@lo}Ie?`{^68>J@l;avs<Y@y)$OI%LI!H(id<nV-yg+mb5Y?k2ju5EU1#`3e
zx<B^4;9;2!fV~YlCj<gEhG+je$bT>P#<299scOji8{AqNI|!5qq{G)?XYoH+_@E7&
zJ@`#jt*A5b=E$!b1PnNA`{xe&e@KAUA)gm6{WB(2p~pSfUUPFW1VHWKC;L&^Gu5*h
zbemxr$K$pF)P1SA`JC}B;jk4i6~L9LB%twkA5D6U-tOykoOB1$wbQ4b-Q%WFit~<b
z0p6TS67Em8<NS1dXm5VN&$-i{z$(L{n<|fF|9o5mK&3dZxdm7`!=nG@%KFS~ZcBg~
zqtRs8e4Bx*Gf4P8%QC*pDB0gpQ(}AGTXjy6tusY>HF$Qk6Jlc$08mw*`5Q!b#k}w$
zJFEVf_4Zip<0eHbk7T@r=z$oPzb@s8j913%U`%8-O;<u8@P`<D_rEv0=NC+LY<|MD
zc=gHUX0q3M2B?i4S6_c&b|-u*EXU<<)~2Go=A8mBP3s^}q`c}##>)g)?+ZGT*_PM*
zO+{;&ekaO4L3pn6NLEk>yhF-|et&h#=ftoM2xLqbCr6-QZ++H<pc5mL*<gl0n=1!W
zq7~T*yt21GvxX2$+>_3TZ_jSL+nggWpi&A<RfVZrRbKb0XLt3{+(~(?VJis~Wj7{B
zoD?E#0ZEU9)B+z`NG)D}O;uCQwJ?ntew3^}_Nd=rqoBDU4+pZ{jsXie4cefpbt7r4
zFq0Zt6lOO%?G7VTEYcYIsCx0Rs*Lved=Jn8oJF<WG_|F=DaRGb`TY+k(UBw2;qxs3
O0000<MNUMnLSTZ16Pv#P

literal 0
HcmV?d00001

diff --git a/app/resources/images/favicon.light.png b/app/resources/images/favicon.light.png
new file mode 100644
index 0000000000000000000000000000000000000000..ced572ebdb256e324fdf53e72eb01eb572809553
GIT binary patch
literal 1889
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
bxxfDb(xicXq<68l00000NkvXXu0mjf#M!I7

literal 0
HcmV?d00001

diff --git a/app/src/Providers/TwigProvider.php b/app/src/Providers/TwigProvider.php
index 10655d1..b329ea3 100644
--- a/app/src/Providers/TwigProvider.php
+++ b/app/src/Providers/TwigProvider.php
@@ -50,7 +50,7 @@ class TwigProvider
      */
     public function __invoke(): void
     {
-        $twig = new Twig(new FilesystemLoader('app/resources/views'));
+        $twig = new Twig(new FilesystemLoader('app/views'));
 
         $twig->getEnvironment()->setCache(
             $this->config->get('view.cache', 'app/cache/views')
diff --git a/app/resources/views/404.twig b/app/views/404.twig
similarity index 100%
rename from app/resources/views/404.twig
rename to app/views/404.twig
diff --git a/app/resources/views/components/file.twig b/app/views/components/file.twig
similarity index 100%
rename from app/resources/views/components/file.twig
rename to app/views/components/file.twig
diff --git a/app/resources/views/components/footer.twig b/app/views/components/footer.twig
similarity index 100%
rename from app/resources/views/components/footer.twig
rename to app/views/components/footer.twig
diff --git a/app/resources/views/components/google-analytics.twig b/app/views/components/google-analytics.twig
similarity index 100%
rename from app/resources/views/components/google-analytics.twig
rename to app/views/components/google-analytics.twig
diff --git a/app/resources/views/components/header.twig b/app/views/components/header.twig
similarity index 100%
rename from app/resources/views/components/header.twig
rename to app/views/components/header.twig
diff --git a/app/resources/views/components/readme.twig b/app/views/components/readme.twig
similarity index 100%
rename from app/resources/views/components/readme.twig
rename to app/views/components/readme.twig
diff --git a/app/resources/views/components/scroll-to-top.twig b/app/views/components/scroll-to-top.twig
similarity index 100%
rename from app/resources/views/components/scroll-to-top.twig
rename to app/views/components/scroll-to-top.twig
diff --git a/app/resources/views/index.twig b/app/views/index.twig
similarity index 100%
rename from app/resources/views/index.twig
rename to app/views/index.twig
diff --git a/app/resources/views/layouts/app.twig b/app/views/layouts/app.twig
similarity index 100%
rename from app/resources/views/layouts/app.twig
rename to app/views/layouts/app.twig
diff --git a/webpack.mix.js b/webpack.mix.js
index 7d9f9dd..943121c 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -15,6 +15,8 @@ mix.sass('app/resources/sass/app.scss', 'app/assets/app.css').options({
 
 mix.js('app/resources/js/app.js', 'app/assets/app.js');
 
+mix.copyDirectory('app/resources/images', 'app/assets/images');
+
 mix.copyDirectory(
     'node_modules/@fortawesome/fontawesome-free/webfonts',
     'app/assets/webfonts'