Skip to content

Commit 68212be

Browse files
authored
Bump frontend (#3597)
* Retorna último bump * Atualiz de versões do front e impactos no código Atualiza versões secundárias e de remendos x.Y.Z Atualiza versões secundárias (minor version x.Y.z) e de remendos (patch version x.y.Z) em conjunto das libs de menor impacto no frontend. Syncs webpack-bundle-tracker django-webpack-loader A primeira delas é do frontend já a segunda é do backend. Elas fazem a ponte entre o front e back. A primeira faz um catálogo (webpack-stats-json) de todo material compilado para produção pelo webpack. Em tempo de desenvolvimento, esses catálogo não possui referências para arquivos, mas para urls do servidor de desenvolvimento do frontend. Já a segunda, lê todo o material produzido pela primeira, disponibiliza filters para acesso geral, modular ou diretamente a arquivos específicos. bump vs secundária do vue e vue-template-compiler Já existe atualização de versão primária do VueJs mas atualizá-la algo em ~3.0.0 exige revisão, refatoração e/ou reimplementação de código. vue-template-compiler anda junto com vue e é usado para possui compilar container pre-alimentado no backend como é o caso de: https://github.com/interlegis/sapl/blob/3.1.x/sapl/templates/parlamentares/parlamentares_list.html migra libs para devDependencies bump version frontend
1 parent cc567c7 commit 68212be

File tree

243 files changed

+1176
-20832
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

243 files changed

+1176
-20832
lines changed

frontend/.eslintrc.js .eslintrc.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module.exports = {
1111
],
1212
rules: {
1313
'generator-star-spacing': 'off',
14-
//'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
14+
// 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
1515
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
1616
camelcase: 0
1717
},
@@ -20,7 +20,8 @@ module.exports = {
2020
'vue'
2121
],
2222
parserOptions: {
23-
parser: 'babel-eslint'
23+
parser: '@babel/eslint-parser'
24+
// requireConfigFile: false
2425
},
2526

2627
globals: {
File renamed without changes.

frontend/public/img/arrow.png

-262 Bytes
Binary file not shown.

frontend/public/img/authenticated.png

-29.6 KB
Binary file not shown.

frontend/public/img/avatar.png

-58.9 KB
Binary file not shown.

frontend/public/img/beta.png

-6.64 KB
Binary file not shown.

frontend/public/img/brasao_transp.gif

-7.46 KB
Binary file not shown.
-682 Bytes
Binary file not shown.

frontend/public/img/etiqueta.png

-694 Bytes
Binary file not shown.

frontend/public/img/favicon.ico

-975 Bytes
Binary file not shown.

frontend/public/img/file.png

-1021 Bytes
Binary file not shown.

frontend/public/img/hand-note.png

-502 Bytes
Binary file not shown.
-3 KB
Binary file not shown.
-2.8 KB
Binary file not shown.
-1.47 KB
Binary file not shown.
-2.79 KB
Binary file not shown.
-4.88 KB
Binary file not shown.
-1.57 KB
Binary file not shown.

frontend/public/img/icon_pautas.png

-1.91 KB
Binary file not shown.
-4.34 KB
Binary file not shown.
-1.24 KB
Binary file not shown.
-2.85 KB
Binary file not shown.

frontend/public/img/lexml.gif

-568 Bytes
Binary file not shown.

frontend/public/img/logo.png

-18.4 KB
Binary file not shown.

frontend/public/img/logo_cc.png

-3.13 KB
Binary file not shown.
-1.59 KB
Binary file not shown.

frontend/public/img/manual.png

-343 Bytes
Binary file not shown.

frontend/public/img/pdflogo.png

-238 KB
Binary file not shown.

frontend/public/img/perfil.png

-6.15 KB
Binary file not shown.

frontend/public/img/search-gray.png

-2.96 KB
Binary file not shown.

frontend/public/img/search.png

-367 Bytes
Binary file not shown.

frontend/public/img/user.png

-290 Bytes
Binary file not shown.

frontend/src/__apps/compilacao/js/old/compilacao_edit.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ window.DispositivoEdit = function () {
6262
const obj_click = (event.target.classList.contains('dpt-link')
6363
? event.target
6464
: (event.target.parentElement.classList.contains('dpt-link')
65-
? event.target.parentElement
66-
: null))
65+
? event.target.parentElement
66+
: null))
6767

6868
if (obj_click && obj_click.getAttribute('href') && obj_click.getAttribute('href').length > 0) { return }
6969

@@ -245,7 +245,7 @@ window.DispositivoEdit = function () {
245245
if (editortype !== 'construct') {
246246
dpt_form.html(data)
247247
if (editortype === 'tinymce') {
248-
window.initTextRichEditor()
248+
window.initTextRichEditor(null, false, true)
249249
}
250250
// OptionalCustomFrontEnd().init()
251251
}
@@ -431,9 +431,9 @@ window.DispositivoEdit = function () {
431431

432432
const form_data = {
433433
csrfmiddlewaretoken: this.csrfmiddlewaretoken.value,
434-
texto: texto,
435-
texto_atualizador: texto_atualizador,
436-
visibilidade: visibilidade,
434+
texto,
435+
texto_atualizador,
436+
visibilidade,
437437
formtype: 'get_form_base'
438438
}
439439

frontend/src/__apps/compilacao/scss/compilacao.scss

+6-2
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,10 @@ a:link:after, a:visited:after {
424424
float:left;
425425
.dptt {
426426
position: relative;
427+
p {
428+
429+
display: inline !important;
430+
}
427431
}
428432
}
429433

@@ -1381,7 +1385,7 @@ a:link:after, a:visited:after {
13811385
&::before {
13821386
z-index: 20;
13831387
position: absolute;
1384-
background: url(/static/img/icon_delete_white.png) no-repeat 50% 50%;
1388+
background: url(@/assets/img/icon_delete_white.png) no-repeat 50% 50%;
13851389
content:"";
13861390
top: 0;
13871391
left: 0;
@@ -1403,7 +1407,7 @@ a:link:after, a:visited:after {
14031407
color: white;
14041408
}
14051409
&::before {
1406-
background: url(/static/img/icon_save_white.png) no-repeat 50% 50%;
1410+
background: url(@/assets/img/icon_save_white.png) no-repeat 50% 50%;
14071411
}
14081412
}
14091413
span {

frontend/src/__global/js/tinymce/index.js

+17-22
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,32 @@
1-
2-
import tinymce from 'tinymce/tinymce'
3-
import './langs/pt_BR.js'
1+
import tinymce from 'tinymce'
42

53
import 'tinymce/themes/silver'
64
import 'tinymce/icons/default'
5+
import 'tinymce/models/dom/index'
6+
import 'tinymce/skins/ui/oxide/skin.min.css'
77

8-
import 'tinymce/plugins/table'
9-
import 'tinymce/plugins/lists'
108
import 'tinymce/plugins/code'
11-
import 'tinymce/plugins/visualblocks'
9+
import 'tinymce/plugins/advlist'
10+
import 'tinymce/plugins/link'
11+
import 'tinymce/plugins/lists'
12+
import 'tinymce/plugins/table'
1213

13-
import 'tinymce/skins/ui/oxide/skin.css'
14+
import './langs/pt_BR.js'
15+
// import contentUiCss from 'tinymce/skins/ui/oxide/content.css'
16+
// import contentCss from 'tinymce/skins/content/default/content.css'
1417

1518
window.tinymce = tinymce
16-
17-
window.removeTinymce = function () {
18-
while (window.tinymce.editors.length > 0) {
19-
window.tinymce.remove(window.tinymce.editors[0])
20-
}
21-
}
22-
2319
window.initTextRichEditor = function (elements, readonly = false) {
24-
window.removeTinymce()
2520
const configTinymce = {
2621
selector: elements === null || elements === undefined ? 'textarea' : elements,
27-
forced_root_block: '',
28-
min_height: 200,
2922
language: 'pt_BR',
30-
branding: false,
31-
content_css: 'default',
32-
plugins: ['lists table code visualblocks'],
33-
menubar: 'edit view format table tools',
34-
toolbar: 'undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent'
23+
// skin: false,
24+
// content_css: false,
25+
forced_root_block: 'div',
26+
// content_style: contentUiCss.toString() + '\n' + contentCss.toString(),
27+
plugins: 'table lists advlist link code',
28+
toolbar: 'undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link | code',
29+
menubar: 'file edit view insert format table'
3530
}
3631
if (readonly) {
3732
configTinymce.readonly = 1

frontend/src/__global/main.js

+12-20
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,24 @@
1-
// app - global
2-
// é uma app fundamental para o layout do sapl tradicional.
3-
// é importada pelo backend em seus templates
4-
5-
import '@fortawesome/fontawesome-free/css/all.css'
6-
71
import 'bootstrap'
2+
import 'jquery-mask-plugin'
83

9-
import 'webpack-jquery-ui/dialog'
10-
import 'webpack-jquery-ui/sortable'
11-
import 'webpack-jquery-ui/datepicker'
12-
import 'webpack-jquery-ui/autocomplete'
4+
import 'jquery-ui/dist/jquery-ui'
5+
import 'jquery-ui/ui/widgets/dialog'
6+
import 'jquery-ui/ui/widgets/sortable'
7+
import 'jquery-ui/ui/widgets/datepicker'
8+
import 'jquery-ui/ui/widgets/autocomplete'
139
import 'jquery-ui/ui/i18n/datepicker-pt-BR'
1410

15-
import 'jquery-ui-themes/themes/cupertino/jquery-ui.min.css'
16-
17-
import 'jquery-mask-plugin'
18-
19-
import './scss/app.scss'
11+
import * as moment from 'moment'
12+
import 'moment/locale/pt-br'
2013

2114
import './js/tinymce'
2215
import './js/image_cropping'
2316
import './js/functions'
17+
import './js/jquery.runner'
2418

25-
import * as moment from 'moment'
26-
import 'moment/locale/pt-br'
27-
28-
// eslint-disable-next-line
29-
require('imports-loader?window.jQuery=jquery!./js/jquery.runner.js')
19+
import '@fortawesome/fontawesome-free/css/all.css'
20+
import 'jquery-ui-themes/themes/cupertino/jquery-ui.min.css'
21+
import './scss/app.scss'
3022

3123
window.$ = $
3224
window.jQuery = $

frontend/src/__global/scss/_header.scss

+2-36
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,8 @@
22
$blue: #02baf2 !default;
33
$red: #f84545 !default;
44

5-
@import "~bootstrap/scss/functions";
6-
@import "~bootstrap/scss/variables";
7-
@import "~bootstrap/scss/mixins";
8-
@import "~bootstrap/scss/reboot";
9-
@import "~bootstrap/scss/type";
10-
@import "~bootstrap/scss/images";
11-
@import "~bootstrap/scss/code";
12-
@import "~bootstrap/scss/grid";
13-
@import "~bootstrap/scss/tables";
14-
@import "~bootstrap/scss/forms";
15-
@import "~bootstrap/scss/buttons";
16-
@import "~bootstrap/scss/transitions";
17-
@import "~bootstrap/scss/dropdown";
18-
@import "~bootstrap/scss/button-group";
19-
@import "~bootstrap/scss/input-group";
20-
@import "~bootstrap/scss/custom-forms";
21-
@import "~bootstrap/scss/nav";
22-
@import "~bootstrap/scss/navbar";
23-
@import "~bootstrap/scss/card";
24-
@import "~bootstrap/scss/breadcrumb";
25-
@import "~bootstrap/scss/pagination";
26-
@import "~bootstrap/scss/badge";
27-
@import "~bootstrap/scss/jumbotron";
28-
@import "~bootstrap/scss/alert";
29-
@import "~bootstrap/scss/progress";
30-
@import "~bootstrap/scss/media";
31-
@import "~bootstrap/scss/list-group";
32-
@import "~bootstrap/scss/close";
33-
@import "~bootstrap/scss/toasts";
34-
@import "~bootstrap/scss/modal";
35-
@import "~bootstrap/scss/tooltip";
36-
@import "~bootstrap/scss/popover";
37-
@import "~bootstrap/scss/carousel";
38-
@import "~bootstrap/scss/spinners";
39-
@import "~bootstrap/scss/utilities";
40-
@import "~bootstrap/scss/print";
5+
@import "~bootstrap/scss/bootstrap";
6+
417

428
@each $color, $value in $theme-colors {
439
.btn-outline-#{$color} {

frontend/src/__global/scss/libs/bootstrap/_nav_navbar.scss

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import "~bootstrap/scss/variables";
2+
13
.navbar {
24
padding: 0;
35
}
@@ -26,7 +28,7 @@
2628
border-radius: 0;
2729
}
2830
a {
29-
padding: 0 $grid-gutter-width / 2;
31+
padding: 0 calc($grid-gutter-width / 2);
3032
line-height: 2.3rem;
3133
display: block;
3234
text-decoration: none;
@@ -45,14 +47,14 @@
4547
}
4648
}
4749
.search-form {
48-
padding: $grid-gutter-width / 3;
50+
padding: calc($grid-gutter-width / 3);
4951
min-width: 20%;;
5052
}
5153
a:not([href]):not([tabindex]) {
5254
color: #777;
5355
}
5456

55-
&.justify-content-end {
57+
&.justify-content-end {
5658
.dropdown-menu {
5759
left: auto;
5860
right: 0px;
@@ -71,7 +73,7 @@
7173
a {
7274
color: white;
7375
}
74-
}
76+
}
7577
}
7678

7779
}
File renamed without changes.

0 commit comments

Comments
 (0)