Merge pull request #94 from jeverd/staging

RELEASE v0.1

Author: jeverd

.circleci/config.yml

@@ -6,10 +6,10 @@ jobs:
       - checkout
       - setup_remote_docker
       - run: |
-          TAG=0.1.$CIRCLE_BUILD_NUM
-          docker build -t jeverd/liteboard-express .
+          TAG=0.1.$CIRCLE_BUILD_NUM_$CIRCLE_BRANCH
+          docker build -t jeverd/liteboard-express:$TAG .
           echo $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin  # (4)
-          docker push jeverd/liteboard-express
+          docker push jeverd/liteboard-express:$TAG
   tests:
     docker:
       - image: circleci/node:10.15.0
@@ -36,8 +36,7 @@ workflows:
           filters:
             branches:
               only: 
-                - dev
-                - switch-device
-                - jawad/Staging
+                - staging
+                - master
       - tests
 

.gitignore

@@ -120,4 +120,5 @@ config/.env
 /docker/docker-config/janus/janus.transport.http.jcfg
 /docker/docker-config/nginx.conf
 config/.env
+/docker/production.yml;
 

README.md

@@ -31,7 +31,7 @@ Liteboard is a free, browser-based lecturing platform for anyone who wants to qu
   <img src="public/images/github-readme-main.png"/>
 </div>
 
-Liteboard is powered by WebRTC and uses the [Janus](https://github.com/meetecho/janus-gateway) implementation of a Selective Forwarding Unit (SFU) to allow multiple participants per lecture while ensuring the lowest latency available on browsers. We host our own TURN server to guarantee support for users in any kind of network.
+Liteboard is powered by WebRTC and uses the [Janus](https://github.com/meetecho/janus-gateway) implementation of a Selective Forwarding Unit (SFU) to allow multiple participants per lecture while ensuring the lowest latency available on browsers. We host our own TURN server to guarantee support for users in any kind of network. Read about us in [this university article](https://falauniversidades.com.br/projeto-gratuito-simplifica-o-acesso-as-aulas-on-line/).
 
 ## Contents
 
@@ -134,7 +134,7 @@ We encourge anyone interested in contributing to our project to open Pull Reques
     <td align="center"><a href="https://github.com/lnogueir">
       <img src="https://avatars0.githubusercontent.com/u/48890798?s=460&u=6c62615de3bc32628e8aec4e8a4c320fe6d77869&v=4" width="100px;" alt=""/><br /><sub><b>Lucas Nogueira</b></sub></a><br /> 
         <a href="https://github.com/jeverd/lecture-experience/commits?author=lnogueir"           title="Commits">📖</a> 
-        <a href="https://lucasnogueira.ca/">🔗</a>
+        <a href="https://lnogueir.me/">🔗</a>
         <a href="https://devpost.com/lnogueir">💻</a>
     </td>
     <td align="center"><a href="https://github.com/lukasmuller10"><img src="https://avatars3.githubusercontent.com/u/66929827?s=460&u=34131fcf10cbd8918da4fa95ac807c4b75e36714&v=4" width="100px;" alt=""/><br /><sub><b>Lukas Müller</b></sub></a><br /><a href="https://github.com/jeverd/lecture-experience/commits?author=lukasmuller10" title="Commits">📖</a>
@@ -156,6 +156,7 @@ We encourge anyone interested in contributing to our project to open Pull Reques
     </td>
     <td align="center"><a href="https://github.com/michaelfromyeg"><img src="https://avatars1.githubusercontent.com/u/35978975?s=460&u=05153ea0426075ea9edf9960bdd2443e167b31ce&v=4" width="100px;" alt=""/><br /><sub><b>Michael DeMarco</b></sub></a><br /><a href="https://github.com/jeverd/lecture-experience/commits?author=michaelfromyeg" title="Commits">📖</a>
     <a href="https://michaeldemar.co/">🔗</a>
+    <a href="https://www.linkedin.com/in/michaelfromyeg/">💼</a>
     </td>
   </tr>
 </table>

config/example.prod.env

@@ -216,4 +216,6 @@
   </script>
 </body>
 
+
+
 </html>

docker/production.yml

@@ -1220,7 +1220,7 @@ div.messages.active-chat{
 .message-container {
   position: relative;
   bottom: 0;
-  max-height: 240px;
+  max-height: calc(300px + 10vh - 65px);
   overflow-y: auto;
   word-wrap: break-word;
   margin: auto;
@@ -1239,8 +1239,10 @@ div.messages.active-chat{
 }
 
 .preview{
-  position: relative;
-  top: -3px;
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  z-index: 1;
   display: flex;
   flex: 1;
 }

public/create.html

@@ -11,6 +11,10 @@ body {
     margin: 0;
   }
 
+#whiteboard{
+  background-color: white !important;
+}
+
 .message-container::-webkit-scrollbar,
 .page-list::-webkit-scrollbar {
   width: 7px;
@@ -1271,25 +1275,12 @@ div.messages.active-chat{
   left:-100px;
 }
 
-/*preview*/
-
-.preview{
-  position: relative;
-  top: -3px;
-  display: flex;
-  flex: 1;
-}
-
-.preview-content{
-  padding-top: 10px; 
-  padding-right: 30px; 
-  overflow: auto;
-}
-
 /*Preview*/
 .preview{
-  position: relative;
-  top: -3px;
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  z-index: 1;
   display: flex;
   flex: 1;
   background-color: rgb(53, 53, 73);

public/css/canvas.css

@@ -1,27 +1,10 @@
-import { displayImagePopUpOnClick } from '../utility.js';
+import { displayImagePopUpOnClick, downloadFile } from '../utility.js';
 import Attachment from './classes/Attachment.js';
 
-/* eslint-disable no-undef */
-function downloadFile(file, fileName) {
-  const messageContainer = document.getElementById('message-container');
-  const messageElement = document.createElement('tr');
-  messageElement.style.display = 'none';
-  let fileElement = null;
-  fileElement = document.createElement('a');
-  fileElement.href = file;
-  fileElement.download = fileName;
-  fileElement.innerText = fileName;
-  messageElement.append(fileElement);
-  messageContainer.append(messageElement);
-  fileElement.click();
-  $(messageElement).remove();
-}
-
 export default function initializeChat(chat) {
   const fileInput = document.getElementById('file-input');
 
   fileInput.addEventListener('change', (e) => {
-    document.querySelector('#message-container').appendChild(document.querySelector('#preview'));
     const file = e.target.files[0];
     const reader = new FileReader();
     reader.onload = function (fileLoadedEvent) {

public/css/lecture.css

@@ -68,13 +68,13 @@ export default class Chat {
         file.append(imageName);
         tableData.append(file);
       }
-
-      document.getElementById('file-input').value = '';
-      $('#file-preview').hide();
-      $('#name-file').html('');
-      $('#image-preview').attr('src', '');
-      $('#preview').hide();
-      $('#close-preview').css('right', '15px');
+      if (!isIncoming) {
+        $('#file-preview').hide();
+        $('#name-file').html('');
+        $('#image-preview').attr('src', '');
+        $('#close-preview').css('right', '15px');
+        $('#preview').hide();
+      }
     }
     tableData.append(messageText);
     messageElement.append(tableData);