R 1.0.0-Beta Merge branch 'develop'

Author: Lulu300

.travis.yml

@@ -12,8 +12,22 @@ matrix:
         - sudo apt-get update
         - sudo apt-get install yarn -y
         - sudo yarn global add coveralls
+        - sudo yarn global add create-react-app
+        - sudo yarn global add serve
+        - sudo yarn global add typescript
+        - sudo yarn global add react-scripts-ts
+        - sudo yarn global add gulp
+        - sudo yarn global add node-pty
+        - sudo yarn global add node-gyp
+        - sudo apt install make -y
+        - sudo apt install g++ -y
         - cd src/client
-        - yarn install
+        - yarn add git+https://github.com/CodeChillAlluna/xterm.js.git
+        - yarn install --no-bin-links
+        - cd node_modules/xterm
+        - npm install
+        - cd ../..
+        - ls node_modules/xterm -al
 
       script:
         - yarn build
@@ -24,12 +38,15 @@ matrix:
       jdk: oraclejdk8
 
       sudo: required
+      services:
+        - docker
       before_script:
         - sudo apt-get install -y maven
         - sudo apt-get install -y python-dev
         - sudo apt-get install -y libpq-dev
         - sudo service postgresql restart
         - sudo sh install/db.sh
+        - sudo sh install/docker.sh
         - cd src/spring
 
       script:
@@ -38,4 +55,4 @@ matrix:
         - sudo sh mvnw clean test -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID jacoco:report coveralls:report
 
 notifications:
-email: false
+  email: false

README.md

