Skip to content

Commit 920be6f

Browse files
yarlyarl
authored
Merge pull request #8 from hatnote/dev
version 0.7
2 parents 3dd4f36 + 71fd121 commit 920be6f

12 files changed

Lines changed: 256 additions & 204 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
node_modules
22
app
3+
static
34

45
.vscode
56
jsconfig.json

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "monumental",
3-
"version": "0.6.0",
3+
"version": "0.7.0",
44
"private": true,
55
"description": "Monumental app",
66
"main": "src/index.js",

‎src/components/main/dashboard/dashboard.html‎

Lines changed: 35 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,37 @@
1-
<md-content layout="column" layout-align="start center" flex>
2-
<div class="dashboard" layout="row" layout-align="center start">
3-
<div layout="column" layout-align="start start" flex>
4-
<h3 class="md-title">Language</h3>
5-
<div layout="row" layout-align="start start">
6-
<md-input-container>
7-
<label>First language</label>
8-
<input type="text" ng-model="$ctrl.languages[0]">
9-
</md-input-container>
10-
<md-input-container>
11-
<label>Second language</label>
12-
<input type="text" ng-model="$ctrl.languages[1]">
13-
</md-input-container>
14-
<md-input-container>
15-
<label>Third language</label>
16-
<input type="text" ng-model="$ctrl.languages[2]">
17-
</md-input-container>
1+
<md-toolbar class="toolbar md-whiteframe-3dp" layout="column" layout-align="start center">
2+
</md-toolbar>
3+
<div class="container" layout="column" layout-align="space-between stretch" flex>
4+
<md-content layout="column" layout-align="start center" flex>
5+
<div class="dashboard" layout="row" layout-align="center start">
6+
<div layout="column" layout-align="start start" flex>
7+
<h3 class="md-title">Language</h3>
8+
<div layout="row" layout-align="start start">
9+
<md-input-container>
10+
<label>First language</label>
11+
<input type="text" ng-model="$ctrl.languages[0]">
12+
</md-input-container>
13+
<md-input-container>
14+
<label>Second language</label>
15+
<input type="text" ng-model="$ctrl.languages[1]">
16+
</md-input-container>
17+
<md-input-container>
18+
<label>Third language</label>
19+
<input type="text" ng-model="$ctrl.languages[2]">
20+
</md-input-container>
21+
</div>
22+
<md-button class="md-primary" ng-click="$ctrl.saveLanguages()">Save</md-button>
23+
</div>
24+
<div flex>
25+
<!--
26+
<md-button ng-click="$ctrl.login()">Login</md-button>
27+
<md-button ng-click="$ctrl.logout()">Logout</md-button>
28+
-->
29+
<h3 class="md-title">Examples</h3>
30+
<ul>
31+
<li><a ui-sref="main.object({id: '167566'})">Pałac Kultury i Nauki</a></li>
32+
<li><a ui-sref="main.list({id: '54181'})">monuments in Silesian Voivodeship</a></li>
33+
</ul>
1834
</div>
19-
<md-button class="md-primary" ng-click="$ctrl.saveLanguages()">Save</md-button>
20-
</div>
21-
<div flex>
22-
<h3 class="md-title">Examples</h3>
23-
<ul>
24-
<li><a ui-sref="main.object({id: '167566'})">Pałac Kultury i Nauki</a></li>
25-
<li><a ui-sref="main.list({id: '54181'})">monuments in Silesian Voivodeship</a></li>
26-
</ul>
2735
</div>
28-
</div>
29-
</md-content>
36+
</md-content>
37+
</div>

‎src/components/main/list/list.html‎

