From d8348c56a7784c1807e2b45ac0c473caa159593f Mon Sep 17 00:00:00 2001
From: Samuli Virtapohja <l4721@student.jamk.fi>
Date: Fri, 14 Jun 2019 12:06:02 +0300
Subject: [PATCH] appcontroller, links
---
src/app.controller.ts | 12 ++++++++++++
src/app.module.ts | 2 ++
src/user/user.entity.ts | 5 +++--
3 files changed, 17 insertions(+), 2 deletions(-)
create mode 100644 src/app.controller.ts
diff --git a/src/app.controller.ts b/src/app.controller.ts
new file mode 100644
index 0000000..cce879e
--- /dev/null
+++ b/src/app.controller.ts
@@ -0,0 +1,12 @@
+import { Controller, Get } from '@nestjs/common';
+import { AppService } from './app.service';
+
+@Controller()
+export class AppController {
+ constructor(private readonly appService: AppService) {}
+
+ @Get()
+ getHello(): string {
+ return this.appService.getHello();
+ }
+}
diff --git a/src/app.module.ts b/src/app.module.ts
index 7158700..f591eb0 100644
--- a/src/app.module.ts
+++ b/src/app.module.ts
@@ -9,12 +9,14 @@ import { HttpErrorFilter } from './shared/http-error.filter';
import { LoggingInterceptor } from './shared/logging.interceptor';
import { MapMarkerModule } from './mapmarkers/mapmarkers.module';
import { NotificationModule } from './notifications/notifications.module';
+import { GameModule } from './game/game.module';
@Module({
imports: [
TypeOrmModule.forRoot(),
UserModule,
MapMarkerModule,
+ GameModule,
NotificationModule,
],
controllers: [AppController],
diff --git a/src/user/user.entity.ts b/src/user/user.entity.ts
index 6c00a00..a71b569 100644
--- a/src/user/user.entity.ts
+++ b/src/user/user.entity.ts
@@ -1,8 +1,9 @@
import { Entity, Column, PrimaryGeneratedColumn, BeforeInsert, OneToMany } from 'typeorm';
import * as bcrypt from 'bcryptjs';
import * as jwt from 'jsonwebtoken';
-import { MapMarkerEntity } from 'src/mapmarkers/mapmarker.entity';
-import { Game_PersonEntity } from 'src/game/game.entity';
+
+import { MapMarkerEntity } from '../mapmarkers/mapmarker.entity';
+import { Game_PersonEntity } from '../game/game.entity';
@Entity('Person')
export class PersonEntity {
--
GitLab