From 0ff69dbe31707d65e44f91925a30c263db2c9c7e Mon Sep 17 00:00:00 2001 From: Ezerous Date: Fri, 29 Mar 2019 20:25:42 +0200 Subject: [PATCH] Major improvements (Orbit, Topic.js, LoadingContainer) --- app/src/assets/images/orbitdb_logo.png | Bin 0 -> 25187 bytes app/src/components/Topic.js | 84 ++++++++----------------- app/src/components/TopicList.js | 36 ++++++++--- app/src/containers/LoadingContainer.js | 16 ++++- app/src/redux/actions/orbitActions.js | 4 +- app/src/redux/reducers/orbitReducer.js | 12 +--- app/src/redux/sagas/orbitSaga.js | 22 ++++--- app/src/utils/orbitUtils.js | 11 +++- 8 files changed, 94 insertions(+), 91 deletions(-) create mode 100644 app/src/assets/images/orbitdb_logo.png diff --git a/app/src/assets/images/orbitdb_logo.png b/app/src/assets/images/orbitdb_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..1f416672977474fd354753c80772f51203187621 GIT binary patch literal 25187 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

-qluL3n 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

-

- {topicData !== null - ? topicData.value[2] - : 'Username' - } +

+ {topicData.userName}

-

- {`Number of replies: ${topicData !== null - ? topicData.value[4].length - : ''}` - } +

+ Number of Replies: {topicData.nReplies}

- {topicData !== null - && ( - - ) - } +