Lines changed: 56 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
<md-content layout="row" layout-align="start stretch" flex>
2-
<div class="list" layout="column" layout-align="start stretch" flex="none">
1+
<md-toolbar class="toolbar toolbar--wide md-whiteframe-3dp" layout="column" layout-align="start center">
2+
<div class="md-toolbar-tools">
3+
<md-button ui-sref="main.dashboard">
4+
Dashboard
5+
</md-button>
6+
<span flex></span>
37
<md-autocomplete
48
md-input-name="autocompleteField"
59
md-selected-item="$ctrl.search.selectedItem"
@@ -11,49 +15,55 @@
1115
placeholder="Search"
1216
md-menu-class="autocomplete-custom-template">
1317
<md-item-template>
14-
<strong>{{item.label}}</strong>
15-
<span>{{item.description}}</span>
18+
<strong>{{item.label}}</strong>
19+
<span>{{item.description}}</span>
1620
</md-item-template>
1721
</md-autocomplete>
18-
<md-virtual-repeat-container class="list__container" flex>
19-
<md-list-item>
20-
<span ng-if="$ctrl.showMap">{{$ctrl.list.length}} results</span>
21-
<span ng-if="!$ctrl.showMap">Loading...</span>
22-
</md-list-item>
23-
<md-list-item class="md-2-line"
24-
md-virtual-repeat="item in $ctrl.list | orderBy: 'name.value'"
25-
ui-sref="main.object({id: item.name.value_id.substring(1)})">
26-
<div class="list__image" layout="row" layout-align="center center">
27-
<img ng-src="{{item.image}}" alt="{{item.name.value}}" ng-if="item.image">
28-
</div>
29-
<div class="md-list-item-text" layout="column">
30-
<p>{{item.name.value}}</p>
31-
<p class="muted">{{item.admin.value}}</p>
32-
</div>
33-
</md-list-item>
34-
<md-list-item class="md-2-line" ng-if="!$ctrl.showMap">
35-
<div class="list__image" layout="row" layout-align="center center"></div>
36-
<div class="md-list-item-text" layout="column"></div>
37-
</md-list-item>
38-
<md-list-item class="md-2-line" ng-if="!$ctrl.showMap">
39-
<div class="list__image" layout="row" layout-align="center center"></div>
40-
<div class="md-list-item-text" layout="column"></div>
41-
</md-list-item>
42-
<md-list-item class="md-2-line" ng-if="!$ctrl.showMap">
43-
<div class="list__image" layout="row" layout-align="center center"></div>
44-
<div class="md-list-item-text" layout="column"></div>
45-
</md-list-item>
46-
<md-list-item class="md-2-line" ng-if="!$ctrl.showMap">
47-
<div class="list__image" layout="row" layout-align="center center"></div>
48-
<div class="md-list-item-text" layout="column"></div>
49-
</md-list-item>
50-
<md-list-item class="md-2-line" ng-if="!$ctrl.showMap">
51-
<div class="list__image" layout="row" layout-align="center center"></div>
52-
<div class="md-list-item-text" layout="column"></div>
53-
</md-list-item>
54-
</md-virtual-repeat-container>
55-
</div>
56-
<div class="list__map" flex>
57-
<leaflet ng-if="$ctrl.showMap" markers="$ctrl.map.markers" layers="$ctrl.map.layers" center="$ctrl.map.center" flex></leaflet>
58-
</div>
59-
</md-content>
22+
</div>
23+
</md-toolbar>
24+
<div class="container" layout="column" layout-align="space-between stretch" flex>
25+
<md-content layout="row" layout-align="start stretch" flex>
26+
<div class="list" layout="column" layout-align="start stretch" flex="none">
27+
<md-virtual-repeat-container class="list__container" flex>
28+
<md-list-item>
29+
<span ng-if="$ctrl.showMap">{{$ctrl.list.length}} results</span>
30+
<span ng-if="!$ctrl.showMap">Loading...</span>
31+
</md-list-item>
32+
<md-list-item class="md-2-line"
33+
md-virtual-repeat="item in $ctrl.list | orderBy: 'name.value'"
34+
ui-sref="main.object({id: item.name.value_id.substring(1)})">
35+
<div class="list__image" layout="row" layout-align="center center">
36+
<img ng-src="{{item.image}}" alt="{{item.name.value}}" ng-if="item.image">
37+
</div>
38+
<div class="md-list-item-text" layout="column">
39+
<p>{{item.name.value}}</p>
40+
<p class="muted">{{item.admin.value}}</p>
41+
</div>
42+
</md-list-item>
43+
<md-list-item class="md-2-line" ng-if="!$ctrl.showMap">
44+
<div class="list__image" layout="row" layout-align="center center"></div>
45+
<div class="md-list-item-text" layout="column"></div>
46+
</md-list-item>
47+
<md-list-item class="md-2-line" ng-if="!$ctrl.showMap">
48+
<div class="list__image" layout="row" layout-align="center center"></div>
49+
<div class="md-list-item-text" layout="column"></div>
50+
</md-list-item>
51+
<md-list-item class="md-2-line" ng-if="!$ctrl.showMap">
52+
<div class="list__image" layout="row" layout-align="center center"></div>
53+
<div class="md-list-item-text" layout="column"></div>
54+
</md-list-item>
55+
<md-list-item class="md-2-line" ng-if="!$ctrl.showMap">
56+
<div class="list__image" layout="row" layout-align="center center"></div>
57+
<div class="md-list-item-text" layout="column"></div>
58+
</md-list-item>
59+
<md-list-item class="md-2-line" ng-if="!$ctrl.showMap">
60+
<div class="list__image" layout="row" layout-align="center center"></div>
61+
<div class="md-list-item-text" layout="column"></div>
62+
</md-list-item>
63+
</md-virtual-repeat-container>
64+
</div>
65+
<div class="list__map" flex>
66+
<leaflet ng-if="$ctrl.showMap" markers="$ctrl.map.markers" layers="$ctrl.map.layers" center="$ctrl.map.center" flex></leaflet>
67+
</div>
68+
</md-content>
69+
</div>

