Skip to content

Commit 243e10b

Browse files
GeoloeG-IsTGeoloeG-IsT
committed
migration to polymerfire
1 parent a22e8c0 commit 243e10b

7 files changed

+29
-44
lines changed

‎bower.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
],
4242
"dependencies": {
4343
"polymer": "Polymer/polymer#^1.2.0",
44-
"iron-meta": "PolymerElements/iron-meta#^1.0.0",
44+
"iron-meta": "DreamworldSolutions/iron-meta#^1.1.3",
4545
"iron-icon": "PolymerElements/iron-icon#^1.0.0",
4646
"iron-icons": "PolymerElements/iron-icons#^1.0.0",
4747
"iron-iconset-svg": "PolymerElements/iron-iconset-svg#^1.0.0",
@@ -59,8 +59,7 @@
5959
"neon-animation": "PolymerElements/neon-animation#^1.0.0",
6060
"gold-email-input": "PolymerElements/gold-email-input#^1.0.0",
6161
"gold-password-input": "gold-password-input#^1.0.0",
62-
"polymerfire": "firebase/polymerfire#0.9.2",
63-
"akc-meta": "akc42/akc-meta#^v1.0.0"
62+
"polymerfire": "firebase/polymerfire#^v0.10.0"
6463
},
6564
"devDependencies": {
6665
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",

‎firebase-account-menu.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
},
117117

118118
ready: function() {
119-
this._firebaseMeta = new Polymer.IronMeta({type: 'firebaseExtended'});
119+
this._firebaseMeta = new Polymer.IronMeta({type: 'polymerFireExtended'});
120120
},
121121

122122
signUpButton: function() {

‎firebase-auth-dialog.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ <h2 title-sign-in>Login Dialog</h2>
234234
//
235235
ready: function() {
236236
// Register the dialog in meta to be accessible from anywhere
237-
new Polymer.IronMeta({type: 'firebaseExtended', key: 'authDialog', value: this});
237+
new Polymer.IronMeta({type: 'polymerFireExtended', key: 'authDialog', value: this});
238238
},
239239

240240
//

‎firebase-auth-manager.html‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<link rel="import" href="../polymer/polymer.html">
22

3-
<link rel="import" href="../akc-meta/akc-meta.html">
3+
<link rel="import" href="../iron-meta/iron-meta.html">
44
<link rel="import" href="../paper-toast/paper-toast.html">
55

66
<link rel="import" href="../polymerfire/firebase-auth.html">
@@ -20,13 +20,12 @@
2020
-->
2121
<dom-module id="firebase-auth-manager">
2222
<template>
23-
<akc-meta key="logged" value="[[_logged]]"></akc-meta>
23+
<iron-meta key="logged" value="[[_logged]]"></iron-meta>
2424
<!-- TODO PG: check if we can switch this to 2 way-data binding if we solved the query issue... -->
25-
<akc-meta key="user" value="[[_deepClone(_user)]]"></akc-meta>
26-
<!-- akc-meta is not compatible with the user object from firebase -->
27-
<akc-meta key="profile" value="[[_profile]]"></akc-meta>
28-
<akc-meta key="profilePath" value="[[_profilePath]]"></akc-meta>
29-
<akc-meta key="appName" value="[[appName]]"></akc-meta>
25+
<iron-meta key="user" value="{{_user}}"></iron-meta>
26+
<iron-meta key="profile" value="{{_profile}}"></iron-meta>
27+
<iron-meta key="profilePath" value="{{_profilePath}}"></iron-meta>
28+
<iron-meta key="appName" value="{{appName}}"></iron-meta>
3029

3130
<firebase-auth app-name="[[appName]]"
3231
id="firebaseAuth"
@@ -148,16 +147,6 @@
148147
}
149148
},
150149

