Added basic chat layout

TannerGabriel · TannerGabriel · commit 1bf3436efad4 · 2019-07-15T20:45:43.000+02:00
diff --git a/Camera/.idea/runConfigurations.xml b/Camera/.idea/runConfigurations.xml
diff --git a/Camera/.idea/vcs.xml b/Camera/.idea/vcs.xml
diff --git a/Camera/app/src/main/java/com/example/videorecorder/MainActivity.kt b/Camera/app/src/main/java/com/example/videorecorder/MainActivity.kt
@@ -47,6 +47,8 @@ class MainActivity : AppCompatActivity() {
         fotoapparatState = FotoapparatState.OFF
 
         fab_camera.setOnClickListener {
+            print("Taking photo")
+            val test = "Test233"
             takePhoto()
         }
 
diff --git a/NestVueChat/src/main.ts b/NestVueChat/src/main.ts
@@ -1,8 +1,11 @@
 import { NestFactory } from '@nestjs/core';
 import { AppModule } from './app.module';
+import { NestExpressApplication } from '@nestjs/platform-express';
+import { join } from 'path';
 
 async function bootstrap() {
-  const app = await NestFactory.create(AppModule);
+  const app = await NestFactory.create<NestExpressApplication>(AppModule);
+  app.useStaticAssets(join(__dirname, '..', 'static'));
   await app.listen(3000);
 }
 bootstrap();
diff --git a/NestVueChat/static/index.html b/NestVueChat/static/index.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
+    <title>Document</title>
+    <link rel="stylesheet" href="styles.css">
+    <script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
+    <script type="text/javascript" src="https://cdn.socket.io/socket.io-1.4.5.js"></script>
+    
+</head>
+<body>
+    <div id="app" class="container">
+            <div class="row">
+                <div class="col-md-6 offset-md-3 col-sm-12">
+                    <h1 class="text-center">{{ title }}</h1>
+                    <br>
+                    <div id="status"></div>
+                    <div id="chat">
+                        <input type="text" v-model="name" id="username" class="form-control" placeholder="Enter name...">
+                        <br>
+                        <div class="card">
+                            <div id="messages" class="card-block">
+                                <ul>
+                                    <li v-for="message of messages">{{ message }}</li>
+                                </ul>
+                            </div>
+                        </div>
+                        <br>
+                        <textarea id="textarea" class="form-control" v-model="text" placeholder="Enter message..."></textarea>
+                        <br>
+                        <button id="send" class="btn">Send</button>
+                    </div>
+                </div>
+            </div>
+    </div>
+
+
+    <script>
+        var app = new Vue({
+            el: '#app',
+            data: {
+                title: 'Nestjs Websockets Chat',
+                name: '',
+                text: '',
+                messages: ['test', 'test2']
+            },
+        })
+    </script>
+</body>
+</html>
diff --git a/NestVueChat/static/styles.css b/NestVueChat/static/styles.css
@@ -0,0 +1,4 @@
+#messages{
+    height:300px;
+    overflow-y: scroll;
+}

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,8 @@ class MainActivity : AppCompatActivity() {`
`47`	`47`	`fotoapparatState = FotoapparatState.OFF`
`48`	`48`
`49`	`49`	`fab_camera.setOnClickListener {`
	`50`	`+ print("Taking photo")`
	`51`	`+ val test = "Test233"`
`50`	`52`	`takePhoto()`
`51`	`53`	`}`
`52`	`54`