Skip to content

Commit 9edd9d6

Browse files
author
An Phan
committed
Switch from elixir to mix
1 parent 8b17004 commit 9edd9d6

File tree

14 files changed

+2038
-1810
lines changed

14 files changed

+2038
-1810
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
/public/css
44
/public/img
55
/public/js
6+
/public/hot
67
/storage/*.key
78
/vendor
89
Homestead.json
910
Homestead.yaml
1011
.env
1112
/config/customRules.php
13+
mix-manifest.json

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "phanan/kupo",
3-
"description": "Simple site launch checklist validator",
3+
"description": "Simple site launch checklist checker",
44
"keywords": ["site", "launch", "checklist"],
55
"license": "MIT",
66
"type": "project",

‎config/app.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
| any other location as required by the application or its packages.
1313
*/
1414

15-
'name' => 'Site Launch Checklist Validator',
15+
'name' => 'kupo',
16+
17+
'description' => 'Site launch checklist checker',
1618

1719
/*
1820
|--------------------------------------------------------------------------

‎gulpfile.js

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎package.json

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
11
{
22
"license": "MIT",
33
"scripts": {
4-
"prod": "cross-env NODE_ENV=production && gulp --production",
5-
"dev": "gulp watch",
6-
"test": "eslint resources/assets/js --ext=js,vue"
4+
"dev": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
5+
"watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
6+
"hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
7+
"build": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
78
},
89
"devDependencies": {
910
"axios": "^0.15.2",
10-
"cross-env": "^3.1.3",
11+
"cross-env": "^3.1.4",
1112
"eslint": "^3.11.1",
1213
"eslint-config-vue": "^2.0.1",
1314
"eslint-plugin-vue": "^1.0.0",
14-
"gulp": "^3.9.1",
15-
"laravel-elixir": "^6.0.0-11",
16-
"laravel-elixir-vue-2": "^0.2.0",
17-
"laravel-elixir-webpack-official": "^1.0.2",
15+
"laravel-mix": "^0.8.1",
1816
"lodash": "^4.16.2",
1917
"node-sass": "^3.11.2",
20-
"sass-loader": "^4.0.2",
2118
"slugify": "^1.0.2",
2219
"vue": "^2.0.1"
2320
},

‎resources/assets/js/app.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export default {
3838
}
3939
</script>
4040

41-
<style lang="sass">
41+
<style lang="scss">
4242
#main {
4343
position: relative;
4444
padding: 16px;

‎resources/assets/js/components/check-form.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export default {
2929
}
3030
</script>
3131

32-
<style lang="sass">
32+
<style lang="scss">
3333
.form-check {
3434
position: relative;
3535
padding-right: 99px;

‎resources/assets/js/components/result-item.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export default {
3333
}
3434
</script>
3535

36-
<style lang="sass">
36+
<style lang="scss">
3737
@import '../../sass/_variables';
3838
3939
li.item {

‎resources/assets/js/components/results.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export default {
7979
}
8080
</script>
8181

82-
<style lang="sass" scoped>
82+
<style lang="scss" scoped>
8383
@import '../../sass/_variables';
8484
8585
.results ul {

‎resources/assets/js/components/site-footer.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
<p>An open source project by <a href="http://phanan.net">Phan An</a></p>
44
<p>Built on <a href="http://laravel.com">Laravel</a> and <a href="http://vuejs.org">Vue</a> ·
55
<a href="https://github.com/phanan/kupo">GitHub</a></p>
6-
<p><a href="http://finalfantasy.wikia.com/wiki/Moogle_(race)">Moogles</a> and “kupo” might be
7-
trademarks and/or copyrights of Square Enix, I don’t know.</p>
6+
<p><a href="http://finalfantasy.wikia.com/wiki/Moogle_(race)">Moogle</a>
7+
animation beautifully done by <a href="http://staticwind.deviantart.com/">staticwind</a></p>
8+
<p><em>Moogles</em> and <em>kupo</em> might be trademarks and/or copyrights of Square Enix, I don’t know.</p>
89
<img src="img/moogles.gif" alt="Mooogles" width="96">
910
</footer>
1011
</template>
@@ -13,7 +14,7 @@
1314
export default {}
1415
</script>
1516

16-
<style lang="sass" scoped>
17+
<style lang="scss" scoped>
1718
@import '../../sass/_variables';
1819
1920
footer {

‎resources/assets/js/components/site-header.vue

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<header class="site-header">
3-
<h1><span class="name">kupo</span> Site Launch Checklist</h1>
3+
<h1><span class="name">{{ appMeta.name }}</span> {{ appMeta.description }}</h1>
44
<check-form/>
55
</header>
66
</template>
@@ -10,11 +10,16 @@ import checkForm from './check-form.vue'
1010
1111
export default {
1212
name: 'header',
13-
components: { checkForm }
13+
components: { checkForm },
14+
data () {
15+
return {
16+
appMeta: window.appMeta
17+
}
18+
}
1419
}
1520
</script>
1621

17-
<style lang="sass">
22+
<style lang="scss">
1823
@import '../../sass/_variables';
1924
2025
.site-header {

‎resources/views/app.blade.php

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,26 @@
44
<meta charset="utf-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
7-
<meta name="description" content="A simple site launch checklist checker">
8-
<title>Website Deployment Checklist</title>
7+
<meta name="description" content="{{ config('app.description') }}">
8+
<title>{{ config('app.name') }}</title>
99
<link rel="shortcut icon" href="{{ asset('img/logo.png') }}">
1010
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:100,300,600|Roboto Mono">
11-
<link rel="stylesheet" href="{{ asset('css/app.css') }}">
11+
<link rel="stylesheet" href="{{ mix('/css/app.css') }}">
1212

1313
<script>
1414
window.Laravel = <?= json_encode([
15-
'csrfToken' => csrf_token(),
16-
]); ?>
15+
'csrfToken' => csrf_token(),
16+
]); ?>;
17+
window.appMeta = <?= json_encode([
18+
'name' => config('app.name'),
19+
'description' => config('app.description'),
20+
]); ?>;
1721
</script>
1822
</head>
1923
<body>
2024
<div id="app"></div>
2125

2226
<script src="https://cdnjs.cloudflare.com/ajax/libs/velocity/1.2.3/velocity.min.js"></script>
23-
<script src="{{ asset('js/app.js') }}"></script>
27+
<script src="{{ mix('/js/app.js') }}"></script>
2428
</body>
2529
</html>

‎webpack.mix.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
const { mix } = require('laravel-mix');
2+
3+
mix.js('resources/assets/js/app.js', 'public/js')
4+
.sass('resources/assets/sass/app.scss', 'public/css')
5+
.copy('resources/assets/img', 'public/img');
6+
7+
if (mix.config.inProduction) {
8+
mix.version();
9+
}

0 commit comments

Comments
 (0)