151-
_deepClone: function(obj) {
152-
var newUser = JSON.parse(JSON.stringify(obj, function(key, val) {
153-
if (key.length > 0 && key.length < 3) {
154-
return undefined;
155-
}
156-
return val;
157-
}));
158-
return newUser;
159-
},
160-
161150
_notifyStatus: function(newStatus, oldStatus) {
162151
if (oldStatus && !newStatus) {
163152
this.fire('logout');

‎firebase-profile-page.html‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<link rel="import" href="../paper-input/paper-input.html">
55
<link rel="import" href="../paper-material/paper-material.html">
66

7-
<link rel="import" href="./firebase-profile.html">
7+
<link rel="import" href="./firebase-state.html">
88

99
<!--
1010
`<firebase-profile-page>` is an element that provides basic profile information to be edited as well as custom profile information.
@@ -50,16 +50,17 @@
5050

5151
</style>
5252

53-
<firebase-profile profile="{{profile}}"></firebase-profile>
53+
<firebase-state logged="{{_logged}}" profile="{{_profile}}"></firebase-state>
54+
5455
<paper-material elevation="1">
5556
<h3>General Information</h3>
5657
<div id="container">
57-
<iron-image src="[[profile.picture]]" sizing="cover"></iron-image>
58+
<iron-image src="[[_profile.picture]]" sizing="cover"></iron-image>
5859
<div id="info">
59-
<paper-input label="Display Name" value="{{profile.displayName}}"></paper-input>
60-
<paper-input label="First Name" value="{{profile.firstName}}"></paper-input>
61-
<paper-input label="Last Name" value="{{profile.lastName}}"></paper-input>
62-
<paper-input label="Email" value="{{profile.email}}"></paper-input>
60+
<paper-input label="Display Name" value="{{_profile.displayName}}"></paper-input>
61+
<paper-input label="First Name" value="{{_profile.firstName}}"></paper-input>
62+
<paper-input label="Last Name" value="{{_profile.lastName}}"></paper-input>
63+
<paper-input label="Email" value="{{_profile.email}}"></paper-input>
6364
</div>
6465
</div>
6566
</paper-material>
@@ -77,7 +78,7 @@ <h3>General Information</h3>
7778
/**
7879
* This property reflects the firebase user auth object.
7980
*/
80-
profile: {
81+
_profile: {
8182
type: Object,
8283
notify: true
8384
}

‎firebase-profile.html‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<link rel="import" href="../polymer/polymer.html">
22

3-
<link rel="import" href="../akc-meta/akc-meta.html">
3+
<link rel="import" href="../iron-meta/iron-meta.html">
44
<link rel="import" href="../polymerfire/firebase-document.html">
55

66
<!--
@@ -17,13 +17,12 @@
1717
-->
1818
<dom-module id="firebase-profile">
1919
<template>
20-
<akc-meta-query key="logged" value="{{_logged}}"></akc-meta-query>
21-
<akc-meta-query key="profilePath" value="{{_profilePath}}"></akc-meta-query>
22-
<akc-meta-query key="appName" value="{{_appName}}"></akc-meta-query>
20+
<iron-meta-query key="logged" value="{{_logged}}"></iron-meta-query>
21+
<iron-meta-query key="profilePath" value="{{_profilePath}}"></iron-meta-query>
22+
<iron-meta-query key="appName" value="{{_appName}}"></iron-meta-query>
2323

2424
<template is="dom-if" if="[[_logged]]" restamp>
25-
<firebase-document log
26-
app-name="[[_appName]]"
25+
<firebase-document app-name="[[_appName]]"
2726
path="[[_profilePath]]"
2827
data="{{profile}}">
2928
</firebase-document>

‎firebase-state.html‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<link rel="import" href="../polymer/polymer.html">
22

3-
<link rel="import" href="../akc-meta/akc-meta.html">
3+
<link rel="import" href="../iron-meta/iron-meta.html">
44

55
<!--
66
`<firebase-state>` is an element that is sharing globally the `logged`, `user` and `profile` value in read mode of the current user.
@@ -19,9 +19,9 @@
1919
-->
2020
<dom-module id="firebase-state">
2121
<template>
22-
<akc-meta-query key="logged" value="{{logged}}"></akc-meta-query>
23-
<akc-meta-query key="user" value="{{user}}"></akc-meta-query>
24-
<akc-meta-query key="profile" value="{{profile}}"></akc-meta-query>
22+
<iron-meta-query key="logged" value="{{logged}}"></iron-meta-query>
23+
<iron-meta-query key="user" value="{{user}}"></iron-meta-query>
24+
<iron-meta-query key="profile" value="{{profile}}"></iron-meta-query>
2525
</template>
2626
<script>
2727

@@ -36,7 +36,6 @@
3636
*/
3737
logged: {
3838
type: Boolean,
39-
readonly: true,
4039
notify: true
4140
},
4241

@@ -45,16 +44,14 @@
4544
*/
4645
user: {
4746
type: Object,
48-
readonly: true,
4947
notify: true
5048
},
5149

5250
/**
53-
* This property reflects the firebase user auth object.
51+
* This property reflects the firebase profile object.
5452
*/
5553
profile: {
5654
type: Object,
57-
readonly: true,
5855
notify: true
5956
}
6057

0 commit comments

Comments
 (0)