Skip to content
This repository has been archived by the owner on Aug 28, 2021. It is now read-only.

Commit

Permalink
Add .editorconfig and make all sources compliant
Browse files Browse the repository at this point in the history
  • Loading branch information
Logan Glasson committed Jul 20, 2018
1 parent 8a74e59 commit 3ae910c
Show file tree
Hide file tree
Showing 61 changed files with 74 additions and 62 deletions.
10 changes: 10 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
root = true

[*]
indent_style = space
indent_size = 2
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

2 changes: 1 addition & 1 deletion .env-base
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ INDENT_RESPONSES=false

# If you want user email addresses to be publicly visible, set this to true. Not recommended for
# public instances.
EXPOSE_EMAILS=false
EXPOSE_EMAILS=false
1 change: 1 addition & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

2 changes: 1 addition & 1 deletion Changelog.html
Original file line number Diff line number Diff line change
Expand Up @@ -1069,4 +1069,4 @@ <h2 id="models"><a name="user-content-models" href="#models" class="headeranchor
<li>PUT: myComment.set( body ).save( )</li>
</ul>
</li>
</ul></article></body></html>
</ul></article></body></html>
2 changes: 1 addition & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ All Payloads for POST or PUT should be unified to:
+ PUT: myProject.set( body ).save( )
- POST/PUT Comment: BODY A Comment
+ POST: new Comment( body )
+ PUT: myComment.set( body ).save( )
+ PUT: myComment.set( body ).save( )
2 changes: 1 addition & 1 deletion app/api/v1/accounts/UserCreate.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ module.exports = function( req, res ) {
res.status( 400 )
return res.send( { success: false, message: err.message } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/accounts/UserGet.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ module.exports = function( req, res ) {
res.status( 400 )
res.send( { success: false, message: err.toString( ) } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/accounts/UserLogin.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ module.exports = function( req, res ) {
res.status( 401 )
res.send( { success: false, message: err } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/accounts/UserProfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ module.exports = function( req, res ) {
res.status( 400 )
res.send( { success: false, message: err.toString( ) } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/accounts/UserPut.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ module.exports = function( req, res ) {
res.status( 400 )
res.send( { success: false, message: err.toString( ) } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/accounts/UserSearch.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ module.exports = function( req, res ) {
res.status( 400 )
res.send( { success: false, message: err.toString( ) } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/clients/ClientDelete.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ module.exports = ( req, res ) => {
res.status( err.message === 'Unauthorized. Please log in.' ? 401 : 404 )
res.send( { success: false, message: err.toString( ) } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/clients/ClientGet.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ module.exports = ( req, res ) => {
res.status( 400 )
res.send( { success: false, message: err.toString() } )
})
}
}
2 changes: 1 addition & 1 deletion app/api/v1/clients/ClientGetAll.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ module.exports = ( req, res ) => {
res.status( 400 )
res.send( { success: false, message: err.toString( ) } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/clients/ClientPost.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ module.exports = ( req, res ) => {
res.status( 400 )
res.send( { success: false, message: err.toString( ) } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/clients/ClientPut.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ module.exports = ( req, res ) => {
res.status( 400 )
res.send( { success: false, message: err.toString( ) } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/comments/CommentDelete.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ module.exports = function( req, res ) {
res.status( err.message.indexOf( 'authorised' ) >= 0 ? 401 : 404 )
res.send( { success: false, message: err.message } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/comments/CommentGetAll.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ module.exports = ( req, res ) => {
res.status( err.message.indexOf( 'authorised' ) >= 0 ? 401 : 404 )
res.send( { success: false, message: err.message, streamId: req.streamId } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/comments/CommentGetAssigned.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ module.exports = ( req, res ) => {
res.status( err.message.indexOf( 'authorised' ) >= 0 ? 401 : 404 )
res.send( { success: false, message: err.message, streamId: req.streamId } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/comments/CommentPost.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ module.exports = function( req, res ) {
res.status( err.message.indexOf( 'authorised' ) >= 0 ? 401 : 404 )
res.send( { success: false, message: err.message, streamId: req.streamId } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/comments/CommentPut.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ module.exports = function( req, res ) {
res.status( err.message.indexOf( 'authorised' ) >= 0 ? 401 : 404 )
res.send( { success: false, message: err.message, commentId: req.commentId } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -177,4 +177,4 @@ module.exports = function( app, express, urlRoot ) {

// mount all these routes up
app.use( urlRoot, r )
}
}
10 changes: 5 additions & 5 deletions app/api/v1/middleware/BulkObjectSave.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ module.exports = ( objects, user ) => {
return new Promise( ( resolve, reject ) => {
if ( objects.length === 0 )
return resolve( objects )

let notPlaceholders = objects.filter( obj => obj.type != 'Placeholder' )
if( notPlaceholders.length === 0 )
if( notPlaceholders.length === 0 )
return resolve( objects )

SpeckleObject.find( { hash: { $in: objects.map( obj => obj.hash ) } }, '_id hash' )
.then( existingObjects => {
winston.debug( chalk.bgBlue( 'Bulk obj save: ' ) + ` ${existingObjects.length} preexisting objs.` )
Expand All @@ -36,5 +36,5 @@ module.exports = ( objects, user ) => {
.catch( err => {
reject( err )
} )
} ) 
}
} )
}
2 changes: 1 addition & 1 deletion app/api/v1/middleware/GetResourceByType.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ module.exports = ( type, id, populateFields ) => {
default:
break
}
}
}
2 changes: 1 addition & 1 deletion app/api/v1/middleware/PermissionCheck.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,4 @@ module.exports = ( user, operation, resource, mod ) => {
return reject( new Error( `You are not authorised to ${operation}: unknown.` ) )
}
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/middleware/PrepareQuery.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ module.exports = ( q ) => {
return query
}
return query
}
}
2 changes: 1 addition & 1 deletion app/api/v1/middleware/ProtectedFields.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ module.exports = [
'canWrite',
'private',
'email'
]
]
2 changes: 1 addition & 1 deletion app/api/v1/middleware/TokenCheck.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ module.exports = ( req, res, next ) => {
res.status( 401 )
return res.send( { success: false, message: 'Token check failed.', error: err } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/objects/ObjectDelete.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ module.exports = ( req, res ) => {
res.status( err.message === 'Unauthorized. Please log in.' ? 401 : 404 )
res.send( { success: false, message: err.toString() } )
})
}
}
2 changes: 1 addition & 1 deletion app/api/v1/objects/ObjectGet.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ module.exports = ( req, res ) => {
res.status( 400 )
res.send( { success: false, message: err.toString( ) } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/objects/ObjectPost.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ module.exports = ( req, res ) => {
res.status( 400 )
res.send( { success: false, message: err.toString( ) } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/objects/ObjectPut.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ module.exports = ( req, res ) => {
return res.send( { success: false, message: err.toString( ) } )
} )

}
}
2 changes: 1 addition & 1 deletion app/api/v1/objects/ObjectPutProperties.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ module.exports = ( req, res ) => {
return res.send( { success: false, message: err.toString( ) } )
} )

}
}
2 changes: 1 addition & 1 deletion app/api/v1/objects/ObjectsGetBulk.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ module.exports = ( req, res ) => {
res.status( err.message === 'Unauthorized. Please log in.' ? 401 : 404 )
res.send( { success: false, message: err.message, streamId: req.streamId } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/projects/ProjectDelete.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ module.exports = ( req, res ) => {
res.status( err.message.indexOf( 'authorised' ) >= 0 ? 401 : 404 )
res.send( { success: false, message: err.message } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/projects/ProjectGet.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ module.exports = ( req, res ) => {
res.status( err.message.indexOf( 'authorised' ) >= 0 ? 401 : 404 )
res.send( { success: false, message: err.message, streamId: req.streamId } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/projects/ProjectGetAll.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ module.exports = ( req, res ) => {
res.status( err.message.indexOf( 'authorised' ) >= 0 ? 401 : 404 )
res.send( { success: false, message: err.message, streamId: req.streamId } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/projects/ProjectPost.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ module.exports = ( req, res ) => {
res.status( 400 )
return res.send( { success: false, message: err.toString( ) } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/projects/ProjectPut.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ module.exports = ( req, res ) => {
res.status( err.message.indexOf( 'authorised' ) >= 0 ? 401 : 404 )
res.send( { success: false, message: err.message } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/streams/StreamDelete.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ module.exports = ( req, res ) => {
res.status( err.message === 'Unauthorized. Please log in.' ? 401 : 404 )
res.send( { success: false, message: err.toString( ) } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/streams/StreamDiff.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ module.exports = ( req, res ) => {
res.send( { success: false, message: err.toString( ) } )
} )

}
}
2 changes: 1 addition & 1 deletion app/api/v1/streams/StreamDuplicate.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ module.exports = ( req, res ) => {
res.send( { success: false, message: err, streamId: req.streamId } )
} )

}
}
2 changes: 1 addition & 1 deletion app/api/v1/streams/StreamGet.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ function getDefaultLayer( length ) {
topology: `0;0-${length} `,
properties: { color: { a: 1, hex: 'Black' } }
}
}
}
2 changes: 1 addition & 1 deletion app/api/v1/streams/StreamGetAll.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ module.exports = ( req, res ) => {
res.status( 400 )
res.send( { success: false, message: 'Something failed.' } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/streams/StreamObjectsGet.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ module.exports = ( req, res ) => {
res.status( err.message === 'Unauthorized. Please log in.' ? 401 : 404 )
res.send( { success: false, message: err.message, streamId: req.streamId } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/streams/StreamPost.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ module.exports = ( req, res ) => {
res.status( 400 )
return res.send( { success: false, message: err.toString( ) } )
} )
}
}
2 changes: 1 addition & 1 deletion app/api/v1/streams/StreamPut.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ module.exports = ( req, res ) => {
res.status( 400 )
res.send( { success: false, message: err.toString( ) } )
} )
}
}
2 changes: 1 addition & 1 deletion app/ws/ClientStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ module.exports = {
winston.debug( chalk.bgRed( 'Socket removed', ws.clientId ) )
winston.debug( chalk.blue( `There are now ${this.clients.length} ws clients in ${process.pid}.` ) )
}
}
}
2 changes: 1 addition & 1 deletion app/ws/RadioTower.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,4 @@ module.exports = {
}
}
}
}
}
2 changes: 1 addition & 1 deletion app/ws/SpeckleSockets.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@ module.exports = function( wss ) {
clientStore.remove( ws )
} )
} )
}
}
2 changes: 1 addition & 1 deletion app/ws/middleware/VerifyClient.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ module.exports = function( info, cb ) {
winston.error( err )
return cb( false, 401, 'Unauthorized' )
})
}
}
2 changes: 1 addition & 1 deletion config/passport.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ module.exports = function( passport ) {

passport.use( new AnonymousStrategy( ) )

}
}
2 changes: 1 addition & 1 deletion models/Comment.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ var commentSchema = mongoose.Schema( {

}, { timestamps: true } )

module.exports = mongoose.model( 'Comment', commentSchema )
module.exports = mongoose.model( 'Comment', commentSchema )
2 changes: 1 addition & 1 deletion models/DataStream.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ var dataStreamSchema = mongoose.Schema( {

}, { timestamps: true } )

module.exports = mongoose.model( 'DataStream', dataStreamSchema )
module.exports = mongoose.model( 'DataStream', dataStreamSchema )
Loading

0 comments on commit 3ae910c

Please sign in to comment.