@@ -12,15 +12,18 @@ Master project : Online development environment
 * If you want  to set up our project from scratch using our vagrant click [here](#vagrant-installation-guide)
 * If you want to set up our project without vagrant click [here](#vagrantless-installation-guide) 
 # Release installation guide
-* You need <a href="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html">Java 8+</a> , <a href="https://nodejs.org/en/">NodeJS 9+</a> and <a href="https://www.postgresql.org/download/">PostgresSQL</a>.
-* Create a user `code` with password `chill` in postgresSQL
-* Create a database `codechill` and grant permission on this database to your user.
-* You can install Code&Chill <a href="https://github.com/CodeChillAlluna/code-chill/releases">here</a>.
-* Go to your spring repository : `cd ./spring`
-* Run the command : `java -jar spring-0.1.0.jar`
-* And then : `npm install serve`
-* To run the server : `serve -s client` 
-* You can go to <a href="http://localhost:5000/">http://localhost:5000/</a> on your browser to access to your terminal.
+You can run our releases in our vagrant or install it on your own machine.
+You can download our releases <a href="https://github.com/CodeChillAlluna/code-chill/releases">here</a>
+## Install on Vagrant
+1. Extract the release in your vagrant folder.
+2. Follow <a href="#vagrant-installation-guide">Vagrant installation guide</a>
+3. Launch <a href="#production-mode">Server</a>
+4. Launch <a href="#production-mode-1">Client</a>
+## Install on your machine
+1. Extract the release on your machine.
+2. Install all the dependancies (Check `install/install.sh` to have all dependancies).
+3. Launch <a href="#production-mode">Server</a>
+4. Launch <a href="#production-mode-1">Client</a>
 
 # Vagrant installation guide
 ## Environment installation
@@ -54,31 +57,36 @@ You will find all our project dependancies in `install/install.sh`
 Choose either of the solutions:
 - Cloning the repository : `git clone https://github.com/CodeChillAlluna/code-chill.git`
 - Downloading the repository : `https://github.com/CodeChillAlluna/code-chill/archive/master.zip`
+- Downloading our release : `https://github.com/CodeChillAlluna/code-chill/releases`
 
 # Usage
 ## Spring
-### Build Spring
+### Production Mode
 To build Spring, you will have to use the following command lines : 
 
 1. `cd src/spring` : will place you in the source dictionnary.
 2. `sh mvnw clean package` : will compile java files to create a runnable jar package.
 3. `cd target` : will place you in the build dictionnary of the project.
 4. `java -jar spring-0.0.1-SNAPSHOT.jar` : will launch the Spring project, depending on what you are using the version might not always be "0.0.1".
-### Run Spring
+5. Server API accessible at `http://localhost:8080/`
+### Development Mode
 To run Spring in development mode, you will have to use the following command lines : 
 1. `cd src/spring` : will place you in the source dictionnary.
 2. `sh mvnw spring-boot:run`: will compile the source code and launch the spring server
+3. Server API accessible at `http://localhost:8080/`
 
 ##  React
-### Build React
+### Production Mode
 To build React, you will have to use the following command lines : 
 1. `cd src/client` : will place you in the source dictionnary.
 2. `sudo yarn install` : will install if they are missing and update the dependencies of the project.
 3. `yarn build` : will build the project.
 4. `serve -s build` : will launch the project properly.
-### Run React
+5. Website accessible at `http://localhost:5000/`
+### Development Mode
 To run react in development mode, you will have to use the following command lines : 
 1. `cd src/client` : will place you in the source dictionnary.
 2. `sudo yarn install` : will install if they are missing and update the dependencies of the project.
 3. `yarn start`: will check your code validity and launch the node server.
+4. Website accessible at `http://localhost:3000/`
 

Vagrantfile

@@ -33,11 +33,13 @@ Vagrant.configure("2") do |config|
   # Create a forwarded port mapping which allows access to a specific port
   # within the machine from a port on the host machine and only allow access
   # via 127.0.0.1 to disable public access
+  config.vm.network "public_network", ip: "192.168.1.97"
   config.vm.network "forwarded_port", guest: 8080, host: 8080, host_ip: "127.0.0.1"
   config.vm.network "forwarded_port", guest: 3000, host: 3000, host_ip: "127.0.0.1"
   config.vm.network "forwarded_port", guest: 5000, host: 5000, host_ip: "127.0.0.1"
   config.vm.network "forwarded_port", guest: 2375, host: 2375, host_ip: "127.0.0.1"
   config.vm.network "forwarded_port", guest: 2376, host: 2376, host_ip: "127.0.0.1"
+  config.vm.network "forwarded_port", guest: 80, host: 80, host_ip: "127.0.0.1"
 
   # Create a private network, which allows host-only access to the machine
   # using a specific IP.

install/db.sh

@@ -3,6 +3,7 @@
 DB_USER=code
 DB_PWD=chill
 DB_NAME=codechill
+DB_NAME_TEST=codechill_test
 
 sudo su - postgres -c psql <<EOF
 CREATE DATABASE $DB_NAME;
@@ -16,3 +17,15 @@ GRANT ALL PRIVILEGES ON DATABASE $DB_NAME TO $DB_USER;
 ALTER USER $DB_USER CREATEDB;
 EOF
 
+sudo su - postgres -c psql <<EOF
+CREATE DATABASE $DB_NAME_TEST;
+CREATE USER $DB_USER WITH PASSWORD '$DB_PWD';
+
+ALTER ROLE $DB_USER SET client_encoding TO 'utf8';
+ALTER ROLE $DB_USER SET default_transaction_isolation TO 'read committed';
+ALTER ROLE $DB_USER SET timezone TO 'UTC';
+
+GRANT ALL PRIVILEGES ON DATABASE $DB_NAME_TEST TO $DB_USER;
+ALTER USER $DB_USER CREATEDB;
+EOF
+

install/docker.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Installation de Docker
+export DOCKER_HOST=tcp://localhost:2375
+if ! grep -qF "DOCKER_HOST=tcp://localhost:2375" /etc/environment
+then
+        echo "DOCKER_HOST=tcp://localhost:2375" >> /etc/environment
+fi
+source /etc/environment
+systemctl restart docker
+docker pull ubuntu
+docker run --name code-chill -dti ubuntu /bin/bash

install/install.sh

@@ -75,6 +75,7 @@ sudo apt-get install -y postgresql-contrib
 DB_USER=code
 DB_PWD=chill
 DB_NAME=codechill
+DB_NAME_TEST=codechill_test
 
 sudo service postgresql restart
 sudo su - postgres -c psql <<EOF
@@ -89,6 +90,18 @@ GRANT ALL PRIVILEGES ON DATABASE $DB_NAME TO $DB_USER;
 ALTER USER $DB_USER CREATEDB;
 EOF
 
+sudo su - postgres -c psql <<EOF
+CREATE DATABASE $DB_NAME_TEST;
+CREATE USER $DB_USER WITH PASSWORD '$DB_PWD';
+
+ALTER ROLE $DB_USER SET client_encoding TO 'utf8';
+ALTER ROLE $DB_USER SET default_transaction_isolation TO 'read committed';
+ALTER ROLE $DB_USER SET timezone TO 'UTC';
+
+GRANT ALL PRIVILEGES ON DATABASE $DB_NAME_TEST TO $DB_USER;
+ALTER USER $DB_USER CREATEDB;
+EOF
+
 # Installation de Docker
 curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
 sudo apt-key fingerprint 0EBFCD88
@@ -140,12 +153,19 @@ systemctl restart docker
 docker pull ubuntu
 docker run --name code-chill -dti ubuntu /bin/bash
 
+# Install nginx
+sudo apt-get install nginx
+
 # Install js packages
 cd $client
 yarn global add create-react-app
 yarn global add serve
 yarn global add typescript
 yarn global add react-scripts-ts
+yarn global add gulp
+
+sudo apt-get install make -y
+sudo apt-get install g++ -y
 
 # Fix error with shared folder and npm modules
 # https://medium.com/@dtinth/isolating-node-modules-in-vagrant-9e646067b36
@@ -155,6 +175,9 @@ mkdir $client/node_modules
 # sudo mount --rbind $HOME_DIR/vagrant_node_modules $client/node_modules
 
 # Install client dependencies
+yarn add git+https://github.com/CodeChillAlluna/xterm.js.git --no-bin-links
 yarn install --no-bin-links
+cd node_modules/xterm
+npm install --no-bin-links
 
 print_help

src/client/package.json

@@ -1,7 +1,10 @@
 {
-  "name": "my-app",
-  "version": "0.1.0",
+  "name": "code-chill",
+  "version": "1.0.0-Beta",
   "private": true,
+  "homepage": "/",
+  "restApi": "http://localhost:8080",
+  "dockerApi": "ws://localhost:2375",
   "dependencies": {
     "@types/lodash": "^4.14.104",
     "@types/react-redux": "^5.0.14",
@@ -12,11 +15,12 @@
     "react-dom": "^16.2.0",
     "react-redux": "^5.0.6",
     "react-router-dom": "^4.2.2",
+    "react-router-named-routes": "^0.0.23",
     "react-scripts-ts": "2.12.0",
     "semantic-ui-css": "^2.2.14",
     "semantic-ui-react": "^0.78.2",
     "text-encoding": "^0.6.4",
-    "xterm": "^3.1.0"
+    "xterm": "git+https://github.com/CodeChillAlluna/xterm.js.git"
   },
   "scripts": {
     "start": "react-scripts-ts start",

src/client/public/index.html

@@ -26,6 +26,7 @@
     <meta name="msapplication-TileColor" content="#ffffff">
     <meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
     <meta name="theme-color" content="#ffffff">
+    <meta name="description" content="Have you ever wanted to code something in your couch ? Code&Chill is now here for you. Don't forget this: a good developper is a lazy one" />
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
@@ -35,7 +36,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>React App</title>
+    <title>Code&Chill</title>
   </head>
   <body>
     <noscript>

src/client/public/manifest.json

@@ -1,6 +1,6 @@
 {
-  "short_name": "React App",
-  "name": "Create React App Sample",
+  "short_name": "Code&Chill",
+  "name": "Code&Chill",
   "icons": [
     {
       "src": "favicon.ico",

src/client/src/App.css

@@ -34,3 +34,7 @@
   from { transform: rotate(0deg); }
   to { transform: rotate(360deg); }
 }
+
+#root {
+  margin-top: 5em;
+}