Add node_env-var for serverstart; Add Signature preview and link copy
parent
156604105e
commit
e586df6aa4
|
@ -35,6 +35,8 @@ mongoose.Promise = global.Promise;
|
||||||
// app creation
|
// app creation
|
||||||
const app = express();
|
const app = express();
|
||||||
|
|
||||||
|
// Middlewares *************************************************
|
||||||
|
|
||||||
// setup CORS-middleware
|
// setup CORS-middleware
|
||||||
const corsOptions = {
|
const corsOptions = {
|
||||||
methods: ['GET'],
|
methods: ['GET'],
|
||||||
|
@ -42,17 +44,13 @@ const corsOptions = {
|
||||||
};
|
};
|
||||||
app.use(cors(corsOptions));
|
app.use(cors(corsOptions));
|
||||||
|
|
||||||
// Middlewares *************************************************
|
|
||||||
|
|
||||||
app.use(favicon(path.join(__dirname + '/..', 'public', 'favicon.ico')));
|
app.use(favicon(path.join(__dirname + '/..', 'public', 'favicon.ico')));
|
||||||
app.use(express.static(path.join(__dirname + '/..', 'public')));
|
app.use(express.static(path.join(__dirname + '/..', 'public')));
|
||||||
app.use(bodyParser.json());
|
app.use(bodyParser.json());
|
||||||
|
|
||||||
|
|
||||||
// API request checks for API-version and JSON etc.
|
// API request checks for API-version and JSON etc.
|
||||||
app.use(restAPIchecks);
|
app.use(restAPIchecks);
|
||||||
|
|
||||||
|
|
||||||
// Routes ******************************************************
|
// Routes ******************************************************
|
||||||
app.use(urls.signatures, signatureRouter);
|
app.use(urls.signatures, signatureRouter);
|
||||||
|
|
||||||
|
@ -62,7 +60,7 @@ if (!process.env.NODE_ENV) {
|
||||||
app.use(requestLogger('dev'));
|
app.use(requestLogger('dev'));
|
||||||
} else if (process.env.NODE_ENV !== config.test.env) {
|
} else if (process.env.NODE_ENV !== config.test.env) {
|
||||||
// production logging, apache style
|
// production logging, apache style
|
||||||
app.use(requestLogger(':date :remote-addr :method :url :status :response-time ms'));
|
app.use(requestLogger(':date[iso] :remote-addr :method :url :status :response-time ms'));
|
||||||
}
|
}
|
||||||
|
|
||||||
app.use(urls.auth, authenticateRouter);
|
app.use(urls.auth, authenticateRouter);
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "npm run deploy-static-prod && node ./api/server.js",
|
"start": "npm run deploy-static-prod && NODE_ENV=production node ./api/server.js",
|
||||||
"dev": "npm run deploy-static && nodemon ./api/server.js",
|
"dev": "npm run deploy-static && nodemon ./api/server.js",
|
||||||
"deploy-static": "cd ./static && ng build && ln -s ../api/resource/ ../public/resource",
|
"deploy-static": "cd ./static && ng build && ln -s ../api/resource/ ../public/resource",
|
||||||
"deploy-static-prod": "cd ./static && ng build --env=prod && ln -s ../api/resource/ ../public/resource",
|
"deploy-static-prod": "cd ./static && ng build --env=prod && ln -s ../api/resource/ ../public/resource",
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
"jquery": "^3.1.0",
|
"jquery": "^3.1.0",
|
||||||
"jquery-ui": "^1.12.0",
|
"jquery-ui": "^1.12.0",
|
||||||
"jquery-ui-bundle": "^1.11.4",
|
"jquery-ui-bundle": "^1.11.4",
|
||||||
|
"ngx-clipboard": "^8.0.2",
|
||||||
"rxjs": "^5.2.0",
|
"rxjs": "^5.2.0",
|
||||||
"socket.io-client": "^1.4.8",
|
"socket.io-client": "^1.4.8",
|
||||||
"ts-helpers": "^1.1.1",
|
"ts-helpers": "^1.1.1",
|
||||||
|
|
|
@ -26,9 +26,10 @@ import {LoginGuard} from "./login/login.guard";
|
||||||
import {AwardingService} from "./services/awarding-service/awarding.service";
|
import {AwardingService} from "./services/awarding-service/awarding.service";
|
||||||
import {HttpClient} from "./services/http-client";
|
import {HttpClient} from "./services/http-client";
|
||||||
import {ArmyService} from "./services/army-service/army.service";
|
import {ArmyService} from "./services/army-service/army.service";
|
||||||
|
import { ClipboardModule } from 'ngx-clipboard';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [BrowserModule, FormsModule, ReactiveFormsModule, appRouting, HttpModule],
|
imports: [BrowserModule, FormsModule, ReactiveFormsModule, appRouting, HttpModule, ClipboardModule],
|
||||||
providers: [
|
providers: [
|
||||||
HttpClient,
|
HttpClient,
|
||||||
LoginService,
|
LoginService,
|
||||||
|
|
|
@ -9,6 +9,17 @@
|
||||||
|
|
||||||
<div class="overview">
|
<div class="overview">
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<img style="padding-left: 13%;" src="/signatures/{{user.username}}">
|
||||||
|
</div>
|
||||||
|
<div class="input-group" style="width: 662px; margin-left: 13%;">
|
||||||
|
<input type="text" class="form-control" [(ngModel)]="signatureUrl">
|
||||||
|
<span class="input-group-btn">
|
||||||
|
<button class="btn btn-default" [class.btn-success]="isCopied" type="button"
|
||||||
|
ngxClipboard [cbContent]="signatureUrl" (cbOnSuccess)="isCopied = true">kopieren</button>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="pull-left" style="margin-top:20px;">
|
<div class="pull-left" style="margin-top:20px;">
|
||||||
<div class="table-container" style="width: 75%; min-width: 500px">
|
<div class="table-container" style="width: 75%; min-width: 500px">
|
||||||
<table class="table table-hover">
|
<table class="table table-hover">
|
||||||
|
|
|
@ -16,6 +16,10 @@ export class ArmyMemberComponent {
|
||||||
|
|
||||||
user: User = {};
|
user: User = {};
|
||||||
|
|
||||||
|
signatureUrl;
|
||||||
|
|
||||||
|
isCopied = false;
|
||||||
|
|
||||||
constructor(private router: Router,
|
constructor(private router: Router,
|
||||||
private route: ActivatedRoute,
|
private route: ActivatedRoute,
|
||||||
private userService: UserService) {
|
private userService: UserService) {
|
||||||
|
@ -28,6 +32,7 @@ export class ArmyMemberComponent {
|
||||||
.flatMap(id => this.userService.getUser(id))
|
.flatMap(id => this.userService.getUser(id))
|
||||||
.subscribe(user => {
|
.subscribe(user => {
|
||||||
this.user = user;
|
this.user = user;
|
||||||
|
this.signatureUrl = window.location.origin + '/resource/signature/' + user._id + '.png';
|
||||||
});
|
});
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue