Merge branch 'master' into feature/implement-autoScroll

Author: manudous

.dockerignore

@@ -0,0 +1,9 @@
+.vscode
+dist
+node_modules
+.editorconfig
+.env
+.env.example
+.gitignore
+package-lock.json
+README.md

.github/workflows/cd.yml

@@ -0,0 +1,27 @@
+name: Continuos Deployment workflow
+
+on:
+  push:
+    branches:
+      - master
+
+env:
+  HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
+
+jobs:
+  cd:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - name: Install heroku and login
+        # Login using HEROKU_API_KEY env variable
+        run: |
+          curl https://cli-assets.heroku.com/install-ubuntu.sh | sh
+          heroku container:login
+      - name: Build docker image
+        run: docker build --build-arg BASE_API_URL=${{ secrets.BASE_API_URL }} --build-arg BASE_SOCKET_URL=${{ secrets.BASE_SOCKET_URL }} -t registry.heroku.com/${{ secrets.HEROKU_APP_NAME }}/web .
+      - name: Deploy docker image
+        run: docker push registry.heroku.com/${{ secrets.HEROKU_APP_NAME }}/web
+      - name: Release
+        run: heroku container:release web -a ${{ secrets.HEROKU_APP_NAME }}

Dockerfile

@@ -0,0 +1,28 @@
+FROM node:12-alpine AS base
+RUN mkdir -p /usr/app
+WORKDIR /usr/app
+
+# Build front
+FROM base AS build-frontend
+ARG BASE_API_URL
+ENV BASE_API_URL=$BASE_API_URL
+ARG BASE_SOCKET_URL
+ENV BASE_SOCKET_URL=$BASE_SOCKET_URL
+COPY ./front ./
+RUN npm install
+RUN npm run build
+
+# Build backend
+FROM base AS build-backend
+COPY ./back ./
+RUN npm install
+RUN npm run build
+
+# Release
+FROM base AS release
+COPY --from=build-backend /usr/app/dist ./
+COPY --from=build-frontend /usr/app/dist ./public
+COPY ./back/package.json ./
+RUN npm install --only=production
+
+ENTRYPOINT [ "node", "index" ]

README.md

@@ -22,6 +22,9 @@
   <p align="center">
     Code Paster is a Teacher-to-Student communication tool for online programming lessons. Create a new session and easily share your code with all students connected so they can follow along with your examples.
   </p>
+  <p>
+  Click here to navigate to <a href="https://www.codepaster.net/">Codepaster</a>
+  </p>
 </p>
 <br />
 

back/.babelrc

@@ -22,8 +22,6 @@
                       "core": "./src/core",
                       "dals": "./src/dals",
                       "pods": "./src/pods",
-                      "messages": "./src/messages",
-                      "business": "./src/business"
                     }
                   }
               ]

back/.env

@@ -1,7 +1,8 @@
 NODE_ENV=development
 PORT=8081
-SOCKET_PORT=3000
 MOCK_REPOSITORY=false
 API_URL=/api
 CORS_ORIGIN=http://localhost:8080
 MONGODB_URI=mongodb://localhost:27017/code-paster
+STATIC_FILES_PATH="../../front/dist"
+MONGO_EXPIRATION_TIME='2d'

back/.vscode/launch.json

@@ -10,7 +10,8 @@
       "runtimeExecutable": null,
       "runtimeArgs": ["--nolazy"],
       "env": {
-        "NODE_ENV": "development"
+        "NODE_ENV": "development",
+        "MOCK_REPOSITORY": "true"
       },
       "console": "internalConsole",
       "sourceMaps": true,

back/src/app.ts

@@ -1,98 +1,24 @@
-import cors from 'cors';
-import SocketIOClient, { Socket } from 'socket.io';
+import express from 'express';
+import path from 'path';
 
-import { createApp } from './express.server';
-import { envConstants, connectToDB } from 'core';
-import { api } from './api';
-import { processInputMessage, InputMessageTypes, processOutputMessageCollection, Action, SocketInfo } from './messages';
+import { createApp, createSocketServer } from 'core/servers';
+import { connectToDB } from 'core/db';
+import { envConstants } from 'core/constants';
+import { api } from 'pods/room';
 
 const app = createApp();
