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

Up to date with nightly #862

Closed
wants to merge 8 commits into from
Closed

Up to date with nightly #862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
da1f245
Digitalocan API
xardass Nov 12, 2018
6ed825b
Socket
xardass Nov 12, 2018
c8c7374
Socket secure false
xardass Nov 12, 2018
0256672
Working api
xardass Nov 12, 2018
30d6f7d
New ipfs gateway
xardass Nov 12, 2018
28e4f5d
New ipfs resolving
xardass Nov 13, 2018
ffac5e2
Socket apiweb3
xardass Nov 13, 2018
d2ac178
New API & IPFS gateway
xardass Nov 14, 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
3 changes: 2 additions & 1 deletion src/data/socket-redux.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,12 +350,13 @@
constructor() {
super();
// Create websocket
this.socket = io('https://dev.swarm.city', // eslint-disable-line
this.socket = io('https://scapiweb3-c.swarm.city', // eslint-disable-line
{
query: 'apiUser=swarmCity',
path: '/api',
transports: ['websocket', 'xhr-polling'],
autoConnect: false,
secure: false,
});
window.setUrl = (url) => {
this.socket.close();
Expand Down
4 changes: 2 additions & 2 deletions src/displays/display-chat-messages.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<div class="message-box">
<template is="dom-if" if="[[_isUser(item)]]">
<div class="left">
<iron-image class="avatar-chat" sizing="cover" preload src="https://dev.swarm.city/img/[[_getAvatarHash(item)]]" placeholder="../images/defaultavatar.png">
<iron-image class="avatar-chat" sizing="cover" preload src="https://scapiweb3-c.swarm.city/img/[[_getAvatarHash(item)]]" placeholder="../images/defaultavatar.png">
</iron-image>
<div class="vertical">
<div class="message-date">
Expand All @@ -111,7 +111,7 @@
[[item.message]]
</div>
</div>
<iron-image class="avatar-chat" sizing="cover" preload src="https://dev.swarm.city/img/[[_getAvatarHash(item)]]" placeholder="../images/defaultavatar.png">
<iron-image class="avatar-chat" sizing="cover" preload src="https://scapiweb3-c.swarm.city/img/[[_getAvatarHash(item)]]" placeholder="../images/defaultavatar.png">
</iron-image>
</div>
</template>
Expand Down
2 changes: 1 addition & 1 deletion src/displays/display-simpledeal-detail-funded.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
</div>
<div class="providerbox" on-up="_toUserReputation">
<div class="avatar">
<iron-image sizing="cover" preload src="https://dev.swarm.city/img/[[hashtagItem.selectee.avatarHash]]" placeholder="../images/defaultavatar.png">
<iron-image sizing="cover" preload src="https://scapiweb3-c.swarm.city/img/[[hashtagItem.selectee.avatarHash]]" placeholder="../images/defaultavatar.png">
</iron-image>
</div>
<template is="dom-if" if="[[_isSeeker(hashtagItem.seeker.address, publicKey)]]">
Expand Down
2 changes: 1 addition & 1 deletion src/displays/display-simpledeal-detail-selected.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
</div>
<div class="providerbox" on-up="_toUserReputation">
<div class="avatar">
<iron-image sizing="cover" preload src="https://dev.swarm.city/img/[[hashtagItem.selectee.avatarHash]]"
<iron-image sizing="cover" preload src="https://scapiweb3-c.swarm.city/img/[[hashtagItem.selectee.avatarHash]]"
placeholder="../images/defaultavatar.png">
</iron-image>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/displays/display-simpledeal-detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@
</div>
<div class="seeker">

<iron-image class="seeker-avatar" sizing="cover" preload src="https://dev.swarm.city/img/[[hashtagItem.seeker.avatarHash]]"
<iron-image class="seeker-avatar" sizing="cover" preload src="https://scapiweb3-c.swarm.city/img/[[hashtagItem.seeker.avatarHash]]"
placeholder="../images/defaultavatar.png" on-up="_toUserReputation">
</iron-image>

Expand Down
2 changes: 1 addition & 1 deletion src/displays/display-simpledeal-itemreplies.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
<div class="date">[[_formatDate(item.dateTime)]]</div>

<div class="bottom">
<iron-image sizing="cover" preload src="https://dev.swarm.city/img/[[item.avatarHash]]" placeholder="../images/defaultavatar.png"
<iron-image sizing="cover" preload src="https://scapiweb3-c.swarm.city/img/[[item.avatarHash]]" placeholder="../images/defaultavatar.png"
on-up="_toUserReputation">
</iron-image>

Expand Down
8 changes: 4 additions & 4 deletions src/displays/display-simpledeal-items.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
<div class="replyicon"></div>

<template is="dom-if" if="[[_hasSelectee(item)]]">
<iron-image class="item-avatar-topright" sizing="cover" preload fade src="https://dev.swarm.city/img/[[item.selectee.avatarHash]]"
<iron-image class="item-avatar-topright" sizing="cover" preload fade src="https://scapiweb3-c.swarm.city/img/[[item.selectee.avatarHash]]"
placeholder="../images/defaultavatar.png">
</iron-image>
</template>
Expand All @@ -303,18 +303,18 @@

<template is="dom-if" if="[[_doubleAvatar(item)]]">
<div class="avatar-double">
<iron-image class="item-avatar-seeker" sizing="cover" preload fade src="https://dev.swarm.city/img/[[item.seeker.avatarHash]]"
<iron-image class="item-avatar-seeker" sizing="cover" preload fade src="https://scapiweb3-c.swarm.city/img/[[item.seeker.avatarHash]]"
placeholder="../images/defaultavatar.png">
</iron-image>
<iron-image class="item-avatar-selectee" sizing="cover" preload fade src="https://dev.swarm.city/img/[[item.selectee.avatarHash]]"
<iron-image class="item-avatar-selectee" sizing="cover" preload fade src="https://scapiweb3-c.swarm.city/img/[[item.selectee.avatarHash]]"
placeholder="../images/defaultavatar.png">
</iron-image>
</div>
</template>

<template is="dom-if" if="[[!_doubleAvatar(item)]]">
<div class="avatar">
<iron-image class="item-avatar-seeker" sizing="cover" preload fade src="https://dev.swarm.city/img/[[item.seeker.avatarHash]]"
<iron-image class="item-avatar-seeker" sizing="cover" preload fade src="https://scapiweb3-c.swarm.city/img/[[item.seeker.avatarHash]]"
placeholder="../images/defaultavatar.png">
</iron-image>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/displays/display-simpledeal-reply-detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
</div>
<div class="providerbox" on-up="_toUserReputation">
<div class="avatar">
<iron-image sizing="cover" preload src="https://dev.swarm.city/img/[[selectedReply.avatarHash]]" placeholder="../images/defaultavatar.png">
<iron-image sizing="cover" preload src="https://scapiweb3-c.swarm.city/img/[[selectedReply.avatarHash]]" placeholder="../images/defaultavatar.png">
</iron-image>
</div>
<div class="username">[[selectedReply.username]] · [[selectedReply.reputation]] SWR</div>
Expand Down
6 changes: 3 additions & 3 deletions src/pages/page-chat.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,10 @@

<div class="top"></div>
<div class="top-avatar-box">
<iron-image class="top-avatar top-avatar-seeker" sizing="cover" preload src="https://dev.swarm.city/img/[[seeker.avatarHash]]"
<iron-image class="top-avatar top-avatar-seeker" sizing="cover" preload src="https://scapiweb3-c.swarm.city/img/[[seeker.avatarHash]]"
placeholder="../images/defaultavatar.png">
</iron-image>
<iron-image class="top-avatar top-avatar-provider" sizing="cover" preload src="https://dev.swarm.city/img/[[provider.avatarHash]]"
<iron-image class="top-avatar top-avatar-provider" sizing="cover" preload src="https://scapiweb3-c.swarm.city/img/[[provider.avatarHash]]"
placeholder="../images/defaultavatar.png">
</iron-image>
</div>
Expand All @@ -211,7 +211,7 @@
<div class="bottom">
<div class="divider"></div>
<div class="input-box">
<iron-image class="avatar-main" sizing="cover" preload src="https://dev.swarm.city/img/[[user.avatarHash]]" placeholder="../images/defaultavatar.png">
<iron-image class="avatar-main" sizing="cover" preload src="https://scapiweb3-c.swarm.city/img/[[user.avatarHash]]" placeholder="../images/defaultavatar.png">
</iron-image>
<paper-input type="txt" value="{{message}}" autofocus on-keypress="_checkForEnter"></paper-input>
<div class="input-confirm" on-up="_sendMessage" on-keypress="_checkForEnter">
Expand Down
2 changes: 1 addition & 1 deletion src/pages/page-user-reputation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
<div class="close" on-up="_close"></div>
</div>
<div class="userbox">
<iron-image class="avatar" sizing="cover" preload src="https://dev.swarm.city/img/[[avatarHash]]" placeholder="../images/defaultavatar.png">
<iron-image class="avatar" sizing="cover" preload src="https://scapiweb3-c.swarm.city/img/[[avatarHash]]" placeholder="../images/defaultavatar.png">
</iron-image>
<div class="userinfo">
<div class="username">{{username}}</div>
Expand Down