Skip to content

Commit

Permalink
Merge pull request #64 from etalab/julien/optimbuild
Browse files Browse the repository at this point in the history
optimize build
  • Loading branch information
JulienParis authored May 6, 2020
2 parents 2893e64 + 88d2b23 commit 9a17f63
Show file tree
Hide file tree
Showing 11 changed files with 139 additions and 454 deletions.
21 changes: 15 additions & 6 deletions frontend/VERSIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,32 +13,41 @@ You can also check the [wireframe document online][wireframe_slides] or the [wir
[wireframe_slides]: https://docs.google.com/presentation/d/1j_0xaJzPIjmuDSQG-nNYzADad4pFaf8E3VBkggFu1FY/edit?usp=sharing
[wireframe_pdf]: ../screenshots/DASHBOARD_WIREFRAME_v.1.0-2.0.pdf

-----------------
date : 05-06/05/2020

- v.1.14.1 : optimizing buiild =>
- geojson 1000m instead of 100m
- fonts from CDN instead of build
- analyzer in nuxt script : `nuxt run analyze`
- big linting with standardJS
- fetch minified data instead of pretty jsons

-----------------
date : 04/05/2020

- v.0.13.1 : fix bug coherent colors when rebuilding apexChart
- v.1.13.1 : fix bug coherent colors when rebuilding apexChart

-----------------
date : 28/04/2020

- v.0.13 : iframing override from from [`.env` file](.envExample)
- v.1.13 : iframing override from from [`.env` file](.envExample)


-----------------
date : 27/04/2020

- v.0.12 : iframing parameter in url to hide navbar
- v.0.11 : Matomo parameters injection from [`.env` file](.envExample)
- v.1.12 : iframing parameter in url to hide navbar
- v.1.11 : Matomo parameters injection from [`.env` file](.envExample)

-----------------
date : 26/04/2020

- v.0.10 :
- v.1.10 :
- ability to load config files from distant files
- can write config js files to json files in statics

-----------------
date : 23/04/2020

- v.0 : first version (almost stable)
- v.1 : first version (almost stable)
8 changes: 4 additions & 4 deletions frontend/assets/css/fontawesome.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$fa-font-path : "../../node_modules/@fortawesome/fontawesome-free/webfonts";
@import '../../node_modules/@fortawesome/fontawesome-free/scss/fontawesome.scss';
@import '../../node_modules/@fortawesome/fontawesome-free/scss/solid.scss';
// $fa-font-path : "../../node_modules/@fortawesome/fontawesome-free/webfonts";
// @import '../../node_modules/@fortawesome/fontawesome-free/scss/fontawesome.scss';
// @import '../../node_modules/@fortawesome/fontawesome-free/scss/solid.scss';
// @import '../../node_modules/@fortawesome/fontawesome-free/scss/brands.scss';
// @import '../../node_modules/@fortawesome/fontawesome-free/scss/regular.scss';
// @import '../../node_modules/@fortawesome/fontawesome-free/scss/regular.scss';
7 changes: 3 additions & 4 deletions frontend/assets/css/main.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@import './fontawesome.scss';
@import './materialdesign.scss';

// @import './fontawesome.scss';
// @import './materialdesign.scss';

.skip-navbar{
padding-top : rem(64px) ;
Expand All @@ -12,4 +11,4 @@
.fullscreen-div{
height: 100%;
width: 100%;
}
}
2 changes: 1 addition & 1 deletion frontend/assets/css/materialdesign.scss
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@import '../../node_modules/material-design-icons-iconfont/dist/material-design-icons.css';
// @import '../../node_modules/material-design-icons-iconfont/dist/material-design-icons.css';
79 changes: 0 additions & 79 deletions frontend/components/UI/Logo.vue

This file was deleted.

18 changes: 0 additions & 18 deletions frontend/components/UI/VuetifyLogo.vue

This file was deleted.

2 changes: 2 additions & 0 deletions frontend/components/UX/NavbarFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,11 @@
<span>
{{ btn.title[locale] }}
</span>

<v-icon>
{{ btn.icon }}
</v-icon>

</v-btn>
</v-bottom-navigation>
</v-footer>
Expand Down
14 changes: 6 additions & 8 deletions frontend/nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ console.log(
process.env.NUXT_ENV_APP_TITLE
)

const APP_VERSION = 'v.0.13.linting - linting frontend code'
const APP_VERSION = 'v.0.14.analyze - analyze build + treeshake icons'

// - - - - - - - - - - - - - - - - - - - - - - - -
// CONFIGS FROM...
Expand Down Expand Up @@ -274,7 +274,10 @@ export default {
content: process.env.NUXT_ENV_APP_TITLE || 'ODAMAP'
}
],
link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }]
link: [
{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' },
{ href: 'https://use.fontawesome.com/releases/v5.0.13/css/all.css', rel: 'stylesheet' }
]
},

// for build or dev
Expand Down Expand Up @@ -338,6 +341,7 @@ export default {
'nuxt-i18n',
// '~/modules/objectFromPath',
'@nuxtjs/device'

],

i18n: {
Expand Down Expand Up @@ -374,12 +378,6 @@ export default {
*/
build: {
transpile: ['vue-mapbox'],
// plugins: [
// new webpack.ProvidePlugin({
// mapboxgl: 'mapbox-gl'
// })
// ],

/*
** You can extend webpack config here
*/
Expand Down
Loading

0 comments on commit 9a17f63

Please sign in to comment.