Merge pull request #111 from vivitek/feature/openvvrt

Feature/openvvrt
vivitek · Aug 2, 2021 · c1f35c9 · c1f35c9
2 parents 0180eaa + abad470
commit c1f35c9
Show file tree

Hide file tree

Showing 14 changed files with 210 additions and 280 deletions.
diff --git a/server/src/app.module.ts b/server/src/app.module.ts
@@ -10,7 +10,7 @@ import { ConfigModule } from './config/config.module';
 import { BeamsModule } from './beams/beams.module';
 import { GraphQLModule } from '@nestjs/graphql';
 import { AppController } from './app.controller';
-import { BalenaModule } from './balena/balena.module';
+import { OpenVVRTModule } from './openvvrt/openvvrt.module';
 
 const MODULES = [
   MongooseModule.forRoot(`mongodb:https://${process.env.MONGO}/vivi`),
@@ -30,7 +30,7 @@ const MODULES = [
   ServiceModule,
   ConfigModule,
   BeamsModule,
-  BalenaModule,
+  OpenVVRTModule
 ];
 
 @Module({

diff --git a/server/src/auth/auth.service.ts b/server/src/auth/auth.service.ts
@@ -66,7 +66,6 @@ export class AuthService {
   }
 
   private generateToken(user: User): string {
-    const now = Date.now()
     return this.jwtService.sign(
       {
         ...user.toJSON(),

diff --git a/server/src/balena/balena.module.ts b/server/src/balena/balena.module.ts
diff --git a/server/src/balena/balena.resolver.ts b/server/src/balena/balena.resolver.ts
diff --git a/server/src/balena/balena.service.ts b/server/src/balena/balena.service.ts
diff --git a/server/src/balena/balena.utils.ts b/server/src/balena/balena.utils.ts
diff --git a/server/src/balena/schema/balena.schema.ts b/server/src/balena/schema/balena.schema.ts
diff --git a/server/src/ban/ban.resolver.ts b/server/src/ban/ban.resolver.ts
@@ -66,7 +66,7 @@ export class BanResolver {
   }
 
   @Mutation(() => Boolean)
-  async deleteBansByRouter(@Args('routerId') routerId: string): Promise<Boolean> {
+  async deleteBansByRouter(@Args('routerId') routerId: string): Promise<boolean> {
     return await this.banService.deleteByRouter(routerId);
   }
 

diff --git a/server/src/openvvrt/openvvrt.module.ts b/server/src/openvvrt/openvvrt.module.ts
@@ -0,0 +1,8 @@
+import { Module } from "@nestjs/common"
+import { OpenVVRTResolver } from "./openvvrt.resolver"
+import { OpenVVRTService } from "./openvvrt.service"
+
+@Module({
+    providers: [OpenVVRTResolver, OpenVVRTService]
+})
+export class OpenVVRTModule {}