foltik
/
shimapan
Mirror von https://github.com/Foltik/Shimapan
1
0
Fork 0
Code Issues 0 Releases 0 Wiki Aktivität
Quellcode durchsuchen

Add different env configs

pull/1/head
Jack vor 6 Jahren
Ursprung
e01051f97f
Commit
25d28720dd
Signiert von: foltik <jack@foltz.io> GPG-Schlüssel-ID: 303F88F996E95541
9 geänderte Dateien mit 56 neuen und 29 gelöschten Zeilen
Geteilte Ansicht
Diff-Optionen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen
  1. +3
    -0
      config/default.json
  2. +3
    -0
      config/dev.json
  3. +3
    -0
      config/test.json
  4. +13
    -0
      gulpfile.js
  5. +14
    -4
      package.json
  6. +2
    -5
      public/views/index.html
  7. +1
    -2
      public/views/panel.html
  8. +1
    -5
      public/views/register.html
  9. +16
    -13
      server.js

+ 3
- 0
config/default.json Datei anzeigen

@@ -0,0 +1,3 @@
{
"dbHost": "mongodb://localhost/shimapan"
}

+ 3
- 0
config/dev.json Datei anzeigen

@@ -0,0 +1,3 @@
{
"dbHost": "mongodb://localhost/shimapan"
}

+ 3
- 0
config/test.json Datei anzeigen

@@ -0,0 +1,3 @@
{
"dbHost": "mongodb://localhost/shimapan-test"
}

+ 13
- 0
gulpfile.js Datei anzeigen

@@ -0,0 +1,13 @@
var gulp = require('gulp');
var concat = require('gulp-concat');
var rename = require('gulp-rename');
var uglify = require('gulp-uglify');

var jsFiles = 'public/js/**/*.js',
jsDest = 'public/libs/app';

gulp.task('concat', function() {
return gulp.src(jsFiles)
.pipe(concat('app.js'))
.pipe(gulp.dest(jsDest));
});

+ 14
- 4
package.json Datei anzeigen

@@ -6,13 +6,14 @@
"angular-ui-router": "^0.4.3",
"async": "^2.5.0",
"body-parser": "^1.18.2",
"express": "latest",
"config": "^1.26.2",
"express": "^4.16.2",
"express-jwt": "^5.3.0",
"gulp": "latest",
"jsonwebtoken": "^8.1.0",
"jwt-sign": "^0.1.0",
"method-override": "latest",
"mongoose": "latest",
"mongoose": "^4.12.1",
"morgan": "^1.9.0",
"multer": "^1.3.0",
"ng-file-upload": "^12.2.13",
"passport": "^0.4.0",
@@ -20,7 +21,16 @@
},
"description": "A simple file sharing website.",
"main": "index.js",
"devDependencies": {},
"devDependencies": {
"chai": "^4.1.2",
"chai-http": "^3.0.0",
"gulp": "latest",
"gulp-concat": "^2.6.1",
"gulp-rename": "^1.2.2",
"gulp-uglify": "^3.0.0",
"mocha": "^4.0.1",
"nyc": "^11.2.1"
},
"author": "Jack Foltz",
"license": "WTFPL",
"scripts": {


+ 2
- 5
public/views/index.html Datei anzeigen

@@ -14,11 +14,8 @@
<script src="https://cdn.rawgit.com/zenorocha/clipboard.js/master/dist/clipboard.min.js"></script>
<script src="/libs/ngclipboard/src/ngclipboard.js"></script>

<script src="/js/components/UploadComp.js"></script>
<script src="/js/components/RegisterComp.js"></script>
<script src="/js/components/LoginComp.js"></script>
<script src="/js/services/AuthSvc.js"></script>
<script src="/js/shimapan.js"></script>
<script src="/libs/app/app.js"></script>

</head>
<body ng-app="shimapan">
<div id="container">


+ 1
- 2
public/views/panel.html Datei anzeigen

@@ -12,8 +12,7 @@
<script src="/libs/angular/angular.min.js"></script>
<script src="/libs/angular-ui-router/release/angular-ui-router.min.js"></script>

<script src="/js/PanelRoutes.js"></script>
<script src="/js/shimapan-panel.js"></script>
<script src="/libs/app/app.js"></script>
</head>
<body ng-app="shimapan-panel">
<div id="container" ui-view></div>


+ 1
- 5
public/views/register.html Datei anzeigen

@@ -10,11 +10,7 @@
<script src="https://cdn.rawgit.com/zenorocha/clipboard.js/master/dist/clipboard.min.js"></script>
<script src="/libs/ngclipboard/src/ngclipboard.js"></script>

<script src="/js/components/UploadComp.js"></script>
<script src="/js/components/RegisterComp.js"></script>
<script src="/js/components/LoginComp.js"></script>
<script src="/js/services/AuthSvc.js"></script>
<script src="/js/shimapan.js"></script>
<script src="/libs/app/app.js"></script>
</head>
<body ng-app="shimapan">
<div id="container">


+ 16
- 13
server.js Datei anzeigen

@@ -2,30 +2,31 @@ var express = require('express');
var bodyParser = require('body-parser');
var methodOverride = require('method-override');
var mongoose = require('mongoose');
var morgan = require('morgan');
var passport = require('passport');

var app = express();

mongoose.connect('mongodb://localhost/shimapan', {useMongoClient: true});
var config = require('config');
if(config.util.getEnv('NODE_ENV') !== 'test') {
app.use(morgan('combined'));
}

mongoose.Promise = global.Promise;
mongoose.connect(config.dbHost, {useMongoClient: true});
var db = mongoose.connection;
db.on('error', function(err) {
if (err)
console.log('MongoDB Connection Error: ', err);
else
console.log('MongoDB Connection Established');

});
db.once('open', function() {
console.log('MongoDB Connection Open')
if (err) console.log('MongoDB Connection Error: ', err);
});

require('./config/passport.js');

app.use(bodyParser.json());
app.use(bodyParser.json({ type: 'application/vnd.api+json' }));
app.use(bodyParser.json({ type: 'application/json' }));
app.use(bodyParser.urlencoded({ extended: true }));
app.use(passport.initialize());
app.use(bodyParser.text());
app.use(methodOverride('X-HTTP-Method-Override'));
app.use(passport.initialize());

// Set /public to document root
app.use(express.static(__dirname + '/public'));
@@ -33,8 +34,10 @@ require('./app/routes')(app);

// Start app
var port = process.env.PORT || 8080;
app.listen(port);
var server = app.listen(port);
console.log('Listening on port ', port, '...');

// Expose app
exports = module.exports = app;
exports.db = db;
exports.server = server;
exports.app = app;

Verfassen Vorschau
Laden…
Abbrechen
Speichern