Skip to content
This repository has been archived by the owner on Sep 20, 2023. It is now read-only.

[RFC] Issue #36 - add approx price #118

Closed
wants to merge 73 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
c7e6bb9
Transaction summary
micahalcorn Mar 31, 2018
e535cf8
Transaction details and reviews
micahalcorn Apr 1, 2018
9d15ec3
Merge branch 'transaction_pages' into ui
micahalcorn Apr 1, 2018
fa17ba4
Add tooltips for steps
micahalcorn Apr 3, 2018
800a21d
Merge branch 'transaction_pages' into ui
micahalcorn Apr 3, 2018
1c4d40b
Separate listing card and purchase card
micahalcorn Apr 3, 2018
f3f9e77
Merge branch 'my_listings_page' into ui
micahalcorn Apr 3, 2018
030ddc1
Add my sales page
micahalcorn Apr 4, 2018
fdaeedf
Merge branch 'my_sales_page' into ui
micahalcorn Apr 4, 2018
2fe6035
Update navbar links and add dropdown
micahalcorn Apr 4, 2018
220c99d
Merge branch 'navbar' into ui
micahalcorn Apr 4, 2018
e2ee7d0
Fix navbar links
micahalcorn Apr 4, 2018
b82b449
Merge branch 'navbar' into ui
micahalcorn Apr 4, 2018
89ec82b
Separate timelapse component, improve navbar and sale card
micahalcorn Apr 4, 2018
2dccfb5
Update platform package
micahalcorn Apr 4, 2018
659c73c
Change filters and default to pending, subdue purchase progress
micahalcorn Apr 5, 2018
1193c9b
Separate review component and add stars
micahalcorn Apr 5, 2018
2148f7b
Code cleanup
micahalcorn Apr 5, 2018
80d5b2a
Prevent flash of NaN
micahalcorn Apr 5, 2018
5b6f35f
Improve listing detail, localize numbers, and clean up
micahalcorn Apr 5, 2018
26baaff
Improve notifications
micahalcorn Apr 6, 2018
3f5220e
Improve listing cards and details
micahalcorn Apr 6, 2018
4cf787c
Hide some elements while loading
micahalcorn Apr 6, 2018
56540eb
Show placeholders during loading
micahalcorn Apr 7, 2018
c89a430
Merge branch 'loading_placeholders' into ui
micahalcorn Apr 7, 2018
d24d687
Redesign profile
micahalcorn Apr 8, 2018
dd8b962
Handle unload event
micahalcorn Apr 11, 2018
d877552
Merge branch 'profile_page' into ui
micahalcorn Apr 13, 2018
ce6c694
Add shimmer effect for loading
micahalcorn Apr 13, 2018
3c8d593
Expand profile height
micahalcorn Apr 13, 2018
93cfdf4
Style service modals with relevant icons
micahalcorn Apr 13, 2018
dc0eef2
Phone and email modal forms
micahalcorn Apr 14, 2018
65c5758
Handle large notification count
micahalcorn Apr 15, 2018
295421a
Redesign notifications
micahalcorn Apr 15, 2018
f380c73
Add comments and clean up unused code
micahalcorn Apr 17, 2018
15e2e09
Remove unused flags
micahalcorn Apr 17, 2018
984709f
Updating Readme per one-line-to-rule-them-all
wanderingstan Apr 18, 2018
4d383f8
Merge pull request #110 from OriginProtocol/topic/demo-dapp-readme-on…
joshfraser Apr 19, 2018
e75a6aa
Resolve merge conflicts
micahalcorn Apr 19, 2018
0a810c6
Bumped required npm version to 0.5.9 for new sprint.
wanderingstan Apr 20, 2018
6171799
Merge branch 'develop' into ui
wanderingstan Apr 20, 2018
2c491e1
Changed origin package "version" to refer to develop branch
wanderingstan Apr 20, 2018
34e84ea
Merge pull request #109 from OriginProtocol/ui
wanderingstan Apr 20, 2018
7dcfb7b
Remove remaining Civic code
micahalcorn Apr 20, 2018
8750967
Merge pull request #121 from OriginProtocol/old_code
joshfraser Apr 21, 2018
fcb619e
Use listing address in listing detail URL.
DanielVF Apr 20, 2018
685d1f5
Update readme to point to new repo url
tyleryasaka Apr 21, 2018
1afba16
Merge pull request #120 from OriginProtocol/feature/112_get_listings_…
joshfraser Apr 22, 2018
8dc1edb
Merge pull request #122 from OriginProtocol/update-repo-link
joshfraser Apr 23, 2018
45d8d80
Simulate a myListings method
micahalcorn Apr 23, 2018
5a267bc
Async everything
micahalcorn Apr 23, 2018
f8458e6
Hide unavailable attributes
micahalcorn Apr 23, 2018
3f2c7c5
Include real images
micahalcorn Apr 24, 2018
22b09fb
Remove fixed height
micahalcorn Apr 24, 2018
4cc5296
Merge pull request #124 from OriginProtocol/ui
joshfraser Apr 24, 2018
0331eea
Close listing
micahalcorn Apr 24, 2018
8422b7d
Hide close link
micahalcorn Apr 24, 2018
2cd6bc3
Move unitsAvailable to state, since it changes.
DanielVF Apr 24, 2018
19fadc8
Repair purchase card image
micahalcorn Apr 24, 2018
f8f359b
Filter listings
micahalcorn Apr 24, 2018
c1b667e
Sync updated listing
micahalcorn Apr 24, 2018
73774e0
Use cleaner syntax
micahalcorn Apr 24, 2018
25328e4
Merge pull request #125 from OriginProtocol/my_listings_and_purchases
joshfraser Apr 24, 2018
b2a1f24
adding issue and pull request templates
joshfraser Apr 13, 2018
f75cf80
update PR template to remind folks to use `develop` instead of `master`
joshfraser Apr 16, 2018
9cc1337
remove the tests requirement from the PR template
joshfraser Apr 18, 2018
b5555fc
dependencies
inkredabull Apr 19, 2018
ec83efb
failing tests
inkredabull Apr 19, 2018
2e17992
ready for RFC
inkredabull Apr 19, 2018
9489aec
lib upgrades
inkredabull Apr 24, 2018
ddba5de
polyfill update for web3 & component test via Jest
inkredabull Apr 24, 2018
073c64c
upgrade to React 16
inkredabull Apr 24, 2018
2ad1b39
cleanup
inkredabull Apr 24, 2018
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
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ Please explain the changes you made here:

