Moved frontend, templates and lang to resources

87 files changed, 55 insertions, 37 deletions

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 @@
 <?php
 
+use Engelsystem\Renderer\Twig\Extensions\Assets;
+
 /**
  * Render a stat for dashborad (big number with label).
  * If no style given, style is danger if number > 0, and success if number == 0.
@@ -450,26 +452,39 @@ function table_body($array)
  */
 function ReplaceSmilies($msg)
 {
-    $msg = str_replace(';o))', '<img src="pic/smiles/icon_redface.gif">', $msg);
-    $msg = str_replace(':-))', '<img src="pic/smiles/icon_redface.gif">', $msg);
-    $msg = str_replace(';o)', '<img src="pic/smiles/icon_wind.gif">', $msg);
-    $msg = str_replace(':)', '<img src="pic/smiles/icon_smile.gif">', $msg);
-    $msg = str_replace(':-)', '<img src="pic/smiles/icon_smile.gif">', $msg);
-    $msg = str_replace(':(', '<img src="pic/smiles/icon_sad.gif">', $msg);
-    $msg = str_replace(':-(', '<img src="pic/smiles/icon_sad.gif">', $msg);
-    $msg = str_replace(':o(', '<img src="pic/smiles/icon_sad.gif">', $msg);
-    $msg = str_replace(':o)', '<img src="pic/smiles/icon_lol.gif">', $msg);
-    $msg = str_replace(';o(', '<img src="pic/smiles/icon_cry.gif">', $msg);
-    $msg = str_replace(';(', '<img src="pic/smiles/icon_cry.gif">', $msg);
-    $msg = str_replace(';-(', '<img src="pic/smiles/icon_cry.gif">', $msg);
-    $msg = str_replace('8)', '<img src="pic/smiles/icon_rolleyes.gif">', $msg);
-    $msg = str_replace('8o)', '<img src="pic/smiles/icon_rolleyes.gif">', $msg);
-    $msg = str_replace(':P', '<img src="pic/smiles/icon_evil.gif">', $msg);
-    $msg = str_replace(':-P', '<img src="pic/smiles/icon_evil.gif">', $msg);
-    $msg = str_replace(':oP', '<img src="pic/smiles/icon_evil.gif">', $msg);
-    $msg = str_replace(';P', '<img src="pic/smiles/icon_mad.gif">', $msg);
-    $msg = str_replace(';oP', '<img src="pic/smiles/icon_mad.gif">', $msg);
-    $msg = str_replace('?)', '<img src="pic/smiles/icon_question.gif">', $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(
+            '<img src="%s">',
+            sprintf($assets->getAsset('emojis/%s.gif'), $replace)
+        ), $msg);
+    }
 
     return $msg;
 }
