Skip to content

Commit c88c04d

Browse files
author
timhuisman1
authored
Merge pull request #41 from AreaFiftyLAN/feature-web_tab
Add web tab to admin page
2 parents 93b4ae7 + b62cfbe commit c88c04d

18 files changed

+2264
-8
lines changed

gulp/polymer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"src/lancie-admin-endpoint/lancie-admin-pages/lancie-admin-seats.html",
1515
"src/lancie-admin-endpoint/lancie-admin-pages/lancie-admin-mail/lancie-admin-mail.html",
1616
"src/lancie-admin-endpoint/lancie-admin-pages/lancie-admin-homepage-text.html",
17+
"src/lancie-admin-web/lancie-admin-web.html",
1718
"src/lancie-admin-rfid/lancie-admin-rfid-assign.html",
1819
"src/lancie-admin-rfid/lancie-admin-rfid-alcohol.html",
1920
"src/lancie-admin-rfid/lancie-admin-rfid-consumption.html",

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
"fs-extra": "^4.0.1",
77
"glob": "^7.1.1",
88
"gulp": "gulpjs/gulp#4.0",
9+
"gulp-babel-minify": "^0.2.0",
910
"gulp-html-minifier": "^0.1.8",
1011
"gulp-if": "^2.0.1",
12+
"gulp-imagemin": "^3.3.0",
1113
"gulp-jshint": "^2.0.2",
1214
"gulp-replace": "^0.6.1",
1315
"gulp-style-modules": "^0.1.0",
@@ -16,10 +18,8 @@
1618
"merge-stream": "^1.0.0",
1719
"plylog": "^0.5.0",
1820
"polymer-build": "^2.0.0",
19-
"polyserve": "^0.20.0",
20-
"superagent": "^3.2.1",
21-
"gulp-babel-minify": "^0.2.0",
22-
"gulp-imagemin": "^3.3.0"
21+
"polyserve": "^0.27.13",
22+
"superagent": "^3.2.1"
2323
},
2424
"scripts": {
2525
"build": "node ./node_modules/gulp/bin/gulp.js",

src/lancie-admin-app.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<link rel="import" href="../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
66
<link rel="import" href="../bower_components/lancie-login-card/lancie-login-card.html">
77
<link rel="import" href="../bower_components/lancie-ajax/lancie-ajax.html">
8+
<link rel="import" href="../bower_components/lancie-form/lancie-form.html">
89
<link rel="import" href="../bower_components/paper-toast/paper-toast.html">
910

1011
<dom-module id="lancie-admin-app">
@@ -30,6 +31,7 @@
3031
<paper-toast id="globalToast"></paper-toast>
3132

3233
<lancie-ajax id="ajax"></lancie-ajax>
34+
<lancie-form id="form"></lancie-form>
3335
<iron-ajax
3436
id="getCurrentUser"
3537
url="/api/v1/users/current"
@@ -94,6 +96,7 @@
9496
if (detail.user.authorities.indexOf('ROLE_ADMIN') > -1) {
9597
this.user = detail;
9698
this.$.ajax.injectToken(detail.token);
99+
this.$.form.injectToken(detail.token);
97100
window.localStorage.setItem('a5lauth', detail.token);
98101

99102
this.loggedIn = true;

src/lancie-admin-content.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<lancie-admin-seats data-route="seats" data-path="lancie-admin-endpoint/lancie-admin-pages/lancie-admin-seats.html"></lancie-admin-seats>
3333
<lancie-admin-homepage-text data-route="text" data-path="lancie-admin-endpoint/lancie-admin-pages/lancie-admin-homepage-text.html"></lancie-admin-homepage-text>
3434
<lancie-admin-mail data-route="mail" data-path="lancie-admin-endpoint/lancie-admin-pages/lancie-admin-mail/lancie-admin-mail.html"></lancie-admin-mail>
35+
<lancie-admin-web data-route="web" data-path="lancie-admin-web/lancie-admin-web.html"></lancie-admin-web>
3536
<lancie-admin-rfid-assign data-route="rfidassign" data-path="lancie-admin-rfid/lancie-admin-rfid-assign.html"></lancie-admin-rfid-assign>
3637
<lancie-admin-rfid-alcohol data-route="alcoholcheck" data-path="lancie-admin-rfid/lancie-admin-rfid-alcohol.html"></lancie-admin-rfid-alcohol>
3738
<lancie-admin-rfid-consumption data-route="consumptions" data-path="lancie-admin-rfid/lancie-admin-rfid-consumption.html"></lancie-admin-rfid-consumption>

src/lancie-admin-icons.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@
2121
<g id="menu"><path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"/></g>
2222
<g id="mail"><path d="M20 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 4l-8 5-8-5V6l8 5 8-5v2z"/></g>
2323
<g id="timeline"><path d="M23 8c0 1.1-.9 2-2 2-.18 0-.35-.02-.51-.07l-3.56 3.55c.05.16.07.34.07.52 0 1.1-.9 2-2 2s-2-.9-2-2c0-.18.02-.36.07-.52l-2.55-2.55c-.16.05-.34.07-.52.07s-.36-.02-.52-.07l-4.55 4.56c.05.16.07.33.07.51 0 1.1-.9 2-2 2s-2-.9-2-2 .9-2 2-2c.18 0 .35.02.51.07l4.56-4.55C8.02 9.36 8 9.18 8 9c0-1.1.9-2 2-2s2 .9 2 2c0 .18-.02.36-.07.52l2.55 2.55c.16-.05.34-.07.52-.07s.36.02.52.07l3.55-3.56C19.02 8.35 19 8.18 19 8c0-1.1.9-2 2-2s2 .9 2 2z"/></g>
24+
<g id="web"><path d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96z"/></g>
2425
</defs></svg>
2526
</iron-iconset-svg>

src/lancie-admin-layout/lancie-admin-layout.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
width: 100%;
6969
}
7070

71-
.rfid, .logout{
71+
.rfid, .logout, .web {
7272
border-top: 1px solid #e8e8e8;
7373
}
7474

@@ -125,6 +125,10 @@
125125
<iron-icon icon="lancie-admin:mail" slot="item-icon"></iron-icon>
126126
<a href="/mail">Mail</a>
127127
</paper-icon-item>
128+
<paper-icon-item class="web" data-route="web">
129+
<iron-icon icon="lancie-admin:web" slot="item-icon"></iron-icon>
130+
<a href="/web">Web</a>
131+
</paper-icon-item>
128132
<paper-icon-item class="rfid" data-route="rfidassign">
129133
<iron-icon icon="lancie-admin:nfc" slot="item-icon"></iron-icon>
130134
<a href="/rfidassign">Assign RFID</a>
@@ -153,7 +157,7 @@
153157
<app-header-layout id="headerLayout" fullbleed>
154158
<app-header fixed effects="waterfall" slot="header">
155159
<app-toolbar class="layout horizontal">
156-
<paper-icon-button class="menu-button" icon="lancie-admin:menu" hidden$="[[wideLayout]]" drawer-toggle></paper-icon-button>
160+
<paper-icon-button class="menu-button" icon="lancie-admin:menu" hidden$="[[wideLayout]]" drawer-toggle></paper-icon-button>
157161
<div main-title>[[_getTitle(route)]]</div>
158162
</app-toolbar>
159163
</app-header>

src/lancie-admin-table/lancie-admin-table.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
var keys = Object.keys(data[0]);
176176
var columns = keys.map(function(key) {
177177
// If a mapping exists, resolve it
178-
if (!!this.columnMappings[key]) {
178+
if (this.columnMappings && !!this.columnMappings[key]) {
179179
return this.columnMappings[key].map(function(item) {
180180
return {
181181
name: key + '.' + item,
@@ -195,7 +195,7 @@
195195
attached here.
196196
*/
197197
columns = columns.map(function(col) {
198-
if (!!this.columnRenderers[col.name]) {
198+
if (this.columnRenderers && !!this.columnRenderers[col.name]) {
199199
col.renderer = this.columnRenderers[col.name];
200200
}
201201
return col;
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<link rel="import" href="../../bower_components/iron-icon/iron-icon.html">
2+
<link rel="import" href="../../bower_components/iron-iconset-svg/iron-iconset-svg.html">
3+
4+
<iron-iconset-svg size="24" name="commission">
5+
<svg><defs>
6+
<g id="attach-money"><path d="M11.8 10.9c-2.27-.59-3-1.2-3-2.15 0-1.09 1.01-1.85 2.7-1.85 1.78 0 2.44.85 2.5 2.1h2.21c-.07-1.72-1.12-3.3-3.21-3.81V3h-3v2.16c-1.94.42-3.5 1.68-3.5 3.61 0 2.31 1.91 3.46 4.7 4.13 2.5.6 3 1.48 3 2.41 0 .69-.49 1.79-2.7 1.79-2.06 0-2.87-.92-2.98-2.1h-2.2c.12 2.19 1.76 3.42 3.68 3.83V21h3v-2.15c1.95-.37 3.5-1.5 3.5-3.55 0-2.84-2.43-3.81-4.7-4.4z"></path></g>
7+
<g id="announcement"><path d="M20 2H4c-1.1 0-1.99.9-1.99 2L2 22l4-4h14c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm-7 9h-2V5h2v6zm0 4h-2v-2h2v2z"></path></g>
8+
<g id="chrome-reader-mode"><path d="M13 12h7v1.5h-7zm0-2.5h7V11h-7zm0 5h7V16h-7zM21 4H3c-1.1 0-2 .9-2 2v13c0 1.1.9 2 2 2h18c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 15h-9V6h9v13z"></path></g>
9+
<g id="gavel"><path d="M1 21h12v2H1zM5.245 8.07l2.83-2.827 14.14 14.142-2.828 2.828zM12.317 1l5.657 5.656-2.83 2.83-5.654-5.66zM3.825 9.485l5.657 5.657-2.828 2.828-5.657-5.657z"></path></g>
10+
<g id="settings"><path d="M19.43 12.98c.04-.32.07-.64.07-.98s-.03-.66-.07-.98l2.11-1.65c.19-.15.24-.42.12-.64l-2-3.46c-.12-.22-.39-.3-.61-.22l-2.49 1c-.52-.4-1.08-.73-1.69-.98l-.38-2.65C14.46 2.18 14.25 2 14 2h-4c-.25 0-.46.18-.49.42l-.38 2.65c-.61.25-1.17.59-1.69.98l-2.49-1c-.23-.09-.49 0-.61.22l-2 3.46c-.13.22-.07.49.12.64l2.11 1.65c-.04.32-.07.65-.07.98s.03.66.07.98l-2.11 1.65c-.19.15-.24.42-.12.64l2 3.46c.12.22.39.3.61.22l2.49-1c.52.4 1.08.73 1.69.98l.38 2.65c.03.24.24.42.49.42h4c.25 0 .46-.18.49-.42l.38-2.65c.61-.25 1.17-.59 1.69-.98l2.49 1c.23.09.49 0 .61-.22l2-3.46c.12-.22.07-.49-.12-.64l-2.11-1.65zM12 15.5c-1.93 0-3.5-1.57-3.5-3.5s1.57-3.5 3.5-3.5 3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5z"></path></g>
11+
<g id="local-shipping"><path d="M20 8h-3V4H3c-1.1 0-2 .9-2 2v11h2c0 1.66 1.34 3 3 3s3-1.34 3-3h6c0 1.66 1.34 3 3 3s3-1.34 3-3h2v-5l-3-4zM6 18.5c-.83 0-1.5-.67-1.5-1.5s.67-1.5 1.5-1.5 1.5.67 1.5 1.5-.67 1.5-1.5 1.5zm13.5-9l1.96 2.5H17V9.5h2.5zm-1.5 9c-.83 0-1.5-.67-1.5-1.5s.67-1.5 1.5-1.5 1.5.67 1.5 1.5-.67 1.5-1.5 1.5z"></path></g>
12+
<g id="notifications"><path d="M12 22c1.1 0 2-.9 2-2h-4c0 1.1.89 2 2 2zm6-6v-5c0-3.07-1.64-5.64-4.5-6.32V4c0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5v.68C7.63 5.36 6 7.92 6 11v5l-2 2v1h16v-1l-2-2z"></path></g>
13+
</defs></svg>
14+
</iron-iconset-svg>
Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
<link rel="import" href="../../bower_components/polymer/polymer.html">
2+
<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
3+
<link rel="import" href="../../bower_components/iron-icon/iron-icon.html">
4+
5+
<link rel="import" href="lancie-admin-committee-icons.html">
6+
7+
<dom-module id="lancie-admin-committee-member">
8+
<template>
9+
<style>
10+
:host {
11+
display: block;
12+
}
13+
14+
iron-icon {
15+
margin-right: 10px;
16+
}
17+
18+
.delete-button {
19+
cursor: pointer;
20+
}
21+
22+
.align-right {
23+
text-align: right;
24+
}
25+
</style>
26+
27+
<custom-style>
28+
<style is="custom-style">
29+
.flex-horizontal-with-ratios {
30+
@apply (--layout-horizontal);
31+
}
32+
.flexchild {
33+
@apply (--layout-flex);
34+
}
35+
.flex2child {
36+
@apply (--layout-flex-4);
37+
}
38+
.flex3child {
39+
@apply (--layout-flex-9);
40+
}
41+
</style>
42+
</custom-style>
43+
44+
<paper-item class="container flex-horizontal-with-ratios">
45+
<div class="flex2child">[[member.name]]</div>
46+
<div class="flex3child">
47+
<iron-icon icon="commission:[[member.icon]]"></iron-icon>[[member.function]]
48+
</div>
49+
<div class="flexchild">[[member.position]]</div>
50+
<div class="flexchild align-right">
51+
<iron-icon icon="icons:delete" on-tap="deleteMemberDialog" class="delete-button"></iron-icon>
52+
</div>
53+
</paper-item>
54+
55+
</template>
56+
<script>
57+
(function() {
58+
'use strict';
59+
60+
class LancieAdminCommitteeMember extends Polymer.Element {
61+
static get is() {
62+
return 'lancie-admin-committee-member';
63+
}
64+
65+
static get properties() {
66+
return {
67+
member: Object
68+
}
69+
}
70+
71+
deleteMemberDialog() {
72+
this.dispatchEvent(new CustomEvent('delete-member-dialog', {
73+
detail: {
74+
position: this.member.position
75+
},
76+
bubbles: true,
77+
composed: true
78+
}));
79+
}
80+
}
81+
82+
customElements.define(LancieAdminCommitteeMember.is, LancieAdminCommitteeMember);
83+
})();
84+
</script>
85+
</dom-module>

0 commit comments

Comments
 (0)