Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modernization (Slim 3, Bootstrap 4, working search) #200

Open
wants to merge 39 commits into
base: live
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
8a59d97
fetch dependencies via npm and build CSS/JS with bower
Findus23 Oct 21, 2017
6729e77
send /data/documents as JSON
Findus23 Oct 23, 2017
db36a65
reorganize search
Findus23 Oct 23, 2017
760333b
fix https://github.com/piwik/developer-documentation/issues/23
Findus23 Oct 23, 2017
b98552a
update composer.lock to the versions defined in composer.json
Findus23 Oct 23, 2017
09a1f94
rewrite Slim 2 to Slim 3
Findus23 Oct 23, 2017
c53a674
some minor fixes (typos, etc.)
Findus23 Oct 25, 2017
8bdb92f
use HTTPS
Findus23 Oct 25, 2017
bb73385
specify language in <html>-Tag
Findus23 Oct 25, 2017
f576147
make Cache working and improved logging
Findus23 Oct 25, 2017
4c0e274
improved PHP style
Findus23 Oct 25, 2017
6b8ec24
update markdown parser
Findus23 Oct 25, 2017
51a4e67
fix error handling
Findus23 Oct 25, 2017
a2282db
move to Bootstrap 4 and scss
Findus23 Oct 26, 2017
aa92e03
style sidebar
Findus23 Oct 26, 2017
694b29b
style documentation
Findus23 Oct 26, 2017
c3abeee
fix API documentation
Findus23 Oct 26, 2017
83c00fe
improve styling
Findus23 Oct 26, 2017
5591cdf
run grunt on commit hook
Findus23 Oct 26, 2017
52c9f4d
minor style changes
Findus23 Oct 26, 2017
5146b27
also cache JSON data
Findus23 Oct 26, 2017
1d2eb90
opengraph data
Findus23 Oct 30, 2017
a3de287
fix api-reference/reporting-api and api-reference/reporting-api-metadata
Findus23 Oct 30, 2017
a163bae
remove console.log
Findus23 Oct 31, 2017
fd67aff
full text search
Findus23 Nov 1, 2017
2d576b9
quick fix
Findus23 Nov 1, 2017
fc6b1e1
search index directory
Findus23 Nov 1, 2017
59287a3
limit results
Findus23 Nov 1, 2017
f5c359f
force tntsearch version including my fix
Findus23 Nov 1, 2017
d701720
don't use html entities in title
Findus23 Nov 1, 2017
b936f52
compare lowercase query
Findus23 Nov 1, 2017
2392e44
also search in remote links
Findus23 Nov 1, 2017
36e6524
add token authentification to commit hook
Findus23 Nov 2, 2017
1af35e4
improve anchor behind fixed header
Findus23 Nov 2, 2017
cdea147
update slim to 3.9.0
Findus23 Nov 6, 2017
0fac648
dependency update
Findus23 Nov 26, 2017
a2cb1c4
update slim
Findus23 Dec 7, 2017
4f0579b
remove html entities from #id-links in sidebar
Findus23 Dec 7, 2017
8619b4d
fix twig cache
Findus23 Dec 7, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@
/generator/vendor
/generator/composer.phar
/app/vendor
/app/node_modules
/app/composer.phar
/app/public/dist/
/.idea
/app/config/local.php
/app/tmp/cache/*
/app/tmp/logs/*
/app/tmp/index/*
/docs/changelog.md
/docs/cache/
/docs/*/cache/
111 changes: 111 additions & 0 deletions app/Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
module.exports = function (grunt) {
'use strict';
// load all grunt tasks
require('time-grunt')(grunt);
require('load-grunt-tasks')(grunt);
//
grunt.initConfig({
watch: {
options: {
atBegin: true
},
sass: {
files: ['scss/*.scss'],
tasks: ['css']
},
js: {
files: ['js/*.js', "Gruntfile.js"],
tasks: 'js'
}
},
clean: {
dist: 'public/dist/'
},
sass: {
options: {
style: 'expanded',
sourceMap: true
},
style: {
files: {
'public/dist/css/style.css': 'scss/style.scss'
}
}
},
postcss: {
options: {
map: true,
processors: [
require('autoprefixer')({
browsers: '> 0.5%'
})
]
},
dist: {
src: 'public/dist/css/*.css'
}
},
cssmin: {
options: {
shorthandCompacting: false,
roundingPrecision: -1,
sourceMap: true
},
style: {
files: {
'public/dist/css/style.min.css': 'public/dist/css/style.css'
}
}
},
jshint: {
options: {
extract: 'auto'
},
html: ["js/app.js", "Gruntfile.js"]
},
concat: {
options: {
sourceMap: true
},
libraries: {
src: [
'node_modules/jquery/dist/jquery.min.js',
'node_modules/popper.js/dist/umd/popper.min.js',
'node_modules/bootstrap/dist/js/bootstrap.min.js',
'node_modules/corejs-typeahead/dist/typeahead.bundle.min.js',
'js/highlight.pack.js'
],
dest: 'public/dist/js/libraries.min.js'
}
},
uglify: {
options: {
sourceMap: true,
mangle: {
reserved: ['_paq']
}
},
admin: {
files: {
'public/dist/js/app.min.js': 'js/app.js'
}
}
},
copy: {
frontend_libs: {
files: [{
expand: true,
cwd: 'node_modules/font-awesome/',
src: 'fonts/*',
dest: 'public/dist/fonts/font-awesome',
flatten: true
}]
}
}
})
;
grunt.registerTask('default', 'dist');
grunt.registerTask('dist', ['clean:dist', 'css', 'js', 'copy']);
grunt.registerTask('css', ['sass', 'postcss', 'cssmin']);
grunt.registerTask('js', ['jshint', 'concat', 'uglify']);
};
12 changes: 6 additions & 6 deletions app/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
},
"require": {
"php": ">=5.4.0",
"twig/twig": "1.12.*",
"slim/slim": "2.*",
"slim/extras": "2.*",
"slim/views": "0.1.*",
"michelf/php-markdown": "1.4.1",
"mnapoli/front-yaml": "~1.2"
"slim/slim": "^3.0",
"slim/twig-view": "^2.2",
"michelf/php-markdown": "^1.7",
"mnapoli/front-yaml": "~1.2",
"monolog/monolog": "^1.23",
"teamtnt/tntsearch": "dev-master#e4aa719c97415374fb893f0a93226816ef16ef8a"
},
"require-dev": {
"phpunit/phpunit": "~4.0"
Expand Down
Loading