ECEntrics
/
concordia
mirror of https://gitlab.com/ecentrics/concordia
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'develop' into feature/94-add-an-about-menu-item 

# Conflicts:
#	yarn.lock
develop
Apostolos Fanakis 4 years ago
parent
ef9ce45f91 9867846874
commit
99bd2b3240
14 changed files with 385 additions and 615 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      LICENSE
  2. 2
      docker/Makefile
  3. 2
      docker/docker-compose.yml
  4. BIN
      packages/concordia-app/public/favicon.ico
  5. 4
      packages/concordia-app/src/assets/css/index.css
  6. BIN
      packages/concordia-app/src/assets/images/app_logo.png
  7. 1
      packages/concordia-app/src/assets/images/app_logo.svg
  8. 2
      packages/concordia-app/src/components/InitializationScreen/CustomLoader/index.jsx
  9. 2
      packages/concordia-app/src/components/UsernameSelector.jsx
  10. 4
      packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx
  11. 2
      packages/concordia-app/src/options/web3Options.js
  12. 2
      packages/concordia-app/src/views/Profile/GeneralTab/index.jsx
  13. 5
      packages/concordia-rendezvous/package.json
  14. 953
      yarn.lock

21
LICENSE
View File

@ -0,0 +1,21 @@
MIT License
Copyright (c) 2020 ECEntrics
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

2
docker/Makefile
View File

@ -28,7 +28,7 @@ run-ganache-test:
# Rendezvous targets # Rendezvous targets
run-rendezvous: run-rendezvous:
@docker network create --driver bridge concordia_rendezvous_network || true &&\ @docker network create --driver bridge concordia_rendezvous_network || true &&\
docker run -d -p 9090:9090 --name concordia-rendezvous libp2p/js-libp2p-webrtc-star:version-0.20.1 docker run -d -p 9090:9090 --name concordia-rendezvous libp2p/js-libp2p-webrtc-star:version-0.20.5
# Contracts targets # Contracts targets
build-contracts: build-contracts:

2
docker/docker-compose.yml
View File

@ -21,7 +21,7 @@ services:
restart: always restart: always
rendezvous: rendezvous:
image: libp2p/js-libp2p-webrtc-star:version-0.20.1 image: libp2p/js-libp2p-webrtc-star:version-0.20.5
container_name: concordia-rendezvous container_name: concordia-rendezvous
networks: networks:
rendezvous_network: rendezvous_network:

BIN
packages/concordia-app/public/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 15 KiB

4
packages/concordia-app/src/assets/css/index.css
View File

@ -15,3 +15,7 @@ body.app {
color: gray; color: gray;
font-style: italic; font-style: italic;
} }
.ui.inverted.menu {
background: #0B2540;
}

BIN
packages/concordia-app/src/assets/images/app_logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 216 KiB

1
packages/concordia-app/src/assets/images/app_logo.svg
View File

