Skip to content
This repository has been archived by the owner on Mar 26, 2022. It is now read-only.

Commit

Permalink
Merge branch 'develop' into feature/friend-list-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
mesacarlos committed Mar 29, 2019
2 parents c931f91 + 9e79c42 commit f911536
Show file tree
Hide file tree
Showing 25 changed files with 219 additions and 13,669 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,6 @@ typings/

# Webstorm files
.idea
./src/chat/index.js

#index.js
src/index.js
4 changes: 2 additions & 2 deletions App.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ var express = require('express');
var app = express();
var path = require('path');

app.use(express.static(path.join(__dirname, '/src/chat')));
app.use(express.static(path.join(__dirname, '/src')));

app.get('/', function (req, res) {
res.sendFile(path.join(__dirname, '/src/chat/index.html'));
res.sendFile(path.join(__dirname, '/src/index.html'));
});

app.listen(1919, () => {
Expand Down
12,331 changes: 0 additions & 12,331 deletions package-lock.json

This file was deleted.

35 changes: 24 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,42 +29,55 @@
"homepage": "https://github.com/arquisoft/dechat_es5b",
"devDependencies": {
"@babel/cli": "^7.2.3",
"@babel/core": "^7.2.2",
"@babel/core": "^7.4.0",
"@babel/node": "^7.2.2",
"@babel/preset-env": "^7.3.1",
"@babel/register": "^7.0.0",
"@babel/preset-env": "^7.4.2",
"@babel/register": "^7.4.0",
"asciidoctor-cli": "^1.5.6-rc.1",
"asciidoctor.js": "^1.5.9",
"babel-plugin-istanbul": "^5.1.0",
"babel-plugin-istanbul": "^5.1.1",
"chai": "4.2.x",
"coveralls": "^3.0.2",
"coveralls": "^3.0.3",
"eslint": "^5.x",
"gulp": "^4.0.0",
"gulp-cli": "^2.0.1",
"gulp-cli": "^2.1.0",
"gulp-exec": "^3.0.2",
"gulp-puml": "^0.1.24",
"gulp-svg2png": "^2.0.2",
"jsdoc": "^3.5.5",
"mocha": "^5.2.0",
"mocha": "^6.0.2",
"mocha-lcov-reporter": "^1.3.0",
"node-plantuml": "^0.8.1",
"nyc": "^13.3.0",
"standard": "^12.0.1",
"webpack": "^4.29.6",
"webpack-cli": "^3.2.3"
"webpack-cli": "^3.3.0"
},
"dependencies": {
"codacy-coverage": "^3.4.0",
"cucumber": "^5.1.0",
"express": "^4.16.4",
"istanbul": "^0.4.5",
"jsonld-request": "^0.2.0",
"path": "^0.12.7",
"rdflib": "^0.20.0",
"solid-file-client": "^0.4.9",
"standard": "^12.0.1"
},
"directories": {
"doc": "docs",
"test": "test"
},
"keywords": []
"keywords": [
"solid",
"chat",
"message",
"discusssion",
"decentralized",
"web",
"rdf",
"ldp",
"linked",
"pane",
"app",
"data"
]
}
133 changes: 0 additions & 133 deletions src/chat/index.js

This file was deleted.

0 comments on commit f911536

Please sign in to comment.