Skip to content

Commit

Permalink
Merge branch 'release/startingFromPSK3.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Royedc4 committed Mar 23, 2017
2 parents 214e3dc + 17a6255 commit 47b40df
Show file tree
Hide file tree
Showing 30 changed files with 395 additions and 363 deletions.
7 changes: 6 additions & 1 deletion .eslintrc.json
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
{
"extends": ["eslint:recommended", "google"],
"parserOptions": {
"ecmaVersion": 6
},
"env": {
"browser": true
},
"plugins": [
"html"
],
"rules": {
"brace-style": "off",
"new-cap": ["error", { "capIsNewExceptions": ["Polymer"] }],
"no-var": "off",
"new-cap": ["error", { "capIsNewExceptions": ["Polymer"] }]
"require-jsdoc": "off"
},
"globals": {
"Polymer": true
Expand Down
Empty file modified .gitattributes
100644 → 100755
Empty file.
Empty file modified .github/ISSUE_TEMPLATE.md
100644 → 100755
Empty file.
9 changes: 4 additions & 5 deletions .gitignore
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
bower_components
build
node_modules
bower_components/
build/
node_modules/

.idea
*.log
\.idea/
Empty file modified .travis.yml
100644 → 100755
Empty file.
8 changes: 8 additions & 0 deletions README.md
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,14 @@ This command will run [Web Component Tester](https://github.com/Polymer/web-comp
against the browsers currently installed on your machine:

polymer test

#### Common Bugfixes

When presenting an error with **Safari Test** check the following:

- [x] In developer menu: Check "Allow remote automation" (Previously activating show developer menu in Advanced preferences).

There is no need to use Selenium Safari WebDriver, [because Webkit includes WebDriver now](https://webkit.org/blog/6900/webdriver-support-in-safari-10/).

### Adding a new view

Expand Down
32 changes: 18 additions & 14 deletions bower.json
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
{
"name": "plus-team-starter-kit",
"name": "plusTeam-polymer-starter-kit",
"authors": [
"The +TeaM Developers"
"The Polymer +devTeaM"
],
"license": "https://polymer.github.io/LICENSE.txt",
"dependencies": {
"app-layout": "PolymerElements/app-layout#^0.10.0",
"app-route": "PolymerElements/app-route#^0.9.0",
"iron-flex-layout": "PolymerElements/iron-flex-layout#^1.0.0",
"iron-icon": "PolymerElements/iron-icon#^1.0.0",
"iron-iconset-svg": "PolymerElements/iron-iconset-svg#^1.0.0",
"iron-localstorage": "PolymerElements/iron-localstorage#^1.0.0",
"iron-media-query": "PolymerElements/iron-media-query#^1.0.0",
"iron-pages": "PolymerElements/iron-pages#^1.0.0",
"iron-selector": "PolymerElements/iron-selector#^1.0.0",
"paper-icon-button": "PolymerElements/paper-icon-button#~1.1.0",
"polymer": "Polymer/polymer#^1.8.1"
"app-layout": "PolymerElements/app-layout#2.0-preview",
"app-route": "PolymerElements/app-route#2.0-preview",
"iron-flex-layout": "PolymerElements/iron-flex-layout#2.0-preview",
"iron-icon": "PolymerElements/iron-icon#2.0-preview",
"iron-iconset-svg": "PolymerElements/iron-iconset-svg#2.0-preview",
"iron-localstorage": "PolymerElements/iron-localstorage#2.0-preview",
"iron-media-query": "PolymerElements/iron-media-query#2.0-preview",
"iron-pages": "PolymerElements/iron-pages#2.0-preview",
"iron-selector": "PolymerElements/iron-selector#2.0-preview",
"paper-icon-button": "PolymerElements/paper-icon-button#2.0-preview",
"polymer": "Polymer/polymer#^2.0.0-rc.1",
"webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0-rc.4"
},
"resolutions": {
"polymer": "^2.0.0-rc.1"
},
"devDependencies": {
"web-component-tester": "^4.0.0"
"web-component-tester": "6.0.0-prerelease.5"
},
"private": true
}
Empty file modified images/favicon.ico
100644 → 100755
Empty file.
Empty file modified images/manifest/icon-144x144.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/manifest/icon-192x192.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/manifest/icon-48x48.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/manifest/icon-512x512.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/manifest/icon-72x72.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/manifest/icon-96x96.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
167 changes: 67 additions & 100 deletions index.html
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -10,104 +10,71 @@

<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="generator" content="Polymer Starter Kit">
<meta name="viewport" content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">

<title>My App</title>
<meta name="description" content="My App description">

<link rel="icon" href="/images/favicon.ico">

<!-- See https://goo.gl/OOhYW5 -->
<link rel="manifest" href="/manifest.json">

<!-- See https://goo.gl/qRE0vM -->
<meta name="theme-color" content="#3f51b5">

<!-- Add to homescreen for Chrome on Android. Fallback for manifest.json -->
<meta name="mobile-web-app-capable" content="yes">
<meta name="application-name" content="My App">

<!-- Add to homescreen for Safari on iOS -->
<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="My App">

<!-- Homescreen icons -->
<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">

<!-- Tile icon for Windows 8 (144x144 + tile color) -->
<meta name="msapplication-TileImage" content="/images/manifest/icon-144x144.png">
<meta name="msapplication-TileColor" content="#3f51b5">
<meta name="msapplication-tap-highlight" content="no">

<script>
// Setup Polymer options
window.Polymer = {
dom: 'shadow',
lazyRegister: true,
};

// Load webcomponentsjs polyfill if browser does not support native
// Web Components
(function(){
'use strict';

var onload = function(){
// For native Imports, manually fire WebComponentsReady so user code
// can use the same code path for native and polyfill'd imports.
if (!window.HTMLImports) {
document.dispatchEvent(
new CustomEvent('WebComponentsReady', {bubbles: true})
);
}
};

var webComponentsSupported = (
'registerElement' in document
&& 'import' in document.createElement('link')
&& 'content' in document.createElement('template')
);

if (!webComponentsSupported) {
var script = document.createElement('script');
script.async = true;
script.src = '/bower_components/webcomponentsjs/webcomponents-lite.min.js';
script.onload = onload;
document.head.appendChild(script);
} else {
onload();
}
})();

// Load pre-caching Service Worker
if ('serviceWorker' in navigator) {
window.addEventListener('load', function(){
navigator.serviceWorker.register('/service-worker.js');
});
}
</script>

<link rel="import" href="/src/my-app.html">

<style>
body {
margin: 0;
font-family: 'Roboto', 'Noto', sans-serif;
line-height: 1.5;
min-height: 100vh;
background-color: #eeeeee;
}
</style>
</head>
<body>
<my-app></my-app>
<!-- Built with love using Polymer Starter Kit -->
</body>
<head>
<meta charset="utf-8">
<meta name="generator" content="Polymer Starter Kit">
<meta name="viewport" content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">

<title>My App</title>
<meta name="description" content="My App description">

<link rel="icon" href="/images/favicon.ico">

<!-- See https://goo.gl/OOhYW5 -->
<link rel="manifest" href="/manifest.json">

<!-- See https://goo.gl/qRE0vM -->
<meta name="theme-color" content="#3f51b5">

<!-- Add to homescreen for Chrome on Android. Fallback for manifest.json -->
<meta name="mobile-web-app-capable" content="yes">
<meta name="application-name" content="My App">

<!-- Add to homescreen for Safari on iOS -->
<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="My App">

<!-- Homescreen icons -->
<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">

<!-- Tile icon for Windows 8 (144x144 + tile color) -->
<meta name="msapplication-TileImage" content="/images/manifest/icon-144x144.png">
<meta name="msapplication-TileColor" content="#3f51b5">
<meta name="msapplication-tap-highlight" content="no">

<!-- Load and register pre-caching Service Worker -->
<script>
if ('serviceWorker' in navigator) {
window.addEventListener('load', function() {
navigator.serviceWorker.register('/service-worker.js');
});
}
</script>

<!-- Load webcomponents-loader.js to check and load any polyfills your browser needs -->
<script src="/bower_components/webcomponentsjs/webcomponents-loader.js"></script>

<!-- Load your application shell -->
<link rel="import" href="/src/my-app.html">

<!-- Add any global styles for body, document, etc. -->
<style>
body {
margin: 0;
font-family: 'Roboto', 'Noto', sans-serif;
line-height: 1.5;
min-height: 100vh;
background-color: #eeeeee;
}
</style>
</head>
<body>
<my-app></my-app>
<!-- Built with love using Polymer Starter Kit -->
</body>
</html>
Empty file modified manifest.json
100644 → 100755
Empty file.
14 changes: 9 additions & 5 deletions package.json
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
{
"name": "plus-team-starter-kit",
"name": "plusTeam-polymer-starter-kit",
"license": "BSD-3-Clause",
"devDependencies": {
"eslint": "^3.12.0",
"eslint-config-google": "^0.7.1",
"eslint-plugin-html": "^1.7.0"
"eslint-plugin-html": "^1.7.0",
"web-component-tester": "^5.0.1"
},
"scripts": {
"lint": "eslint . --ext js,html --ignore-path .gitignore",
"test": "npm run lint && polymer test"
"lint": "eslint . —ext js,html —ignore-path .gitignore",
"test": "npm run lint && polymer test",
"bundled": "polymer build —js-minify —css-minify —html-minify —add-service-worker —bundle",
"unbundled": "polymer build —js-minify —css-minify —html-minify —add-service-worker",
"build": "npm run unbundled"
}
}
}
10 changes: 7 additions & 3 deletions polymer.json
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,15 @@
"src/views/my-view404.html"
],
"sources": [
"src/**/*",
"images/**/*",
"bower.json"
],
"extraDependencies": [
"manifest.json",
"bower_components/webcomponentsjs/webcomponents-lite.min.js"
]
}
"bower_components/webcomponentsjs/*.js"
],
"lint": {
"rules": ["polymer-2"]
}
}
12 changes: 11 additions & 1 deletion service-worker.js
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
/**
* @license
* Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
* This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
* The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
* The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
* Code distributed by Google as part of the polymer project is also
* subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
*/

/* eslint no-console: ["error", { allow: ["info"] }] */

console.info(
'Service worker disabled for development, will be generated at build time.'
'Service worker disabled for development, will be generated at build time.'
);
Loading

0 comments on commit 47b40df

Please sign in to comment.