added database to be ignored

tesis-lab · Jan 17, 2017 · 8065eca · 8065eca
1 parent 4cccba5
commit 8065eca
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 2 deletions.
diff --git a/client/index.html b/client/index.html
@@ -4,9 +4,9 @@
  <meta charset="utf-8">
  <title>tesis</title>
  <!-- Styles -->
+ <link rel="stylesheet" href="//cdn.quilljs.com/1.1.9/quill.bubble.css">
  <link rel="stylesheet" type="text/css" href="client/styles/normalize.css">
  <link rel="stylesheet" type="text/css" href="client/styles/style.css">
- <link rel="stylesheet" href="//cdn.quilljs.com/1.1.9/quill.bubble.css">
  <!-- jquery -->
  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" />

diff --git a/client/styles/style.css b/client/styles/style.css
@@ -10,3 +10,14 @@ html, body{
 body{
  padding-top: 8em;
 }
+.ql-bubble .ql-editor code,
+.ql-bubble .ql-editor pre {
+ background-color: #f0f0f0;
+ border: none;
+ border-radius: 1px;
+}
+.ql-bubble .ql-tooltip {
+ background-color: #444;
+ border-radius: 3px;
+ color: #fff;
+}
diff --git a/client/vue-components/main_content.vue b/client/vue-components/main_content.vue
@@ -1,12 +1,14 @@
 <template>
  <div class="main-content">
  <navbar></navbar>
+
  <div>
  <!-- area to add live data as text is being added -->
  <div class="content-left">
  <div>
  <videocomponent id="video" :wsrtc="wsRTC" :uri="URI"></videocomponent>
  </div>
+
  <div class="doc-info" v-if="count > 0">
  <div>{{ count }} words</div>
  <div>{{ time }} read</div>
@@ -69,13 +71,42 @@
  let socket = new WebSocket(`ws:https://${window.location.host}`);
  connection.bindToSocket(socket);
  }
+<<<<<<< 4cccba5e8144a1bb2f18461c7b9b2a64f67fd1c2
  // Storing doc inside editor for access in other components.
  editor.doc = connection.get('docs', this.URI);
  // New quill
  editor.makeQuill();
  editor.quillOn(editor.doc);
  editor.docSubscribe(editor.quill, editor.doc);
  editor.changeQuill('');
+=======
+ const doc = connection.get('docs', this.URI);
+ this.quill = new Quill('#editor', {
+ modules: {
+ toolbar : {
+ container: [
+ ['bold', 'italic', 'underline'],
+ [{header: 1}, {header: 2}],
+ ['blockquote', 'code-block'],
+ ['image', 'link']
+ ],
+ handlers: {
+
+ }
+ },
+ placeholder: 'Filthy animals.',
+ theme: 'bubble'
+ }
+ })
+
+ this.quill.on('text-change', () => {
+ let text = this.quill.getText()
+ let stats = textStats(text)
+ this.time = stats.display
+ this.count = stats.length
+ })
+ docSubscribe(this.quill, doc)
+>>>>>>> added database to be ignored
  },
 
  data() {
@@ -140,4 +171,3 @@ code {
  color: #f66;
 }
 </style>
-