update to Webpack 5
Change-Id: Icc238a9f981ecaf5c5802c9a3a4f0bcb89e7d42b
diff --git a/client/src/App.css b/client/src/App.css
new file mode 100644
index 0000000..915ab44
--- /dev/null
+++ b/client/src/App.css
@@ -0,0 +1,42 @@
+.App {
+ text-align: center;
+}
+
+.App-logo {
+ height: 40vmin;
+ pointer-events: none;
+}
+
+@media (prefers-reduced-motion: no-preference) {
+ .App-logo {
+ animation: App-logo-spin infinite 20s linear;
+ }
+}
+
+.App-header {
+ background-color: #282c34;
+ min-height: 100vh;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ font-size: calc(10px + 2vmin);
+ color: white;
+}
+
+.App-link {
+ color: #61dafb;
+}
+
+.loginCard {
+ margin-top: 2em;
+}
+
+@keyframes App-logo-spin {
+ from {
+ transform: rotate(0deg);
+ }
+ to {
+ transform: rotate(360deg);
+ }
+}
diff --git a/client/src/App.js b/client/src/App.js
new file mode 100644
index 0000000..c943b71
--- /dev/null
+++ b/client/src/App.js
@@ -0,0 +1,47 @@
+/*
+ Company: Savoir-faire Linux
+ Author: Larbi Gharib <larbi.gharib@savoirfairelinux.com>
+ License: AGPL-3
+*/
+
+import React from 'react';
+import CssBaseline from '@material-ui/core/CssBaseline';
+import authManager from './AuthManager'
+//import logo from './logo.svg';
+import './App.css';
+
+import { BrowserRouter as Router, Route, Switch, Link, Redirect } from 'react-router-dom';
+
+import SignInPage from "./pages/loginDialog.jsx";
+import JamiMessenger from "./pages/messenger.jsx"
+import AccountSettings from "./pages/accountSettings.jsx"
+import AccountSelection from "./pages/accountSelection.jsx"
+import NotFoundPage from "./pages/404.jsx"
+
+class App extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ authenticated: authManager.isAuthenticated(),
+ };
+ authManager.setOnAuthChanged(authenticated => this.setState({authenticated}))
+ }
+
+ render() {
+ return <React.Fragment>
+ <CssBaseline />
+ <Router>
+ <Switch>
+ <Route exact path="/"><Redirect to="/account" /></Route>
+ <Route path="/account/:accountId" component={AccountSettings} />
+ <Route path="/account" component={AccountSelection} />
+ <Route path="/messaging" component={JamiMessenger} />
+ <Route component={NotFoundPage} />
+ </Switch>
+ </Router>
+ {!this.state.authenticated && <SignInPage open={!this.state.authenticated}/>}
+ </React.Fragment>
+ }
+}
+
+export default App
\ No newline at end of file
diff --git a/client/src/App.test.js b/client/src/App.test.js
new file mode 100644
index 0000000..4db7ebc
--- /dev/null
+++ b/client/src/App.test.js
@@ -0,0 +1,9 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import App from './App';
+
+test('renders learn react link', () => {
+ const { getByText } = render(<App />);
+ const linkElement = getByText(/learn react/i);
+ expect(linkElement).toBeInTheDocument();
+});
diff --git a/client/src/AuthManager.js b/client/src/AuthManager.js
new file mode 100644
index 0000000..09aef64
--- /dev/null
+++ b/client/src/AuthManager.js
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2017-2021 Savoir-faire Linux Inc.
+ *
+ * Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+//import cookie from 'cookie';
+
+class AuthManager {
+ constructor() {
+ console.log("AuthManager()")
+ this.authenticated = true//'connect.sid' in cookie.parse(document.cookie)
+ this.authenticating = false
+ this.tasks = []
+ this.onAuthChanged = undefined
+ }
+ setOnAuthChanged(onAuthChanged) {
+ this.onAuthChanged = onAuthChanged
+ }
+
+ isAuthenticated() {
+ return this.authenticated
+ }
+
+ authenticate() {
+ if (this.authenticating)
+ return
+ console.log("Starting authentication")
+ this.authenticating = true
+ fetch('/api/localLogin?username=local&password=local', { method:"POST" })
+ .then(response => {
+ console.log(response)
+ this.authenticating = false
+ this.authenticated = response.ok && response.status === 200
+ if (this.onAuthChanged)
+ this.onAuthChanged(this.authenticated)
+ while (this.tasks.length !== 0) {
+ const task = this.tasks.shift()
+ if (this.authenticated)
+ fetch(task.url, task.init).then(res => task.resolve(res))
+ else
+ task.reject(new Error("Authentication failed"))
+ }
+ })
+ }
+
+ disconnect() {
+ console.log("Disconnect")
+ this.authenticated = false
+ if (this.onAuthChanged)
+ this.onAuthChanged(this.authenticated)
+ }
+
+ fetch(url, init) {
+ console.log(`get ${url}`)
+ if (!this.authenticated) {
+ return new Promise((resolve, reject) => this.tasks.push({url, init, resolve, reject}))
+ }
+ return fetch(url, init)
+ .then(response => {
+ console.log(`Got status ${response.status}`)
+ if (response.status === 401) {
+ this.disconnect()
+ return this.fetch(url, init)
+ }
+ return response
+ })
+ }
+}
+
+export default new AuthManager()
\ No newline at end of file
diff --git a/client/src/components/AccountList.js b/client/src/components/AccountList.js
new file mode 100644
index 0000000..6f38c3c
--- /dev/null
+++ b/client/src/components/AccountList.js
@@ -0,0 +1,29 @@
+import React from 'react';
+
+import List from '@material-ui/core/List';
+import ListItem from '@material-ui/core/ListItem';
+import ListItemText from '@material-ui/core/ListItemText';
+import ListItemAvatar from '@material-ui/core/ListItemAvatar';
+import Avatar from '@material-ui/core/Avatar';
+import PersonRoundedIcon from '@material-ui/icons/PersonRounded';
+
+class AccountList extends React.Component {
+ render() {
+ return (
+ <List>
+ {
+ this.props.accounts.map(account => <ListItem button key={account.getId()} onClick={() => this.props.onClick(account)}>
+ <ListItemAvatar>
+ <Avatar>
+ <PersonRoundedIcon />
+ </Avatar>
+ </ListItemAvatar>
+ <ListItemText primary={account.getDisplayName()} secondary={account.getDisplayUri()} />
+ </ListItem>
+ )
+ }
+ </List>)
+ }
+}
+
+export default AccountList;
\ No newline at end of file
diff --git a/client/src/components/AccountPreferences.js b/client/src/components/AccountPreferences.js
new file mode 100644
index 0000000..5b6ae28
--- /dev/null
+++ b/client/src/components/AccountPreferences.js
@@ -0,0 +1,63 @@
+import React from 'react';
+
+import Typography from '@material-ui/core/Typography';
+
+import JamiIdCard from './JamiIdCard';
+import List from '@material-ui/core/List';
+import ListItem from '@material-ui/core/ListItem';
+import ListItemIcon from '@material-ui/core/ListItemIcon';
+import ListItemSecondaryAction from '@material-ui/core/ListItemSecondaryAction';
+import ListItemText from '@material-ui/core/ListItemText';
+import ListSubheader from '@material-ui/core/ListSubheader';
+import Switch from '@material-ui/core/Switch';
+import PhoneCallbackIcon from '@material-ui/icons/PhoneCallback';
+import GroupRoundedIcon from '@material-ui/icons/GroupRounded';
+import Account from '../../../model/Account';
+
+class AccountPreferences extends React.Component {
+
+ render() {
+ const account = this.props.account
+ const isJamiAccount = account.getType() === Account.TYPE_JAMI
+ return (
+ <React.Fragment>
+ <Typography variant="h2" component="h2">{isJamiAccount ? "Jami account" : "SIP account"}</Typography>
+
+ {isJamiAccount &&
+ <JamiIdCard account={account} />}
+
+ <List subheader={<ListSubheader>Settings</ListSubheader>}>
+ <ListItem>
+ <ListItemIcon>
+ <GroupRoundedIcon />
+ </ListItemIcon>
+ <ListItemText id="switch-list-label-rendezvous" primary="Rendez-Vous point" />
+ <ListItemSecondaryAction>
+ <Switch
+ edge="end"
+ /*onChange={handleToggle('wifi')}*/
+ checked={account.isRendezVous()}
+ inputProps={{ 'aria-labelledby': 'switch-list-label-wifi' }}
+ />
+ </ListItemSecondaryAction>
+ </ListItem>
+ <ListItem>
+ <ListItemIcon>
+ <PhoneCallbackIcon />
+ </ListItemIcon>
+ <ListItemText id="switch-list-label-publicin" primary="Allow connection from unkown peers" />
+ <ListItemSecondaryAction>
+ <Switch
+ edge="end"
+ /*onChange={handleToggle('bluetooth')}*/
+ checked={account.isPublicIn()}
+ inputProps={{ 'aria-labelledby': 'switch-list-label-bluetooth' }}
+ />
+ </ListItemSecondaryAction>
+ </ListItem>
+ </List>
+ </React.Fragment>)
+ }
+}
+
+export default AccountPreferences;
\ No newline at end of file
diff --git a/client/src/components/ContactList.js b/client/src/components/ContactList.js
new file mode 100644
index 0000000..af232a0
--- /dev/null
+++ b/client/src/components/ContactList.js
@@ -0,0 +1,16 @@
+import React from 'react'
+
+class ContactList extends React.Component {
+ render() {
+
+ return (
+ <div className="rooms-list">
+ <ul>
+ <h3>Liste de contacts</h3>
+ </ul>
+ </div>
+ )
+ }
+}
+
+export default ContactList
\ No newline at end of file
diff --git a/client/src/components/Header.js b/client/src/components/Header.js
new file mode 100644
index 0000000..d245976
--- /dev/null
+++ b/client/src/components/Header.js
@@ -0,0 +1,45 @@
+import React from 'react'
+import Button from '@material-ui/core/Button';
+import Menu from '@material-ui/core/Menu';
+import MenuItem from '@material-ui/core/MenuItem';
+//import { useHistory } from "react-router-dom";
+import authManager from '../AuthManager'
+
+export default function Header() {
+ //const history = useHistory();
+
+ const [anchorEl, setAnchorEl] = React.useState(null);
+
+ const handleClick = (event) => {
+ setAnchorEl(event.currentTarget);
+ };
+
+ const handleClose = () => {
+ setAnchorEl(null);
+ };
+
+ const disconnect = () => {
+ authManager.disconnect()
+ //let path = `/`;
+ //history.push(path);
+ }
+
+ return (
+ <div>
+ <Button aria-controls="simple-menu" aria-haspopup="true" onClick={handleClick}>
+ Menu
+ </Button>
+ <Menu
+ id="simple-menu"
+ anchorEl={anchorEl}
+ keepMounted
+ open={Boolean(anchorEl)}
+ onClose={handleClose}
+ >
+ <MenuItem onClick={handleClose}>Profile</MenuItem>
+ <MenuItem onClick={handleClose}>Mon compte</MenuItem>
+ <MenuItem onClick={disconnect}>Déconnexion</MenuItem>
+ </Menu>
+ </div>
+ );
+}
\ No newline at end of file
diff --git a/client/src/components/JamiIdCard.js b/client/src/components/JamiIdCard.js
new file mode 100644
index 0000000..eb31a26
--- /dev/null
+++ b/client/src/components/JamiIdCard.js
@@ -0,0 +1,25 @@
+import React from 'react';
+
+import Card from '@material-ui/core/Card';
+import CardContent from '@material-ui/core/CardContent';
+import Typography from '@material-ui/core/Typography';
+
+class JamiIdCard extends React.Component {
+ render() {
+ const account = this.props.account
+ const registeredName = account.getRegisteredName()
+ return (
+ <Card style={{marginBottom:16}}>
+ <CardContent>
+ <Typography variant="h6">Jami key ID</Typography>
+ <Typography variant="body1">{account.getUri()}</Typography>
+ {registeredName && <div>
+ <Typography variant="h6">Jami username</Typography>
+ <Typography variant="body1">{registeredName}</Typography></div>
+ }
+ </CardContent>
+ </Card>)
+ }
+}
+
+export default JamiIdCard;
\ No newline at end of file
diff --git a/client/src/components/Message.js b/client/src/components/Message.js
new file mode 100644
index 0000000..2e1c086
--- /dev/null
+++ b/client/src/components/Message.js
@@ -0,0 +1,12 @@
+import React from 'react'
+
+function Message(props) {
+ return (
+ <div className="message">
+ <div className="message-username">{props.username}</div>
+ <div className="message-text">{props.text}</div>
+ </div>
+ )
+}
+
+export default Message
\ No newline at end of file
diff --git a/client/src/components/MessageList.js b/client/src/components/MessageList.js
new file mode 100644
index 0000000..08bdbea
--- /dev/null
+++ b/client/src/components/MessageList.js
@@ -0,0 +1,22 @@
+import React from 'react'
+import Message from './Message'
+
+
+class MessageList extends React.Component {
+ render() {
+ return (
+ <div className="message-list">
+
+ {
+ this.props.messages.map((message, index) => {
+ /*DUMMY_DATA.map((message, index) => {*/
+ return (
+ <Message key={index} username={message.senderId} text={message.text} />
+ )
+ })}
+ </div>
+ )
+ }
+}
+
+export default MessageList
\ No newline at end of file
diff --git a/client/src/components/NewContactForm.js b/client/src/components/NewContactForm.js
new file mode 100644
index 0000000..ef590c5
--- /dev/null
+++ b/client/src/components/NewContactForm.js
@@ -0,0 +1,19 @@
+import React from 'react'
+
+class NewContactForm extends React.Component {
+ render() {
+ return (
+ <div className="new-room-form">
+ <form>
+ <input
+ type="text"
+ placeholder="Ajouter un contact"
+ required />
+ <button id="create-room-btn" type="submit">+</button>
+ </form>
+ </div>
+ )
+ }
+}
+
+export default NewContactForm
\ No newline at end of file
diff --git a/client/src/components/SendMessageForm.js b/client/src/components/SendMessageForm.js
new file mode 100644
index 0000000..43a4998
--- /dev/null
+++ b/client/src/components/SendMessageForm.js
@@ -0,0 +1,51 @@
+import React from 'react'
+import TextField from '@material-ui/core/TextField'
+//import InputEmoji from "react-input-emoji";
+
+class SendMessageForm extends React.Component {
+
+ constructor() {
+ super()
+ this.state = {
+ message: ''
+ }
+ this.handleChange = this.handleChange.bind(this)
+ this.handleSubmit = this.handleSubmit.bind(this)
+ }
+
+ handleChange(e) {
+ this.setState({
+ message: e
+ })
+ }
+
+ handleSubmit(e) {
+ //e.preventDefault()
+ this.props.sendMessage(this.state.message)
+ //this.props.sendMessage(this.state.message)
+ this.setState({
+ message: ''
+ })
+ }
+
+ render() {
+ return (
+ <div
+ //onSubmit={this.handleSubmit}
+ className="send-message-form">
+ <TextField
+ disabled={this.props.disabled}
+ onChange={this.handleChange}
+ value={this.state.message}
+ cleanOnEnter
+ onEnter={this.handleSubmit}
+ placeholder="Écris ton message et cliques sur Entrer"
+ height="35"
+ />
+
+ </div>
+ )
+ }
+}
+
+export default SendMessageForm
\ No newline at end of file
diff --git a/client/src/index.css b/client/src/index.css
new file mode 100644
index 0000000..062ee6f
--- /dev/null
+++ b/client/src/index.css
@@ -0,0 +1,211 @@
+:root {
+ --main-color: #1F1F1F;
+ --secondary-color: white;
+ --third-color: #2F2F2F;
+ --main-text-color: #3e5869;
+ --secondary-text-color: #b0c7d6;
+ --send-message-form: #F5F5F5;
+}
+
+html, body {
+ height: 100%;
+ margin: 0;
+ padding: 0;
+ font-family: 'Open Sans', sans-serif;
+ font-weight: 200;
+ color: #3e5869;
+}
+
+#root {
+ height: 100%;
+}
+
+.app {
+ display: grid;
+ height: 100%;
+ grid-template-columns: repeat(6, 1fr);
+ grid-template-rows: 40px 1fr 1fr 1fr 1fr 1fr 60px;
+ grid-template-areas:
+ "h h h h h h"
+ "r m m m m m"
+ "r m m m m m"
+ "r m m m m m"
+ "r m m m m m"
+ "r m m m m m"
+ "n s s s s s";
+}
+
+.login {
+ background-color: var(--main-color);
+}
+
+.header-section {
+ grid-area: h;
+}
+
+.new-room-form {
+ grid-area: n;
+}
+
+.rooms-list {
+ grid-area: r;
+}
+
+.message-list {
+ grid-area: m;
+}
+
+.send-message-form {
+ grid-area: s;
+}
+
+/* REST OF CSS */
+
+.header-section {
+ background-color: var(--main-color);
+
+}
+
+.simple-menu {
+ color: var(--send-message-form);
+}
+
+.rooms-list {
+ box-sizing: border-box;
+ padding: 10px;
+ background-color: var(--main-color);
+ overflow: scroll;
+ height: 100%;
+}
+
+.rooms-list ul {
+ list-style-type: none;
+ padding: 0;
+ overflow: scoll;
+}
+
+.rooms-list li {
+ margin: 10px 0;
+}
+
+.rooms-list h3 {
+ margin: 5px 0;
+ color: var(--secondary-color);
+}
+
+.rooms-list .room a {
+ color: var(--secondary-text-color);
+ font-weight: 600;
+ text-decoration: none;
+
+}
+
+.rooms-list .room.active a {
+ color: var(--secondary-color);
+}
+
+.new-room-form {
+ padding: 0 5px;
+ background: var(--secondary-color);
+ color: var(--main-text-color);
+}
+
+.new-room-form form {
+ height: 100%;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.new-room-form input {
+ width: 135px;
+ background: var(--secondary-color);
+}
+
+.new-room-form button {
+ background: var(--secondary-color);
+ color: var(--main-text-color);
+ border: 0;
+}
+
+.new-room-form input::placeholder {
+ color: var(--main-text-color);
+ font-weight: 200;
+}
+
+.new-room-form input:focus {
+ outline-width: 0;
+}
+
+.new-room-form input {
+ border: 0;
+}
+
+.new-room-form button {
+ border: 0;
+}
+
+.message {
+ margin: 15px 0;
+}
+
+.message .message-username {
+ font-size: 11px;
+ font-weight: bold;
+ color: var(--secondary-color);
+ opacity: 0.9;
+ margin-bottom: 6px;
+}
+.message .message-text {
+ background: var(--third-color);
+ color: var(--secondary-color);
+ display: inline;
+ padding: 4px 8px;
+ border-radius: 8px;
+}
+
+.message-list {
+ box-sizing: border-box;
+ padding-left: 6px;
+ width: 100%;
+ height: 100%;
+ overflow: scroll;
+ background: var(--third-color);
+}
+
+.message-list .join-room {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 100%;
+ font-size: 34px;
+ font-weight: 300;
+}
+
+.send-message-form {
+ background: var(--send-message-form);
+ display: flex;
+}
+
+.send-message-form input {
+ width: 100%;
+ padding: 15px 10px;
+ margin: 0;
+ border-style: none;
+ background: var(--send-message-form);
+ font-weight: 200;
+
+}
+
+.send-message-form input:focus {
+ outline-width: 0;
+}
+
+.send-message-form input::placeholder {
+ color: var(--main-text-color);
+}
+
+.help-text {
+ position: absolute;
+ top: 10px;
+}
diff --git a/client/src/index.ejs b/client/src/index.ejs
new file mode 100644
index 0000000..f1cd060
--- /dev/null
+++ b/client/src/index.ejs
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+ <meta charset="utf-8" />
+ <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+ <meta name="viewport" content="width=device-width, initial-scale=1" />
+ <meta name="theme-color" content="#000000" />
+ <meta name="description" content="Web site created using create-react-app" />
+ <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+ <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" />
+ <title>Jaas Web Client App</title>
+</head>
+
+<body>
+ <div id="root"></div>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/client/src/index.js b/client/src/index.js
new file mode 100644
index 0000000..42d2abd
--- /dev/null
+++ b/client/src/index.js
@@ -0,0 +1,17 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import './index.css';
+import App from './App';
+//import * as serviceWorker from './serviceWorker';
+
+ReactDOM.render(
+ <React.StrictMode>
+ <App />
+ </React.StrictMode>,
+ document.getElementById('root')
+);
+
+// If you want your app to work offline and load faster, you can change
+// unregister() to register() below. Note this comes with some pitfalls.
+// Learn more about service workers: https://bit.ly/CRA-PWA
+//serviceWorker.unregister();
diff --git a/client/src/logo.svg b/client/src/logo.svg
new file mode 100644
index 0000000..6b60c10
--- /dev/null
+++ b/client/src/logo.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
+ <g fill="#61DAFB">
+ <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
+ <circle cx="420.9" cy="296.5" r="45.7"/>
+ <path d="M520.5 78.1z"/>
+ </g>
+</svg>
diff --git a/client/src/pages/404.jsx b/client/src/pages/404.jsx
new file mode 100644
index 0000000..8d0dcb1
--- /dev/null
+++ b/client/src/pages/404.jsx
@@ -0,0 +1,12 @@
+import React from 'react';
+
+
+const NotFoundPage = () => {
+ return (
+ <div>
+ <h3>404 Page not found</h3>
+ </div>
+ )
+}
+
+export default NotFoundPage;
\ No newline at end of file
diff --git a/client/src/pages/accountSelection.jsx b/client/src/pages/accountSelection.jsx
new file mode 100644
index 0000000..2a4c99b
--- /dev/null
+++ b/client/src/pages/accountSelection.jsx
@@ -0,0 +1,64 @@
+import React from 'react';
+import Header from '../components/Header'
+import authManager from '../AuthManager'
+import AccountList from '../components/AccountList';
+import CircularProgress from '@material-ui/core/CircularProgress';
+import { withRouter } from 'react-router-dom';
+import Card from '@material-ui/core/Card';
+import CardHeader from '@material-ui/core/CardHeader';
+import Container from '@material-ui/core/Container';
+import Account from '../../../model/Account';
+
+class AccountSelection extends React.Component {
+
+ constructor(props) {
+ super(props)
+ this.controller = new AbortController()
+ this.state = {
+ loaded: false,
+ error: false,
+ accounts: []
+ }
+ }
+
+ componentDidMount() {
+ if (!this.state.loaded) {
+ authManager.fetch('/api/accounts', {signal: this.controller.signal})
+ .then(res => res.json())
+ .then(result => {
+ console.log(result)
+ this.setState({
+ loaded: true,
+ accounts: result.map(account => Account.from(account)),
+ })
+ }, error => {
+ console.log(`get error ${error}`)
+ this.setState({
+ loaded: true,
+ error: true
+ })
+ })
+ }
+ }
+ componentWillUnmount() {
+ this.controller.abort()
+ }
+
+ render() {
+ if (!this.state.loaded)
+ return <Container><CircularProgress /></Container>
+ return (
+ <div className="app" style={{marginBottom:32}} >
+ <Header />
+ <Container>
+ <Card style={{marginTop:32, marginBottom:32}}>
+ <CardHeader title="Choose an account" />
+ <AccountList accounts={this.state.accounts} onClick={account => this.props.history.push(`/account/${account.getId()}`)} />
+ </Card>
+ </Container>
+ </div>
+ )
+ }
+}
+
+export default withRouter(AccountSelection);
\ No newline at end of file
diff --git a/client/src/pages/accountSettings.jsx b/client/src/pages/accountSettings.jsx
new file mode 100644
index 0000000..d7f71cf
--- /dev/null
+++ b/client/src/pages/accountSettings.jsx
@@ -0,0 +1,45 @@
+import React from 'react';
+import Header from '../components/Header'
+import AccountPreferences from '../components/AccountPreferences'
+import Container from '@material-ui/core/Container';
+import CircularProgress from '@material-ui/core/CircularProgress';
+import authManager from '../AuthManager'
+import Account from '../../../model/Account'
+
+class AccountSettings extends React.Component {
+
+ constructor(props) {
+ super(props)
+ this.accountId = props.accountId || props.match.params.accountId
+ this.state = { loaded: false, account: props.account }
+ this.req = undefined
+ this.controller = new AbortController()
+ }
+
+ componentDidMount() {
+ if (this.req === undefined) {
+ this.req = authManager.fetch(`/api/accounts/${this.accountId}`, {signal: this.controller.signal})
+ .then(res => res.json())
+ .then(result => {
+ console.log(result)
+ this.setState({loaded: true, account: Account.from(result)})
+ })
+ }
+ }
+
+ componentWillUnmount() {
+ this.controller.abort()
+ this.req = undefined
+ }
+
+ render() {
+ return (
+ <Container maxWidth="sm" className="app" >
+ <Header />
+ {this.state.loaded ? <AccountPreferences account={this.state.account} /> : <CircularProgress />}
+ </Container>
+ )
+ }
+}
+
+export default AccountSettings;
\ No newline at end of file
diff --git a/client/src/pages/loginDialog.jsx b/client/src/pages/loginDialog.jsx
new file mode 100644
index 0000000..93f9f59
--- /dev/null
+++ b/client/src/pages/loginDialog.jsx
@@ -0,0 +1,245 @@
+import React from 'react';
+
+import Avatar from '@material-ui/core/Avatar';
+import Button from '@material-ui/core/Button';
+import TextField from '@material-ui/core/TextField';
+import FormControlLabel from '@material-ui/core/FormControlLabel';
+import Checkbox from '@material-ui/core/Checkbox';
+import Link from '@material-ui/core/Link';
+import Grid from '@material-ui/core/Grid';
+import Box from '@material-ui/core/Box';
+import Card from '@material-ui/core/Card';
+import CardContent from '@material-ui/core/CardContent';
+import CardActionArea from '@material-ui/core/CardActionArea';
+import CardActions from '@material-ui/core/CardActions';
+
+import LockOutlinedIcon from '@material-ui/icons/LockOutlined';
+import Typography from '@material-ui/core/Typography';
+//import { makeStyles } from '@material-ui/core/styles';
+import Container from '@material-ui/core/Container';
+import { Redirect } from 'react-router-dom';
+import CircularProgress from '@material-ui/core/CircularProgress';
+import DialogTitle from '@material-ui/core/DialogTitle';
+import Dialog from '@material-ui/core/Dialog';
+import DialogActions from '@material-ui/core/DialogActions';
+import DialogContent from '@material-ui/core/DialogContent';
+import DialogContentText from '@material-ui/core/DialogContentText';
+
+import authManager from '../AuthManager'
+
+function Copyright() {
+ return (
+ <Typography variant="body2" color="textSecondary" align="center">
+ {'Copyright © 2016-'}{new Date().getFullYear()}{' Savoir-faire Linux Inc.'}
+ <Link color="inherit" href="https://jami.net/">
+ Jami.net
+ </Link>{' '}
+ {'.'}
+ </Typography>
+ );
+}
+
+/*const useStyles = makeStyles((theme) => ({
+ paper: {
+ marginTop: theme.spacing(8),
+ display: 'flex',
+ flexDirection: 'column',
+ alignItems: 'center',
+ },
+ avatar: {
+ margin: theme.spacing(1),
+ backgroundColor: theme.palette.secondary.main,
+ },
+ form: {
+ width: '100%', // Fix IE 11 issue.
+ marginTop: theme.spacing(1),
+ },
+ submit: {
+ margin: theme.spacing(3, 0, 2),
+ },
+}));*/
+
+/*function SignIn() {
+ const classes = useStyles();
+
+
+}*/
+
+/*
+ TODO:
+ Use useState to handle username password and redirect states to render this page to
+ comply with material-ui usage of useStyles
+ Src: https://blog.logrocket.com/a-guide-to-usestate-in-react-ecb9952e406c/
+*/
+
+class SignInPage extends React.Component {
+
+ constructor(props) {
+ console.log("SignInPage " + props.open)
+ super(props)
+ this.state = {
+ /*username: '',
+ password: '',
+ redirect: false,
+ session: null,*/
+ submitted: false,
+ loading: false/*,
+ error: false,
+ open: false,
+ errorMessage: ''*/
+ }
+ this.handleSubmit = this.handleSubmit.bind(this);
+ this.localLogin = this.localLogin.bind(this);
+ }
+
+ handleusername(text) {
+ this.setState({ username: text.target.value })
+ }
+
+ handlePassword(text) {
+ this.setState({ password: text.target.value })
+ }
+
+ localLogin() {
+ this.setState({
+ submitted: true,
+ loading: true
+ })
+ authManager.authenticate()
+ /*fetch('/api/localLogin?username=none&password=none', {
+ header: { "Content-Type": "application/json" },
+ method: "POST",
+ credentials: 'same-origin'
+ //body: JSON.stringify({ obj })
+ })
+ .then((res) => {
+ if (res.status === '200') {
+ this.setState({
+ redirect: true
+ });
+ } else if (res.status === '401') {
+ this.setState({
+ loading: false,
+ error: true,
+ open: true,
+ errorMessage: "Wrong credentials! Your are not allowed to connect"
+ })
+ }
+ //this.setState({ session: res });
+ }).catch((e) => {
+ this.setState({
+ loading: false,
+ error: true,
+ open: true,
+ errorMessage: e.toString()
+ })
+ })*/
+ }
+
+ handleSubmit(event) {
+ event.preventDefault();
+ let obj = {}
+ obj.username = this.state.username;
+ obj.password = this.state.password;
+
+ this.setState({
+ submitted: true,
+ loading: true
+ })
+
+ fetch('/api/login?username=' + obj.username + '&password=' + obj.password,
+ {
+ header: {
+ "Content-Type": "application/json"
+ },
+ method: "POST",
+ credentials: 'same-origin'
+ //body: JSON.stringify({ obj })
+ }
+ ).then((res) => {
+ if (res.status === '200') {
+ this.setState({
+ redirect: true
+ });
+ } else if (res.status === '401') {
+ this.setState({
+ loading: false,
+ error: true,
+ open: true,
+ errorMessage: "Wrong credentials! Your are not allowed to connect"
+ })
+ }
+ //this.setState({ session: res });
+ }).catch((e) => {
+ this.setState({
+ loading: false,
+ error: true,
+ open: true,
+ errorMessage: e.toString()
+ })
+ })
+ }
+
+ render() {
+ console.log("SignInPage render " + this.props.open)
+ return (
+ <Dialog open={this.props.open}>
+ <DialogTitle>Se connecter</DialogTitle>
+ <DialogContent>
+ <Button
+ type="submit"
+ fullWidth
+ variant="contained"
+ color="primary"
+ className=""/*{classes.submit}*/
+ onClick={() => { this.localLogin() }}
+ >
+ Compte local
+ </Button>
+
+ <TextField
+ variant="outlined"
+ margin="normal"
+ required
+ fullWidth
+ id="username"
+ label="LDAP Savoir-faire Linux"
+ name="username"
+ autoComplete="email"
+ autoFocus
+ onChange={(text) => { this.handleusername(text) }}
+ />
+ <TextField
+ variant="outlined"
+ margin="normal"
+ required
+ fullWidth
+ name="password"
+ label="Mot de passe"
+ type="password"
+ id="password"
+ autoComplete="current-password"
+ onChange={(text) => { this.handlePassword(text) }}
+ />
+ <FormControlLabel
+ control={<Checkbox value="remember" color="primary" />}
+ label="Se rapeller de moi"
+ />
+ </DialogContent>
+
+ <DialogActions>
+ <Button
+ type="submit"
+ size="medium"
+ onClick={this.handleSubmit}
+ >
+ Se connecter
+ </Button>
+ </DialogActions>
+ </Dialog>
+ );
+ }
+}
+
+
+export default SignInPage;
\ No newline at end of file
diff --git a/client/src/pages/messenger.jsx b/client/src/pages/messenger.jsx
new file mode 100644
index 0000000..23f3935
--- /dev/null
+++ b/client/src/pages/messenger.jsx
@@ -0,0 +1,81 @@
+import React from 'react';
+import Header from '../components/Header'
+import ContactList from '../components/ContactList'
+import MessageList from '../components/MessageList'
+import SendMessageForm from '../components/SendMessageForm'
+import NewContactForm from '../components/NewContactForm'
+//import Sound from 'react-sound';
+import io from "socket.io-client";
+//const socket = io.connect('http://localhost:3000');
+
+class JamiMessenger extends React.Component {
+
+ constructor() {
+ super()
+ this.state = {
+ messages: [],
+ sound: false
+ }
+
+ /*socket.on('connect', () => {
+ console.log("Success !")
+ })*/
+
+
+ //this.socket = socketIOClient(ENDPOINT);
+ //this.socket.on("FromAPI", data => {
+ // this.setState({
+ // messages: [...this.state.messages, data]
+ // })
+ //});
+ this.sendMessage = this.sendMessage.bind(this)
+ }
+
+ componentDidMount() {
+ /*socket.on('receivedMessage', (data) => {
+ const message = {
+ senderId: '65f6674b26e5af6ed0b4e92a13b80ff4bbfdf1e8',
+ text: data
+ }
+ this.setState({
+ messages: [...this.state.messages, message],
+ sound: true
+ })
+ });*/
+ }
+
+ sendMessage(text) {
+ var data = {
+ senderId: 'Me',
+ destinationId: '65f6674b26e5af6ed0b4e92a13b80ff4bbfdf1e8',
+ text: text
+ }
+ //socket.emit("SendMessage", data);
+ console.log(data.text);
+ this.setState({
+ messages: [...this.state.messages, data],
+ sound: false
+ })
+ }
+ render() {
+ return (
+ <div className="app" >
+ <Header />
+ <ContactList />
+ <MessageList messages={this.state.messages} />
+ <SendMessageForm sendMessage={this.sendMessage} />
+ <NewContactForm />
+ {this.state.sound && <Sound
+ url="stairs.mp3" /*https://notificationsounds.com/message-tones/stairs-567*/
+ playStatus={Sound.status.PLAYING}
+ playFromPosition={0 /* in milliseconds */}
+ onLoading={this.handleSongLoading}
+ onPlaying={this.handleSongPlaying}
+ onFinishedPlaying={this.handleSongFinishedPlaying}
+ />}
+ </div>
+ )
+ }
+}
+
+export default JamiMessenger;
\ No newline at end of file
diff --git a/client/src/serviceWorker.js b/client/src/serviceWorker.js
new file mode 100644
index 0000000..b04b771
--- /dev/null
+++ b/client/src/serviceWorker.js
@@ -0,0 +1,141 @@
+// This optional code is used to register a service worker.
+// register() is not called by default.
+
+// This lets the app load faster on subsequent visits in production, and gives
+// it offline capabilities. However, it also means that developers (and users)
+// will only see deployed updates on subsequent visits to a page, after all the
+// existing tabs open on the page have been closed, since previously cached
+// resources are updated in the background.
+
+// To learn more about the benefits of this model and instructions on how to
+// opt-in, read https://bit.ly/CRA-PWA
+
+const isLocalhost = Boolean(
+ window.location.hostname === 'localhost' ||
+ // [::1] is the IPv6 localhost address.
+ window.location.hostname === '[::1]' ||
+ // 127.0.0.0/8 are considered localhost for IPv4.
+ window.location.hostname.match(
+ /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
+ )
+);
+
+export function register(config) {
+ if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
+ // The URL constructor is available in all browsers that support SW.
+ const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
+ if (publicUrl.origin !== window.location.origin) {
+ // Our service worker won't work if PUBLIC_URL is on a different origin
+ // from what our page is served on. This might happen if a CDN is used to
+ // serve assets; see https://github.com/facebook/create-react-app/issues/2374
+ return;
+ }
+
+ window.addEventListener('load', () => {
+ const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
+
+ if (isLocalhost) {
+ // This is running on localhost. Let's check if a service worker still exists or not.
+ checkValidServiceWorker(swUrl, config);
+
+ // Add some additional logging to localhost, pointing developers to the
+ // service worker/PWA documentation.
+ navigator.serviceWorker.ready.then(() => {
+ console.log(
+ 'This web app is being served cache-first by a service ' +
+ 'worker. To learn more, visit https://bit.ly/CRA-PWA'
+ );
+ });
+ } else {
+ // Is not localhost. Just register service worker
+ registerValidSW(swUrl, config);
+ }
+ });
+ }
+}
+
+function registerValidSW(swUrl, config) {
+ navigator.serviceWorker
+ .register(swUrl)
+ .then(registration => {
+ registration.onupdatefound = () => {
+ const installingWorker = registration.installing;
+ if (installingWorker == null) {
+ return;
+ }
+ installingWorker.onstatechange = () => {
+ if (installingWorker.state === 'installed') {
+ if (navigator.serviceWorker.controller) {
+ // At this point, the updated precached content has been fetched,
+ // but the previous service worker will still serve the older
+ // content until all client tabs are closed.
+ console.log(
+ 'New content is available and will be used when all ' +
+ 'tabs for this page are closed. See https://bit.ly/CRA-PWA.'
+ );
+
+ // Execute callback
+ if (config && config.onUpdate) {
+ config.onUpdate(registration);
+ }
+ } else {
+ // At this point, everything has been precached.
+ // It's the perfect time to display a
+ // "Content is cached for offline use." message.
+ console.log('Content is cached for offline use.');
+
+ // Execute callback
+ if (config && config.onSuccess) {
+ config.onSuccess(registration);
+ }
+ }
+ }
+ };
+ };
+ })
+ .catch(error => {
+ console.error('Error during service worker registration:', error);
+ });
+}
+
+function checkValidServiceWorker(swUrl, config) {
+ // Check if the service worker can be found. If it can't reload the page.
+ fetch(swUrl, {
+ headers: { 'Service-Worker': 'script' },
+ })
+ .then(response => {
+ // Ensure service worker exists, and that we really are getting a JS file.
+ const contentType = response.headers.get('content-type');
+ if (
+ response.status === 404 ||
+ (contentType != null && contentType.indexOf('javascript') === -1)
+ ) {
+ // No service worker found. Probably a different app. Reload the page.
+ navigator.serviceWorker.ready.then(registration => {
+ registration.unregister().then(() => {
+ window.location.reload();
+ });
+ });
+ } else {
+ // Service worker found. Proceed as normal.
+ registerValidSW(swUrl, config);
+ }
+ })
+ .catch(() => {
+ console.log(
+ 'No internet connection found. App is running in offline mode.'
+ );
+ });
+}
+
+export function unregister() {
+ if ('serviceWorker' in navigator) {
+ navigator.serviceWorker.ready
+ .then(registration => {
+ registration.unregister();
+ })
+ .catch(error => {
+ console.error(error.message);
+ });
+ }
+}
diff --git a/client/src/setupTests.js b/client/src/setupTests.js
new file mode 100644
index 0000000..74b1a27
--- /dev/null
+++ b/client/src/setupTests.js
@@ -0,0 +1,5 @@
+// jest-dom adds custom jest matchers for asserting on DOM nodes.
+// allows you to do things like:
+// expect(element).toHaveTextContent(/react/i)
+// learn more: https://github.com/testing-library/jest-dom
+import '@testing-library/jest-dom/extend-expect';
