Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
debd4d0
updates to latest coldbox/testbox and integration tests.
lmajano Sep 27, 2016
389f0f7
integration with the node runner
lmajano Sep 27, 2016
41a85a0
grunt watchers with live reload
lmajano Sep 27, 2016
9c76246
grunt runner for tests
lmajano Sep 27, 2016
0f962f5
travis integration
lmajano Sep 27, 2016
71e8155
migration to ColdBox Elixir
lmajano Sep 27, 2016
b502ace
gulp elixir watch bridge
lmajano Sep 27, 2016
50dd0b7
Additional node requirements to run gulp on my machine (MacOS 11)
goochjj Oct 10, 2016
c6f30aa
Merge pull request #1 from goochjj/master
lmajano Oct 11, 2016
3315690
Update Main.cfm
bdw429s Nov 10, 2016
93767a5
more and more tests
lmajano Apr 25, 2017
e1b746d
more stories
lmajano Apr 25, 2017
a423018
travis updates
lmajano Apr 25, 2017
f2a4a0b
fix for travis
lmajano Apr 25, 2017
1163f0f
Updated contact service
lmajano Apr 26, 2017
4b25299
using our awesome mock data CFC
lmajano Apr 26, 2017
4bf7dd8
fix on pathing
lmajano Apr 26, 2017
8ee50c3
added dependency caching
lmajano Apr 26, 2017
0ce6ab8
added gitlab file
lmajano Jul 11, 2017
e498420
update branch
lmajano Jul 11, 2017
67524c9
mroe testws
lmajano Jul 11, 2017
6d3f3a2
trying jdk image
lmajano Jul 11, 2017
9845129
Update .gitlab-ci.yml
lmajano Jul 11, 2017
1c5edd1
Update .gitlab-ci.yml
lmajano Jul 11, 2017
2c35ea5
switched to alpine version for faster downloads.
lmajano Jul 11, 2017
a7aa0cd
fix for tests
lmajano Jul 14, 2017
d969892
Update box.json
lmajano Jul 24, 2017
15eedca
dep updates
lmajano Apr 25, 2018
6cc5a63
more udpates on contacts
lmajano Apr 25, 2018
003766b
coldbox 5 updates
lmajano Apr 25, 2018
450295e
fixed tests
lmajano Apr 25, 2018
7029c9d
upgrade cbValidation
JaimeRamirezSV Apr 9, 2024
af6dc3c
Fix errors
JaimeRamirezSV Apr 10, 2024
2b25472
Upgrade testbox
JaimeRamirezSV Apr 10, 2024
f85f168
Merge pull request #2 from coldbox-samples/upgrade-dependencies
lmajano Apr 10, 2024
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
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@ settings.xml
tests/results/*
coldbox/*
testbox/*
build/*
build/*
**/node_modules/*
**/bower_components/*
modules/*
21 changes: 21 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
image: ortussolutions/commandbox:alpine

stages:
- build
- test
- deploy

build_app:
stage: build
script:
- box install production=true

run_tests:
stage: test
only:
- master
# when: manual, always, on_success, on_failure
script:
- box install
- box server start
- box testbox run
5 changes: 5 additions & 0 deletions .testbox-runnerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"runner": "http://127.0.0.1:11254/tests/runner.cfm",
"directory": "/tests/specs",
"recurse": true
}
28 changes: 28 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
language: java

branches:
only:
- master

sudo: required

dist: trusty

cache:
timeout: 180
directories:
- $HOME/.CommandBox

before_install:
- sudo apt-key adv --keyserver keys.gnupg.net --recv 6DA70622
- sudo echo "deb http://downloads.ortussolutions.com/debs/noarch /" | sudo tee -a /etc/apt/sources.list.d/commandbox.list

install:
- sudo apt-get update && sudo apt-get --assume-yes install commandbox
- box install

before_script:
- box server start

script:
- box testbox run
5 changes: 1 addition & 4 deletions Application.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ www.ortussolutions.com
*/
component{
// Application properties
this.name = hash( getCurrentTemplatePath() );
this.name = "CBVue" & hash( getCurrentTemplatePath() );
this.sessionManagement = true;
this.sessionTimeout = createTimeSpan(0,0,30,0);
this.setClientCookies = true;
Expand All @@ -19,9 +19,6 @@ component{
COLDBOX_CONFIG_FILE = "";
// COLDBOX APPLICATION KEY OVERRIDE
COLDBOX_APP_KEY = "";
// JAVA INTEGRATION: JUST DROP JARS IN THE LIB FOLDER
// You can add more paths or change the reload flag as well.
this.javaSettings = { loadPaths = [ "lib" ], reloadOnChange = false };

// application start
public boolean function onApplicationStart(){
Expand Down
56 changes: 56 additions & 0 deletions Gulpfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
var elixir = require( 'coldbox-elixir' );
var del = require( 'del' );
var gulp = require( 'gulp' );
var shell = require( 'gulp-shell' );

/*********************************************************************************/
/* Gulp TASKS */
/*********************************************************************************/

gulp.task( 'cleanup', function(){
del.sync( [
'includes/css',
'includes/js',
'includes/fonts'
] );
});

gulp.task( 'tests', shell.task( 'box testbox run reporter="mintext"' ) );
gulp.watch( [ 'handlers/**', 'tests/**/*.cfc', 'models/**/*.cfc' ], [ 'tests' ] );

/*********************************************************************************/
/* Elixir TASKS */
/*********************************************************************************/

elixir( function( mix ){
mix.task( "cleanup" )
// Font Awesome
.copy( "bower_components/font-awesome-sass/assets/fonts", "includes/fonts" )
.copy( "bower_components/bootstrap-sass/assets/fonts", "includes/fonts" )
// Vendor Scripts
.scripts(
[
"jquery/dist/jquery.min.js",
"bootstrap-sass/assets/javascripts/bootstrap.min.js",
"vue/dist/vue.min.js",
"vue-resource/dist/vue-resource.min.js"
], // concatenated + minified files
"includes/js/vendor.min.js", // ouput file
"bower_components" // base dir
)
// Dev Vendor Scripts : Great for local development
.scripts(
[
"jquery/dist/jquery.min.js",
"bootstrap-sass/assets/javascripts/bootstrap.min.js",
"vue/dist/vue.js",
"vue-resource/dist/vue-resource.js"
], // concatenated + minified files
"includes/js/vendor-dev.js", // ouput file
"bower_components" // base dir
)
// Mix App styles
.sass( "App.scss" )
// Mix JS
.scripts( "App.js" );
} );
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ A Contact Editor using Vue.js and ColdBox REST API

## Dependencies
- CommandBox
- Coldbox Framework
- ColdBox Framework
- Vue.js
- Vue Resource (for Restful Methods)
- Boostrap
Expand Down
11 changes: 11 additions & 0 deletions bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "cbvue",
"description": "",
"authors": [],
"dependencies": {
"bootstrap-sass": "^3.3.6",
"font-awesome-sass": "^4.6.2",
"vue": "^1.0.27",
"vue-resource": "^1.0.3"
}
}
92 changes: 22 additions & 70 deletions box.json
Original file line number Diff line number Diff line change
@@ -1,87 +1,39 @@
{
"name":"CBVue",
"version":"0.0.0",
"author":"",
"location":"",
"directory":"",
"createPackageDirectory":true,
"packageDirectory":"",
"homepage":"",
"documentation":"",
"version":"1.0.0",
"author":"Ortus Solutions, Corp",
"homepage":"https://github.com/coldbox-samples/cbvue",
"documentation":"https://github.com/coldbox-samples/cbvue",
"repository":{
"type":"",
"URL":""
"type":"git",
"URL":"https://github.com/coldbox-samples/cbvue"
},
"bugs":"",
"bugs":"https://github.com/coldbox-samples/cbvue/issues",
"slug":"CBVue",
"shortDescription":"A sweet package",
"description":"",
"instructions":"",
"changelog":"",
"type":"",
"keywords":[

],
"private":false,
"engines":[
{
"type":"",
"version":""
}
],
"defaultEngine":"",
"defaultPort":0,
"projectURL":"",
"license":[
{
"type":"",
"URL":""
}
],
"contributors":[

],
"shortDescription":"A ColdBox + VueJS Contact Manager",
"type":"projects",
"contributors":[],
"dependencies":{
"coldbox":"4.1.0+00002"
},
"devDependencies":{

"cbvalidation":"^4.4.0",
"mockdatacfc":"^2.3.0",
"coldbox":"^7.2.0",
"testbox":"^5.3.1+6"
},
"devDependencies":{},
"installPaths":{
"coldbox":"coldbox"
"cbvalidation":"modules/cbvalidation",
"mockdatacfc":"modules/mockdatacfc",
"coldbox":"coldbox",
"testbox":"testbox"
},
"ignore":[
"**/.*",
"test",
"tests"
"**/.*"
],
"testbox":{
"runner":[
{
"default":""
"default":"http://127.0.0.1:11254/tests/runner.cfm"
}
],
"labels":[

],
"reporter":"",
"reporterResults":"",
"bundles":[
""
],
"directory":{
"mapping":"",
"recurse":true
},
"watchers":[

],
"notify":{
"emails":[

],
"growl":"",
"URL":""
}
]
}
}
Loading