Skip to content

Commit

Permalink
Merge pull request #2 from brunohendias/custom_paths
Browse files Browse the repository at this point in the history
paths geral
  • Loading branch information
brunohendias authored Feb 22, 2021
2 parents 4d3fd45 + adf670d commit 219b757
Show file tree
Hide file tree
Showing 14 changed files with 142 additions and 127 deletions.
218 changes: 109 additions & 109 deletions public/js/app.js

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions resources/js/components/formMatricula.vue
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,12 @@
</template>

<script>
import apiCep from '../core/endereco/apiCep'
import selectSeries from './shared/select/selectSeries'
import selectAtencoes from './shared/select/selectAtencoes'
import botaoMatricular from './shared/button/botaoMatricular'
import required from './shared/input/required'
import msg from './shared/msg/required'
import apiCep from '@api/endereco/apiCep'
import selectSeries from '@select/selectSeries'
import selectAtencoes from '@select/selectAtencoes'
import botaoMatricular from '@button/botaoMatricular'
import required from '@input/required'
import msg from '@msg/required'
export default {
name: 'formMatricula',
Expand Down
8 changes: 4 additions & 4 deletions resources/js/components/shared/button/botaoMatricular.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
</template>

<script>
import apiInscricao from '../../../core/inscricao/apiInscricao'
import apiEnderecoInsc from '../../../core/inscricao/apiEnderecoInsc'
import scrollView from '../../../helpers/scrollView'
import emptyKey from '../../../helpers/emptyKey'
import apiInscricao from '@api/inscricao/apiInscricao'
import apiEnderecoInsc from '@api/inscricao/apiEnderecoInsc'
import scrollView from '@helpers/scrollView'
import emptyKey from '@helpers/emptyKey'
import bus from '../../../core/bus'
export default {
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/shared/select/selectAtencoes.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</template>

<script>
import apiAtencoes from '../../../core/dados/apiAtencoes'
import apiAtencoes from '@api/dados/apiAtencoes'
export default {
name: 'selectAtencoes',
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/shared/select/selectSeries.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</template>

<script>
import apiSeries from '../../../core/dados/apiSeries'
import apiSeries from '@api/dados/apiSeries'
export default {
name: 'selectSeries',
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Api from '../api'
import Api from '@api/api'

class ApiAtencoes extends Api {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Api from '../api'
import Api from '@api/api'

class ApiSerie extends Api {
constructor(host) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Api from '../api'
import env from '../env.js'
import Api from '@api/api'
import env from '../../env.js'

class ApiCep extends Api{

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Api from '../api'
import Api from '@api/api'

class ApiEnderecoInsc extends Api {
constructor(host) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Api from '../api'
import Api from '@api/api'

class ApiInscricao extends Api {
constructor(host) {
Expand Down
File renamed without changes.
File renamed without changes.
15 changes: 15 additions & 0 deletions webpack.mix.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const mix = require('laravel-mix');
const path = require('path');

/*
|--------------------------------------------------------------------------
Expand All @@ -11,6 +12,20 @@ const mix = require('laravel-mix');
|
*/

mix.webpackConfig({
resolve: {
alias: {
'@': path.resolve('resources/js'),
'@button': path.resolve('resources/js/components/shared/button'),
'@input': path.resolve('resources/js/components/shared/input'),
'@msg': path.resolve('resources/js/components/shared/msg'),
'@select': path.resolve('resources/js/components/shared/select'),
'@api': path.resolve('resources/js/core/api'),
'@helpers': path.resolve('resources/js/core/helpers'),
}
}
})

mix.js('resources/js/app.js', 'public/js')
.vue()
.sass('resources/sass/app.scss', 'public/css');

0 comments on commit 219b757

Please sign in to comment.