- A description of the problem you're trying to solve
- An overview of the suggested solution
- If the feature changes current behavior, reasons why your solution is better
- If the feature changes current behavior, reasons why your solution is better
42 changes: 13 additions & 29 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,45 +1,22 @@
![origin_github_banner](https://user-images.githubusercontent.com/673455/37314301-f8db9a90-2618-11e8-8fee-b44f38febf38.png)

# Origin Demo DApp
The sharing economy without intermediaries.
This is an examle DApp (Decentralized Application) that shows how easy it is to create a decentralized marketplace on the ethereum blockchain. It showcases the power of [origin.js](https://github.com/OriginProtocol/origin-js). Using only javascript commands, you can search listings, create listings, purchase listings, and more.

NOTE 2018-03-11: We are in the midst of transitioning this demo to use our `origin.js` library. This work is currently on the `develop` branch but will soon be merged.

## Project Overview

Origin is a sharing economy marketplace that enables buyers and sellers of fractional use goods and services (car-sharing, service-based tasks, home-sharing, etc.) to transact on the distributed, open web. Using the Ethereum blockchain and Interplanetary File System (IPFS), the platform and community are decentralized, allowing for the creation and booking of services and goods without traditional intermediaries.

We are specifically building a large-scale commerce network that:
* Transfers direct financial value (listing, transaction, and service fees) from large corporations like Airbnb, Craigslist, Postmates, etc. to individual buyers and sellers
* Transfers indirect financial and strategic value (privately aggregated silos of customer and transaction data) from those same corporations to the entire ecosystem
* Creates new financial value for marketplace participants that contribute to the growth of the network (e.g. building new technology for the Origin network, bootstrapping new product verticals, and referring new users and businesses)
* Is built on an open, distributed, and shared data layer to promote transparency and collaboration
* Immediately allows buyers and sellers across the world to do business with each other without difficult currency conversions or tariffs
* Promotes personal liberty by not allowing a central corporation or government to impose arbitrary and oftentimes onerous rules on how to do business

To accomplish these ambitious goals, the Origin platform is being launched with incentives from the outset to encourage other technologists, businesses, and consumers to build, contribute, and extend the ecosystem with us. We imagine a broad collection of vertical use cases (e.g short-term vacation rentals, freelance software engineering, tutoring for hire) that are built on top of Origin standards and shared data. Together, we will create the Internet economy of tomorrow.
Documentation for origin.js is located here: http://docs.originprotocol.com/

To learn more about this project, please visit [the Origin website](https://www.originprotocol.com) and download our whitepaper.

*NOTE:* This project is under rapid development.

## Try Demo Dapp on the Rinkeby testnet

This demo is currently running on the Rinkeby testnet.
This demo is currently running on the Rinkeby testnet. (Note that this demo is slightly behind the current state of this repo.)
- [Overview and step-by-step instructions](https://medium.com/originprotocol/origin-demo-dapp-is-now-live-on-testnet-835ae201c58)
- [Live Demo](http://demo.originprotocol.com)


## Core Technologies

If you're new to the space, it may be helpful to first familiarize yourself with some of the core technologies that we're using to build Origin.

* [JSON Schema](http://json-schema.org/)
* [IPFS](https://ipfs.io/)
* [Ethereum](https://www.ethereum.org/)

## Install and run Demo DApp locally

NOTE: This installs the DApp locally for use with the Rinkeby and Ropsten test nets. See below for developing with a local test chain or for hosting on a server. If you need some Rinkeby eth, you can get some at [this faucet](https://faucet.rinkeby.io/).

### 1. Check node version

Make sure you have `node` version 8.5.0 or greater
Expand Down Expand Up @@ -71,14 +48,21 @@ A browser will open to http://localhost:3000. You're not quite done though! You'

**Be careful not to mix up your test wallet with your real one on the Main Network.**

### 4. Get some test ether

- To get some Rinkeby ETH for creating or purchasing listings, visit the [this faucet](https://faucet.rinkeby.io/).

### 4. Try it!
Create a listing and post it to IPFS and Ethereum.


## Developing with a local chain

By default, this demo will connect to the global test networks of Rinkeby or Ropsten. For development, you may wish to connect to a local blockchain running on your local machine.

### 1. Set up and run *origin.js* locally

[Follow these instructions to setup and run origin.js.](https://github.com/OriginProtocol/platform#local) Origin.js is needed to run a local blockchain and make it accessible to your dapp.
[Follow these instructions to setup and run origin.js.](https://github.com/OriginProtocol/origin-js#local) Origin.js is needed to run a local blockchain and make it accessible to your dapp.

### 2. Set up the dapp

Expand Down
10 changes: 10 additions & 0 deletions config/polyfills.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,13 @@ require('whatwg-fetch');
// Object.assign() is commonly used with React.
// It will use the native implementation if it's present and isn't buggy.
Object.assign = require('object-assign');

// Without the following stubs, when running component tests, we get...
// Err : "Cannot read property 'currentProvider' of undefined"
// Loc : node_modules/origin/dist/index.js:345
// Ref : http://airbnb.io/enzyme/docs/guides/jsdom.html : "jsdom ~<v10"

import sinon from 'sinon';
const { jsdom } = require('jsdom');
global.window.web3 = sinon.stub();
global.window.web3.currentProvider = sinon.stub();
Loading