@@ -97,43 +69,37 @@ class Topic extends Component { Topic.propTypes = { user: PropTypes.object.isRequired, history: PropTypes.object.isRequired, - topicData: GetTopicResult.isRequired, + //TODO: topicData: GetTopicResult.isRequired, orbitDB: PropTypes.object.isRequired, topicID: PropTypes.number.isRequired }; function getTopicSubject(state, props){ - const { user, orbit } = state; - if (orbit.ipfsInitialized && orbit.orbitdb) { - const { topicData, topicID } = props; - if (topicData){ - if(user && topicData.value[1] === user.address) { - const orbitData = orbit.topicsDB.get(topicID); - if(orbitData && orbitData.subject) - return orbitData.subject; - } - else{ - const db = orbit.peerDatabases.find(db => db.fullAddress === `/orbitdb/${topicData.value[0]}/topics`); - if(db && db.store){ - const localOrbitData = db.store.get(topicID); - if (localOrbitData) - return localOrbitData.subject; - } - } + const { user: {address: userAddress}, orbit } = state; + const { topicData, topicID } = props; + if(userAddress === topicData.userAddress) { + const orbitData = orbit.topicsDB.get(topicID); + if(orbitData && orbitData.subject) + return orbitData.subject; + } + else{ + const db = orbit.peerDatabases.find(db => db.fullAddress === topicData.fullOrbitAddress); + if(db && db.store){ + const localOrbitData = db.store.get(topicID); + if (localOrbitData) + return localOrbitData.subject; } } + return null; } - - function mapStateToProps(state, ownProps) { return { - user: state.user, + userAddress: state.user.address, orbitDB: state.orbit, topicSubject: getTopicSubject(state, ownProps) } } - export default withRouter(connect(mapStateToProps)(Topic)); diff --git a/app/src/components/TopicList.js b/app/src/components/TopicList.js index dd00318..de6165b 100644 --- a/app/src/components/TopicList.js +++ b/app/src/components/TopicList.js @@ -55,16 +55,32 @@ class TopicList extends Component { const { dataKeys } = this.state; const { topicIDs, contracts } = this.props; - const topics = topicIDs.map(topicID => ( - - )); + const topics = topicIDs.map(topicID => { + let fetchedTopicData; + if(dataKeys[topicID]) + fetchedTopicData = contracts[contract][getTopicMethod][dataKeys[topicID]]; + + if(fetchedTopicData) { + const topicData = { + userAddress: fetchedTopicData.value[0], + fullOrbitAddress: `/orbitdb/${fetchedTopicData.value[0]}/topics`, + userName: fetchedTopicData.value[2], + timestamp: fetchedTopicData.value[3]*1000, + nReplies: fetchedTopicData.value[4].length + }; + return( + + ) + } + + return( +
TODO: Add a loading thingy
+ ) + }); return (
diff --git a/app/src/containers/LoadingContainer.js b/app/src/containers/LoadingContainer.js index 5983628..837f008 100644 --- a/app/src/containers/LoadingContainer.js +++ b/app/src/containers/LoadingContainer.js @@ -2,8 +2,8 @@ import React, { Children, Component } from 'react'; import { connect } from 'react-redux'; import ethereum_logo from '../assets/images/ethereum_logo.svg'; import ipfs_logo from '../assets/images/ipfs_logo.svg'; +import orbitdb_logo from '../assets/images/orbitdb_logo.png'; -//TODO: Add OrbitDB Loading thingy class LoadingContainer extends Component { render() { if (this.props.web3.status === 'failed' || !this.props.web3.networkId) { @@ -74,6 +74,19 @@ class LoadingContainer extends Component { ) } + if (!this.props.orbitReady) { + return( +
+
+
+ orbitdb_logo +

Initializing OrbitDB...

+
+
+
+ ) + } + //TODO: wtf is this if (this.props.drizzleStatus.initialized) return Children.only(this.props.children); @@ -101,6 +114,7 @@ const mapStateToProps = state => { drizzleStatus: state.drizzleStatus, web3: state.web3, ipfsInitialized: state.orbit.ipfsInitialized, + orbitReady: state.orbit.ready, contractInitialized: state.contracts.Forum.initialized } }; diff --git a/app/src/redux/actions/orbitActions.js b/app/src/redux/actions/orbitActions.js index 45b3907..283a505 100644 --- a/app/src/redux/actions/orbitActions.js +++ b/app/src/redux/actions/orbitActions.js @@ -5,7 +5,7 @@ const DATABASES_NOT_READY = 'DATABASES_NOT_READY'; const ADD_PEER_DATABASE = 'ADD_PEER_DATABASE'; const PEER_DATABASE_ADDED = 'PEER_DATABASE_ADDED'; const UPDATE_PEERS = 'UPDATE_PEERS'; -const ORRBIT_GETTING_INFO = 'ORRBIT_GETTING_INFO'; +const ORBIT_INIT = 'ORBIT_INIT'; const ORBIT_SAGA_ERROR = 'ORBIT_SAGA_ERROR'; function updateDatabases(type, orbitdb, topicsDB, postsDB) { @@ -32,7 +32,7 @@ export { DATABASES_CREATED, UPDATE_PEERS, ADD_PEER_DATABASE, PEER_DATABASE_ADDED, - ORRBIT_GETTING_INFO, + ORBIT_INIT, ORBIT_SAGA_ERROR, addPeerDatabase, updateDatabases diff --git a/app/src/redux/reducers/orbitReducer.js b/app/src/redux/reducers/orbitReducer.js index fc82d3f..737bb89 100644 --- a/app/src/redux/reducers/orbitReducer.js +++ b/app/src/redux/reducers/orbitReducer.js @@ -2,7 +2,7 @@ import { DATABASES_CREATED, DATABASES_LOADED, DATABASES_NOT_READY, - IPFS_INITIALIZED, UPDATE_PEERS, PEER_DATABASE_ADDED + IPFS_INITIALIZED, UPDATE_PEERS, PEER_DATABASE_ADDED, ORBIT_INIT } from '../actions/orbitActions'; const initialState = { @@ -26,14 +26,6 @@ const orbitReducer = (state = initialState, action) => { ipfsInitialized: true }; case DATABASES_CREATED: - return { - ...state, - ready: true, - orbitdb: action.orbitdb, - topicsDB: action.topicsDB, - postsDB: action.postsDB, - id: action.id - }; case DATABASES_LOADED: return { ...state, @@ -43,7 +35,7 @@ const orbitReducer = (state = initialState, action) => { postsDB: action.postsDB, id: action.id }; - case DATABASES_NOT_READY: + case ORBIT_INIT: return { ...state, ready: false, diff --git a/app/src/redux/sagas/orbitSaga.js b/app/src/redux/sagas/orbitSaga.js index 0e52ca9..18005cd 100644 --- a/app/src/redux/sagas/orbitSaga.js +++ b/app/src/redux/sagas/orbitSaga.js @@ -1,13 +1,17 @@ import { all, call, put, select, take, takeEvery, takeLatest } from 'redux-saga/effects'; import isEqual from 'lodash.isequal'; import { forumContract, getCurrentAccount } from './drizzleUtilsSaga'; -import { loadDatabases, orbitSagaOpen } from '../../utils/orbitUtils'; +import { + createTempDatabases, + loadDatabases, + orbitSagaOpen +} from '../../utils/orbitUtils'; import { DRIZZLE_UTILS_SAGA_INITIALIZED } from '../actions/drizzleUtilsActions'; import { ADD_PEER_DATABASE, PEER_DATABASE_ADDED, - DATABASES_NOT_READY, + DATABASES_CREATED, IPFS_INITIALIZED, - UPDATE_PEERS, ORRBIT_GETTING_INFO, ORBIT_SAGA_ERROR + UPDATE_PEERS, ORBIT_INIT, ORBIT_SAGA_ERROR, updateDatabases } from '../actions/orbitActions'; import { ACCOUNT_CHANGED } from '../actions/userActions'; import { ACCOUNTS_FETCHED } from '../actions/drizzleActions'; @@ -16,7 +20,7 @@ let latestAccount; function* getOrbitDBInfo() { yield put({ - type: ORRBIT_GETTING_INFO, ...[] + type: ORBIT_INIT, ...[] }); const account = yield call(getCurrentAccount); if (account !== latestAccount) { @@ -42,11 +46,13 @@ function* getOrbitDBInfo() { orbitDBInfo[0], orbitDBInfo[1], orbitDBInfo[2], orbitDBInfo[3], orbitDBInfo[4]); } else { - yield put({ - type: DATABASES_NOT_READY, ...[] - }); + const orbit = yield select(state => state.orbit); + if(!orbit.ready){ + const { orbitdb, topicsDB, postsDB } = yield call(createTempDatabases); + yield put(updateDatabases(DATABASES_CREATED, orbitdb, topicsDB, postsDB )); + console.debug("Created temporary databases."); + } } - latestAccount = account; } catch (error) { console.error(error); diff --git a/app/src/utils/orbitUtils.js b/app/src/utils/orbitUtils.js index 390cbf7..6a1e138 100644 --- a/app/src/utils/orbitUtils.js +++ b/app/src/utils/orbitUtils.js @@ -21,6 +21,15 @@ function initIPFS() { }); } +async function createTempDatabases() { + console.debug('Creating temporary databases...'); + const ipfs = getIPFS(); + const orbitdb = new OrbitDB(ipfs); + const topicsDB = await orbitdb.keyvalue('topics'); + const postsDB = await orbitdb.keyvalue('posts'); + return { orbitdb, topicsDB, postsDB }; +} + async function createDatabases() { console.debug('Creating databases...'); const ipfs = getIPFS(); @@ -108,4 +117,4 @@ async function orbitSagaOpen(orbitdb, address) { return store; } -export { initIPFS, createDatabases, loadDatabases, orbitSagaPut, orbitSagaOpen }; +export { initIPFS, createTempDatabases, createDatabases, loadDatabases, orbitSagaPut, orbitSagaOpen };