Merge pull request speckleworks#164 from speckleworks/job-numbers

Job numbers

docker-compose.yml

@@ -12,19 +12,28 @@ services:
       - redis
       - mongo
     environment:
-      # Change the variable underneath as it will help users differentiate
-      # between multiple accounts.
-      - SERVER_NAME=Docker Speckle Server
-      # This is used in the encryption of the api access tokens.
-      # Please change it to something random!
-      - SESSION_SECRET=helloworld
-      - REQ_SIZE=16mb
-      - INDENT_RESPONSES=false
-      - MONGODB_URI=mongodb://mongo:27017/speckle_docker
-      - REDIS_URL=redis://redis:6379
-      - EXPOSE_EMAILS=false
+      # Please see the example .env file provided for how to properly configure this.
+      # https://github.com/speckleworks/SpeckleServer/blob/master/.env-base
+      - SERVER_NAME="Docker Speckle Server"
+      - CANONICAL_URL="http://localhost:3000"
+      - SESSION_SECRET="Change Me"
+      - MAX_PROC=1
+      - CANONICAL_URL="http://localhost:3000"
       - PUBLIC_STREAMS=true
-      - PLUGIN_DIRS=./node_modules/@speckle,./plugins
+      - PLUGIN_DIRS="./node_modules/@speckle,./plugins"
+      - PORT=3000
+      - IP=0.0.0.0
+      - MAX_PROC=1
+      - REQ_SIZE=10mb
+      - SESSION_SECRET=":D"
+      - MONGODB_URI="mongodb://localhost:27017/speckle_v3"
+      - REDIS_URL="redis://localhost:6379"
+      - INDENT_RESPONSES=false
+      - EXPOSE_EMAILS=true
+      - FIRST_USER_ADMIN=true
+      - PUBLIC_REGISTRATION=true
+      - USE_LOCAL=true
+      - REDIRECT_URLS="https://app.speckle.systems"
     links:
       - redis
       - mongo

models/DataStream.js

@@ -40,7 +40,10 @@ var dataStreamSchema = mongoose.Schema( {
 
   // keeps track wether this stream can be edited from the online ui or not.
   // it's set by default to NOPE
-  onlineEditable: { type: Boolean, default: false }
+  onlineEditable: { type: Boolean, default: false },
+
+  jobNumber: { type: String, default: ''}
+
 }, { timestamps: true, strict: false } )
 
 module.exports = mongoose.model( 'DataStream', dataStreamSchema )

models/Project.js

@@ -27,9 +27,9 @@ var projectSchema = mongoose.Schema( {
     canWrite: [ { type: mongoose.Schema.Types.ObjectId, ref: 'User' } ]
   },
 
-  deleted: { type: Boolean, default: false }
+  deleted: { type: Boolean, default: false },
 
-  // strict false so peeps can expand the schema if they wanna add shit 💩
+  jobNumber: { type: String, default: ''}
 }, { timestamps: true, strict: false } )
 
 module.exports = mongoose.model( 'Project', projectSchema )

server.js

@@ -12,6 +12,9 @@ const logger = require( './config/logger' )
 
 // load up .env
 const configResult = require( 'dotenv' ).config( { path: './.env' } )
+
+process.env.CANONICAL_URL = new URL( process.env.CANONICAL_URL ).origin
+
 if ( configResult.error ) {
   logger.debug( chalk.bgRed( 'There is an error in the .env configuration file. Will use the default provided ones (if any).' ) )
 }