@ -0,0 +1 @@
<svg id="e12732d2-a5d8-4802-8cce-7bb947dee9fc" data-name="Main" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 330.81 373.92"><defs><style>.ea73fbdf-f048-4e97-bc07-bb0b2969bee0,.f07aef9f-38fd-428f-bc73-47ca525dc184,.f4a4d906-3c6f-4179-bb65-49dff726c11f{fill:#ea6954;}.afa3e173-b557-4a70-97cf-07566c42bb6b,.ea73fbdf-f048-4e97-bc07-bb0b2969bee0,.eb772659-6642-46b7-9d47-de390253f8eb,.f07aef9f-38fd-428f-bc73-47ca525dc184,.f4a4d906-3c6f-4179-bb65-49dff726c11f{stroke:#ea6954;stroke-miterlimit:10;}.ea73fbdf-f048-4e97-bc07-bb0b2969bee0{stroke-width:4px;}.afa3e173-b557-4a70-97cf-07566c42bb6b,.eb772659-6642-46b7-9d47-de390253f8eb{fill:none;}.eb772659-6642-46b7-9d47-de390253f8eb{stroke-width:8px;}.afa3e173-b557-4a70-97cf-07566c42bb6b{stroke-width:5px;}.f4a4d906-3c6f-4179-bb65-49dff726c11f{stroke-width:6px;}.f07aef9f-38fd-428f-bc73-47ca525dc184{stroke-width:10px;}</style></defs><title>concordia_logo_clean_transp</title><g id="b83a01e3-c11e-43ae-b1d1-41016566a065" data-name="Thin lines"><line class="ea73fbdf-f048-4e97-bc07-bb0b2969bee0" x1="6.54" y1="159.57" x2="214.18" y2="40.02"/><line class="ea73fbdf-f048-4e97-bc07-bb0b2969bee0" x1="268.01" y1="67.02" x2="8.19" y2="217.01"/><path class="ea73fbdf-f048-4e97-bc07-bb0b2969bee0" d="M147.33,310.48" transform="translate(-84.98 -63.19)"/><path class="ea73fbdf-f048-4e97-bc07-bb0b2969bee0" d="M93.17,340.61" transform="translate(-84.98 -63.19)"/><path class="ea73fbdf-f048-4e97-bc07-bb0b2969bee0" d="M194.38,339.38" transform="translate(-84.98 -63.19)"/><path class="ea73fbdf-f048-4e97-bc07-bb0b2969bee0" d="M143.26,369.07" transform="translate(-84.98 -63.19)"/><line class="ea73fbdf-f048-4e97-bc07-bb0b2969bee0" x1="164.08" y1="307.55" x2="218.73" y2="276.32"/><line class="ea73fbdf-f048-4e97-bc07-bb0b2969bee0" x1="164.08" y1="307.55" x2="164.08" y2="307.55"/><path class="ea73fbdf-f048-4e97-bc07-bb0b2969bee0" d="M250.4,70.47" transform="translate(-84.98 -63.19)"/><path class="ea73fbdf-f048-4e97-bc07-bb0b2969bee0" d="M250.4,131.07" transform="translate(-84.98 -63.19)"/><line class="ea73fbdf-f048-4e97-bc07-bb0b2969bee0" x1="214.18" y1="40.02" x2="213.85" y2="98.18"/><line class="ea73fbdf-f048-4e97-bc07-bb0b2969bee0" x1="268.07" y1="72.66" x2="268.07" y2="128.48"/><line class="ea73fbdf-f048-4e97-bc07-bb0b2969bee0" x1="61.62" y1="248.08" x2="60.76" y2="251.27"/><line class="ea73fbdf-f048-4e97-bc07-bb0b2969bee0" x1="109.4" y1="276.19" x2="109.4" y2="276.19"/><line class="ea73fbdf-f048-4e97-bc07-bb0b2969bee0" x1="60.76" y1="185.89" x2="60.76" y2="246.48"/><line class="ea73fbdf-f048-4e97-bc07-bb0b2969bee0" x1="164.08" y1="307.55" x2="8.13" y2="216.98"/><line class="ea73fbdf-f048-4e97-bc07-bb0b2969bee0" x1="164.39" y1="8.19" x2="164.08" y2="307.55"/></g><g id="fed0cce0-4af9-4b2d-b863-61c942ac6516" data-name="Thick lines"><polyline class="eb772659-6642-46b7-9d47-de390253f8eb" points="8.19 217.19 8.93 99.77 164.08 8.19"/><polyline class="eb772659-6642-46b7-9d47-de390253f8eb" points="322.52 98.08 268.38 130.07 164.08 69.47 61.56 128.48 61.56 186.08"/><polyline class="eb772659-6642-46b7-9d47-de390253f8eb" points="218.73 276.32 322.29 215.69 321.5 276.78 164.08 369.28 8.19 277.19"/></g><g id="fc525e57-c3b6-4537-a6f4-917e8af7caa9" data-name="Medium lines"><polyline class="afa3e173-b557-4a70-97cf-07566c42bb6b" points="164.08 8.19 164.08 68.78 214.18 40.02 214.18 98.18 268.27 67.88 268.28 130.28"/><polyline class="afa3e173-b557-4a70-97cf-07566c42bb6b" points="8.19 277.19 61.62 248.08 61.62 304.28 109.4 276.19 109.4 336.28 164.06 307.55 164.06 369.28"/></g><g id="b1c4230e-0310-46b2-a1fb-d6a53c5bc9b8" data-name="Small nodes"><circle class="f4a4d906-3c6f-4179-bb65-49dff726c11f" cx="268.28" cy="67.88" r="3.19"/><circle class="f4a4d906-3c6f-4179-bb65-49dff726c11f" cx="109.4" cy="276.19" r="3.19"/></g><g id="ef16cbf3-3f8b-4797-841e-58de76523415" data-name="Big nodes"><circle class="f07aef9f-38fd-428f-bc73-47ca525dc184" cx="61.56" cy="186.08" r="3.19"/><circle class="f07aef9f-38fd-428f-bc73-47ca525dc184" cx="164.08" cy="8.19" r="3.19"/><circle class="f07aef9f-38fd-428f-bc73-47ca525dc184" cx="164.08" cy="307.55" r="3.19"/><circle class="f07aef9f-38fd-428f-bc73-47ca525dc184" cx="8.19" cy="217.01" r="3.19"/><circle class="f07aef9f-38fd-428f-bc73-47ca525dc184" cx="61.62" cy="248.08" r="3.19"/><circle class="f07aef9f-38fd-428f-bc73-47ca525dc184" cx="322.62" cy="98.08" r="3.19"/><circle class="f07aef9f-38fd-428f-bc73-47ca525dc184" cx="214.18" cy="40.02" r="3.19"/><circle class="f07aef9f-38fd-428f-bc73-47ca525dc184" cx="218.73" cy="276.32" r="3.19"/><circle class="f07aef9f-38fd-428f-bc73-47ca525dc184" cx="8.19" cy="277.19" r="3.19"/></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

