From 1fdec8c214b50e0be024939ea0f10db2778c022f Mon Sep 17 00:00:00 2001 From: Leandro Roberto Date: Sun, 13 Jan 2019 04:10:57 -0200 Subject: [PATCH] move assets para sapl-frontend --- sapl-frontend/package.json | 4 +- .../src/assets}/audio/ring.mp3 | Bin .../src/assets}/img/arrow.png | Bin .../src/assets}/img/authenticated.png | Bin .../src/assets}/img/avatar.png | Bin .../src/assets}/img/beta.png | Bin .../src/assets}/img/brasao_transp.gif | Bin .../src/assets}/img/down_arrow_select.jpg | Bin .../src/assets}/img/etiqueta.png | Bin .../src/assets}/img/favicon.ico | Bin .../src/assets}/img/file.png | Bin .../src/assets}/img/hand-note.png | Bin .../src/assets}/img/icon_comissoes.png | Bin .../src/assets}/img/icon_delete_white.png | Bin .../assets}/img/icon_materia_legislativa.png | Bin .../src/assets}/img/icon_mesa_diretora.png | Bin .../src/assets}/img/icon_normas_juridicas.png | Bin .../src/assets}/img/icon_parlamentares.png | Bin .../src/assets}/img/icon_pautas.png | Bin .../src/assets}/img/icon_plenarias.png | Bin .../src/assets}/img/icon_relatorios.png | Bin .../src/assets}/img/icon_save_white.png | Bin .../src/assets}/img/lexml.gif | Bin .../src/assets}/img/logo.png | Bin .../src/assets}/img/logo_cc.png | Bin .../src/assets}/img/logo_interlegis.png | Bin .../src/assets}/img/manual.png | Bin .../src/assets}/img/pdflogo.png | Bin .../src/assets}/img/perfil.png | Bin .../src/assets}/img/search-gray.png | Bin .../src/assets}/img/search.png | Bin .../src/assets}/img/user.png | Bin sapl-frontend/src/theme/main.js | 6 +- sapl-frontend/vue.config.js | 8 +- sapl/settings.py | 5 +- sapl/templates/base.html | 97 +++++++++--------- sapl/templates/index.html | 33 +++--- sapl/templates/menus/nav.html | 10 +- sapl/templates/menus/subnav.html | 10 +- 39 files changed, 91 insertions(+), 82 deletions(-) rename {sapl/static => sapl-frontend/src/assets}/audio/ring.mp3 (100%) rename {sapl/static => sapl-frontend/src/assets}/img/arrow.png (100%) rename {sapl/static => sapl-frontend/src/assets}/img/authenticated.png (100%) rename {sapl/static => sapl-frontend/src/assets}/img/avatar.png (100%) rename {sapl/static => sapl-frontend/src/assets}/img/beta.png (100%) rename {sapl/static => sapl-frontend/src/assets}/img/brasao_transp.gif (100%) rename {sapl/static => sapl-frontend/src/assets}/img/down_arrow_select.jpg (100%) rename {sapl/static => sapl-frontend/src/assets}/img/etiqueta.png (100%) rename {sapl/static => sapl-frontend/src/assets}/img/favicon.ico (100%) rename {sapl/static => sapl-frontend/src/assets}/img/file.png (100%) rename {sapl/static => sapl-frontend/src/assets}/img/hand-note.png (100%) rename {sapl/static => sapl-frontend/src/assets}/img/icon_comissoes.png (100%) rename {sapl/static => sapl-frontend/src/assets}/img/icon_delete_white.png (100%) rename {sapl/static => sapl-frontend/src/assets}/img/icon_materia_legislativa.png (100%) rename {sapl/static => sapl-frontend/src/assets}/img/icon_mesa_diretora.png (100%) rename {sapl/static => sapl-frontend/src/assets}/img/icon_normas_juridicas.png (100%) rename {sapl/static => sapl-frontend/src/assets}/img/icon_parlamentares.png (100%) rename {sapl/static => sapl-frontend/src/assets}/img/icon_pautas.png (100%) rename {sapl/static => sapl-frontend/src/assets}/img/icon_plenarias.png (100%) rename {sapl/static => sapl-frontend/src/assets}/img/icon_relatorios.png (100%) rename {sapl/static => sapl-frontend/src/assets}/img/icon_save_white.png (100%) rename {sapl/static => sapl-frontend/src/assets}/img/lexml.gif (100%) rename {sapl/static => sapl-frontend/src/assets}/img/logo.png (100%) rename {sapl/static => sapl-frontend/src/assets}/img/logo_cc.png (100%) rename {sapl/static => sapl-frontend/src/assets}/img/logo_interlegis.png (100%) rename {sapl/static => sapl-frontend/src/assets}/img/manual.png (100%) rename {sapl/static => sapl-frontend/src/assets}/img/pdflogo.png (100%) rename {sapl/static => sapl-frontend/src/assets}/img/perfil.png (100%) rename {sapl/static => sapl-frontend/src/assets}/img/search-gray.png (100%) rename {sapl/static => sapl-frontend/src/assets}/img/search.png (100%) rename {sapl/static => sapl-frontend/src/assets}/img/user.png (100%) diff --git a/sapl-frontend/package.json b/sapl-frontend/package.json index 67a03eec8..9c22f9d2e 100644 --- a/sapl-frontend/package.json +++ b/sapl-frontend/package.json @@ -17,7 +17,9 @@ "vue-router": "^3.0.1", "vuex": "^3.0.1", "webpack": "^4.28.4", - "webpack-bundle-tracker": "^0.4.2-beta" + "webpack-bundle-tracker": "^0.4.2-beta", + + "sapl-oficial-theme": "../../sapl-oficial-theme" }, "devDependencies": { "@vue/cli-plugin-babel": "^3.3.0", diff --git a/sapl/static/audio/ring.mp3 b/sapl-frontend/src/assets/audio/ring.mp3 similarity index 100% rename from sapl/static/audio/ring.mp3 rename to sapl-frontend/src/assets/audio/ring.mp3 diff --git a/sapl/static/img/arrow.png b/sapl-frontend/src/assets/img/arrow.png similarity index 100% rename from sapl/static/img/arrow.png rename to sapl-frontend/src/assets/img/arrow.png diff --git a/sapl/static/img/authenticated.png b/sapl-frontend/src/assets/img/authenticated.png similarity index 100% rename from sapl/static/img/authenticated.png rename to sapl-frontend/src/assets/img/authenticated.png diff --git a/sapl/static/img/avatar.png b/sapl-frontend/src/assets/img/avatar.png similarity index 100% rename from sapl/static/img/avatar.png rename to sapl-frontend/src/assets/img/avatar.png diff --git a/sapl/static/img/beta.png b/sapl-frontend/src/assets/img/beta.png similarity index 100% rename from sapl/static/img/beta.png rename to sapl-frontend/src/assets/img/beta.png diff --git a/sapl/static/img/brasao_transp.gif b/sapl-frontend/src/assets/img/brasao_transp.gif similarity index 100% rename from sapl/static/img/brasao_transp.gif rename to sapl-frontend/src/assets/img/brasao_transp.gif diff --git a/sapl/static/img/down_arrow_select.jpg b/sapl-frontend/src/assets/img/down_arrow_select.jpg similarity index 100% rename from sapl/static/img/down_arrow_select.jpg rename to sapl-frontend/src/assets/img/down_arrow_select.jpg diff --git a/sapl/static/img/etiqueta.png b/sapl-frontend/src/assets/img/etiqueta.png similarity index 100% rename from sapl/static/img/etiqueta.png rename to sapl-frontend/src/assets/img/etiqueta.png diff --git a/sapl/static/img/favicon.ico b/sapl-frontend/src/assets/img/favicon.ico similarity index 100% rename from sapl/static/img/favicon.ico rename to sapl-frontend/src/assets/img/favicon.ico diff --git a/sapl/static/img/file.png b/sapl-frontend/src/assets/img/file.png similarity index 100% rename from sapl/static/img/file.png rename to sapl-frontend/src/assets/img/file.png diff --git a/sapl/static/img/hand-note.png b/sapl-frontend/src/assets/img/hand-note.png similarity index 100% rename from sapl/static/img/hand-note.png rename to sapl-frontend/src/assets/img/hand-note.png diff --git a/sapl/static/img/icon_comissoes.png b/sapl-frontend/src/assets/img/icon_comissoes.png similarity index 100% rename from sapl/static/img/icon_comissoes.png rename to sapl-frontend/src/assets/img/icon_comissoes.png diff --git a/sapl/static/img/icon_delete_white.png b/sapl-frontend/src/assets/img/icon_delete_white.png similarity index 100% rename from sapl/static/img/icon_delete_white.png rename to sapl-frontend/src/assets/img/icon_delete_white.png diff --git a/sapl/static/img/icon_materia_legislativa.png b/sapl-frontend/src/assets/img/icon_materia_legislativa.png similarity index 100% rename from sapl/static/img/icon_materia_legislativa.png rename to sapl-frontend/src/assets/img/icon_materia_legislativa.png diff --git a/sapl/static/img/icon_mesa_diretora.png b/sapl-frontend/src/assets/img/icon_mesa_diretora.png similarity index 100% rename from sapl/static/img/icon_mesa_diretora.png rename to sapl-frontend/src/assets/img/icon_mesa_diretora.png diff --git a/sapl/static/img/icon_normas_juridicas.png b/sapl-frontend/src/assets/img/icon_normas_juridicas.png similarity index 100% rename from sapl/static/img/icon_normas_juridicas.png rename to sapl-frontend/src/assets/img/icon_normas_juridicas.png diff --git a/sapl/static/img/icon_parlamentares.png b/sapl-frontend/src/assets/img/icon_parlamentares.png similarity index 100% rename from sapl/static/img/icon_parlamentares.png rename to sapl-frontend/src/assets/img/icon_parlamentares.png diff --git a/sapl/static/img/icon_pautas.png b/sapl-frontend/src/assets/img/icon_pautas.png similarity index 100% rename from sapl/static/img/icon_pautas.png rename to sapl-frontend/src/assets/img/icon_pautas.png diff --git a/sapl/static/img/icon_plenarias.png b/sapl-frontend/src/assets/img/icon_plenarias.png similarity index 100% rename from sapl/static/img/icon_plenarias.png rename to sapl-frontend/src/assets/img/icon_plenarias.png diff --git a/sapl/static/img/icon_relatorios.png b/sapl-frontend/src/assets/img/icon_relatorios.png similarity index 100% rename from sapl/static/img/icon_relatorios.png rename to sapl-frontend/src/assets/img/icon_relatorios.png diff --git a/sapl/static/img/icon_save_white.png b/sapl-frontend/src/assets/img/icon_save_white.png similarity index 100% rename from sapl/static/img/icon_save_white.png rename to sapl-frontend/src/assets/img/icon_save_white.png diff --git a/sapl/static/img/lexml.gif b/sapl-frontend/src/assets/img/lexml.gif similarity index 100% rename from sapl/static/img/lexml.gif rename to sapl-frontend/src/assets/img/lexml.gif diff --git a/sapl/static/img/logo.png b/sapl-frontend/src/assets/img/logo.png similarity index 100% rename from sapl/static/img/logo.png rename to sapl-frontend/src/assets/img/logo.png diff --git a/sapl/static/img/logo_cc.png b/sapl-frontend/src/assets/img/logo_cc.png similarity index 100% rename from sapl/static/img/logo_cc.png rename to sapl-frontend/src/assets/img/logo_cc.png diff --git a/sapl/static/img/logo_interlegis.png b/sapl-frontend/src/assets/img/logo_interlegis.png similarity index 100% rename from sapl/static/img/logo_interlegis.png rename to sapl-frontend/src/assets/img/logo_interlegis.png diff --git a/sapl/static/img/manual.png b/sapl-frontend/src/assets/img/manual.png similarity index 100% rename from sapl/static/img/manual.png rename to sapl-frontend/src/assets/img/manual.png diff --git a/sapl/static/img/pdflogo.png b/sapl-frontend/src/assets/img/pdflogo.png similarity index 100% rename from sapl/static/img/pdflogo.png rename to sapl-frontend/src/assets/img/pdflogo.png diff --git a/sapl/static/img/perfil.png b/sapl-frontend/src/assets/img/perfil.png similarity index 100% rename from sapl/static/img/perfil.png rename to sapl-frontend/src/assets/img/perfil.png diff --git a/sapl/static/img/search-gray.png b/sapl-frontend/src/assets/img/search-gray.png similarity index 100% rename from sapl/static/img/search-gray.png rename to sapl-frontend/src/assets/img/search-gray.png diff --git a/sapl/static/img/search.png b/sapl-frontend/src/assets/img/search.png similarity index 100% rename from sapl/static/img/search.png rename to sapl-frontend/src/assets/img/search.png diff --git a/sapl/static/img/user.png b/sapl-frontend/src/assets/img/user.png similarity index 100% rename from sapl/static/img/user.png rename to sapl-frontend/src/assets/img/user.png diff --git a/sapl-frontend/src/theme/main.js b/sapl-frontend/src/theme/main.js index 0a5a58855..69597209a 100644 --- a/sapl-frontend/src/theme/main.js +++ b/sapl-frontend/src/theme/main.js @@ -1,5 +1,9 @@ -import "./scss/app.scss"; +//import "./scss/app.scss"; +//import 'bootstrap'; + +import "sapl-oficial-theme/src/main"; //eslint-disable-next-line let theme_lib = THEME_CUSTOM console.log(theme_lib); + diff --git a/sapl-frontend/vue.config.js b/sapl-frontend/vue.config.js index 72f7ca134..69dca7c5c 100644 --- a/sapl-frontend/vue.config.js +++ b/sapl-frontend/vue.config.js @@ -1,4 +1,5 @@ const webpack = require('webpack') +const path = require('path') const BundleTracker = require('webpack-bundle-tracker') const dotenv = require('dotenv') @@ -24,10 +25,13 @@ module.exports = { .public('') .host('localhost') .port(8080) - .hotOnly(true) - .watchOptions({ poll: 1000 }) + .hot(true) + .watchOptions({ poll: true }) + .watchContentBase( true ) .https(false) .headers({ 'Access-Control-Allow-Origin': '\*' }) + .contentBase( [path.join(__dirname, 'public'), path.join(__dirname, 'src', 'assets')] ) + config.entryPoints.delete('app') diff --git a/sapl/settings.py b/sapl/settings.py index cb6db9d4e..b1b4c962e 100755 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -269,6 +269,9 @@ WEBPACK_LOADER = { 'CACHE': not DEBUG, 'BUNDLE_DIR_NAME': 'bundle/dist/', 'STATS_FILE': FRONTEND_DIR.child('webpack-stats.json'), + 'POLL_INTERVAL': 0.1, + 'TIMEOUT': None, + 'IGNORE': [r'.+\.hot-update.js', r'.+\.map'] } } @@ -282,7 +285,7 @@ STATIC_ROOT = PROJECT_DIR.child("collected_static") STATICFILES_DIRS = ( # BASE_DIR.child("static"), - FRONTEND_DIR.child('bundle').child('dist'), + FRONTEND_DIR.child('dist'), ) diff --git a/sapl/templates/base.html b/sapl/templates/base.html index 08ca060cb..282ad7e41 100644 --- a/sapl/templates/base.html +++ b/sapl/templates/base.html @@ -2,6 +2,7 @@ {% load i18n staticfiles menus %} {% load common_tags %} {% load render_bundle from webpack_loader %} +{% load webpack_static from webpack_loader %} @@ -13,7 +14,7 @@ {% block head_title %}{% trans 'SAPL - Sistema de Apoio ao Processo Legislativo' %}{% endblock %} {% block head_content %} - + {# Styles #} {% comment "" %} @@ -39,55 +40,49 @@ {% if not request|has_iframe %} {% block navigation %} - + + + {% endblock navigation %} {# Header #} @@ -96,7 +91,7 @@
- Logo {# XXX Make better use of translation tags in html blocks ie. actually use the proper blocktrans tag efficiently #} @@ -187,7 +182,7 @@ - {% trans 'Logo do Interlegis' %} + {% trans 'Logo do Interlegis' %}

@@ -199,7 +194,7 @@

diff --git a/sapl/templates/index.html b/sapl/templates/index.html index 9dd611471..3d9534d0e 100644 --- a/sapl/templates/index.html +++ b/sapl/templates/index.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% load i18n staticfiles %} +{% load webpack_static from webpack_loader %} {% block title %} @@ -10,13 +11,13 @@

- Mesa Diretora + Mesa Diretora

Mesa Diretora

- +

Mesa Diretora

@@ -33,13 +34,13 @@

- Comissões + Comissões

Comissões

- +

Comissões

@@ -56,13 +57,13 @@

- Parlamentares + Parlamentares

Parlamentares

- +

Parlamentares

@@ -79,13 +80,13 @@

- Pautas das Sessões + Pautas das Sessões

Pautas das Sessões

- +

Pautas das
Sessões

@@ -103,13 +104,13 @@

- Sessão Plenária + Sessão Plenária

Sessão Plenária

- +

Sessão Plenária

@@ -128,13 +129,13 @@

- Matérias Legislativas + Matérias Legislativas

Matérias Legislativas

- +

Matérias
Legislativas

@@ -151,13 +152,13 @@

- Normas Jurídicas + Normas Jurídicas

Normas Jurídicas

- +

Normas Jurídicas

@@ -172,13 +173,13 @@

- Relatórios + Relatórios

Relatórios

- +

Relatórios

diff --git a/sapl/templates/menus/nav.html b/sapl/templates/menus/nav.html index 548c54a63..8d504b666 100644 --- a/sapl/templates/menus/nav.html +++ b/sapl/templates/menus/nav.html @@ -1,25 +1,25 @@ {% load i18n %} {% if menu %} -