From c1a1180d1f43a430b38450cb0b64bcd74487b4ae Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Mon, 10 Sep 2018 17:22:05 +0200 Subject: [PATCH] Moved frontend, templates and lang to resources --- contrib/Dockerfile | 5 +- includes/engelsystem.php | 2 +- includes/pages/guest_credits.php | 2 +- includes/pages/user_shifts.php | 2 +- includes/sys_template.php | 55 +++++++++++------- .../smiles/icon_cry.gif => emojis/cry.gif} | Bin .../smiles/icon_evil.gif => emojis/evil.gif} | Bin .../smiles/icon_lol.gif => emojis/lol.gif} | Bin .../smiles/icon_mad.gif => emojis/mad.gif} | Bin .../icon_question.gif => emojis/question.gif} | Bin .../icon_redface.gif => emojis/redface.gif} | Bin .../icon_rolleyes.gif => emojis/rolleyes.gif} | Bin .../smiles/icon_frown.gif => emojis/sad.gif} | Bin .../icon_smile.gif => emojis/smile.gif} | Bin .../smiles/icon_wind.gif => emojis/wind.gif} | Bin public/pic/smiles/aerger2.gif | Bin 561 -> 0 bytes public/pic/smiles/alien.gif | Bin 933 -> 0 bytes public/pic/smiles/blush.gif | Bin 954 -> 0 bytes public/pic/smiles/boggle.gif | Bin 951 -> 0 bytes public/pic/smiles/bounce.gif | Bin 2757 -> 0 bytes public/pic/smiles/bun.gif | Bin 956 -> 0 bytes public/pic/smiles/candycane.gif | Bin 904 -> 0 bytes public/pic/smiles/cheesy.gif | Bin 933 -> 0 bytes public/pic/smiles/dead.gif | Bin 961 -> 0 bytes public/pic/smiles/depressed.gif | Bin 977 -> 0 bytes public/pic/smiles/ginger.gif | Bin 980 -> 0 bytes public/pic/smiles/hirsch1.gif | Bin 1262 -> 0 bytes public/pic/smiles/huh.gif | Bin 939 -> 0 bytes public/pic/smiles/icon_arrow.gif | Bin 170 -> 0 bytes public/pic/smiles/icon_biggrin.gif | Bin 172 -> 0 bytes public/pic/smiles/icon_confused.gif | Bin 171 -> 0 bytes public/pic/smiles/icon_cool.gif | Bin 172 -> 0 bytes public/pic/smiles/icon_eek.gif | Bin 170 -> 0 bytes public/pic/smiles/icon_exclaim.gif | Bin 236 -> 0 bytes public/pic/smiles/icon_idea.gif | Bin 176 -> 0 bytes public/pic/smiles/icon_mrgreen.gif | Bin 349 -> 0 bytes public/pic/smiles/icon_neutral.gif | Bin 171 -> 0 bytes public/pic/smiles/icon_razz.gif | Bin 176 -> 0 bytes public/pic/smiles/icon_sad.gif | Bin 171 -> 0 bytes public/pic/smiles/icon_surprised.gif | Bin 174 -> 0 bytes public/pic/smiles/icon_twisted.gif | Bin 238 -> 0 bytes public/pic/smiles/koenig1.gif | Bin 937 -> 0 bytes public/pic/smiles/laser1.gif | Bin 1432 -> 0 bytes public/pic/smiles/love1.gif | Bin 1009 -> 0 bytes public/pic/smiles/moo.gif | Bin 1175 -> 0 bytes public/pic/smiles/nuts.gif | Bin 531 -> 0 bytes public/pic/smiles/robin.gif | Bin 971 -> 0 bytes public/pic/smiles/sheep.gif | Bin 915 -> 0 bytes public/pic/smiles/sick.gif | Bin 940 -> 0 bytes public/pic/smiles/sleep.gif | Bin 1005 -> 0 bytes public/pic/smiles/soppy.gif | Bin 994 -> 0 bytes public/pic/smiles/stress.gif | Bin 1258 -> 0 bytes public/pic/smiles/sweet.gif | Bin 972 -> 0 bytes public/pic/smiles/tired.gif | Bin 929 -> 0 bytes public/pic/smiles/urgh.gif | Bin 980 -> 0 bytes public/pic/smiles/winken1.gif | Bin 3249 -> 0 bytes public/pic/smiles/worm.gif | Bin 945 -> 0 bytes public/pic/smiles/worry.gif | Bin 951 -> 0 bytes .../assets}/angelFont/angelFont.css | 0 .../assets}/angelFont/angelFont.eot | Bin .../assets}/angelFont/angelFont.svg | 0 .../assets}/angelFont/angelFont.ttf | Bin .../assets}/angelFont/angelFont.woff | Bin {frontend => resources/assets}/js/forms.js | 0 .../assets}/js/moment-countdown.js | 0 .../assets}/js/sticky-headers.js | 0 {frontend => resources/assets}/js/vendor.js | 0 .../assets}/themes/base.less | 2 +- .../assets}/themes/theme0.less | 0 .../assets}/themes/theme1.less | 2 +- .../assets}/themes/theme2.less | 2 +- .../assets}/themes/theme3.less | 2 +- .../assets}/themes/theme4.less | 2 +- .../assets}/themes/theme5.less | 2 +- .../assets}/themes/theme6.less | 2 +- .../lang}/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin .../lang}/de_DE.UTF-8/LC_MESSAGES/default.po | 0 .../lang}/pt_BR.UTF.8/LC_MESSAGES/pt_BR.mo | Bin .../lang}/pt_BR.UTF.8/LC_MESSAGES/pt_BR.po | 0 .../views}/errors/default.twig | 0 .../views}/layouts/app.twig | 0 .../views}/layouts/maintenance.html | 0 .../views}/pages/credits.html | 0 .../views}/pages/user-shifts.html | 0 src/Application.php | 6 +- tests/Unit/ApplicationTest.php | 2 + webpack.config.js | 4 +- 87 files changed, 55 insertions(+), 37 deletions(-) rename public/{pic/smiles/icon_cry.gif => emojis/cry.gif} (100%) rename public/{pic/smiles/icon_evil.gif => emojis/evil.gif} (100%) rename public/{pic/smiles/icon_lol.gif => emojis/lol.gif} (100%) rename public/{pic/smiles/icon_mad.gif => emojis/mad.gif} (100%) rename public/{pic/smiles/icon_question.gif => emojis/question.gif} (100%) rename public/{pic/smiles/icon_redface.gif => emojis/redface.gif} (100%) rename public/{pic/smiles/icon_rolleyes.gif => emojis/rolleyes.gif} (100%) rename public/{pic/smiles/icon_frown.gif => emojis/sad.gif} (100%) rename public/{pic/smiles/icon_smile.gif => emojis/smile.gif} (100%) rename public/{pic/smiles/icon_wind.gif => emojis/wind.gif} (100%) delete mode 100644 public/pic/smiles/aerger2.gif delete mode 100644 public/pic/smiles/alien.gif delete mode 100644 public/pic/smiles/blush.gif delete mode 100644 public/pic/smiles/boggle.gif delete mode 100644 public/pic/smiles/bounce.gif delete mode 100644 public/pic/smiles/bun.gif delete mode 100644 public/pic/smiles/candycane.gif delete mode 100644 public/pic/smiles/cheesy.gif delete mode 100644 public/pic/smiles/dead.gif delete mode 100644 public/pic/smiles/depressed.gif delete mode 100644 public/pic/smiles/ginger.gif delete mode 100644 public/pic/smiles/hirsch1.gif delete mode 100644 public/pic/smiles/huh.gif delete mode 100644 public/pic/smiles/icon_arrow.gif delete mode 100644 public/pic/smiles/icon_biggrin.gif delete mode 100644 public/pic/smiles/icon_confused.gif delete mode 100644 public/pic/smiles/icon_cool.gif delete mode 100644 public/pic/smiles/icon_eek.gif delete mode 100644 public/pic/smiles/icon_exclaim.gif delete mode 100644 public/pic/smiles/icon_idea.gif delete mode 100644 public/pic/smiles/icon_mrgreen.gif delete mode 100644 public/pic/smiles/icon_neutral.gif delete mode 100644 public/pic/smiles/icon_razz.gif delete mode 100644 public/pic/smiles/icon_sad.gif delete mode 100644 public/pic/smiles/icon_surprised.gif delete mode 100644 public/pic/smiles/icon_twisted.gif delete mode 100644 public/pic/smiles/koenig1.gif delete mode 100644 public/pic/smiles/laser1.gif delete mode 100644 public/pic/smiles/love1.gif delete mode 100644 public/pic/smiles/moo.gif delete mode 100644 public/pic/smiles/nuts.gif delete mode 100644 public/pic/smiles/robin.gif delete mode 100644 public/pic/smiles/sheep.gif delete mode 100644 public/pic/smiles/sick.gif delete mode 100644 public/pic/smiles/sleep.gif delete mode 100644 public/pic/smiles/soppy.gif delete mode 100644 public/pic/smiles/stress.gif delete mode 100644 public/pic/smiles/sweet.gif delete mode 100644 public/pic/smiles/tired.gif delete mode 100644 public/pic/smiles/urgh.gif delete mode 100644 public/pic/smiles/winken1.gif delete mode 100644 public/pic/smiles/worm.gif delete mode 100644 public/pic/smiles/worry.gif rename {frontend => resources/assets}/angelFont/angelFont.css (100%) rename {frontend => resources/assets}/angelFont/angelFont.eot (100%) rename {frontend => resources/assets}/angelFont/angelFont.svg (100%) rename {frontend => resources/assets}/angelFont/angelFont.ttf (100%) rename {frontend => resources/assets}/angelFont/angelFont.woff (100%) rename {frontend => resources/assets}/js/forms.js (100%) rename {frontend => resources/assets}/js/moment-countdown.js (100%) rename {frontend => resources/assets}/js/sticky-headers.js (100%) rename {frontend => resources/assets}/js/vendor.js (100%) rename {frontend => resources/assets}/themes/base.less (98%) rename {frontend => resources/assets}/themes/theme0.less (100%) rename {frontend => resources/assets}/themes/theme1.less (99%) rename {frontend => resources/assets}/themes/theme2.less (93%) rename {frontend => resources/assets}/themes/theme3.less (96%) rename {frontend => resources/assets}/themes/theme4.less (99%) rename {frontend => resources/assets}/themes/theme5.less (94%) rename {frontend => resources/assets}/themes/theme6.less (99%) rename {locale => resources/lang}/de_DE.UTF-8/LC_MESSAGES/default.mo (100%) rename {locale => resources/lang}/de_DE.UTF-8/LC_MESSAGES/default.po (100%) rename {locale => resources/lang}/pt_BR.UTF.8/LC_MESSAGES/pt_BR.mo (100%) rename {locale => resources/lang}/pt_BR.UTF.8/LC_MESSAGES/pt_BR.po (100%) rename {templates => resources/views}/errors/default.twig (100%) rename {templates => resources/views}/layouts/app.twig (100%) rename {templates => resources/views}/layouts/maintenance.html (100%) rename {templates => resources/views}/pages/credits.html (100%) rename {templates => resources/views}/pages/user-shifts.html (100%) diff --git a/contrib/Dockerfile b/contrib/Dockerfile index f5446e77..a47c935f 100644 --- a/contrib/Dockerfile +++ b/contrib/Dockerfile @@ -5,7 +5,7 @@ RUN composer --no-ansi dump-autoload --optimize FROM node:8-alpine as themes WORKDIR /app -COPY frontend/ /app/frontend +COPY resources/assets/ /app/resources/assets COPY .babelrc package.json webpack.config.js /app/ RUN apk add --no-cache yarn RUN yarn install @@ -17,10 +17,9 @@ COPY bin/ /app/bin COPY config/ /app/config COPY db/ /app/db COPY includes/ /app/includes -COPY locale/ /app/locale COPY public/ /app/public +COPY resources/ /app/resources COPY src/ /app/src -COPY templates/ /app/templates COPY composer.json LICENSE package.json README.md /app/ diff --git a/includes/engelsystem.php b/includes/engelsystem.php index 4c096b43..a5dee186 100644 --- a/includes/engelsystem.php +++ b/includes/engelsystem.php @@ -16,7 +16,7 @@ require __DIR__ . '/includes.php'; * Check for maintenance */ if ($app->get('config')->get('maintenance')) { - echo file_get_contents(__DIR__ . '/../templates/layouts/maintenance.html'); + echo file_get_contents(__DIR__ . '/../resources/views/layouts/maintenance.html'); die(); } diff --git a/includes/pages/guest_credits.php b/includes/pages/guest_credits.php index ecfa8f7c..308e6c94 100644 --- a/includes/pages/guest_credits.php +++ b/includes/pages/guest_credits.php @@ -13,5 +13,5 @@ function credits_title() */ function guest_credits() { - return view(__DIR__ . '/../../templates/pages/credits.html'); + return view(__DIR__ . '/../../resources/views/pages/credits.html'); } diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index 020cfe54..06a77591 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -224,7 +224,7 @@ function view_user_shifts() return page([ div('col-md-12', [ msg(), - view(__DIR__ . '/../../templates/pages/user-shifts.html', [ + view(__DIR__ . '/../../resources/views/pages/user-shifts.html', [ 'title' => shifts_title(), 'room_select' => make_select($rooms, $shiftsFilter->getRooms(), 'rooms', _('Rooms')), 'start_select' => html_select_key( diff --git a/includes/sys_template.php b/includes/sys_template.php index 986270b5..19b0c2fa 100644 --- a/includes/sys_template.php +++ b/includes/sys_template.php @@ -1,5 +1,7 @@ 0, and success if number == 0. @@ -450,26 +452,39 @@ function table_body($array) */ function ReplaceSmilies($msg) { - $msg = str_replace(';o))', '', $msg); - $msg = str_replace(':-))', '', $msg); - $msg = str_replace(';o)', '', $msg); - $msg = str_replace(':)', '', $msg); - $msg = str_replace(':-)', '', $msg); - $msg = str_replace(':(', '', $msg); - $msg = str_replace(':-(', '', $msg); - $msg = str_replace(':o(', '', $msg); - $msg = str_replace(':o)', '', $msg); - $msg = str_replace(';o(', '', $msg); - $msg = str_replace(';(', '', $msg); - $msg = str_replace(';-(', '', $msg); - $msg = str_replace('8)', '', $msg); - $msg = str_replace('8o)', '', $msg); - $msg = str_replace(':P', '', $msg); - $msg = str_replace(':-P', '', $msg); - $msg = str_replace(':oP', '', $msg); - $msg = str_replace(';P', '', $msg); - $msg = str_replace(';oP', '', $msg); - $msg = str_replace('?)', '', $msg); + /** @var Assets $assets */ + $assets = app('twig.extension.assets'); + + foreach ( + [ + ';o))' => 'redface', + ':-))' => 'redface', + ';o)' => 'wind', + ':)' => 'smile', + ':-)' => 'smile', + ':(' => 'sad', + ':-(' => 'sad', + ':o(' => 'sad', + ':o)' => 'lol', + ':D' => 'lol', + ';o(' => 'cry', + ';(' => 'cry', + ';-(' => 'cry', + '8)' => 'rolleyes', + '8o)' => 'rolleyes', + ':P' => 'evil', + ':-P' => 'evil', + ':oP' => 'evil', + ';P' => 'mad', + ';oP' => 'mad', + '?)' => 'question', + ] as $search => $replace + ) { + $msg = str_ireplace($search, sprintf( + '', + sprintf($assets->getAsset('emojis/%s.gif'), $replace) + ), $msg); + } return $msg; } diff --git a/public/pic/smiles/icon_cry.gif b/public/emojis/cry.gif similarity index 100% rename from public/pic/smiles/icon_cry.gif rename to public/emojis/cry.gif diff --git a/public/pic/smiles/icon_evil.gif b/public/emojis/evil.gif similarity index 100% rename from public/pic/smiles/icon_evil.gif rename to public/emojis/evil.gif diff --git a/public/pic/smiles/icon_lol.gif b/public/emojis/lol.gif similarity index 100% rename from public/pic/smiles/icon_lol.gif rename to public/emojis/lol.gif diff --git a/public/pic/smiles/icon_mad.gif b/public/emojis/mad.gif similarity index 100% rename from public/pic/smiles/icon_mad.gif rename to public/emojis/mad.gif diff --git a/public/pic/smiles/icon_question.gif b/public/emojis/question.gif similarity index 100% rename from public/pic/smiles/icon_question.gif rename to public/emojis/question.gif diff --git a/public/pic/smiles/icon_redface.gif b/public/emojis/redface.gif similarity index 100% rename from public/pic/smiles/icon_redface.gif rename to public/emojis/redface.gif diff --git a/public/pic/smiles/icon_rolleyes.gif b/public/emojis/rolleyes.gif similarity index 100% rename from public/pic/smiles/icon_rolleyes.gif rename to public/emojis/rolleyes.gif diff --git a/public/pic/smiles/icon_frown.gif b/public/emojis/sad.gif similarity index 100% rename from public/pic/smiles/icon_frown.gif rename to public/emojis/sad.gif diff --git a/public/pic/smiles/icon_smile.gif b/public/emojis/smile.gif similarity index 100% rename from public/pic/smiles/icon_smile.gif rename to public/emojis/smile.gif diff --git a/public/pic/smiles/icon_wind.gif b/public/emojis/wind.gif similarity index 100% rename from public/pic/smiles/icon_wind.gif rename to public/emojis/wind.gif diff --git a/public/pic/smiles/aerger2.gif b/public/pic/smiles/aerger2.gif deleted file mode 100644 index accb9774c53d0cf7dc5c90714920578730f63651..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 561 zcmZ?wbhEHb&KYypJNE~XUa=sczT7|K$lrfneqD*?*HG|{5+W( z%h;oX*-LX7TpgJ9Z)7~aox$FUVg4kL<5+7H6qt@{OncVZcic*BCC6+Iojc|M3TcJx z4i9qGgjo6yU1T^Z(=n|vDnP2hNs#fN;;g%23w@q2$nfOv`R~-oUyj;)dvS z&YFaj1fGTlS-Hq$H$FlBMt)x2NM$BIUY-(3X&D|SO>>sHb1e-S=FMHGHgBos5=}*T z*kJK6(6>N813d=xFwom@KLdRT@iWl#5I+Mw1N1P^t3aOvy$$py(6>Nu1APnhD$v6a zuYy7m=;3+=1*MLRNzZ1kdcCnLZ`KZ{SZ4Q0a-|P`Z=K=sL7T~!<^G%PJOVB!T^t%X zJXZQSTsl#jx7+nl*rpj8=ek^vseeo4;cL5-xMIWP)?-HxJa@NXjbmcv7ZIoxVC`Z` pYUZ!x<`a{a;$>x0Yi4DhGpAeIbnYB;eTGHMOEu@NTm$s8H2}%lyZrzF diff --git a/public/pic/smiles/alien.gif b/public/pic/smiles/alien.gif deleted file mode 100644 index 1404f2999c806366830124e71094f4ae30fa2ef6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 933 zcmZ?wbhEHbvVB^Y72e$1yz4y@BBPXw%Ja_Zd#XDy&-Mx7I z;iVgoF5i6o|Nnom@=;ZZ@aSAVQ#})h1CLI2u<&X~1YCG}l$kp!&F7ZGDi3DPHH&l>lqN9D=8t{E!(H^| W$|g3~I@JRk6wfyK^0TopSOWkm6j1yC diff --git a/public/pic/smiles/blush.gif b/public/pic/smiles/blush.gif deleted file mode 100644 index 28ce436b655b9c3d04da78138375a6a3421c2160..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 954 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 b_R__Inu?IYs=UwqOONXGdIQu|(9(YaKo-8P diff --git a/public/pic/smiles/bun.gif b/public/pic/smiles/bun.gif deleted file mode 100644 index c6ee69379b63bd40ba590005b87a5cb84d4c7454..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 956 zcmZ?wbhEHbQmykahJz=f%ZO$jCeu6@6!9^q=AXy2h|g&0$-*61R0H?&?q7H7R?~ z+NFoKuRpqN-Kj%+&K%r%<=CFf=T6_eeE$BGv-fXay?^uC{ae?b-oEw{O0E{rvswm+#-c{`mgw*UulnfByLO>*t@}zyALI{pZi0|NsAk zT|G*Sh5!{pK=CIFBLjmNgAT|nP@Z7mn8~2aAtRx1;6O7wvxh^1fZ{<;?J|#y7X}Qi zTta*SG7$?JIvChZ%3fGpXlNHSuw(nN;E+ovlNeV+MWOO>9&yEp2OAzbxws1%l{{In zG1 diff --git a/public/pic/smiles/candycane.gif b/public/pic/smiles/candycane.gif deleted file mode 100644 index 4469a5c5bf805fdbd3789bd0337ce55b420ae2bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 904 zcmZ?wbhEHbVhGyLbQp|IaWAMnhoehk)Ww7DfgJHU=G#S3r4!fg_cH zSAszR$Yo?;;Zq54XgbW!$>=g+L&E_VR#sLU6Nv@}78Z6D8wmx21{QV>Q2`DGfdkAP zj1mGK8UhO$S%j200#+C_da&3;n?*=oacJl=seDw!V6x&EyLGcyOGHUR&^$&)25SIB C&O#0V diff --git a/public/pic/smiles/cheesy.gif b/public/pic/smiles/cheesy.gif deleted file mode 100644 index 52d35b273ac99f778681f188deff1960032e317e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 933 zcmZ?wbhEHbiPVzdJWJGPpJKdwLzYC6IBbFIbq3 Hg~1vC2<1Q} diff --git a/public/pic/smiles/dead.gif b/public/pic/smiles/dead.gif deleted file mode 100644 index 8328c3376fe0ebd1ab3651c037fcd2fbe6aa42e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 961 zcmZ?wbhEHbJctFNi4Wp|Xwrkk zNe_~yK1iATAbtA7jHwT@W?beY|C-Oo##w;op(8O)#LCr&%@We z4qx*-dOi5~&5&a^!;jtwJAO0z_>IUDH=|G7iaU8b>D29{Gq+RD+)g`lC-cnR>~r_> z&fY6Jcfa)F{i2HxDlR_w&+xzV-0kMekGifr>AU=(`{vWhH=a(p`E23smkaN_SakQ* z;(M=FJb1I>@tbu|-fnpMZqw6uTc5q({_Opp=O6Yx|8Vl{=TmP#pLzTF?Ay=h-h4j$ z?#spZUoO4-a`of48=t=2{PgYCr*HrN{|9?zlo$;G(n3J-CkrD3gCc_tNE;|mFmSA6 zaOM!9tUMA%b`}d55)>LZRf3j0c-Y*=BP?xF5^}?l ziAm0^j)k#^p{c!(K}x_tp~0bF){spE$Z|f&#yE*>g`slWB?eKhNdiFu9(*$TE0_ch z2{y1QCbYiTVW_-j0ynF=&Dy}nM}yfcJU7fe{mq4wRhuy(!SJvvx0p`If(siGmL6hn c;O)9F;edf7gSeH;gNExHU7DvcGci~L0Kpi|z5oCK diff --git a/public/pic/smiles/ginger.gif b/public/pic/smiles/ginger.gif deleted file mode 100644 index 199b085ddbf1ac9bc62c0bd88f3cd988dc774285..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 980 zcmZ?wbhEHb6krf$_|5r~93p=6ZN~$l)0w=N84B zSde&fVbaM(DW?{to>`WCXNC-MQ_p-41hzKY! zFm_3a3ONWcGBz=(^Yf`NG$we=7g1d0vLS(yX`)3k6UT&)s;4{ncqgTJ6fHd5B$(JH z^7D$8BdbNbo+Dr*(9E*oS5>KWp-+!6Hn%q6(?pevl?hbFZghF f0T-)Bg}^pdpt}~mOQ|$fO`W2mm?kG6z+epkuj^Yz diff --git a/public/pic/smiles/hirsch1.gif b/public/pic/smiles/hirsch1.gif deleted file mode 100644 index 6ef613309e18c7f04dc8f766cb2905e58df02d76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1262 zcmVdVEzZF?UW>TsS{PDlnXGcw|CKB^Vqd78{{u zei{)KJ|{8>0tReIUp^-|C>$j9yq#0NpjEt{RJ)y2x|~zN zqguP4SHh%RzoK22Zxg11HN2WkyO>S6m`uBxPQRW~#id%mpjW$_R>P!QzMxvks$!CA z8>M<8seUH4h%m8+GmL8}o_H>%e=)O+KAd_spnf{Mmr1sfN5`O0!kkmToKn4+QOc!P zx0O%9om9i1R=%86zM56TpIE=0R=u28#G+frqg}k5S;eGY!=hrIa2uv|9hqz!wSgn7 zeI~1XCSXPvt$ix2fG?wXEVYI*u!1tAdNI9?I=YKFqkA%{fi}L6J+6f~r-3=SjX|%5 zKC+8JzLG}Hp-r@nL$i!Ssf0hpnM=8lNV}9uvy4Z!k4f08SGtr;#F|mUn^CfkO1+j( zyq8hHn^(`MU(cprLpC44on6YNWzDH*muexSbR^4?G{A~6yoNEXelf(5IkJQ{)SX1e zlt8Y6IJAX3qj@%~fH}C0M7fVi!j(?Imr~QLY08W=q;)LXn?1mbJi?DezK%q>mSonj zb=tCc<)J~&k2*Ul6ugK*jAt~de?`WbU(~B{-?n|cnQEbue$>UVr(p=7Tnw&f6Toy9 z(tsSLX&!b>8O@ebuYydyk5y1UD6WiSp@?a-XAiDt8lqwv|CcVNg=0G-47qJ5lUEz*@RD*TsT@f zCA5xp$$Cp;J0-DeLsLOFdq*wJg<++7WOYh6$d-OI9~PuzNUCsItAK8~w6cItJ+*OH zkzP!iXjUj06lFy^UpFkYcV&HGSf*%OkWNJ*6A@%OG$|Jqj9FBGQBFA_AxA1IaY;!_ zF)>s}NB{r-A^8LW00930EC2ui03HAy000R80RIUbNU)&6g9sBUR0t*p2{)(~4tx{} zp&uYVib!%KQ6LdXpA6RVGbhuf9|A%7NT_KO5;<$S5HzwRhn7x}Nc@fr1LBHX;(f;WWj>3Kv-N zL=rg2(0xcw{ zw}65MfplPz2p?!D6vQ1m^iTr;05IatSLu;wYQ>TAs=jBP*FkflM?zCbCrVb+sjSbO~t9>%IUtM${ Pu}&Z@V%kj=CI)K&O7cC% diff --git a/public/pic/smiles/icon_biggrin.gif b/public/pic/smiles/icon_biggrin.gif deleted file mode 100644 index d3527723c6d8a0ddfa7ca0bfe1ab8fce0055918c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmZ?wbhEHbgxLc6$23b2ZD19|4%af-@@>3F2nzSlmGt}{{R2@|NpQ5 zKLsg(0L7myj0_CC3_2h#$P5OS$PJ#HS#x(>T`Hg?&Q{P6{IT@*|fe Qt&nb$oR(_V$-rO@0AZ~_>i_@% diff --git a/public/pic/smiles/icon_confused.gif b/public/pic/smiles/icon_confused.gif deleted file mode 100644 index 0c49e06983f1fff4bc0834b4d86ce39b8a36a914..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmZ?wbhEHbZXiyV-#U P9L#x)b-Z(h7#XYqI2k)k diff --git a/public/pic/smiles/icon_cool.gif b/public/pic/smiles/icon_cool.gif deleted file mode 100644 index cead0306c0e38e57bdb0cc85a407b995dcbdc656..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmZ?wbhEHb+|z`)C(1LA_rU|@;d;3=6kcSq>7bCTj>1sqIsoCSRx)8`fJ$~w+{ zJX`yX^?~=R4m2(o_)+HS{ItMiUIk0)fwE>-?dDgxjscmQ{AM&TEaGA7z8`VSO88#> SHjRW8(oK@nQq4LU7_0%kd_$xF diff --git a/public/pic/smiles/icon_eek.gif b/public/pic/smiles/icon_eek.gif deleted file mode 100644 index 5d3978106a2da37441ed17c9d05383b367570d46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmZ?wbhEHbd`4m;$l6XN^_D8SRJJ2FugV_ z;@-1W`~Ak%x7W!T7_8VEVD?C1V$(vmHm-x7t|ENQXTMbHG-$9e9m-TqP;V|s+-sI@ SDB66dp*Gz_Y_|#%gEasOPe3vN diff --git a/public/pic/smiles/icon_exclaim.gif b/public/pic/smiles/icon_exclaim.gif deleted file mode 100644 index 6e50e2eecdb54d2ee3a14c39547a6b454524f98d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 236 zcmZ?wbhEHbIRcFi`x-!pOiN%b)||f$U^p%}h}5a*XWD2sb-X$e}K^frar-lVFcywmLVPpS#r! z1_#Bw>()y8Q=}6Xa7!$m)>9ItA-k>bRM`by3r4gxLc6$23b2ZD19|4%af-@@?!ukgRQ4FCU4{{R2@|EEBy z*B}*Op!k!8k%57iK?lSGnZdvkyTOw)YwnKFWkE{fYz4;!=ddvOIHYqKtO`15eTQk+ zwr{=ctfC9V1Rm6}I;$2M@y*$pa`Z}#oqrI+!z(?kVh8VTo6X#$!E$I32lMi<45x(( UGxi&cHs4b?vq7goSdhUQ00}uk)&Kwi diff --git a/public/pic/smiles/icon_mrgreen.gif b/public/pic/smiles/icon_mrgreen.gif deleted file mode 100644 index b54cd0f9469ae025d7b709f03432eebc30a615b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 349 zcmZ?wbhEHbF%wyNW~cLKD&UCI$nR5;ND%aoaG8jR+sH5 z;LGade6U~GQPko`gGJNAq7#;kr@G#2#;~znnVhs^*T0km#>C~4JR&=FdsEeR+|3R= Q;9xFbtmB<4#K>R`0GZ1@LjV8( diff --git a/public/pic/smiles/icon_razz.gif b/public/pic/smiles/icon_razz.gif deleted file mode 100644 index 29da2a2fccc79981bc54db7513ca6d2374592f9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 176 zcmZ?wbhEHb^3h|5y0`zsdjqAOHXV zwXw1B|EEADAfWh@g^_`Qk3k2-0hz(T5_`c@GHdRQt4o8V#Kj6YnC2W7^l?<@Q2(%O z^|TpzE=L6K%vq%4Qv0AgI88 ZPHWn(3w4)`M4Rs!oY|mbDlEug4FCb$KH>lX diff --git a/public/pic/smiles/icon_sad.gif b/public/pic/smiles/icon_sad.gif deleted file mode 100644 index d2ac78c04bd1f50059ce9c1fa9534dcee2195579..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmZ?wbhEHbaoDCD!-THXQ zaD}Q`!Ef~@t%4VS^H`jpHe@qRnmW&T1rN_M_11z^Th4v=m-`t@{9)jl*%hj`gxLc6$23bKgaNIF2n!7!vD80{0DM@;NRr`CxMLP|FjsU zO`B$HZ2T{m`TzgdAk{j*8D$QDUE*nK$ z7w|KG>@aokb7%R&!0WI`LE+V`jZbtHGVEq^HDzd8gshBhJhWk{9N&@6Gj#R{?N7d_ u@Ss3Q_U6Qmr`{j;vSH$AZf0`Va5JoNi_%bKV4KJmrQFw{HdRBB!5RP#AxjVd diff --git a/public/pic/smiles/koenig1.gif b/public/pic/smiles/koenig1.gif deleted file mode 100644 index b3e710cb9fb9207fda29b8d99e521afa58e66792..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 937 zcmX9-&8yaB5Iw;q?rmq$T}05BVIdYFwV*yE?}#5VrG|BrxxK>$I7 z5ChjpP~aeeBvQy(jUpsyP(TqS)S!VTTIj(Tj2K}i3<(Alm( zC!MH8jdGk3mZBA?{lIb9xsBP+lDUMs52i7q2i)h9)*BU6R7o{zsHv8ErW)0(R`rxO@9@k&(_XuiGdZRM z9qdrYv~R(2S`nuco$OTSw9w*`sp&!&yVNz^=w`RNr+rOch&|1$Qv#PEtYh-s_(XgG z>%Pe4l50uchog70>*&N~UCX?E+L9Gps5P11=mzz?Tm5VQUmLf;6o=ur{u9{T!))FC z%&+(8{mnaW+c?@yn)abf$wksI&6eJ?J?BZsbT?)&M)#oM>ezW&~C zpMQ7x*5~(jZhm#}=J|&Xe714&`u*Qte(=q|f8W}5C1*<^+!MNUfI2L4PHTW9_`^zkn*UwibG diff --git a/public/pic/smiles/laser1.gif b/public/pic/smiles/laser1.gif deleted file mode 100644 index 32e2aab7435e9dfc1d3b676b72641dcac5731521..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1432 zcmZ?wbhEHb)MJoh*v!uW0{{n}D zWwz%%J7EwP|NYHtYcGBE*{tf@RW`n`u$#0wZsP?TreY-g-^DUNtVQcg zV}|mkJ0E_Z$~#=n}tl8KdGYPw6JQT&(&bI7GTw|OY-*>oCt@w+KUW=-S@wcv( z2Oc|cN=5pw@Kg)+TI2d$IFjoO)0OvnbG}ZT^318>Pr|l-wX6ica)~ybB;%5Nc5Rjv z?KX}cj;0n33!A#`o_>2Kz7E&=h-Q1?@ErFEW`3rPOYM_ZE$}v2yUu&lmaP(4!>kv( zGlB7@Imyy!&fj+Z`;<(FwZK8hvkLmnBDYW9#XOOgnCz zd1N6|WbS@ZF-WnJUw-M#$zqEa-`u+3j@**9`a8J1)6{+S1ATe7SDtQ9miSutS~<+7 zAttL{Es4>pip^iQ&Z0quBb|?>R41KdHphfX8V)Yivu4lJ7iOAP)SEeRxoAdh{rvSs zGy2zy*KOHpZ@Oo%{lUXWq_KwU928f}I?W6IAfpi}vg)R#NiCcHp1hKOw-klniJrD7 zvR%?)dS#=|@%bT=H74CtGcJV}^vtll8eF84UmG{k;LilxQ~Nc{_ikxB{$ZU=ZPeix z)iE{dK8z0e9;QttDje)4ESa`^98)=}dvx=sS5BEaW0nXL-^AdqkcA?18{1b3M@=%F zxh`eJ78{f4+vPX!-nU;AtAp3U9lZR6dfCC^o)@7asWbK+JT*&S>R9$`OPl%gcHHzl z?0kZ2-$mbLhb;uynBTu}V4P{v{kXtkolMAW)ij$ z4hz4TlFt`ZQ{rLjty5nW+m>kR!01`URuf!jD#XEV!%}ZEhhq^(ZTn17|KR3@i8C9i4YCYg0rg{yWo>=T-^ W|G>e*V}?G9PnsVEdO=Q*!5RROi9>k+ diff --git a/public/pic/smiles/love1.gif b/public/pic/smiles/love1.gif deleted file mode 100644 index 88dd553aa2d2695f89c0745078ec0e40924d28c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1009 zcmZ?wbhEHb=@u`q-Vg)2vn)~ zlZBOwft5iAqzhy$1B=y$6P~O0TD(5Hd%c51(!+#V%B*vAtk&jodlYnDW3{=l``qz0 z@*m8mTy5Af%j3zZxzqNA7cRSW*W2aZ1hd z6OI>r7n)V2uL^RwUG`Stw7&KIFDwsi6y7#V@V;PX>pi5LKQrdsEWgwVGnIG6>}2}% z>xyfw&SQbHwJu=4qnk_x$D#+P10*;_dRM+k(C8CF^?zzKzgGMkTe*VtZr1KK%0V}@ zt`(fWocYb$Yw{M=cdjDKmQ3Zq76Q&-L(N+jZM@?2yztS9nHsEXw72mY+*wtq>))`J zImm90k^K4Z%1qt6o)}6-8%?x->U$#TF4wUv;qOmYb~uJ_6=K9@E>#?h9s-a+waAwC zx-X{@=Mb6nbipch)-?v!dkc9yN=`jvwS8ePzky9!sN6le@5JeuKAY~n(ww83uXmsC z>l*Cw1o6McYbmFfQR;b*zj->$N_zQVmp1Dj6PvT8ybBEMw(M`>{~`UW$VBPW(ipKs zk2`*=f^N2)(fa)C&dEO4FdY7;f>Y6bZv%;cY}u*iT!Gz->exm5X1!ID`4+G(rm?(O Uw{y|$(-y&^!D518z&Nr700JRw_W%F@ diff --git a/public/pic/smiles/moo.gif b/public/pic/smiles/moo.gif deleted file mode 100644 index e525aa865230969f07b65a6bbcbe6536f7a73892..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1175 zcmZ?wbhEHbRAf+O_|5u+8?`~Uwx*nm-DGz5lf2q^w!VPs(7V$cD30F);f zIQ}t+a)@vwEO2CH<=2X_5IE4(!Y1pK;vx93xrM>NZp{fnhL&zg=ejv3HYy%t<27>Y zXb@8N>|)UHIWc3CV+*HIVNihOW|c#;b%N8TNE&Iha_EaQZIBdteumS@dE1vxfyd{1 zj5TF+XH0zM$Y8vY@9oP_&1;+>F3 zjh8*Am+C$DldCFy9nUPVB6^=qaZe88jcYgmSw{WHxhl>fSJG7fJ74gKctX^}*17eJ zQ6Z9!i~_9!*(PgMBpd~FJOca~Ov)saANjHzaFtb5O-SoD{WhtU#rMa9w6>{Rr?fYp cbQS0*-s&;cUAgw_0k`a*sS)v_tSk)H0JTA|VE_OC diff --git a/public/pic/smiles/nuts.gif b/public/pic/smiles/nuts.gif deleted file mode 100644 index 12d4c5d103b57439c334df09ac0a1e4fd554d069..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 531 zcmZ?wbhEHbR0^9!pgpJdL9f@OEnG8$IGY$snHFgE$v7xHQe7>>)7EsUKtjz=)Vb9m!c4nc z<3ONbi1r|PiJhx#Z=N~KE*B3aDBz|6qT zzzVdOZvvy6dVxZ$cdB`;dy62#ZOlL=oD3{LB?3StFIm! Jo?8?T}D=S*AtnIwIzWdsyzU$j2-`q3n&e0_w5A6JW zXz$nar+?hO@#EQ}pD&;P{`CI;|NmgCMv2i77+fKs_>+Z^fq|Dn2jnbJo?zfu!63~c zt<8 diff --git a/public/pic/smiles/sheep.gif b/public/pic/smiles/sheep.gif deleted file mode 100644 index d1691491423ed8f194a1d7c8a862fc9722fe283d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 915 zcmZ?wbhEHbO5Fx^maDai4$w#h(bCQDJWLAL%b0h^F0+@|L kg;X*RI4~~vVxMJ_X|T|Nk!6F|7B2;d@YV!Q78V9;0M#us{Qv*} diff --git a/public/pic/smiles/sick.gif b/public/pic/smiles/sick.gif deleted file mode 100644 index 488d0e8e0cb3886d5a4011f72ee54d75ff313944..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 940 zcmZ?wbhEHb&!*#oA>oE-?Y4P)AH&q>nk^HuHUh~e#h~~UB?^uobEhyyZgxH?jx`JPeKm8 zXn6hpXCKDO}DiKUNEE_rfl#go&ko}OLv^!(cAS9iX;w&(Q?Alm!-#=bYV4!pT_@a^q` zZ|@#^_w4GY7uP?(xcLR_=}}@d1VAC6_>+Z^fkBl)2gCv82?mZ+4Bi|v919j4Y~&CY z^Et7BrJ;>W-bp2+;Ng*O4sEZLh=9Yb>>^wdDmxmS`P4jHdNddkl^Yn8Ya|?%Qcmf&5S9^RFwvO7 z#4wSUX$O;q(P4%LW>(87x*SW~*_ws6F$D-bJi;aFH|5NN#w4cZwS2ZOID%3U diff --git a/public/pic/smiles/soppy.gif b/public/pic/smiles/soppy.gif deleted file mode 100644 index 6c0416b11d234fe315816fa3211d134fa2d7ebba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 994 zcmZ?wbhEHbve~EI!*4`H+=`FC6BTtQI{Hpb%v~UgjlCZqe=9rt zVPfLLl$2*#Sb#?z4{=aBwc-7eWs;TK!d;6QV zwwK-AuR1zj_xHb?Jo(kMX|I83`t&ywCcFVMX3Tg!bLQ(=vtG}h{bugm|NsAk9WqLc zh5)@oK=CIFBLgri=zuH+PNyc-NiYJ3cV4q9ofdh?f>>+I?9~cg?af)c@7+erMz{n*Vv~0-)g++}# z3@j`O3#YI$FbN17d|*&uU=RzNEB1i%fJ3WLcw~ntw}R8fb>coPvad^=e6}b^M7dZt zFoiRV*!6g9baLeqQ7{SUs1#siWl(gPqrlj}%*yJfX(4dypx*f|6U~SdHy12D(HzUG P^5M_UMHgBa85yhr+ diff --git a/public/pic/smiles/stress.gif b/public/pic/smiles/stress.gif deleted file mode 100644 index 133913d7db3fc27de8e75b1f3065bf277c24c00d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1258 zcmZ?wbhEHb6lD-)c;>Sfre{*Q&n?tkS9G>^~ z==`_G7QH*M?KO$_Y&8(f;2TUy)NJ370%dpa5Vds`Ts&CMAmHZe?{-rPU0Z;nepC%-r= z>x3=_E)H%b4MkyIu7z!@dF6CW&5Sf;xmI+n7Spw`u`|9>N5;hlMkcN`DUsY$7CK<{)GoNEI=fmJ7`oem-sGE}(dtI~U}o&kU#$l^|!!%*-k0Q?c;jdIsLlj1m_PJX+7f%;quUg91Yf3!iDL zNB~2sm$MWvD-$T)v7)8BJxJc^?&&eUF=X-%d*9hMWjttL&>nKemo_Ei0OGYuEbH(IgKaMeQNRf~+*EC!*qOO4kr zGg-gXV%=)v%`40{uCUm+#(w7_&kf7`Hm`QtvBq)d8i!qLoOiBs+_lbW&svvV>p*DF zI@dkxJ@zgxTDd86$L7L4TS5eEp<2zH1@5w#AyYA@zigW)N{vXOYv1h`; z1Cx#%n|S)twCneeKD>AQ!Q&Ipo}7H~urWMO1rux8K!NrLhO1IJ2+at;{}frf+4Y@Av#D+CxA8JSf)G!zanFto8U z%ZR+#;K;+{VU;nX;Xu;CUIrxzL8Buo4RT^mYbqW-YH8txad!n9jE`S!!dkz`#FXwH34m-RYcX&JR@O9qh>%7m`WsjfBK0mkpf$sYQT@MDh9SCqg6zFw0)aOu` z-_c0_qmkYx!u?K1`k#*SKN}rzB0BI?Y~bnGpi{BIr{e<7!~~v=4LTbeaxOmNd~)Q4 zl!QxJsh9J!t`uiqEy=lBntQc0?`m1zwerI2l||Ppi?3IgT(2&@UQ>Fbw&F&8<&FCP z4F7=u?C()xGz1tFf3h$#Fa$8@fWiWlCm1+3GA!f};aHGxu#sb-$d!h~L(Q!0f=mty zj4s?FYDN+q3<(ch_zjA_JTP2*w1bP!O3UT}6T?JB$Ep(y0goKr8HDYwI50fm6p|Nq zj(E@++|sLTGux-9u*tclN!sedgPAEO`#W{KG&FuFu<|kZ%+dI`k-4FZ&!5p`$A?E9 z0?MupFFH0ZV)1X~@wj6UA>hc#sKuzF!Kl!ccvzTyMTkek3P+X(VKEs8MkmGt-Kw8` IB?K6(0r9u5kpKVy diff --git a/public/pic/smiles/winken1.gif b/public/pic/smiles/winken1.gif deleted file mode 100644 index 98f1821b8a133d2b745ea8e88d04cc2f4a5a6220..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3249 zcmZ?wbhEHblw^=)n8*ME|NjHge;`BgKewN2NU*bGfUA+70W%{==qC&32_UTl#0(%U z3{3eg{VPwuMO0 z<$QDReqyd=?YEv4T34|@MR-F3u<{7X7JqmDcQVXlPXvD+6PK$ z2WrdRt}mQ^_-@Ng?l&4yDSd`dCslgg%5c4k(&LH&1T<(T?-4{dn}sITzyy3d#uGqzBBvL zOQ$;uPakPMKbAfD_r}hiYa(Z3tasOMEC18g!^Ck=QAoo=c+#{NSEhDXXSR5b+gyq_CEY6eEWObXUwvPuC_HMJa%t6nC7Zd z5b5}8-q97sFHD@4U3t~c@+8ZD(n(YCxhXr&_Wo>oBx|i@;Vn36^QXtXYf_k)6ix(f zOS{3|Xt86*clI0D;{=>L3@$&CbaFVEvDM=JZOtppZ7Sbe&IxSMjWk>1&A!rPH@~d@ z&)=_A>rCTXB4%@{A6WG1hR?nfkGXwOXLZA^W6NLt4mtSnqSnsR2nPe9KI6pYyc=(O ziJpIax5V15`O`&435_3W9v0Wr*$+eAz=fJS1}Z4foH0P@0?ieJBrrzP1-t?oO&933 z=?E<^Qc#Pn0ZJEWO^ZQNsnWl7!HO0T#I*CM+QzbmRjFtt_yDB~G*=8%x`W;rL8fCCPVvkg*>SQ0KTbn4;d7wOpfLEVYLsZ&hF!6Dso zwwLg=9x?+gs3qvvGFXhb$GyVWnIX5zP*+WN|$H&33uJ~ JHc()&1^{(-Kt=!n diff --git a/public/pic/smiles/worry.gif b/public/pic/smiles/worry.gif deleted file mode 100644 index c598b575b38aed1c9b4255274b5b5f1572db92e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 951 zcmZ?wbhEHbh)~R{|x`{Hv2xE znf+u|-m|%d&li+FUsUmYNzLRY zSyc=&3>X_3xL86KJlNQDb~Xc_!xYb8HHO*tj3OEg3m&)3GH`(x&z#sFb9 H76xko#ST!U diff --git a/frontend/angelFont/angelFont.css b/resources/assets/angelFont/angelFont.css similarity index 100% rename from frontend/angelFont/angelFont.css rename to resources/assets/angelFont/angelFont.css diff --git a/frontend/angelFont/angelFont.eot b/resources/assets/angelFont/angelFont.eot similarity index 100% rename from frontend/angelFont/angelFont.eot rename to resources/assets/angelFont/angelFont.eot diff --git a/frontend/angelFont/angelFont.svg b/resources/assets/angelFont/angelFont.svg similarity index 100% rename from frontend/angelFont/angelFont.svg rename to resources/assets/angelFont/angelFont.svg diff --git a/frontend/angelFont/angelFont.ttf b/resources/assets/angelFont/angelFont.ttf similarity index 100% rename from frontend/angelFont/angelFont.ttf rename to resources/assets/angelFont/angelFont.ttf diff --git a/frontend/angelFont/angelFont.woff b/resources/assets/angelFont/angelFont.woff similarity index 100% rename from frontend/angelFont/angelFont.woff rename to resources/assets/angelFont/angelFont.woff diff --git a/frontend/js/forms.js b/resources/assets/js/forms.js similarity index 100% rename from frontend/js/forms.js rename to resources/assets/js/forms.js diff --git a/frontend/js/moment-countdown.js b/resources/assets/js/moment-countdown.js similarity index 100% rename from frontend/js/moment-countdown.js rename to resources/assets/js/moment-countdown.js diff --git a/frontend/js/sticky-headers.js b/resources/assets/js/sticky-headers.js similarity index 100% rename from frontend/js/sticky-headers.js rename to resources/assets/js/sticky-headers.js diff --git a/frontend/js/vendor.js b/resources/assets/js/vendor.js similarity index 100% rename from frontend/js/vendor.js rename to resources/assets/js/vendor.js diff --git a/frontend/themes/base.less b/resources/assets/themes/base.less similarity index 98% rename from frontend/themes/base.less rename to resources/assets/themes/base.less index f9fa139e..4ae6930e 100644 --- a/frontend/themes/base.less +++ b/resources/assets/themes/base.less @@ -1,4 +1,4 @@ -@import "../../node_modules/bootstrap/less/bootstrap"; +@import "../../../node_modules/bootstrap/less/bootstrap"; @import "../angelFont/angelFont.css"; body { diff --git a/frontend/themes/theme0.less b/resources/assets/themes/theme0.less similarity index 100% rename from frontend/themes/theme0.less rename to resources/assets/themes/theme0.less diff --git a/frontend/themes/theme1.less b/resources/assets/themes/theme1.less similarity index 99% rename from frontend/themes/theme1.less rename to resources/assets/themes/theme1.less index f1b5bd92..20af646a 100644 --- a/frontend/themes/theme1.less +++ b/resources/assets/themes/theme1.less @@ -1,4 +1,4 @@ -@import "../../node_modules/bootstrap/less/variables"; +@import "../../../node_modules/bootstrap/less/variables"; /* The MIT License (MIT) diff --git a/frontend/themes/theme2.less b/resources/assets/themes/theme2.less similarity index 93% rename from frontend/themes/theme2.less rename to resources/assets/themes/theme2.less index 231dc4c4..a72576db 100644 --- a/frontend/themes/theme2.less +++ b/resources/assets/themes/theme2.less @@ -1,4 +1,4 @@ -@import "../../node_modules/bootstrap/less/variables"; +@import "../../../node_modules/bootstrap/less/variables"; @brand-primary: #758499; @brand-success: #7b9c41; diff --git a/frontend/themes/theme3.less b/resources/assets/themes/theme3.less similarity index 96% rename from frontend/themes/theme3.less rename to resources/assets/themes/theme3.less index e4012d7b..a9d6815d 100644 --- a/frontend/themes/theme3.less +++ b/resources/assets/themes/theme3.less @@ -1,4 +1,4 @@ -@import "../../node_modules/bootstrap/less/variables"; +@import "../../../node_modules/bootstrap/less/variables"; @brand-primary: #f19224; @brand-success: #39AB50; diff --git a/frontend/themes/theme4.less b/resources/assets/themes/theme4.less similarity index 99% rename from frontend/themes/theme4.less rename to resources/assets/themes/theme4.less index 40c53f6c..d0a5f948 100644 --- a/frontend/themes/theme4.less +++ b/resources/assets/themes/theme4.less @@ -1,4 +1,4 @@ -@import "../../node_modules/bootstrap/less/variables"; +@import "../../../node_modules/bootstrap/less/variables"; /* The MIT License (MIT) diff --git a/frontend/themes/theme5.less b/resources/assets/themes/theme5.less similarity index 94% rename from frontend/themes/theme5.less rename to resources/assets/themes/theme5.less index bd2b9330..ec5d0cd9 100644 --- a/frontend/themes/theme5.less +++ b/resources/assets/themes/theme5.less @@ -1,4 +1,4 @@ -@import "../../node_modules/bootstrap/less/variables"; +@import "../../../node_modules/bootstrap/less/variables"; @brand-primary: rgb(164, 28, 49); @brand-success: rgb(153, 204, 0); diff --git a/frontend/themes/theme6.less b/resources/assets/themes/theme6.less similarity index 99% rename from frontend/themes/theme6.less rename to resources/assets/themes/theme6.less index 86c2f463..71dcbfd8 100644 --- a/frontend/themes/theme6.less +++ b/resources/assets/themes/theme6.less @@ -1,4 +1,4 @@ -@import "../../node_modules/bootstrap/less/variables"; +@import "../../../node_modules/bootstrap/less/variables"; /* The MIT License (MIT) diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.mo similarity index 100% rename from locale/de_DE.UTF-8/LC_MESSAGES/default.mo rename to resources/lang/de_DE.UTF-8/LC_MESSAGES/default.mo diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po similarity index 100% rename from locale/de_DE.UTF-8/LC_MESSAGES/default.po rename to resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po diff --git a/locale/pt_BR.UTF.8/LC_MESSAGES/pt_BR.mo b/resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.mo similarity index 100% rename from locale/pt_BR.UTF.8/LC_MESSAGES/pt_BR.mo rename to resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.mo diff --git a/locale/pt_BR.UTF.8/LC_MESSAGES/pt_BR.po b/resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.po similarity index 100% rename from locale/pt_BR.UTF.8/LC_MESSAGES/pt_BR.po rename to resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.po diff --git a/templates/errors/default.twig b/resources/views/errors/default.twig similarity index 100% rename from templates/errors/default.twig rename to resources/views/errors/default.twig diff --git a/templates/layouts/app.twig b/resources/views/layouts/app.twig similarity index 100% rename from templates/layouts/app.twig rename to resources/views/layouts/app.twig diff --git a/templates/layouts/maintenance.html b/resources/views/layouts/maintenance.html similarity index 100% rename from templates/layouts/maintenance.html rename to resources/views/layouts/maintenance.html diff --git a/templates/pages/credits.html b/resources/views/pages/credits.html similarity index 100% rename from templates/pages/credits.html rename to resources/views/pages/credits.html diff --git a/templates/pages/user-shifts.html b/resources/views/pages/user-shifts.html similarity index 100% rename from templates/pages/user-shifts.html rename to resources/views/pages/user-shifts.html diff --git a/src/Application.php b/src/Application.php index 86397a2c..d12d3e31 100644 --- a/src/Application.php +++ b/src/Application.php @@ -106,8 +106,10 @@ class Application extends Container $this->instance('path', $appPath); $this->instance('path.config', $appPath . DIRECTORY_SEPARATOR . 'config'); - $this->instance('path.lang', $appPath . DIRECTORY_SEPARATOR . 'locale'); - $this->instance('path.views', $appPath . DIRECTORY_SEPARATOR . 'templates'); + $this->instance('path.resources', $appPath . DIRECTORY_SEPARATOR . 'resources'); + $this->instance('path.assets', $this->get('path.resources') . DIRECTORY_SEPARATOR . 'assets'); + $this->instance('path.views', $this->get('path.resources') . DIRECTORY_SEPARATOR . 'views'); + $this->instance('path.lang', $this->get('path.resources') . DIRECTORY_SEPARATOR . 'lang'); } /** diff --git a/tests/Unit/ApplicationTest.php b/tests/Unit/ApplicationTest.php index 012226b2..e6d77c7d 100644 --- a/tests/Unit/ApplicationTest.php +++ b/tests/Unit/ApplicationTest.php @@ -46,8 +46,10 @@ class ApplicationTest extends TestCase $app->setAppPath('.'); $this->assertTrue($app->has('path')); + $this->assertTrue($app->has('path.assets')); $this->assertTrue($app->has('path.config')); $this->assertTrue($app->has('path.lang')); + $this->assertTrue($app->has('path.resources')); $this->assertTrue($app->has('path.views')); $this->assertEquals(realpath('.'), $app->path()); diff --git a/webpack.config.js b/webpack.config.js index 588ee247..261c1c44 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -20,7 +20,7 @@ const plugins = [ const themeEntries = {}; for (let i = 0; i < 7; i++) { - themeEntries[`theme${i}`] = `./frontend/themes/theme${i}.less`; + themeEntries[`theme${i}`] = `./resources/assets/themes/theme${i}.less`; } module.exports = { @@ -30,7 +30,7 @@ module.exports = { }, entry: { ...themeEntries, - vendor: './frontend/js/vendor.js', + vendor: './resources/assets/js/vendor.js', }, output: { path: path.resolve('public/assets'),