Skip to content

Commit

Permalink
Pequenas alterações
Browse files Browse the repository at this point in the history
- Removidas fontes que não estão sendo utilizadas;
- Removido scripts e links do index.html e adicionado no package.json
  • Loading branch information
greevin committed Mar 27, 2018
1 parent 079fe0f commit ffb1b80
Show file tree
Hide file tree
Showing 11 changed files with 82 additions and 37 deletions.
2 changes: 1 addition & 1 deletion config/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ module.exports = {
// Surge or Netlify already gzip all static assets for you.
// Before setting to `true`, make sure to:
// npm install --save-dev compression-webpack-plugin
productionGzip: false,
productionGzip: true,
productionGzipExtensions: ['js', 'css'],

// Run the build command with an extra argument to
Expand Down
14 changes: 1 addition & 13 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,11 @@

<link rel="stylesheet" href="static/style.css">

<!-- Mapbox GL CSS -->
<link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css' rel='stylesheet' />

<!-- Assembly.css -->
<link href="https://api.mapbox.com/mapbox-assembly/v0.21.0/assembly.min.css" rel="stylesheet">
<script async defer src="https://api.mapbox.com/mapbox-assembly/v0.21.0/assembly.js"></script>

<!-- jQuery -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>

<!--Script for Chart -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.1/Chart.min.js"></script>

<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
<script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>

<!--Timeline-->
<link title="timeline-styles" rel="stylesheet" href="https://cdn.knightlab.com/libs/timeline3/latest/css/timeline.css">
<script src="https://cdn.knightlab.com/libs/timeline3/latest/js/timeline.js"></script>

Expand Down
59 changes: 57 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@
},
"dependencies": {
"axios": "^0.18.0",
"chart.js": "^2.7.2",
"datatables.net": "^1.10.16",
"datatables.net-dt": "^1.10.16",
"jquery-ui": "^1.12.1",
"mapbox-gl": "^0.44.1",
"vue": "^2.5.2"
},
Expand All @@ -27,12 +29,14 @@
"babel-preset-env": "^1.3.2",
"babel-preset-stage-2": "^6.22.0",
"chalk": "^2.0.1",
"compression-webpack-plugin": "^1.1.11",
"copy-webpack-plugin": "^4.0.1",
"css-loader": "^0.28.0",
"extract-text-webpack-plugin": "^3.0.0",
"file-loader": "^1.1.4",
"friendly-errors-webpack-plugin": "^1.6.1",
"html-webpack-plugin": "^2.30.1",
"jquery": "^3.3.1",
"node-notifier": "^5.1.2",
"optimize-css-assets-webpack-plugin": "^3.2.0",
"ora": "^1.2.0",
Expand Down
5 changes: 0 additions & 5 deletions src/components/InfoIpes.vue
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ export default {
id: "",
sigla: "",
arquivo: "",
nome_polo: "",
nome: "",
endereco: {
logradouro: "",
Expand All @@ -187,15 +186,11 @@ export default {
cidade: "",
estado: "",
cep: "",
nome_fantasia: "",
telefone: "",
url: "",
isVisible: false,
infoIpesText: ''
};
},
created() {
},
mounted() {
$("#info-ipes-right-sidebar").tabs({show: 'fade', hide: 'fade', active: 0,
Expand Down
21 changes: 17 additions & 4 deletions src/main.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,25 @@
// The Vue build version to load with the `import` command
// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
import Vue from 'vue'
// jQuery
import jQuery from 'jquery'
global.$ = jQuery
// DataTables
import dataTables from 'datatables.net'
import 'datatables.net-dt/css/jquery.dataTables.css'
// jQuery UI
var tabs = require( "jquery-ui/ui/widgets/tabs" );
// Mapbox
import map from './map'
import 'mapbox-gl/dist/mapbox-gl.css'
// Chart
import Chart from 'chart.js'
// Carrega os gráficos
import functions from './functions'
// EventBus
import { EventBus } from './eventBus'

// Components
import RightSidebar from './components/RightSidebar'
import InfoPolos from './components/InfoPolos'
import InfoIpes from './components/InfoIpes'
Expand All @@ -18,8 +34,5 @@ Vue.config.productionTip = false

/* eslint-disable no-new */
new Vue({
el: '#app',
data: {
seen: true
}
el: '#app'
})
Binary file removed static/font/Cabin-Medium.otf
Binary file not shown.
Binary file removed static/font/Cabin-Regular.otf
Binary file not shown.
Binary file removed static/font/QuattrocentoSans-Bold.otf
Binary file not shown.
Binary file removed static/font/QuattrocentoSans-Regular.otf
Binary file not shown.
14 changes: 2 additions & 12 deletions static/style.css
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
body {
margin: 0;
padding: 0;
font-family: "quattro" !important;
font-family: "gidole" !important;
}

@font-face {
font-family: quattro;
src: url(./font/Gidole-Regular.ttf);
}

@font-face {
font-family: quattrobold;
font-family: gidole;
src: url(./font/Gidole-Regular.ttf);
}

Expand Down Expand Up @@ -116,11 +111,6 @@ li.ui-tabs-active.ui-state-active {
border-radius: 7px !important;
}

li.ui-tabs-active.ui-state-active {
color: #fff !important;
border-bottom: 5px solid #fff !important;
}

#tab-dados td.sorting_1{
text-transform: uppercase;
}
Expand Down

0 comments on commit ffb1b80

Please sign in to comment.