‎src/components/main/list/list.js‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,17 @@ function controller($state, $stateParams, $timeout, leafletData, localStorageSer
105105
vm.map.markers[element.name.value_id] = {
106106
lat: +element.coord[1],
107107
lng: +element.coord[0],
108-
message: element.name.value,
108+
message: `
109+
<md-list-item class="md-2-line"
110+
ui-sref="main.object({id: ${element.name.value_id.substring(1)}})">
111+
<div class="list__image" layout="row" layout-align="center center">
112+
<img ng-src="{{'${element.image}'}}" alt="${element.name.value}" ng-if="${!!element.image}">
113+
</div>
114+
<div class="md-list-item-text" layout="column">
115+
<p>${element.name.value}</p>
116+
<p class="muted">${element.admin.value}</p>
117+
</div>
118+
</md-list-item>`,
109119
layer: 'monuments',
110120
icon: icon
111121
};

‎src/components/main/list/list.scss‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,21 @@ mo-list {
3535
width: 100%;
3636
height: 100%;
3737
}
38+
39+
.leaflet-popup-close-button {
40+
z-index: 1;
41+
padding: 5px;
42+
}
43+
44+
.leaflet-popup-content-wrapper {
45+
border-radius: 2px;
46+
}
47+
48+
.leaflet-popup-content {
49+
min-width: 300px;
50+
margin: 0;
51+
font: 16px Roboto, Arial, sans-serif;
52+
}
3853
}
3954

4055
md-autocomplete {

‎src/components/main/main.html‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1 @@
1-
<md-toolbar class="toolbar md-whiteframe-3dp" layout="column" layout-align="start center">
2-
<div class="md-toolbar-tools">
3-
<md-button ui-sref="main.dashboard">
4-
Dashboard
5-
</md-button>
6-
<span flex></span>
7-
<md-autocomplete
8-
md-input-name="autocompleteField"
9-
md-selected-item="$ctrl.search.selectedItem"
10-
md-search-text="$ctrl.search.text"
11-
md-items="item in $ctrl.querySearch($ctrl.search.text)"
12-
md-selected-item-change="$ctrl.goToItem(item)"
13-
md-item-text="item.label"
14-
md-min-length="1"
15-
placeholder="Search"
16-
md-menu-class="autocomplete-custom-template">
17-
<md-item-template>
18-
<strong>{{item.label}}</strong>
19-
<span>{{item.description}}</span>
20-
</md-item-template>
21-
</md-autocomplete>
22-
</div>
23-
</md-toolbar>
24-
<div class="container" layout="column" layout-align="space-between stretch" flex>
25-
<ui-view></ui-view>
26-
</div>
1+
<ui-view></ui-view>

‎src/components/main/main.scss‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,9 @@
1010
width: 300px;
1111
}
1212
}
13+
14+
&.toolbar--wide .md-toolbar-tools {
15+
max-width: 100%;
16+
padding-left: 15px;
17+
}
1318
}

0 commit comments

Comments
 (0)