Skip to content

Commit

Permalink
Merge pull request #63 from FoxUSA/Fox-Working
Browse files Browse the repository at this point in the history
Fox working
  • Loading branch information
FoxUSA committed Jul 13, 2014
2 parents 5e20a3f + 9ef29d4 commit dd1c4da
Show file tree
Hide file tree
Showing 406 changed files with 2,494 additions and 26,226 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/bower_components
/node_modules
/build
29 changes: 18 additions & 11 deletions .project
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>OpenNote</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>OpenNote</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>tern.eclipse.ide.core.ternBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.angularjs.core.angularnature</nature>
<nature>tern.eclipse.ide.core.ternnature</nature>
</natures>
</projectDescription>
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: php
php:
- "5.5"
- "5.4"
- "5.3"
script: phpunit --configuration ./OpenNote.Test
language: node_js
node_js:
- '0.10'
before_script:
- 'npm install -g grunt-cli'


2 changes: 1 addition & 1 deletion Doc/HowToUse.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
How To Use
How to use
--------------
OpenNote uses a touch to open scheme.
If you want to open something just click it.
Expand Down
2 changes: 1 addition & 1 deletion Doc/Install.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# How To Install
# How to install
# Automatic(Wizard Based Install)
To run the installer open
`<install path>/Service/install.php`
Expand Down
2 changes: 1 addition & 1 deletion Doc/Upgrade.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# How To Upgrade
# How to upgrade
###MYSql
- Make sure you make a copy of you database and the OpenNote directory
- Run `Service/model/sql/updateScript/` scripts to roll the database up to current specs.
Expand Down
128 changes: 128 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
module.exports = function(grunt) {
//Initializing the configuration object
grunt.initConfig({
//Style
less: {
devDark: {
options: {
paths: ["assets/css"],
modifyVars: {
offset: "#000000"
}
},
files: {
"OpenNote/openNote/style/invert/dark/style.css": "OpenNote/openNote/style/invert/style.less",
"OpenNote/openNote/style/invert/dark/note.css": "OpenNote/openNote/style/invert/note.less",
"OpenNote/openNote/style/invert/dark/alertify.css": "OpenNote/openNote/style/invert/alertify.less",
"OpenNote/openNote/style/invert/dark/intojs.css": "OpenNote/openNote/style/invert/introjs.less"

}
},
devLight: {
options: {
paths: ["assets/css"],
modifyVars: {
offset: "#FFFFFF"
}
},
files: {
"OpenNote/openNote/style/invert/light/style.css": "OpenNote/openNote/style/invert/style.less",
"OpenNote/openNote/style/invert/light/note.css": "OpenNote/openNote/style/invert/note.less",
"OpenNote/openNote/style/invert/light/alertify.css": "OpenNote/openNote/style/invert/alertify.less",
"OpenNote/openNote/style/invert/light/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
}
},
prodDark: {
options: {
paths: ["assets/css"],
cleancss: true,
modifyVars: {
offset: "#000000"
}
},
files: {
"OpenNote/openNote/style/invert/dark/style.css": "OpenNote/openNote/style/invert/style.less",
"OpenNote/openNote/style/invert/dark/note.css": "OpenNote/openNote/style/invert/note.less",
"OpenNote/openNote/style/invert/dark/alertify.css": "OpenNote/openNote/style/invert/alertify.less",
"OpenNote/openNote/style/invert/dark/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
}
},
prodLight: {
options: {
paths: ["assets/css"],
cleancss: true,
modifyVars: {
offset: "#FFFFFF"
}
},
files: {
"OpenNote/openNote/style/invert/light/style.css": "OpenNote/openNote/style/invert/style.less",
"OpenNote/openNote/style/invert/light/note.css": "OpenNote/openNote/style/invert/note.less",
"OpenNote/openNote/style/invert/light/alertify.css": "OpenNote/openNote/style/invert/alertify.less",
"OpenNote/openNote/style/invert/light/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
}
}
},
//Testing setup
karma: {
unit: {
configFile: "OpenNote.Test/karma.conf.js",
background: true
},
travis: {
configFile: "OpenNote.Test/karma.conf.js",
singleRun: true,
browsers: ["PhantomJS"]//Override config browsers
}
},
watch: {
karma: {
files: ["src/**/*.js", "test/unit/**/*.js"],
tasks: ["karma:unit:run"]
}
},
shell: {
bowerInstall: {
command: [ "cd OpenNote",
"bower install" ].join("&&")
},
clean:{
command: [ "rm -rf build",
"cd OpenNote",
"rm -rf bower_components",
"cd openNote/style/invert/",
"rm -rf dark",
"rm -rf light"].join("&&")
},
phpPackage:{
command: [ "mkdir build",
"cd build",
"cp -r ../OpenNote/* ./",
"cp -r ../../OpenNoteService-PHP/Service ./",
"cp -r ../../OpenNoteService-PHP/vendor ./"].join("&&")
}
}
});

//Plugin loading
grunt.loadNpmTasks("grunt-contrib-less");
grunt.loadNpmTasks("grunt-contrib-watch");
grunt.loadNpmTasks("grunt-karma");
grunt.loadNpmTasks("grunt-shell");

//Task definition
//css
grunt.registerTask("buildDevCSS", ["less:devDark","less:devLight"]);
grunt.registerTask("buildProdCSS", ["less:prodDark","less:prodLight"]);

//deployment
grunt.registerTask("clean", ["shell:clean"]);
grunt.registerTask("build", ["shell:bowerInstall", "buildDevCSS"]);
grunt.registerTask("default", ["build"]);
grunt.registerTask("deploy", ["clean", "shell:bowerInstall", "buildProdCSS", "shell:phpPackage"]);

//testing
grunt.registerTask("devmode", ["karma:unit", "watch"]);
grunt.registerTask("test", ["karma:travis"])
grunt.registerTask("ci", ["build","karma:travis"])
};
21 changes: 21 additions & 0 deletions License.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2014 Jacob Liscom

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
3 changes: 0 additions & 3 deletions OpenNote.Test/.gitignore

This file was deleted.

17 changes: 0 additions & 17 deletions OpenNote.Test/TestingConfig.php

This file was deleted.

32 changes: 32 additions & 0 deletions OpenNote.Test/karma.conf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
module.exports = function(config){
config.set({
basePath : "../",
files : [
"OpenNote/bower_components/angular/angular.js",
"OpenNote/bower_components/angular-mocks/angular-mocks.js",
"OpenNote/bower_components/angular-route/angular-route.js",
"OpenNote/bower_components/angular-resource/angular-resource.js",
"OpenNote/bower_components/angular-sanitize/angular-sanitize.js",
"OpenNote/bower_components/angular-animate/angular-animate.js",
"OpenNote/bower_components/angular-ui-tree/dist/angular-ui-tree.js",
"OpenNote/bower_components/jquery/jquery.js",
"OpenNote/openNote/openNote.js",
"OpenNote/openNote/**/*.js",
"OpenNote.Test/**/*.js"
],
autoWatch : false,
frameworks: ["jasmine"],
browsers : ["Firefox"],
plugins : [
"karma-junit-reporter",
"karma-chrome-launcher",
"karma-firefox-launcher",
"karma-phantomjs-launcher",
"karma-jasmine"
],
junitReporter : {
outputFile: "test_out/unit.xml",
suite: "unit"
}
})
}
24 changes: 0 additions & 24 deletions OpenNote.Test/phpunit.xml.dist

This file was deleted.

17 changes: 0 additions & 17 deletions OpenNote.Test/runner.php

This file was deleted.

Loading

0 comments on commit dd1c4da

Please sign in to comment.