Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Holochain HDK v0.0.147 update (WIP) #14

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
version: 2
jobs:
build:
working_directory: ~/Hylozoic/hylo-evo
working_directory: ~/Hylozoic/hylo-happ-ui
parallelism: 1
shell: /bin/bash --login
# CircleCI 2.0 does not support environment variables that refer to each other the same way as 1.0 did.
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
- run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
# This is based on your 1.0 configuration file or project settings
- run:
working_directory: ~/Hylozoic/hylo-evo
working_directory: ~/Hylozoic/hylo-happ-ui
command: nvm install 10.13.0 && nvm alias default 10.13.0
# Upgrade yarn
- run: curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
Expand Down
9 changes: 1 addition & 8 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
FILEPICKER_API_KEY=
MIXPANEL_TOKEN=
INTERCOM_APP_ID=
PROXY_HOST=http://hylo-landing.surge.sh
REDIRECT_TO_APP_STORE=

# Holochain
HOLOCHAIN_WEBSOCKET_URI=ws://localhost:3400
HOLOCHAIN_WEBSOCKET_URI=ws://localhost:14202
COMMUNITY_DNA_INSTANCE_ID=__communities
HOLOFUEL_DNA_INSTANCE_ID=__holofuel
HOLOCHAIN_GRAPHQL_PATH=community/graphql/graphql
# HOLOCHAIN_BUILD_PATH=/path/to/hylo-holo-dnas/hylo-ui
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ coverage
build
build-hc
es5
storybook-static

# misc
.DS_Store
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.13.0
14
17 changes: 0 additions & 17 deletions .storybook/config.js

This file was deleted.

29 changes: 0 additions & 29 deletions .storybook/webpack.config.js

This file was deleted.

16 changes: 5 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,19 @@
# hylo-evo
# UI for Hylo on Holochain

## Getting Started

1. `git clone [email protected]:Hylozoic/hylo-evo.git`
2. `cd hylo-evo`
1. `git clone [email protected]:Hylozoic/hylo-happ-ui.git`
2. `cd hylo-happ-ui`

## Running local:

1. `yarn install`
2. `yarn start`

## Building for standard Hylo API deployment
## Running Holochain Hylo Holochain App

