move assets para projetosexterno de tema e configura sapl project para leitura de temas através do .env

sapl-frontend/package.json

@@ -13,13 +13,12 @@
     "dotenv": "^6.2.0",
     "jquery": "^3.3.1",
     "popper.js": "^1.14.6",
+    "sapl-oficial-theme": "../../sapl-oficial-theme",
     "vue": "^2.5.21",
     "vue-router": "^3.0.1",
     "vuex": "^3.0.1",
     "webpack": "^4.28.4",
-    "webpack-bundle-tracker": "^0.4.2-beta",
-
-    "sapl-oficial-theme": "../../sapl-oficial-theme"
+    "webpack-bundle-tracker": "^0.4.2-beta"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^3.3.0",
@@ -27,10 +26,10 @@
     "@vue/cli-service": "^3.3.0",
     "@vue/eslint-config-prettier": "^4.0.1",
     "babel-eslint": "^10.0.1",
+    "css-loader": "^2.1.0",
     "eslint": "^5.8.0",
     "eslint-plugin-vue": "^5.0.0",
     "node-sass": "^4.9.0",
-    "css-loader": "^2.1.0",
     "sass-loader": "^7.0.1",
     "vue-template-compiler": "^2.5.21"
   }

sapl-frontend/public/index.html

@@ -13,5 +13,7 @@
     </noscript>
     <div id="app"></div>
     <!-- built files will be auto injected -->
+        <img src="icon_comissoes">
+
   </body>
 </html>

sapl-frontend/vue.config.js

@@ -5,6 +5,8 @@ const BundleTracker = require('webpack-bundle-tracker')
 const dotenv = require('dotenv')
 dotenv.config({ path: '../sapl/.env' })
 
+var THEME_CUSTOM = process.env.THEME_CUSTOM === undefined ? "sapl-oficial-theme" : process.env.THEME_CUSTOM
+
 module.exports = {
   publicPath: 'http://localhost:8080/',
   outputDir: './dist/',
@@ -30,25 +32,29 @@ module.exports = {
       .watchContentBase( true )
       .https(false)
       .headers({ 'Access-Control-Allow-Origin': '\*' })
-      .contentBase( [path.join(__dirname, 'public'), path.join(__dirname, 'src', 'assets')] )
-
+      .contentBase( [
+        path.join(__dirname, 'public'), 
+        path.join(__dirname, 'src', 'assets'),
+        path.join(__dirname, 'node_modules', THEME_CUSTOM, 'public'), 
+      
+      ] )
 
     config.entryPoints.delete('app')
     
-      // then add your own
     config.entry('hellow')
       .add('./src/hellow/main.js')
       .end()
-      
-    config.entry('theme')
-      .add('./src/theme/main.js')
-      .end()
-      
-    config
+
+    /*config
       .plugin('theme')
       .use(webpack.DefinePlugin, [{
-        THEME_CUSTOM: JSON.stringify(process.env.THEME_CUSTOM)
+        THEME_CUSTOM: JSON.stringify(THEME_CUSTOM)
       }])
+      .end()*/
+      
+    config.entry(THEME_CUSTOM)
+      .add(THEME_CUSTOM + '/src/main.js')
       .end()
+      
   }
 }

sapl/context_processors.py

@@ -22,3 +22,7 @@ def mail_service_configured(request):
         logger.warning(_('Servidor de email não configurado.'))
         return {'mail_service_configured': False}
     return {'mail_service_configured': True}
+
+
+def THEME_CUSTOM(request):
+    return {"THEME_CUSTOM": settings.THEME_CUSTOM}

sapl/settings.py

@@ -190,6 +190,7 @@ TEMPLATES = [
                 'django.contrib.messages.context_processors.messages',
                 'sapl.context_processors.parliament_info',
                 'sapl.context_processors.mail_service_configured',
+                'sapl.context_processors.THEME_CUSTOM'
             ],
             'debug': DEBUG
         },
@@ -274,7 +275,7 @@ WEBPACK_LOADER = {
         'IGNORE': [r'.+\.hot-update.js', r'.+\.map']
     }
 }
-
+THEME_CUSTOM = config('THEME_CUSTOM', default='sapl-oficial-theme')
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.8/howto/static-files/
 

sapl/templates/base.html

@@ -30,7 +30,7 @@
                               {# Scripts #}
                               {# modernizr must be in head (see http://modernizr.com/docs/#installing) #}
       {% endcomment %}
-            {% render_bundle 'theme' 'css' %}
+            {% render_bundle THEME_CUSTOM 'css' %}
 
     {% endblock %}
   </head>
@@ -233,7 +233,7 @@
     {% endif %}
 
     {% block foot_js %}
-      {% render_bundle 'theme' 'js' %}
+      {% render_bundle THEME_CUSTOM 'js' %}
 
       {% comment "" %}