Skip to content

Commit

Permalink
Modified to fit needs of i12 GmbH
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick Wieczorek committed Dec 4, 2015
1 parent a25aa61 commit 9359a63
Show file tree
Hide file tree
Showing 43 changed files with 56 additions and 1,652 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ demo/build
demo/css
demo/fonts
*.map
#build/*

bower_components

Expand Down Expand Up @@ -39,3 +38,4 @@ node_modules

# Users Environment Variables
.lock-wscript
/build
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## v1.22.0 2015-12-04

* Git repo has been forked for modificaation for the i12 GmbH
* Removed all services but facebook, twitter, google plus and info
* not using font-awesome but the internal font 'i12font'

## v1.21.0 2015-11-06

* Added Threema service. (medienverbinder)
Expand Down
128 changes: 11 additions & 117 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ module.exports = function(grunt) {
'<%= grunt.template.today("dd.mm.yyyy") %>\n' +
' * <%= pkg.homepage %>\n' +
' * Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>, <%= _.pluck(pkg.contributors, "name").join(", ") %>\n' +
' * Licensed under the <%= pkg.license %> license\n */\n\n'
' * Licensed under the <%= pkg.license %> license\n' +
' * MODIFIED for i12 GmbH by Patrick Schaper December 2015\n */\n\n'
},

browserify: {
Expand All @@ -27,58 +28,14 @@ module.exports = function(grunt) {
},
banner: '<%= meta.banner %>'
},
dev_demo: {
options: {
browserifyOptions: {
debug: true
},
keepAlive: true,
watch: true
},
src: 'src/js/shariff.js',
dest: 'demo/app.min.js'
},
dist_complete_min: {
options: {
transform: [ ['uglifyify', { global: true } ] ]
},
src: 'src/js/shariff.js',
dest: 'build/shariff.complete.js'
},
dist_min: {
options: {
transform: [
['uglifyify', { global: true } ],
['browserify-shim', { global: true } ]
]
},
src: 'src/js/shariff.js',
dest: 'build/shariff.min.js'
},
demo: {
options: {
transform: [ ['uglifyify', { global: true } ] ],
watch: true
},
src: 'src/js/shariff.js',
dest: 'demo/app.min.js'
}
},

copy: {
demo: {
files: [
{
expand: true,
cwd: 'node_modules/font-awesome',
src: '{fonts,css}/*',
dest: 'demo/'
},
{
src: 'build/*',
dest: 'demo/'
}
]
}
},

Expand All @@ -96,7 +53,6 @@ module.exports = function(grunt) {
options: {
banner: '<%= meta.banner %>',
paths: [
'node_modules/font-awesome/less',
'node_modules/shariff/src/style'
],
plugins: [
Expand All @@ -105,92 +61,30 @@ module.exports = function(grunt) {
],
strictMath: true
},
demo: {
options: {
sourceMap: true,
outputSourceFiles: true,
sourceMapFileInline: true,
plugins: [
new (require('less-plugin-autoprefix'))({
browsers: browsers,
map: true
}),
new (require('less-plugin-clean-css'))()
],
},
src: 'src/style/demo.less',
dest: 'demo/app.min.css'
},
dist: {
options: {
modifyVars: {
'fa-font-path': '"https://netdna.bootstrapcdn.com/font-awesome/4.3.0/fonts"'
}
},
src: 'src/style/shariff-complete.less',
dest: 'build/shariff.complete.css'
},
dist_min: {
src: 'src/style/shariff.less',
dest: 'build/shariff.min.css'
}
},

hapi: {
shariff: {
options: {
server: require('path').resolve('./node_modules/shariff-backend-node/server.js'),
// noasync: true,
}
}
},

connect: {
demo: {
options: {
hostname: '0.0.0.0',
// hostname: 'localhost',
port: 8080,
base: 'demo',
keepalive: true,
// livereload: true,
// open: true,
// debug: true,
middleware: function (connect, options, middlewares) {
var proxy = require('grunt-connect-proxy/lib/utils').proxyRequest;
return [
proxy,
connect.static(options.base[0]),
connect.directory(options.base[0])
];
}
},
proxies: [
file_append: {
default_options: {
files: [
{
rewrite: {
'^/shariff': ''
},
context: '/shariff/',
host: 'localhost',
port: 3001,
https: false,
xforward: false
prepend: '(function($) { \n\t$(document).ready(function() {\n',
append: '\n\t});\n})(cms_jQuery);',
input: 'build/shariff.min.js',
output: 'build/shariff.min.js'
}
]
}
}
});

grunt.loadNpmTasks('grunt-browserify');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-less');
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-connect-proxy');
grunt.loadNpmTasks('grunt-hapi');
grunt.loadNpmTasks('grunt-file-append');

grunt.registerTask('test', ['jshint']);
grunt.registerTask('build', ['test', 'less:demo', 'less:dist', 'less:dist_min', 'browserify:dist_complete_min', 'browserify:dist_min']);
grunt.registerTask('demo', ['copy:demo', 'less:demo', 'browserify:demo', 'hapi', 'configureProxies:demo', 'connect']);
grunt.registerTask('default', ['test', 'demo']);
grunt.registerTask('build', ['test', 'less:dist_min', 'browserify:dist_min', 'file_append']);
};
132 changes: 0 additions & 132 deletions README-de.md

This file was deleted.

Loading

0 comments on commit 9359a63

Please sign in to comment.