diff --git a/public/pic/smiles/icon_cry.gif b/public/emojis/cry.gif
index 7d54b1f9..7d54b1f9 100644
--- a/public/pic/smiles/icon_cry.gif
+++ b/public/emojis/cry.gif
diff --git a/public/pic/smiles/icon_evil.gif b/public/emojis/evil.gif
index ab1aa8e1..ab1aa8e1 100644
--- a/public/pic/smiles/icon_evil.gif
+++ b/public/emojis/evil.gif
diff --git a/public/pic/smiles/icon_lol.gif b/public/emojis/lol.gif
index 374ba150..374ba150 100644
--- a/public/pic/smiles/icon_lol.gif
+++ b/public/emojis/lol.gif
diff --git a/public/pic/smiles/icon_mad.gif b/public/emojis/mad.gif
index 1f6c3c2f..1f6c3c2f 100644
--- a/public/pic/smiles/icon_mad.gif
+++ b/public/emojis/mad.gif
diff --git a/public/pic/smiles/icon_question.gif b/public/emojis/question.gif
index 9d072265..9d072265 100644
--- a/public/pic/smiles/icon_question.gif
+++ b/public/emojis/question.gif
diff --git a/public/pic/smiles/icon_redface.gif b/public/emojis/redface.gif
index ad762832..ad762832 100644
--- a/public/pic/smiles/icon_redface.gif
+++ b/public/emojis/redface.gif
diff --git a/public/pic/smiles/icon_rolleyes.gif b/public/emojis/rolleyes.gif
index d7f5f2f4..d7f5f2f4 100644
--- a/public/pic/smiles/icon_rolleyes.gif
+++ b/public/emojis/rolleyes.gif
diff --git a/public/pic/smiles/icon_frown.gif b/public/emojis/sad.gif
index d2ac78c0..d2ac78c0 100644
--- a/public/pic/smiles/icon_frown.gif
+++ b/public/emojis/sad.gif
diff --git a/public/pic/smiles/icon_smile.gif b/public/emojis/smile.gif
index 7b1f6d30..7b1f6d30 100644
--- a/public/pic/smiles/icon_smile.gif
+++ b/public/emojis/smile.gif
diff --git a/public/pic/smiles/icon_wind.gif b/public/emojis/wind.gif
index d1482880..d1482880 100644
--- a/public/pic/smiles/icon_wind.gif
+++ b/public/emojis/wind.gif
diff --git a/public/pic/smiles/aerger2.gif b/public/pic/smiles/aerger2.gif
deleted file mode 100644
index accb9774..00000000
--- a/public/pic/smiles/aerger2.gif
+++ /dev/null
diff --git a/public/pic/smiles/alien.gif b/public/pic/smiles/alien.gif
deleted file mode 100644
index 1404f299..00000000
--- a/public/pic/smiles/alien.gif
+++ /dev/null
diff --git a/public/pic/smiles/blush.gif b/public/pic/smiles/blush.gif
deleted file mode 100644
index 28ce436b..00000000
--- a/public/pic/smiles/blush.gif
+++ /dev/null
diff --git a/public/pic/smiles/boggle.gif b/public/pic/smiles/boggle.gif
deleted file mode 100644
index 472a3c3c..00000000
--- a/public/pic/smiles/boggle.gif
+++ /dev/null
diff --git a/public/pic/smiles/bounce.gif b/public/pic/smiles/bounce.gif
deleted file mode 100644
index 942318f3..00000000
--- a/public/pic/smiles/bounce.gif
+++ /dev/null
diff --git a/public/pic/smiles/bun.gif b/public/pic/smiles/bun.gif
deleted file mode 100644
index c6ee6937..00000000
--- a/public/pic/smiles/bun.gif
+++ /dev/null
diff --git a/public/pic/smiles/candycane.gif b/public/pic/smiles/candycane.gif
deleted file mode 100644
index 4469a5c5..00000000
--- a/public/pic/smiles/candycane.gif
+++ /dev/null
diff --git a/public/pic/smiles/cheesy.gif b/public/pic/smiles/cheesy.gif
deleted file mode 100644
index 52d35b27..00000000
--- a/public/pic/smiles/cheesy.gif
+++ /dev/null
diff --git a/public/pic/smiles/dead.gif b/public/pic/smiles/dead.gif
deleted file mode 100644
index 8328c337..00000000
--- a/public/pic/smiles/dead.gif
+++ /dev/null
diff --git a/public/pic/smiles/depressed.gif b/public/pic/smiles/depressed.gif
deleted file mode 100644
index 17c24c42..00000000
--- a/public/pic/smiles/depressed.gif
+++ /dev/null
diff --git a/public/pic/smiles/ginger.gif b/public/pic/smiles/ginger.gif
deleted file mode 100644
index 199b085d..00000000
--- a/public/pic/smiles/ginger.gif
+++ /dev/null
diff --git a/public/pic/smiles/hirsch1.gif b/public/pic/smiles/hirsch1.gif
deleted file mode 100644
index 6ef61330..00000000
--- a/public/pic/smiles/hirsch1.gif
+++ /dev/null
diff --git a/public/pic/smiles/huh.gif b/public/pic/smiles/huh.gif
deleted file mode 100644
index 448c6ecc..00000000
--- a/public/pic/smiles/huh.gif
+++ /dev/null
diff --git a/public/pic/smiles/icon_arrow.gif b/public/pic/smiles/icon_arrow.gif
deleted file mode 100644
index 2880055c..00000000
--- a/public/pic/smiles/icon_arrow.gif
+++ /dev/null
diff --git a/public/pic/smiles/icon_biggrin.gif b/public/pic/smiles/icon_biggrin.gif
deleted file mode 100644
index d3527723..00000000
--- a/public/pic/smiles/icon_biggrin.gif
+++ /dev/null
diff --git a/public/pic/smiles/icon_confused.gif b/public/pic/smiles/icon_confused.gif
deleted file mode 100644
index 0c49e069..00000000
--- a/public/pic/smiles/icon_confused.gif
+++ /dev/null
diff --git a/public/pic/smiles/icon_cool.gif b/public/pic/smiles/icon_cool.gif
deleted file mode 100644
index cead0306..00000000
--- a/public/pic/smiles/icon_cool.gif
+++ /dev/null
diff --git a/public/pic/smiles/icon_eek.gif b/public/pic/smiles/icon_eek.gif
deleted file mode 100644
index 5d397810..00000000
--- a/public/pic/smiles/icon_eek.gif
+++ /dev/null
diff --git a/public/pic/smiles/icon_exclaim.gif b/public/pic/smiles/icon_exclaim.gif
deleted file mode 100644
index 6e50e2ee..00000000
--- a/public/pic/smiles/icon_exclaim.gif
+++ /dev/null
diff --git a/public/pic/smiles/icon_idea.gif b/public/pic/smiles/icon_idea.gif
deleted file mode 100644
index a40ae0d7..00000000
--- a/public/pic/smiles/icon_idea.gif
+++ /dev/null
diff --git a/public/pic/smiles/icon_mrgreen.gif b/public/pic/smiles/icon_mrgreen.gif
deleted file mode 100644
index b54cd0f9..00000000
--- a/public/pic/smiles/icon_mrgreen.gif
+++ /dev/null
diff --git a/public/pic/smiles/icon_neutral.gif b/public/pic/smiles/icon_neutral.gif
deleted file mode 100644
index 4f311567..00000000
--- a/public/pic/smiles/icon_neutral.gif
+++ /dev/null
diff --git a/public/pic/smiles/icon_razz.gif b/public/pic/smiles/icon_razz.gif
deleted file mode 100644
index 29da2a2f..00000000
--- a/public/pic/smiles/icon_razz.gif
+++ /dev/null
diff --git a/public/pic/smiles/icon_sad.gif b/public/pic/smiles/icon_sad.gif
deleted file mode 100644
index d2ac78c0..00000000
--- a/public/pic/smiles/icon_sad.gif
+++ /dev/null
diff --git a/public/pic/smiles/icon_surprised.gif b/public/pic/smiles/icon_surprised.gif
deleted file mode 100644
index cb214243..00000000
--- a/public/pic/smiles/icon_surprised.gif
+++ /dev/null
diff --git a/public/pic/smiles/icon_twisted.gif b/public/pic/smiles/icon_twisted.gif
deleted file mode 100644
index 502fe247..00000000
--- a/public/pic/smiles/icon_twisted.gif
+++ /dev/null
diff --git a/public/pic/smiles/koenig1.gif b/public/pic/smiles/koenig1.gif
deleted file mode 100644
index b3e710cb..00000000
--- a/public/pic/smiles/koenig1.gif
+++ /dev/null
diff --git a/public/pic/smiles/laser1.gif b/public/pic/smiles/laser1.gif
deleted file mode 100644
index 32e2aab7..00000000
--- a/public/pic/smiles/laser1.gif
+++ /dev/null
diff --git a/public/pic/smiles/love1.gif b/public/pic/smiles/love1.gif
deleted file mode 100644
index 88dd553a..00000000
--- a/public/pic/smiles/love1.gif
+++ /dev/null
diff --git a/public/pic/smiles/moo.gif b/public/pic/smiles/moo.gif
deleted file mode 100644
index e525aa86..00000000
--- a/public/pic/smiles/moo.gif
+++ /dev/null
diff --git a/public/pic/smiles/nuts.gif b/public/pic/smiles/nuts.gif
deleted file mode 100644
index 12d4c5d1..00000000
--- a/public/pic/smiles/nuts.gif
+++ /dev/null
diff --git a/public/pic/smiles/robin.gif b/public/pic/smiles/robin.gif
deleted file mode 100644
index ee0f0500..00000000
--- a/public/pic/smiles/robin.gif
+++ /dev/null
diff --git a/public/pic/smiles/sheep.gif b/public/pic/smiles/sheep.gif
deleted file mode 100644
index d1691491..00000000
--- a/public/pic/smiles/sheep.gif
+++ /dev/null
diff --git a/public/pic/smiles/sick.gif b/public/pic/smiles/sick.gif
deleted file mode 100644
index 488d0e8e..00000000
--- a/public/pic/smiles/sick.gif
+++ /dev/null
diff --git a/public/pic/smiles/sleep.gif b/public/pic/smiles/sleep.gif
deleted file mode 100644
index 7e1a0c51..00000000
--- a/public/pic/smiles/sleep.gif
+++ /dev/null
diff --git a/public/pic/smiles/soppy.gif b/public/pic/smiles/soppy.gif
deleted file mode 100644
index 6c0416b1..00000000
--- a/public/pic/smiles/soppy.gif
+++ /dev/null
diff --git a/public/pic/smiles/stress.gif b/public/pic/smiles/stress.gif
deleted file mode 100644
index 133913d7..00000000
--- a/public/pic/smiles/stress.gif
+++ /dev/null
diff --git a/public/pic/smiles/sweet.gif b/public/pic/smiles/sweet.gif
deleted file mode 100644
index 6c1e79a7..00000000
--- a/public/pic/smiles/sweet.gif
+++ /dev/null
diff --git a/public/pic/smiles/tired.gif b/public/pic/smiles/tired.gif
deleted file mode 100644
index d8cd4306..00000000
--- a/public/pic/smiles/tired.gif
+++ /dev/null
diff --git a/public/pic/smiles/urgh.gif b/public/pic/smiles/urgh.gif
deleted file mode 100644
index 16a9bc1d..00000000
--- a/public/pic/smiles/urgh.gif
+++ /dev/null
diff --git a/public/pic/smiles/winken1.gif b/public/pic/smiles/winken1.gif
deleted file mode 100644
index 98f1821b..00000000
--- a/public/pic/smiles/winken1.gif
+++ /dev/null
diff --git a/public/pic/smiles/worm.gif b/public/pic/smiles/worm.gif
deleted file mode 100644
index c0134ee8..00000000
--- a/public/pic/smiles/worm.gif
+++ /dev/null
diff --git a/public/pic/smiles/worry.gif b/public/pic/smiles/worry.gif
deleted file mode 100644
index c598b575..00000000
--- a/public/pic/smiles/worry.gif
+++ /dev/null
diff --git a/frontend/angelFont/angelFont.css b/resources/assets/angelFont/angelFont.css
index 01551ecd..01551ecd 100644
--- a/frontend/angelFont/angelFont.css
+++ b/resources/assets/angelFont/angelFont.css
diff --git a/frontend/angelFont/angelFont.eot b/resources/assets/angelFont/angelFont.eot
index 9b08a347..9b08a347 100644
--- a/frontend/angelFont/angelFont.eot
+++ b/resources/assets/angelFont/angelFont.eot
diff --git a/frontend/angelFont/angelFont.svg b/resources/assets/angelFont/angelFont.svg
index e5fdf45a..e5fdf45a 100644
--- a/frontend/angelFont/angelFont.svg
+++ b/resources/assets/angelFont/angelFont.svg
diff --git a/frontend/angelFont/angelFont.ttf b/resources/assets/angelFont/angelFont.ttf
index ac4f0a45..ac4f0a45 100644
--- a/frontend/angelFont/angelFont.ttf
+++ b/resources/assets/angelFont/angelFont.ttf
diff --git a/frontend/angelFont/angelFont.woff b/resources/assets/angelFont/angelFont.woff
index c7107a54..c7107a54 100644
--- a/frontend/angelFont/angelFont.woff
+++ b/resources/assets/angelFont/angelFont.woff
diff --git a/frontend/js/forms.js b/resources/assets/js/forms.js
index 13e42d26..13e42d26 100644
--- a/frontend/js/forms.js
+++ b/resources/assets/js/forms.js
diff --git a/frontend/js/moment-countdown.js b/resources/assets/js/moment-countdown.js
index f5effbc0..f5effbc0 100644
--- a/frontend/js/moment-countdown.js
+++ b/resources/assets/js/moment-countdown.js
diff --git a/frontend/js/sticky-headers.js b/resources/assets/js/sticky-headers.js
index c664387c..c664387c 100644
--- a/frontend/js/sticky-headers.js
+++ b/resources/assets/js/sticky-headers.js
diff --git a/frontend/js/vendor.js b/resources/assets/js/vendor.js
index dd6b66b3..dd6b66b3 100644
--- a/frontend/js/vendor.js
+++ b/resources/assets/js/vendor.js
diff --git a/frontend/themes/base.less b/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
index 3e94f738..3e94f738 100644
--- a/frontend/themes/theme0.less
+++ b/resources/assets/themes/theme0.less
diff --git a/frontend/themes/theme1.less b/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
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
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
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
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
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
index a5cbb44f..a5cbb44f 100644
--- a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
+++ b/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
index f3c6a768..f3c6a768 100644
--- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po
+++ b/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
index 576ea202..576ea202 100644
--- a/locale/pt_BR.UTF.8/LC_MESSAGES/pt_BR.mo
+++ b/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
index f49f6333..f49f6333 100644
--- a/locale/pt_BR.UTF.8/LC_MESSAGES/pt_BR.po
+++ b/resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.po
diff --git a/templates/errors/default.twig b/resources/views/errors/default.twig
index 5fb8bcbd..5fb8bcbd 100644
--- a/templates/errors/default.twig
+++ b/resources/views/errors/default.twig
diff --git a/templates/layouts/app.twig b/resources/views/layouts/app.twig
index aa45484d..aa45484d 100644
--- a/templates/layouts/app.twig
+++ b/resources/views/layouts/app.twig
diff --git a/templates/layouts/maintenance.html b/resources/views/layouts/maintenance.html
index f7ab5772..f7ab5772 100644
--- a/templates/layouts/maintenance.html
+++ b/resources/views/layouts/maintenance.html
diff --git a/templates/pages/credits.html b/resources/views/pages/credits.html
index 4e247113..4e247113 100644
--- a/templates/pages/credits.html
+++ b/resources/views/pages/credits.html
diff --git a/templates/pages/user-shifts.html b/resources/views/pages/user-shifts.html
index 2fdade29..2fdade29 100644
--- a/templates/pages/user-shifts.html
+++ b/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'),