Merge branch 'develop'

Author: Lulu300

.gitignore

@@ -153,6 +153,7 @@ captures/
 .idea/gradle.xml
 .idea/dictionaries
 .idea/libraries
+**/.idea
 
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
@@ -282,5 +283,8 @@ src/client/build
 src/client/yarn.lock
 src/spring/target
 
+# VSCode
+.vscode
+**/.vscode
 
 # End of https://www.gitignore.io/api/node,java,vagrant,java-web,reactnative

install/install.sh

@@ -20,10 +20,10 @@ print_help () {
 
 export DEBIAN_FRONTEND=noninteractive
 
-if ! grep -qF "sudo mount --bind $HOME_DIR/vagrant_node_modules $client/node_modules" /home/vagrant/.bashrc
-then
-        echo "sudo mount --bind $HOME_DIR/vagrant_node_modules $client/node_modules" >> /home/vagrant/.bashrc
-fi
+# if ! grep -qF "sudo mount --bind $HOME_DIR/vagrant_node_modules $client/node_modules" /home/vagrant/.bashrc
+# then
+#         echo "sudo mount --bind $HOME_DIR/vagrant_node_modules $client/node_modules" >> /home/vagrant/.bashrc
+# fi
 
 if ! grep -qF "cd "$vagrant /home/vagrant/.bashrc
 then
@@ -144,15 +144,17 @@ docker run --name code-chill -dti ubuntu /bin/bash
 cd $client
 yarn global add create-react-app
 yarn global add serve
+yarn global add typescript
+yarn global add react-scripts-ts
 
 # Fix error with shared folder and npm modules
 # https://medium.com/@dtinth/isolating-node-modules-in-vagrant-9e646067b36
 mkdir $HOME_DIR/vagrant_node_modules
-mkdir $client/node_modules
-sudo mount --bind $HOME_DIR/vagrant_node_modules $client/node_modules
 sudo chown -R vagrant:vagrant $HOME_DIR/vagrant_node_modules
+mkdir $client/node_modules
+# sudo mount --rbind $HOME_DIR/vagrant_node_modules $client/node_modules
 
 # Install client dependencies
-sudo yarn install
+yarn install --no-bin-links
 
 print_help

src/client/package.json

@@ -5,6 +5,7 @@
   "dependencies": {
     "@types/lodash": "^4.14.104",
     "@types/react-redux": "^5.0.14",
+    "axios": "^0.18.0",
     "jwt-decode": "^2.2.0",
     "react": "^16.2.0",
     "react-bash": "^1.6.0",
@@ -14,7 +15,8 @@
     "react-scripts-ts": "2.12.0",
     "semantic-ui-css": "^2.2.14",
     "semantic-ui-react": "^0.78.2",
-    "text-encoding": "^0.6.4"
+    "text-encoding": "^0.6.4",
+    "xterm": "^3.1.0"
   },
   "scripts": {
     "start": "react-scripts-ts start",

src/client/src/App.css

@@ -22,10 +22,14 @@
   font-size: large;
 }
 
-.menu .item a {
+.dropdown .menu .item a {
   color: rgba(0,0,0,.87) !important;
 }
 
+.modals.visible.transition {
+  display: flex !important;
+}
+
 @keyframes App-logo-spin {
   from { transform: rotate(0deg); }
   to { transform: rotate(360deg); }

src/client/src/App.tsx

@@ -13,7 +13,7 @@ class App extends React.Component<any, any> {
     render() {
         return (
             <div>
-                Welcome {this.props.user.sub}
+                Welcome {this.props.user.username}
             </div>
         );
     }

src/client/src/AuthService.ts

@@ -2,13 +2,16 @@ import decode from "jwt-decode";
 export default class AuthService {
     // Initializing important variables
 
+    user: Object;
     domain: string;
 
     constructor(domain?: string) {
         this.domain = domain || "http://localhost:8080"; // API server domain
+        this.user = Object;
         this.fetch = this.fetch.bind(this); // React binding stuff
         this.login = this.login.bind(this);
         this.getProfile = this.getProfile.bind(this);
+        this.getUserInfos = this.getUserInfos.bind(this);
     }
 
     login(username: string, password: string) {
@@ -64,6 +67,66 @@ export default class AuthService {
         return decode(this.getToken());
     }
 
+    getUserInfos () {
+        return this.fetch(`${this.domain}/user`, {
+            method: "GET",
+         }).then((res) => {
+           return Promise.resolve(res);
+        });
+    }
+
+    editUser(user: Object) {
+        return this.fetch(`${this.domain}/user`, {
+            method: "PUT",
+            body: JSON.stringify(user)
+        }).then((res) => {
+            return Promise.resolve(res);
+        });
+    }
+
+    deleteUser() {
+        return this.fetch(`${this.domain}/user`, {
+            method: "DELETE",
+         }).then((res) => {
+            return Promise.resolve(res);
+        });
+    }
+
+    createAccount(user: Object) {
+        return this.fetch(`${this.domain}/user`, {
+            method: "POST",
+            body: JSON.stringify(user)
+         }).then((res) => {
+            return Promise.resolve(res);
+        });
+    }
+
+    forgotPassword(email: string) {
+        return this.fetch(`${this.domain}/user/forgottenpassword`, {
+            method: "POST",
+            body: email
+         }).then((res) => {
+            return Promise.resolve(res);
+        });
+    }
+
+    checkTokenPassword(token: string) {
+        return this.fetch(`${this.domain}/reset/${token}`, {
+            method: "GET"
+         }).then((res) => {
+            return Promise.resolve(res);
+        });
+    }
+
+    resetPassword(token: string, password: string) {
+        return this.fetch(`${this.domain}/reset`, {
+            method: "POST",
+            body: JSON.stringify({"token": token, "password": password})
+         }).then((res) => {
+            return Promise.resolve(res);
+        });
+    }
+
     fetch(url: any, options: any) {
         // performs api calls sending the required authentication headers
         const headers = {

src/client/src/components/CodeChillRouter.tsx

@@ -2,17 +2,24 @@ import * as React from "react";
 // import { BrowserRouter as Router, Route } from "react-router-dom";
 import { Route, Switch } from "react-router-dom";
 import App from "../App";
+import CodeChillXterm from "./CodeChillXterm";
 import Term, { Terminal } from "./Term";
 import UserConnection from "./user/UserConnection";
+import UserSignUp from "./user/UserSignUp";
 import Presentation from "./Presentation";
+import UserProfile from "./user/UserProfile";
 import NotFound from "./NotFound";
 import withAuth from "./withAuth";
+import UserForgotPassword from "./user/UserForgotPassword";
+import UserResetPassword from "./user/UserResetPassword";
 
 export default class CodeChillRouter extends React.Component<any, any> {
 
     Term = withAuth(Term);
-
+    
     render() {
+        const ccxterm = "CodeChillXterm";
+        const url = "ws://localhost:2375/containers/code-chill/attach/ws?logs=0&stream=1&stdin=0&stdout=0&stderr=0";
         return (
             <main>
                 <Switch>
@@ -31,12 +38,44 @@ export default class CodeChillRouter extends React.Component<any, any> {
                         path="/term" 
                         render={(props) => <Term prefix="code@chill" theme={Terminal.Themes.DARK} />} 
                     />
+                    <Route
+                        exact={true}
+                        path="/profile"
+                        component={UserProfile}
+                    />
+                    <Route 
+                        exact={true}
+                        path="/forgot" 
+                        // render={(props) => <UserConnection props={...props} />}
+                        component={UserForgotPassword} 
+                    />
+                    <Route 
+                        exact={true}
+                        path="/reset/:token" 
+                        // render={(props) => <UserConnection props={...props} />}
+                        component={UserResetPassword} 
+                    />
                     <Route 
                         exact={true}
                         path="/login" 
                         // render={(props) => <UserConnection props={...props} />}
                         component={UserConnection} 
                     />
+                    <Route 
+                        exact={true}
+                        path="/signup" 
+                        // render={(props) => <UserConnection props={...props} />}
+                        component={UserSignUp} 
+                    />
+                    <Route
+                        exact={true}
+                        path="/xtermtest"
+                        render={(props) => 
+                            <CodeChillXterm 
+                                ref={ccxterm} 
+                                url={url}
+                            />}
+                    />
                     <Route 
                         path="*"
                         component={NotFound}