merged edit submissions view
This commit is contained in:
parent
3e364b2f2e
commit
bdb741affc
2
config/env/all.js
vendored
2
config/env/all.js
vendored
@ -7,7 +7,7 @@ module.exports = {
|
||||
description: process.env.APP_DESC || 'Opensource form builder alternative to TypeForm',
|
||||
keywords: process.env.APP_KEYWORDS || 'typeform, pdfs, forms, opensource, formbuilder, google forms, nodejs'
|
||||
},
|
||||
port: process.env.PORT || 3000,
|
||||
port: process.env.PORT || 5000,
|
||||
socketPort: process.env.SOCKET_PORT || 35729,
|
||||
|
||||
templateEngine: 'swig',
|
||||
|
2
config/env/development.js
vendored
2
config/env/development.js
vendored
@ -1,7 +1,7 @@
|
||||
'use strict';
|
||||
|
||||
module.exports = {
|
||||
baseUrl: process.env.BASE_URL || 'http://localhost:3000',
|
||||
baseUrl: process.env.BASE_URL || 'http://localhost:5000',
|
||||
db: {
|
||||
uri: 'mongodb://localhost/mean',
|
||||
options: {
|
||||
|
17
config/env/local.js
vendored
17
config/env/local.js
vendored
@ -1,17 +0,0 @@
|
||||
'use strict';
|
||||
|
||||
var mandrill_api_key = 'AVCCf1C2dFlrNhx9Iyi_yQ';
|
||||
|
||||
//Use mandrill mock API_key if we are testing
|
||||
// if(process.env.NODE_ENV === 'test') mandrill_api_key = '_YNOKLgT9DGb2sgVGR66yQ';
|
||||
|
||||
module.exports = {
|
||||
// db: {
|
||||
// uri: 'mongodb://localhost/local-dev',
|
||||
// options: {
|
||||
// user: '',
|
||||
// pass: ''
|
||||
// }
|
||||
// },
|
||||
sessionSecret: process.env.SESSION_SECRET || 'somethingheresecret',
|
||||
};
|
65
config/env/production-dev.js
vendored
65
config/env/production-dev.js
vendored
@ -1,65 +0,0 @@
|
||||
'use strict';
|
||||
|
||||
module.exports = {
|
||||
baseUrl: process.env.BASE_URL || 'dev.tellform.com',
|
||||
db: {
|
||||
uri: process.env.MONGOHQ_URL || process.env.MONGOLAB_URI || 'mongodb://' + (process.env.DB_1_PORT_27017_TCP_ADDR || 'localhost') + '/mean',
|
||||
options: {
|
||||
user: 'admin',
|
||||
pass: process.env.MONGOLAB_PASS || 'admin'
|
||||
}
|
||||
},
|
||||
log: {
|
||||
// Can specify one of 'combined', 'common', 'dev', 'short', 'tiny'
|
||||
format: 'dev',
|
||||
// Stream defaults to process.stdout
|
||||
// Uncomment to enable logging to a log on the file system
|
||||
options: {
|
||||
stream: 'access.log'
|
||||
}
|
||||
},
|
||||
sessionCookie: {
|
||||
domain: process.env.BASE_URL || 'dev.tellform.com'
|
||||
},
|
||||
assets: {
|
||||
css: 'public/dist/application.min.css',
|
||||
js: 'public/dist/application.min.js'
|
||||
},
|
||||
facebook: {
|
||||
clientID: process.env.FACEBOOK_ID || 'APP_ID',
|
||||
clientSecret: process.env.FACEBOOK_SECRET || 'APP_SECRET',
|
||||
callbackURL: '/auth/facebook/callback'
|
||||
},
|
||||
twitter: {
|
||||
clientID: process.env.TWITTER_KEY || 'CONSUMER_KEY',
|
||||
clientSecret: process.env.TWITTER_SECRET || 'CONSUMER_SECRET',
|
||||
callbackURL: '/auth/twitter/callback'
|
||||
},
|
||||
google: {
|
||||
clientID: process.env.GOOGLE_ID || 'APP_ID',
|
||||
clientSecret: process.env.GOOGLE_SECRET || 'APP_SECRET',
|
||||
callbackURL: '/auth/google/callback'
|
||||
},
|
||||
linkedin: {
|
||||
clientID: process.env.LINKEDIN_ID || 'APP_ID',
|
||||
clientSecret: process.env.LINKEDIN_SECRET || 'APP_SECRET',
|
||||
callbackURL: '/auth/linkedin/callback'
|
||||
},
|
||||
github: {
|
||||
clientID: process.env.GITHUB_ID || 'APP_ID',
|
||||
clientSecret: process.env.GITHUB_SECRET || 'APP_SECRET',
|
||||
callbackURL: '/auth/github/callback'
|
||||
},
|
||||
mailer: {
|
||||
from: process.env.MAILER_FROM || 'no-reply@dev.tellform.com',
|
||||
options: {
|
||||
service: process.env.MAILER_SERVICE_PROVIDER || '',
|
||||
secure: false,
|
||||
requireTLS: true,
|
||||
auth: {
|
||||
user: process.env.MAILER_EMAIL_ID || '',
|
||||
pass: process.env.MAILER_PASSWORD || ''
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
@ -53,7 +53,7 @@ module.exports = function(db) {
|
||||
app.locals.description = config.app.description;
|
||||
app.locals.keywords = config.app.keywords;
|
||||
app.locals.socketPort = config.socketPort;
|
||||
|
||||
|
||||
app.locals.bowerJSFiles = config.getBowerJSAssets();
|
||||
app.locals.bowerCssFiles = config.getBowerCSSAssets();
|
||||
app.locals.bowerOtherFiles = config.getBowerOtherAssets();
|
||||
|
@ -4,8 +4,7 @@
|
||||
var config = require('./config'),
|
||||
path = require('path'),
|
||||
http = require('http'),
|
||||
socketio = require('socket.io'),
|
||||
session = require('express-session');
|
||||
socketio = require('socket.io');
|
||||
|
||||
// Define the Socket.io configuration method
|
||||
module.exports = function (app, db) {
|
||||
|
@ -113,12 +113,7 @@
|
||||
</th>
|
||||
|
||||
<td data-ng-repeat="field in row.form_fields">
|
||||
<span ng-if="field.fieldValue == 'dropdown'">
|
||||
{{field.fieldValue}}
|
||||
</span>
|
||||
<span ng-if="field.fieldValue != 'dropdown'">
|
||||
{{field.fieldValue}}
|
||||
</span>
|
||||
{{field.fieldValue}}
|
||||
</td>
|
||||
<td ng-if="myform.plugins.oscarhost.baseUrl">
|
||||
<a href="{{myform.plugins.oscarhost.baseUrl.split('ws')[0]}}demographic/demographiccontrol.jsp?demographic_no={{row.oscarDemoNum}}&displaymode=edit">
|
||||
|
Loading…
Reference in New Issue
Block a user