1. Run `yarn build`
2. Once complete Hylo is ready to be served at `<projectRoot>/build`
This UI requires a locally running instance of the Hylo Holochain Application. See instructions for building or running the Hylo hApp here: [https://github.com/Hylozoic/hylo-happ](https://github.com/Hylozoic/hylo-happ)

## Building for Holochain

1. Optionally set `HOLOCHAIN_BUILD_PATH` in your local `.env` file. Defaults to `<projectRoot>/build-hc`
2. Run `yarn build:hc`
3. Once complete Hylo+Holochain is ready to be served at `<HOLOCHAIN_BUILD_PATH>`

## Further documentation

Expand Down
17 changes: 2 additions & 15 deletions app.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
{
"name": "hylo-evo",
"name": "hylo-happ-ui",
"scripts": {
},
"env": {
"API_HOST": {
"required": true
},
"FILEPICKER_API_KEY": {
"required": true
},
"NODE_MODULES_CACHE": {
"required": true
},
Expand All @@ -27,23 +24,13 @@
"ROLLBAR_ENV": {
"required": true
},
"MIXPANEL_TOKEN": {
"required": true
},
"INTERCOM_APP_ID": {
"required": true
},
"REDIRECT_TO_APP_STORE": {
"required": true
},
"HOLOCHAIN_WEBSOCKET_URI": {
"required": true
},
"HOLOCHAIN_GRAPHQL_PATH": {
"required": true
},
"COMMUNITY_DNA_INSTANCE_ID": "__community",
"HOLOFUEL_DNA_INSTANCE_ID": "__holofuel"
"COMMUNITY_DNA_INSTANCE_ID": "__hylo"
},
"formation": {
},
Expand Down
8 changes: 1 addition & 7 deletions config/postcss.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,7 @@ module.exports = {
'postcss-flexbugs-fixes': {},
'postcss-preset-env': {
autoprefixer: {
flexbox: 'no-2009',
browsers: [
'>1%',
'last 4 versions',
'Firefox ESR',
'not ie < 9' // React doesn't support IE8 anyway
]
flexbox: 'no-2009'
},
stage: 3
}
Expand Down
45 changes: 18 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hylo-evo",
"version": "0.1.0",
"name": "hylo-happ-ui",
"version": "0.2.0",
"private": true,
"scripts": {
"start": "rm -rf ./node_modules/.cache/babel-loader && node --preserve-symlinks scripts/start.js",
Expand All @@ -9,50 +9,45 @@
"test": "node scripts/test.js",
"lint": "yarn exec standard",
"lint:fix": "yarn exec standard --fix",
"server": "./node_modules/.bin/babel-node --config-file ./config/babel.config.js scripts/serveUniversal.js",
"storybook": "start-storybook -p 6006",
"storybook:build": "build-storybook"
"server": "./node_modules/.bin/babel-node --config-file ./config/babel.config.js scripts/serveUniversal.js"
},
"dependencies": {
"@apollo/react-hooks": "^3.1.3",
"@babel/cli": "7.2.3",
"@babel/core": "7.2.2",
"@babel/node": "7.2.2",
"@babel/plugin-proposal-class-properties": "^7.4.0",
"@babel/plugin-transform-runtime": "^7.4.4",
"@babel/preset-env": "7.2.3",
"@babel/preset-react": "^7.0.0",
"@babel/plugin-transform-runtime": "^7.4.4",
"@holochain/hc-web-client": "0.5.0",
"@storybook/addon-actions": "^v5.0.10",
"@storybook/addon-info": "^5.0.10",
"@storybook/addon-links": "^v5.0.10",
"@storybook/addons": "^v5.0.10",
"@storybook/react": "^v5.0.10",
"@holochain/client": "0.6.0",
"@msgpack/msgpack": "^2.7.2",
"@svgr/webpack": "4.1.0",
"@types/react": "^16.8.14",
"@types/react-css-modules": "^4.6.2",
"@types/react-css-modules": "^4.6.4",
"ansi-styles": "^3.2.1",
"apollo-cache": "^1.3.2",
"apollo-cache-inmemory": "^1.6.3",
"apollo-client": "^2.6.4",
"apollo-link": "^1.2.13",
"apollo-link-context": "^1.0.19",
"apollo-utilities": "^1.3.2",
"apollo-cache": "^1.3.5",
"apollo-cache-inmemory": "^1.6.6",
"apollo-client": "^2.6.10",
"apollo-link": "^1.2.14",
"apollo-link-context": "^1.0.20",
"apollo-link-logger": "^1.2.3",
"apollo-link-retry": "^2.2.15",
"apollo-link-schema": "^1.2.4",
"apollo-link-retry": "^2.2.16",
"apollo-link-schema": "^1.2.5",
"apollo-utilities": "^1.3.4",
"app-module-path": "^2.2.0",
"autoproxy": "^1.0.1",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "9.0.0",
"babel-plugin-import-graphql": "^2.7.0",
"babel-jest": "23.6.0",
"babel-loader": "8.0.5",
"babel-plugin-data-stylename": "0.1.1",
"babel-plugin-import-graphql": "^2.7.0",
"babel-plugin-inline-import": "^3.0.0",
"babel-plugin-module-resolver": "^3.2.0",
"babel-plugin-named-asset-import": "^0.3.1",
"babel-plugin-react-css-modules": "levity/babel-plugin-react-css-modules#ab83008",
"babel-preset-react-app": "^10.0.1",
"bfj": "6.1.1",
"bootstrap": "4.0.0-alpha.6",
"case-sensitive-paths-webpack-plugin": "2.2.0",
Expand Down Expand Up @@ -107,7 +102,6 @@
"immutable": "^3.8.1",
"inflection": "^1.12.0",
"inquirer": "^4.0.1",
"ismobilejs": "^0.4.1",
"jest": "23.6.0",
"jest-pnp-resolver": "1.0.2",
"jest-resolve": "23.6.0",
Expand All @@ -119,10 +113,9 @@
"lru-cache": "^4.1.1",
"mime": "^2.0.3",
"mini-css-extract-plugin": "0.5.0",
"mixpanel-browser": "^2.22.4",
"mock-fs": "^4.2.0",
"moment": "^2.24.0",
"newrelic": "^5.6.3",
"newrelic": "^8.15.0",
"node-sass": "^4.11.0",
"normalize.css": "^7.0.0",
"object-assign": "4.1.1",
Expand Down Expand Up @@ -151,7 +144,6 @@
"react-dnd": "^2.5.4",
"react-dnd-html5-backend": "^2.5.4",
"react-dom": "^16.8.6",
"react-intercom": "^1.0.14",
"react-particles-js": "^2.1.0",
"react-redux": "^6.0.0",
"react-responsive": "^8.0.1",
Expand Down Expand Up @@ -200,7 +192,6 @@
"standard": "12.0.1"
},
"engines": {
"node": "10.13.0",
"yarn": "^1.1.0"
},
"browserslist": [
Expand Down
35 changes: 0 additions & 35 deletions src/client/filepicker.js

This file was deleted.

5 changes: 5 additions & 0 deletions src/client/holochain/agentPubKeyParser.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { decode } from '@msgpack/msgpack'

export default function recordParser (response) {
return decode(response)
}
Loading