2
packages/concordia-app/src/components/InitializationScreen/CustomLoader/index.jsx
View File

@ -8,7 +8,7 @@ import metamaskLogo from '../../../assets/images/metamask_logo.svg';
import ethereumLogo from '../../../assets/images/ethereum_logo.svg'; import ethereumLogo from '../../../assets/images/ethereum_logo.svg';
import ipfsLogo from '../../../assets/images/ipfs_logo.svg'; import ipfsLogo from '../../../assets/images/ipfs_logo.svg';
import orbitdbLogo from '../../../assets/images/orbitdb_logo.svg'; import orbitdbLogo from '../../../assets/images/orbitdb_logo.svg';
import appLogo from '../../../assets/images/app_logo.png'; import appLogo from '../../../assets/images/app_logo.svg';
const LoadingComponent = (props) => { const LoadingComponent = (props) => {
useEffect(() => function cleanup() { useEffect(() => function cleanup() {

2
packages/concordia-app/src/components/UsernameSelector.jsx
View File

@ -38,7 +38,7 @@ const UsernameSelector = (props) => {
}); });
} else { } else {
onErrorChangeCallback({ onErrorChangeCallback({
usernameChecked: checkedUsername !== undefined, usernameChecked: true,
error: false, error: false,
errorMessage: null, errorMessage: null,
}); });

4
packages/concordia-app/src/layouts/MainLayout/MainLayoutMenu/index.jsx
View File

@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
import { useHistory } from 'react-router'; import { useHistory } from 'react-router';
import { useSelector } from 'react-redux'; import { useSelector } from 'react-redux';
import AppContext from '../../../components/AppContext'; import AppContext from '../../../components/AppContext';
import appLogo from '../../../assets/images/app_logo.png'; import appLogo from '../../../assets/images/app_logo.svg';
import ClearDatabasesModal from '../../../components/ClearDatabasesModal'; import ClearDatabasesModal from '../../../components/ClearDatabasesModal';
const MainLayoutMenu = () => { const MainLayoutMenu = () => {
@ -30,7 +30,7 @@ const MainLayoutMenu = () => {
return ( return (
<AppContext.Consumer> <AppContext.Consumer>
{() => ( {() => (
<Menu color="black" inverted> <Menu inverted>
<Menu.Item <Menu.Item
link link
name="home" name="home"

2
packages/concordia-app/src/options/web3Options.js
View File

@ -17,7 +17,7 @@ const web3WebsocketOptions = {
}; };
const web3 = (WEB3_HOST !== undefined && WEB3_PORT !== undefined) const web3 = (WEB3_HOST !== undefined && WEB3_PORT !== undefined)
? `ws://${WEB3_HOST}:${WEB3_PORT}` ? new Web3(new Web3.providers.WebsocketProvider(`ws://${WEB3_HOST}:${WEB3_PORT}`))
: new Web3(Web3.givenProvider || new Web3.providers.WebsocketProvider( : new Web3(Web3.givenProvider || new Web3.providers.WebsocketProvider(
`ws://${WEB3_HOST_DEFAULT}:${WEB3_PORT_DEFAULT}`, web3WebsocketOptions, `ws://${WEB3_HOST_DEFAULT}:${WEB3_PORT_DEFAULT}`, web3WebsocketOptions,
)); ));

2
packages/concordia-app/src/views/Profile/GeneralTab/index.jsx
View File

@ -66,7 +66,7 @@ const GeneralTab = (props) => {
} }
}, [dispatch, profileAddress, users]); }, [dispatch, profileAddress, users]);
const authorAvatar = useMemo(() => (profileMetadataFetched && userAvatarUrl !== null const authorAvatar = useMemo(() => (profileMetadataFetched && userAvatarUrl
? ( ? (
<Image <Image
className="general-tab-profile-picture" className="general-tab-profile-picture"

5
packages/concordia-rendezvous/package.json
View File

@ -4,10 +4,9 @@
"private": true, "private": true,
"description": "Rendezvous server for Concordia", "description": "Rendezvous server for Concordia",
"scripts": { "scripts": {
"rendezvous": "star-signal --port=9090 --host=127.0.0.1",
"start": "star-signal --port=9090 --host=127.0.0.1" "start": "star-signal --port=9090 --host=127.0.0.1"
}, },
"devDependencies": { "dependencies": {
"libp2p-webrtc-star": "~0.20.1" "libp2p-webrtc-star": "~0.20.5"
} }
} }

953
yarn.lock
View File

File diff suppressed because it is too large
Write Preview
Loading…
Cancel
Save