-
-let http = require('http').Server(app);
-// set up socket.io and bind it to our
-// http server.
-let io: SocketIOClient.Socket = require('socket.io')(http);
-
-//options for cors midddleware
-const options: cors.CorsOptions = {
-  allowedHeaders: [
-    'Origin',
-    'X-Requested-With',
-    'Content-Type',
-    'Accept',
-    'X-Access-Token',
-  ],
-  credentials: true,
-  methods: 'GET,HEAD,OPTIONS,PUT,PATCH,POST,DELETE',
-  // IMPORTANT LIMIT HERE YOUR CLIENT APPS DOMAINS
-  origin: '*',
-  preflightContinue: false,
-};
-
-app.use(cors(options));
 app.use(envConstants.API_URL, api);
 
-app.listen(envConstants.PORT, async () => {
+const staticFilesPath = path.resolve(__dirname, envConstants.STATIC_FILES_PATH);
+app.use('/', express.static(staticFilesPath));
+
+const appServer = app.listen(envConstants.PORT, async () => {
   if(!envConstants.isMockRepository && envConstants.MONGODB_URI) {
     await connectToDB(envConstants.MONGODB_URI);
   }
   console.log(`Using ${envConstants.isMockRepository ? 'Mock' : 'DataBase'} for session storage`)
   console.log(`Server ready at http://localhost:${envConstants.PORT}${envConstants.API_URL}`);
 });
 
-// whenever a user connects on port 3000 via
-// a websocket, log that a user has connected
-io.on('connection', async function (socket: Socket) {
-  // WATCH OUT !! Reconnect is not implemented
-  // In the connection input processing, we should
-  // check if connectionId matches with userId and RoomId
-  // if not reject, if it's accepted send connection
-  // reestablished
-  const { room, trainertoken } = socket.handshake.query;
-  console.log(`room request: ${room}`);
-  console.log(`trainer token: ${trainertoken}`);
-  console.log('*** Session ID:', socket.conn.id);
-
-  let outputMessageCollection: Action[] = [];
-  const socketInfo: SocketInfo = {
-    socket: socket,
-    io,
-    connectionId: socket.conn.id,
-  };
-
-  // TODO encapuslate this to processInputMessage
-  if (trainertoken) {
-    outputMessageCollection = await processInputMessage(socketInfo, {
-      type: InputMessageTypes.ESTABLISH_CONNECTION_TRAINER,
-      payload: {
-        room,
-        trainertoken,
-      },
-    });
-  } else {
-    outputMessageCollection = await processInputMessage(socketInfo, {
-      type: InputMessageTypes.ESTABLISH_CONNECTION_STUDENT,
-      payload: {
-        room,
-      },
-    });
-  }
-
-  processOutputMessageCollection(socketInfo, outputMessageCollection);
-
-  socket.on('message', async function (message: any) {
-    console.log(message);
-    if (message && message.type) {
-      const outputMessageCollection: Action[] = await processInputMessage(
-        socketInfo,
-        message
-      );
+createSocketServer(appServer);
 
-      await processOutputMessageCollection(socketInfo, outputMessageCollection);
-    }
-  });
-});
-
-const server = http.listen(3001, function () {
-  console.log('listening on *:3001');
-});

back/src/business/index.ts

@@ -1,10 +1,11 @@
 export const envConstants = {
-    NODE_ENV: process.env.NODE_ENV,
-    PORT: process.env.PORT,
-    SOCKET_PORT: process.env.SOCKET_PORT,
-    isMockRepository: process.env.MOCK_REPOSITORY === 'true',
-    MONGODB_URI: process.env.MONGODB_URI,
-    API_URL: process.env.API_URL,
-    CORS_ORIGIN: process.env.CORS_ORIGIN,
-  };
-  
+  NODE_ENV: process.env.NODE_ENV,
+  PORT: process.env.PORT,
+  isMockRepository: process.env.MOCK_REPOSITORY === 'true',
+  MONGODB_URI: process.env.MONGODB_URI,
+  API_URL: process.env.API_URL,
+  CORS_ORIGIN: process.env.CORS_ORIGIN,
+  isProduction: process.env.NODE_ENV === 'production',
+  STATIC_FILES_PATH: process.env.STATIC_FILES_PATH,
+  MONGO_EXPIRATION_TIME: process.env.MONGO_EXPIRATION_TIME,
+};