Squashed commit of the following:

commit ed3f2fa665c47fc1ad2a898f06bcd00efd756358
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Oct 24 14:13:45 2016 +0100

    Delete bower folder

commit 9166de3f0ac24c9959cf635a4e54ef063486c072
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Oct 24 14:12:42 2016 +0100

    populate frontend folder, gzip on different machine also produces different .gz files for existing assets

commit 0b1958b01e372886f564f7c08c435c52412e3a30
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Oct 24 14:11:22 2016 +0100

    use frotnend asset folder instead of bower

commit 60a7b81b876ebb01991ca524d0e49b81f8aefd76
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Oct 24 13:53:58 2016 +0100

    Move frontend package management to yarn/npm
This commit is contained in:
Jonny Barnes 2016-10-24 14:16:10 +01:00
parent c8fe273f37
commit c38c709c42
47 changed files with 727 additions and 88 deletions

View file

@ -1,26 +0,0 @@
{
"name": "jbuk-frontend",
"description": "",
"main": "",
"authors": [
"Jonny Barnes <jonny@jonnybarnes.uk>"
],
"license": "CC0-1.0",
"homepage": "https://github.com/jonnybarnes/jonnybarnes.uk",
"moduleType": [],
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"dependencies": {
"fetch": "~1.0",
"alertify.js": "alertifyjs#~1.0.5",
"store2": "~2.3.2",
"Autolinker.js": "~1.0",
"marked": "^0.3.6",
"sanitize-css": "^4.1.0"
}
}

View file

@ -27,22 +27,22 @@ gulp.task('js-assets', function () {
.pipe(gulp.dest('./public/assets/js'));
});
gulp.task('bower', function () {
gulp.task('frontend', function () {
//copy JS files
gulp.src([
'bower_components/fetch/fetch.js',
'bower_components/alertify.js/dist/js/alertify.js',
'bower_components/store2/dist/store2.min.js',
'bower_components/Autolinker.js/dist/Autolinker.min.js',
'bower_components/marked/marked.min.js',
'node_modules/whatwg-fetch/fetch.js',
'node_modules/alertify.js/dist/js/alertify.js',
'node_modules/store2/dist/store2.min.js',
'node_modules/autolinker/dist/Autolinker.min.js',
'node_modules/marked/marked.min.js',
])
.pipe(gulp.dest('public/assets/bower/'));
.pipe(gulp.dest('public/assets/frontend/'));
//copy CSS files
gulp.src([
'bower_components/alertify.js/dist/css/alertify.css',
'bower_components/sanitize-css/sanitize.css',
'node_modules/alertify.js/dist/css/alertify.css',
'node_modules/sanitize.css/sanitize.css',
])
.pipe(gulp.dest('public/assets/bower/'));
.pipe(gulp.dest('public/assets/frontend/'));
});
gulp.task('compress', function () {
@ -61,18 +61,18 @@ gulp.task('compress', function () {
.pipe(brotli.compress({mode: 1, quality: 11}))
.pipe(gulp.dest('public/assets/js/'));
//bower components
gulp.src('public/assets/bower/*.css')
gulp.src('public/assets/frontend/*.css')
.pipe(zopfli({ format: 'gzip', append: true }))
.pipe(gulp.dest('public/assets/bower/'));
gulp.src('public/assets/bower/*.js')
.pipe(gulp.dest('public/assets/frontend/'));
gulp.src('public/assets/frontend/*.js')
.pipe(zopfli({ format: 'gzip', append: true }))
.pipe(gulp.dest('public/assets/bower/'));
.pipe(gulp.dest('public/assets/frontend/'));
gulp.src('public/assets/bower/*.css')
.pipe(brotli.compress({mode: 1, quality: 11}))
.pipe(gulp.dest('public/assets/bower/'));
.pipe(gulp.dest('public/assets/frontend/'));
gulp.src('public/assets/bower/*.js')
.pipe(brotli.compress({mode: 1, quality: 11}))
.pipe(gulp.dest('public/assets/bower/'));
.pipe(gulp.dest('public/assets/frontend/'));
//prism
gulp.src('public/assets/prism/*.css')
.pipe(zopfli({ format: 'gzip', append: true }))

View file

@ -27,5 +27,13 @@
},
"pre-commit": [
"lint-staged"
]
],
"dependencies": {
"alertify.js": "^1.0.12",
"autolinker": "^1.2.0",
"marked": "^0.3.6",
"sanitize.css": "^4.1.0",
"store2": "^2.3.2",
"whatwg-fetch": "^1.0.0"
}
}

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -26,7 +26,7 @@ Edit Article « Admin CP
@section('scripts')
@parent
<script src="/assets/bower/marked.min.js"></script>
<script src="/assets/frontend/marked.min.js"></script>
<script>
var preview = document.createElement('div');
preview.classList.add('preview');

View file

@ -29,7 +29,7 @@ New Article « Admin CP
@section('scripts')
@parent
<script src="/assets/bower/marked.min.js"></script>
<script src="/assets/frontend/marked.min.js"></script>
<script>
var preview = document.createElement('div');
preview.classList.add('preview');
@ -41,9 +41,9 @@ New Article « Admin CP
preview.innerHTML = marked(markdown);
}, 5000);
</script>
<script src="/assets/bower/store2.min.js"></script>
<script src="/assets/bower/alertify.js"></script>
<script src="/assets/frontend/store2.min.js"></script>
<script src="/assets/frontend/alertify.js"></script>
<script src="/assets/js/form-save.js"></script>
<link rel="stylesheet" href="/assets/bower/alertify.css">
<link rel="stylesheet" href="/assets/frontend/alertify.css">
@stop

View file

@ -21,7 +21,7 @@ Notes « Jonny Barnes
@section('scripts')
@include('templates.mapbox-links')
<script src="/assets/bower/Autolinker.min.js"></script>
<script src="/assets/frontend/Autolinker.min.js"></script>
<script src="/assets/js/links.js"></script>
<script src="/assets/js/maps.js"></script>

View file

@ -4,7 +4,7 @@
<meta charset="UTF-8">
<title>@if (App::environment() == 'local'){!! "[testing] -"!!}@endif @yield('title')</title>
<meta name="viewport" content="width=device-width">
<link rel="stylesheet" href="/assets/bower/sanitize.css">
<link rel="stylesheet" href="/assets/frontend/sanitize.css">
<link rel="stylesheet" href="/assets/css/global.css">
<link rel="openid.server" href="https://indieauth.com/openid">
<link rel="openid.delegate" href="https://jonnybarnes.uk">

View file

@ -34,11 +34,11 @@ New Note « Jonny Barnes
@section('scripts')
@include('templates.mapbox-links')
<script src="/assets/bower/fetch.js"></script>
<script src="/assets/bower/store2.min.js"></script>
<script src="/assets/bower/alertify.js"></script>
<script src="/assets/frontend/fetch.js"></script>
<script src="/assets/frontend/store2.min.js"></script>
<script src="/assets/frontend/alertify.js"></script>
<script src="/assets/js/form-save.js"></script>
<script src="/assets/js/newnote.js"></script>
<link rel="stylesheet" href="/assets/bower/alertify.css">
<link rel="stylesheet" href="/assets/frontend/alertify.css">
@stop

View file

@ -33,7 +33,7 @@
@section('scripts')
@include('templates.mapbox-links')
<script src="/assets/bower/Autolinker.min.js"></script>
<script src="/assets/frontend/Autolinker.min.js"></script>
<script src="/assets/js/links.js"></script>
<script src="/assets/js/maps.js"></script>

701
yarn.lock

File diff suppressed because it is too large Load diff