Skip to content

Commit

Permalink
Merge pull request #5 from pure180/v4.0
Browse files Browse the repository at this point in the history
Rebuild complete Applikation to V4.0
  • Loading branch information
pure180 authored Oct 16, 2016
2 parents dfc8896 + dc05804 commit bc8178a
Show file tree
Hide file tree
Showing 74 changed files with 2,514 additions and 1,137 deletions.
3 changes: 0 additions & 3 deletions .bowerrc

This file was deleted.

21 changes: 14 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#Repo Ignores
dist
node_modules
bower_components
gulpfile.js
npm-debug.log
dist
src/img
src/video
src/fonts
src/bower_components
src/less/bootstrap
src/less/fontawesome
src/less/font-awesome
npm-debug.log
temp
src/temp

# Windows image file caches
Thumbs.db
Expand Down Expand Up @@ -52,3 +52,10 @@ $RECYCLE.BIN/
Network Trash Folder
Temporary Items
.apdisk
AdditionalConfiguration.php
typo3conf/deprecation_6a38680c90.log
/typo3conf/deprecation_99f83c0de3.log
/fileadmin
/fileadmin.zip
/fileadmin-2016-08-04
/templates/video
30 changes: 15 additions & 15 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"bitwise": true,
"browser": true,
"curly": true,
"eqeqeq": true,
"eqnull": true,
"esnext": true,
"immed": true,
"jquery": true,
"latedef": true,
"newcap": true,
"noarg": true,
"node": true,
"strict": false,
"trailing": true
}
"bitwise": true,
"browser": true,
"curly": true,
"eqeqeq": true,
"eqnull": true,
"esnext": true,
"immed": true,
"jquery": true,
"latedef": true,
"newcap": true,
"noarg": true,
"node": true,
"strict": false,
"trailing": true
}
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ before_script:
- npm run init
script:
- npm run test
- npm run build
cache:
- node_modules
40 changes: 23 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,32 @@

This an easy to handle HTML and CSS template builder application to create compiled HTML-, CSS-, Javascriptfiles.

##### Requirements
* nodejs ^5+
##### Requierments:
To run this template-application you need to install following tools to your working machine.

* [nodejs ^5+](https://nodejs.org/en/download/)
* npm ^3.8+
* bower
* bower
* gulp

##### Installation
* Download NodeJs from [http://nodejs.org/download/] and install it.
* Install dependencies, run > `npm install gulp -g`
* Install bower global, run > `npm install bower -g`
#### Installation instructions

* Download NodeJs from [https://nodejs.org/en/download/](https://nodejs.org/en/download/) and install it.
* Install npm globally, if not yet done, `npm install -g npm`, test npm version with `npm -v`
* Install bower globally, `npm install -g bower` (beware, you need to have [git](https://git-scm.com/downloads) installed to use bower)
* Install gulp globally, `npm install -g gulp`

#### Init Template application and install dependencies
You can use the command, provided by the package.json:

`npm run init`

or, install dependent packages manually with:

##### Build instructions.
Getting startet in Commandline/Terminal
`npm install` and `bower install`

##### 1. Clone git repository.
```
git clone git@github.com:pure180/DefaultTemplate.git
```
##### 2. Install applikation dependencies
Navigate to the applikation folder on your computer (cd DefaultTemplate), then run:
#### Start build
run:
`npm run serve`

1. `npm run init` > This will install all needed packages npm and bower dependencies
2. `npm run start` > to start developing
Open you browser and navigate to `http://127.0.0.1:8888` or `http://localhost:8888`
22 changes: 15 additions & 7 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
{
"name": "defaulttemplate",
"version": "3.1.0",
"version": "4.0.0",
"description": "Gulp, Jade and LESS Template-Applikation with Twbs-Bootstrap",
"main": "index.js",
"authors": [
"Daniel Pfisterer (info@daniel-pfisterer.de)"
"Daniel Pfisterer <info@daniel-pfisterer.de>"
],
"license": "GPL-3.0",
"license": "MIT",
"keywords": [
"jquery",
"checkbox",
"radiobutton"
],
"homepage": "",
"ignore": [
"**/.*",
"node_modules",
Expand All @@ -13,8 +21,8 @@
"tests"
],
"dependencies": {
"bootstrap": "~3.3.6",
"fontawesome": "~4.6.1"
},
"homepage": "https://github.com/pure180/DefaultTemplate"
"jquery": "^2.2.4",
"bootstrap": "^3.3.7",
"font-awesome": "font-awsome#^4.6.3"
}
}
20 changes: 0 additions & 20 deletions gulp_task/fonts.js

This file was deleted.

24 changes: 0 additions & 24 deletions gulp_task/images.js

This file was deleted.

30 changes: 0 additions & 30 deletions gulp_task/jade.js

This file was deleted.

53 changes: 0 additions & 53 deletions gulp_task/less.js

This file was deleted.

36 changes: 0 additions & 36 deletions gulp_task/scripts.js

This file was deleted.

Loading

0 comments on commit bc8178a

Please sign in to comment.