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

Commit

Permalink
Merge pull request #864 from swarmcity/S01E05-live
Browse files Browse the repository at this point in the history
Moved majority of blockchain contact to web3 in front-end
  • Loading branch information
xardass authored Nov 27, 2018
2 parents 41b0a40 + 998afc2 commit f126978
Show file tree
Hide file tree
Showing 188 changed files with 19,582 additions and 20,873 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ node_modules/**
bower_components/**
build/**
webpack/**
src/redux/**
64 changes: 32 additions & 32 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
{
"extends": ["eslint:recommended", "google"],
"parserOptions": {
"ecmaVersion": 6
},
"env": {
"browser": true
},
"plugins": [
"html"
],
"rules": {
"brace-style": "off",
"new-cap": ["error", { "capIsNewExceptions": ["Polymer"] }],
"no-var": "off",
"max-len": "off",
"require-jsdoc": "off"
},
"globals": {
"Polymer": true,
"Promise": true,
"webpack": true,
"pbkdf2Sync": true,
"lightwallet": true,
"require": true,
"io": true,
"Redux": true,
"ReduxMixin": true,
"PolymerRedux": true,
"socket": true,
"abi": true
}
}
"extends": ["eslint:recommended"],
"parserOptions": {
"ecmaVersion": 2017
},
"env": {
"browser": true
},
"plugins": ["html"],
"rules": {
"brace-style": "off",
"new-cap": ["error", { "capIsNewExceptions": ["Polymer"] }],
"no-var": "off",
"max-len": "off",
"require-jsdoc": "off"
},
"globals": {
"Polymer": true,
"Promise": true,
"webpack": true,
"pbkdf2Sync": true,
"lightwallet": true,
"require": true,
"io": true,
"Redux": true,
"ReduxMixin": true,
"PolymerRedux": true,
"socket": true,
"abi": true,
"SwarmCity": true,
"AppStore": true
}
}
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,5 @@ install:
- npm install
- npm install -g polymer-cli
- polymer install
before_script:
- npm run lint
script:
- npm run build
1 change: 0 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"iron-selector": "^2.1.0",
"paper-icon-button": "^2.2.0",
"web-animations-js": "^2.3.1",
"iron-a11y-keys": "^2.1.2",
"paper-checkbox": "^2.0.4"
},
"resolutions": {
Expand Down
Binary file added images/defaultavatar-old.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/defaultavatar.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/social_facebook.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/social_github.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/social_medium.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/social_riot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/social_slack.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/social_twitter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/social_youtube.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
163 changes: 88 additions & 75 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,79 +1,92 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0, initial-scale=1.0, user-scalable=no">
<title>Swarm City</title>
<meta name="description" content="Swarm City">
<base href="/">
<link rel="icon" href="images/favicon.ico">
<link rel="manifest" href="manifest.json">
<meta name="theme-color" content="#EFD96F">
<meta name="mobile-web-app-capable" content="yes">
<meta name="application-name" content="Swarm City">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
<meta name="apple-mobile-web-app-title" content="Swarm City">
<link href='https://fonts.googleapis.com/css?family=Montserrat:200,300,700' rel='stylesheet' type='text/css'>
<link rel="apple-touch-icon" href="images/manifest/icon-48x48.png">
<link rel="apple-touch-icon" sizes="72x72" href="images/manifest/icon-72x72.png">
<link rel="apple-touch-icon" sizes="96x96" href="images/manifest/icon-96x96.png">
<link rel="apple-touch-icon" sizes="144x144" href="images/manifest/icon-144x144.png">
<link rel="apple-touch-icon" sizes="192x192" href="images/manifest/icon-192x192.png">
<meta name="msapplication-TileImage" content="images/manifest/icon-144x144.png">
<meta name="msapplication-TileColor" content="#3f51b5">
<meta name="msapplication-tap-highlight" content="no">
<script src='socket.io.js'></script>

<script>
if (!localStorage.getItem('SwarmCity')) {

<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0, initial-scale=1.0, user-scalable=no">
<title>Swarm City</title>
<meta name="description" content="Swarm City">
<base href="/">
<link rel="icon" href="images/favicon.ico">
<link rel="manifest" href="manifest.json">

<meta property="og:title" content="Swarm City">
<meta property="og:image" content="images/manifest/icon-48x48.png">
<meta property="og:description" content="Swarm City is a blockchain based marketplace with a built in reputation system. It uses blockchain technology and smart contracts to allow people to communicate and transact value, and earn contextual reputation.">
<meta property="og:url" content="https://swarm.city">
<meta name="twitter:card" content="images/manifest/icon-192x192.png">
<meta name="theme-color" content="#3f51b5">

<meta name="mobile-web-app-capable" content="yes">
<meta name="application-name" content="Swarm City">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
<meta name="apple-mobile-web-app-title" content="Swarm City">
<link rel="apple-touch-icon" href="images/manifest/icon-48x48.png">
<link rel="apple-touch-icon" sizes="72x72" href="images/manifest/icon-72x72.png">
<link rel="apple-touch-icon" sizes="96x96" href="images/manifest/icon-96x96.png">
<link rel="apple-touch-icon" sizes="144x144" href="images/manifest/icon-144x144.png">
<link rel="apple-touch-icon" sizes="192x192" href="images/manifest/icon-192x192.png">
<meta name="msapplication-TileImage" content="images/manifest/icon-144x144.png">
<meta name="msapplication-TileColor" content="#3f51b5">
<meta name="msapplication-tap-highlight" content="no">
<script src='socket.io.js'></script>
<script>
if (!localStorage.getItem('SwarmCity')) {
let storage = { // eslint-disable-line
user: {
language: 'en',
username: '',
location: '',
avatar: '[[importHref]]../../images/defaultavatar.png'},
keyStore: {},
};
localStorage.setItem('SwarmCity', JSON.stringify(storage));
}
window.Polymer = {rootPath: '/'};
if ('serviceWorker' in navigator) {
window.addEventListener('load', function() {
navigator.serviceWorker.register('service-worker.js', {
scope: Polymer.rootPath,
});
user: {
language: 'en',
username: '',
location: '',
avatar: '[[importHref]]../../images/defaultavatar.png'
},
keyStore: {},
};
localStorage.setItem('SwarmCity', JSON.stringify(storage));
}
window.Polymer = { rootPath: '/' };
if ('serviceWorker' in navigator) {
window.addEventListener('load', function () {
navigator.serviceWorker.register('service-worker.js', {
scope: Polymer.rootPath,
});
}
</script>
<script src="bower_components/webcomponentsjs/webcomponents-loader.js"></script>
<link rel="import" href="src/swarm-city.html">
<style>
@import url('https://fonts.googleapis.com/css?family=Montserrat:400,800');
body {
margin: 0;
padding: 0;
font-family: 'Montserrat', -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
letter-spacing: 0;
font-style: normal;
background-color: #F4F4F4;
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
-webkit-font-feature-settings: "liga" on;
-moz-font-feature-settings: "liga" on;
-ms-font-feature-settings: "liga" on;
font-feature-settings: "liga" on;
line-height: 1.4;
min-height: 100vh;
}
</style>
</head>
<body>
<swarm-city></swarm-city>
<noscript>
Please enable JavaScript to view this website.
</noscript>
<!-- Built with love -->
</body>
</html>
});
}
</script>
<script src="bower_components/webcomponentsjs/webcomponents-loader.js"></script>
<link rel="import" href="src/swarm-city.html">
<style>
@import url('https://fonts.googleapis.com/css?family=Montserrat:400,800');

body {
margin: 0;
padding: 0;
font-family: 'Montserrat', -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
letter-spacing: 0;
font-style: normal;
background-color: #F4F4F4;
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
-webkit-font-feature-settings: "liga"on;
-moz-font-feature-settings: "liga"on;
-ms-font-feature-settings: "liga"on;
font-feature-settings: "liga"on;
line-height: 1.4;
min-height: 100vh;
background-image: url("loading.png");
background-repeat: no-repeat;
background-position: center, center;
}
</style>
</head>

<body>
<swarm-city></swarm-city>
<noscript>
Please enable JavaScript to view this website.
</noscript>
<!-- Built with love -->
</body>

</html>
Binary file added loading.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit f126978

Please sign in to comment.