Skip to content
This repository has been archived by the owner on Apr 3, 2021. It is now read-only.

Commit

Permalink
Merge pull request #11 from netzbegruenung/two-page-structure
Browse files Browse the repository at this point in the history
Inhalte auf zwei Seitentypen aufteilen
  • Loading branch information
marians authored Oct 27, 2018
2 parents f241f6d + 1b9aece commit 1d36f17
Show file tree
Hide file tree
Showing 179 changed files with 4,538 additions and 4,237 deletions.
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
node_modules
build
secrets
17 changes: 17 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
FROM node:10-slim AS builder

WORKDIR /

ADD yarn.lock /
ADD package.json /
ADD src /src
ADD scripts /scripts
ADD public /public
ADD config /config

RUN yarn install
RUN yarn build

FROM nginx:1.14-alpine
COPY --from=builder /build /usr/share/nginx/html
COPY config/nginx.conf /etc/nginx/nginx.conf
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,6 @@ export:
--credentials-path /secrets/datastore-reader.json \
--loglevel info \
export --kind spider-results

docker-build:
docker build -t quay.io/netzbegruenung/green-spider-webapp:latest .
49 changes: 49 additions & 0 deletions config/nginx.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
user nginx;
worker_processes 1;

error_log stderr warn;
pid /var/run/nginx.pid;

events {
worker_connections 1024;
}

http {
server {
listen *:8000;

root /usr/share/nginx/html;

# siteicons, css, js never change
location /siteicons/ {
expires 100d;
}
location /static/ {
expires 100d;
}

location / {
try_files $uri $uri/ /index.html;
}

}

include /etc/nginx/mime.types;

default_type application/octet-stream;

log_format main '$remote_addr - $remote_user [$time_local] "$request" '
'$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"';

access_log /dev/stdout main;

sendfile on;
#tcp_nopush on;

keepalive_timeout 65;

#gzip on;

include /etc/nginx/conf.d/*.conf;
}
1 change: 0 additions & 1 deletion docs/CNAME

This file was deleted.

6 changes: 0 additions & 6 deletions docs/asset-manifest.json

This file was deleted.

Binary file removed docs/icon128.png
Binary file not shown.
Binary file removed docs/icon32.png
Binary file not shown.
1 change: 0 additions & 1 deletion docs/index.html

This file was deleted.

20 changes: 0 additions & 20 deletions docs/manifest.json

This file was deleted.

1 change: 0 additions & 1 deletion docs/service-worker.js

This file was deleted.

40 changes: 0 additions & 40 deletions docs/serviceWorkerAddon.js

This file was deleted.

Binary file removed docs/siteicons/0073bd6a9bfa8259f684bb664bd28c9a.png
Binary file not shown.
Binary file removed docs/siteicons/042f0bf5868511974bfd22dcf2278fd8.ico
Binary file not shown.
Binary file removed docs/siteicons/0967129c188cec05434bcef22632e797.ico
Binary file not shown.
Binary file removed docs/siteicons/09d52e5603efb19a8c1cb52af6a1c9da.png
Binary file not shown.
Binary file removed docs/siteicons/0ab85f7ffac1aa671cfb2f15116fbc23.ico
Binary file not shown.
Binary file removed docs/siteicons/0ca3f844672deef54d6fc98ecb502ed5.png
Binary file not shown.
Binary file removed docs/siteicons/0dc13b50e03ca27f58f87b00671a1e68.ico
Binary file not shown.
Binary file removed docs/siteicons/0deb279b67c6b805d11e27fc8df48f3a.ico
Binary file not shown.
Binary file not shown.
Binary file removed docs/siteicons/10bccf7c5fd52a0f20456ea4ccf2c403.png
Binary file not shown.
Binary file removed docs/siteicons/1194d7d32448e1f90741a97b42af91fa.ico
Binary file not shown.
Binary file removed docs/siteicons/11ef6c0950e86d4aafd15be832deddd9.ico
Binary file not shown.
Binary file removed docs/siteicons/16eba5d237ec52611d79f5b6714aa6a9.jpg
Binary file not shown.
Binary file removed docs/siteicons/16f5808feb148ca9d088b5535f00777a.png
Binary file not shown.
Binary file removed docs/siteicons/17984ad0a5a726b238a85ae124101276.ico
Binary file not shown.
Binary file removed docs/siteicons/186bbbf767927571de3a8e3648cfded4.png
Binary file not shown.
Binary file removed docs/siteicons/18f1edbd361b70444fd7c7559c1754a0.ico
Binary file not shown.
Binary file removed docs/siteicons/1a345584649d5ec47d61b6f0b73a869d.ico
Binary file not shown.
Binary file removed docs/siteicons/1b890842ba700bd1869198e993f498ac.ico
Binary file not shown.
Binary file removed docs/siteicons/1b9ca126dff5ed42e5ad7e572c0cd2c3.ico
Binary file not shown.
Binary file removed docs/siteicons/1ce0c63f8bd1e5d3376ec0ae95a41c08.ico
Binary file not shown.
Binary file removed docs/siteicons/1d0f9c3c4782850ce383a671bf00f470.png
Binary file not shown.
Binary file removed docs/siteicons/1f615d5bf91b5eb2187c8d85fb801c9a.ico
Binary file not shown.
Binary file removed docs/siteicons/21ab4a872462964b3d3581eb7915ce26.png
Binary file not shown.
Binary file removed docs/siteicons/22cc2005b4cc3d72564fde512b7ac88d.gif
Binary file not shown.
Binary file removed docs/siteicons/249c9b5ef6be0f26977387928c9a4b69.ico
Binary file not shown.
Binary file removed docs/siteicons/2acd93ebf6225a014f4820d5c57bcea1.png
Binary file not shown.
Binary file removed docs/siteicons/2b4be9b11156199e96acb71392cc14ce.png
Binary file not shown.
Binary file removed docs/siteicons/2c77da304308884f973dc578f33f22f3.ico
Binary file not shown.
Binary file removed docs/siteicons/2e6ca33657d64802e2814814fe81a7b4.png
Binary file not shown.
Binary file removed docs/siteicons/304c2af408fe19b004c3bccf847b455a.png
Binary file not shown.
Binary file removed docs/siteicons/31c08a20b3ce617969ee503adfa1a06a.ico
Binary file not shown.
Binary file removed docs/siteicons/32e88c483a630ca0df4a00d8ff1ece04.png
Binary file not shown.
Binary file removed docs/siteicons/360d1d2987fcd886dbfb83f4cf2ae833.ico
Binary file not shown.
Binary file removed docs/siteicons/3c4dea2f646571881e8d882c2b07531a.ico
Binary file not shown.
Binary file removed docs/siteicons/3fbab8afc54f5aa6c679b15655661196.ico
Binary file not shown.
Binary file removed docs/siteicons/3ff9ad98caf4ee59d8789b1c431cd50c.ico
Binary file not shown.
Binary file removed docs/siteicons/41b57c0a0c1c40cd2f3962e3caf87d57.png
Binary file not shown.
Binary file removed docs/siteicons/426267ae845576e8fed33013ff4849f0.ico
Binary file not shown.
Binary file removed docs/siteicons/43fb33c57227e9d867b3089d993628e3.png
Binary file not shown.
Binary file removed docs/siteicons/45764934608573e1d807d338d4ce405d.png
Binary file not shown.
Binary file removed docs/siteicons/469c7d11d58fff007d0d911a2a1e952d.ico
Binary file not shown.
Binary file removed docs/siteicons/47cfbba59aa7e10c678bc8ef3e429b58.ico
Binary file not shown.
Binary file removed docs/siteicons/4822081b2998400cc4422b25ff099c37.ico
Binary file not shown.
Binary file removed docs/siteicons/48ab9a01b86429c31dc2fcd85e925c91.png
Binary file not shown.
Binary file removed docs/siteicons/4a8754784888a49ad98e0a7afce8a906.ico
Binary file not shown.
Binary file removed docs/siteicons/4f4203fe1c43523919b3905a8b3e63a9.ico
Binary file not shown.
Binary file removed docs/siteicons/5080db01b907f1ade5e1f0952799adaf.jpg
Binary file not shown.
Binary file removed docs/siteicons/52582e72bd938205498521c6b509c49d.ico
Binary file not shown.
Binary file removed docs/siteicons/53bc42ded65062b7dc578a20b5ff2cce.jpg
Binary file not shown.
Binary file removed docs/siteicons/557d087af1a964c9015332d64617b6d4.png
Binary file not shown.
Binary file removed docs/siteicons/56ee1b7375fa13b039f8f5319675309c.png
Binary file not shown.
Binary file removed docs/siteicons/5734263810e8879e443ee84db61bf729.ico
Binary file not shown.
Binary file removed docs/siteicons/5982e4314c393fb79586947a0c1fd937.png
Diff not rendered.
Diff not rendered.
Binary file removed docs/siteicons/5a73b539cd667f41fab9916dffe52882.ico
Binary file not shown.
Binary file removed docs/siteicons/5b8565f8cba452e6903b09c8e60530ec.png
Diff not rendered.
Binary file removed docs/siteicons/63b982eddd64d44233baa25066db6bc1.ico
Binary file not shown.
Binary file removed docs/siteicons/694f7df47d355683105b4d59bbaa4b37.ico
Binary file not shown.
Binary file removed docs/siteicons/6d11f61fcfc825f4f5446a844d910cd7.png
Diff not rendered.
Binary file removed docs/siteicons/7043aa439c45317d0495a544e6db92e7.ico
Binary file not shown.
Binary file removed docs/siteicons/705424b605eccdb32f161363457e6374.ico
Binary file not shown.
Binary file removed docs/siteicons/713705bb8b087e0d7b9778e595317600.ico
Binary file not shown.
Binary file removed docs/siteicons/71552f9c7124091304e29d797a89192d.png
Diff not rendered.
Binary file removed docs/siteicons/716be6f93d646088f652036da8701778.ico
Binary file not shown.
Binary file removed docs/siteicons/732bd7f50ca99981afb8252c153a7fb7.png
Diff not rendered.
Binary file removed docs/siteicons/75da0b668686a57ff9622eeb5f54a2b5.ico
Binary file not shown.
Binary file removed docs/siteicons/763a07a20f4c0be782bfc18673b39f04.ico
Binary file not shown.
Binary file removed docs/siteicons/766725601f313ff3b55127f747e868d9.png
Diff not rendered.
Binary file removed docs/siteicons/76a49e20f30f1ff94b7c199dd362709e.jpg
Diff not rendered.
Binary file removed docs/siteicons/77089d19250cbb84ebc67c9906c49af3.ico
Binary file not shown.
Binary file removed docs/siteicons/773ffeda045b702523518f1fc217ae54.ico
Binary file not shown.
Binary file removed docs/siteicons/78f719ae961451e9ad3347283e98daee.png
Diff not rendered.
Binary file removed docs/siteicons/79ded96df21306ec7044622d38902355.ico
Binary file not shown.
Binary file removed docs/siteicons/7b112a77ea87f04a01274c624274a369.ico
Binary file not shown.
Binary file removed docs/siteicons/7cc55df75343353acc6a8be8cbdbe386.png
Diff not rendered.
Binary file removed docs/siteicons/7d70923f50d6a591b474519c1ff1fb41.ico
Binary file not shown.
Binary file removed docs/siteicons/7e6c4a5e862318819087f280178d22f8.ico
Binary file not shown.
Binary file removed docs/siteicons/82143ace59ceead2f64930232180ffad.ico
Binary file not shown.
Binary file removed docs/siteicons/82336140469da0ceb26e6285ef521078.ico
Binary file not shown.
Binary file removed docs/siteicons/835e96c57c3a75a1f4e667800ab71b1a.ico
Binary file not shown.
Binary file removed docs/siteicons/83d74cceb607c6b19336d72f877ef474.jpg
Diff not rendered.
Binary file removed docs/siteicons/8894791e84f5cafebd47311d14a3703c.ico
Binary file not shown.
Binary file removed docs/siteicons/89dda5b572f9ad9a89b0163c8e29c846.png
Diff not rendered.
Binary file removed docs/siteicons/8b4d5da43d1a3269ea1702c4acbc671d.ico
Binary file not shown.
Binary file removed docs/siteicons/8ec59ec3187a8d050bf99a8f1c71772c.ico
Binary file not shown.
Binary file removed docs/siteicons/923662b9d09f230e56affb92dccd1bb0.gif
Diff not rendered.
Binary file removed docs/siteicons/932005cdd933ad5de0f1e8197c77e195.ico
Binary file not shown.
Binary file removed docs/siteicons/9351d68ba37778de3368808f94d53ba8.jpg
Diff not rendered.
Binary file removed docs/siteicons/93655d21a8137fea9cd27c022302258d.ico
Binary file not shown.
Binary file removed docs/siteicons/99b2c4656862aa2091be146489d783d8.ico
Binary file not shown.
Binary file removed docs/siteicons/9baf3023ef50148103c1f0996ed96874.ico
Binary file not shown.
Binary file removed docs/siteicons/9cbe28444cbf8c43a48b3fe02cda449a.png
Diff not rendered.
Binary file removed docs/siteicons/9cc6ca3ef5bd8aee230719b1ae036ae3.ico
Binary file not shown.
Binary file removed docs/siteicons/a0529939c6e78dc2aeb8391a6f1dda4f.ico
Binary file not shown.
Binary file removed docs/siteicons/a167ee74a53751f5610fbb9467069b0a.ico
Binary file not shown.
Binary file removed docs/siteicons/a4046cbaf002313241763cf17befce6e.jpg
Diff not rendered.
Binary file removed docs/siteicons/a8845e9b6d45a85718dbc14efe72de99.jpg
Diff not rendered.
Binary file removed docs/siteicons/a9b8fd90e34da5dc334d8c20c9d11c42.ico
Binary file not shown.
Binary file removed docs/siteicons/aa4dd4b2b0e19aa2614b95745682b984.jpg
Diff not rendered.
Binary file removed docs/siteicons/ad26b2b5dc1cd9cd682d9f653939490d.ico
Binary file not shown.
Binary file removed docs/siteicons/aed5ce816c44cacfe3b22850fe8480a1.png
Diff not rendered.
Binary file removed docs/siteicons/b0166db4002d18f757c53ff6c34cb3ab.png
Diff not rendered.
Binary file removed docs/siteicons/b15c61968c780e09ed43bbe05688fc62.ico
Binary file not shown.
Binary file removed docs/siteicons/b23a4d8e45a2c44faa5a9da8391542b9.ico
Binary file not shown.
Binary file removed docs/siteicons/b2efc9598cd118ce6d8afc88734c05f5.ico
Binary file not shown.
Binary file removed docs/siteicons/b3845b939d00c612361d5fe2d6defcf7.png
Diff not rendered.
Binary file removed docs/siteicons/ba4eedeb55dde701757c424ff3ff3dec.ico
Binary file not shown.
Binary file removed docs/siteicons/bb1613122192c097f186cc5174b59b37.ico
Binary file not shown.
Binary file removed docs/siteicons/bdfb10eae0a5c3da60676ab1f02e0e0b.ico
Binary file not shown.
Binary file removed docs/siteicons/bf7518d64fd14654a17fbdbd168419dd.ico
Binary file not shown.
Binary file removed docs/siteicons/bfa850393d45e44a8086f3669d884d17.ico
Binary file not shown.
Binary file removed docs/siteicons/c291c057816f71ce15ba5c496f1a965a.ico
Binary file not shown.
Binary file removed docs/siteicons/c3c082209d31545ba47f3ac00eac1136.png
Diff not rendered.
Binary file removed docs/siteicons/c3fe41066db45f18d0590642b0a94012.ico
Binary file not shown.
Binary file removed docs/siteicons/c4e528acabca9b0d522c0b077d754c86.ico
Binary file not shown.
Binary file removed docs/siteicons/ca2bb9889f5870b0b31006f9f09a23df.ico
Binary file not shown.
Binary file removed docs/siteicons/cc8af562ad5ee310b2be91d824f630fe.ico
Binary file not shown.
Binary file removed docs/siteicons/ccee93bd02b00be593e0ab7b81491fdd.ico
Binary file not shown.
Diff not rendered.
Binary file removed docs/siteicons/d2850d31b1cdec91cb6ed249d992f740.ico
Binary file not shown.
Binary file removed docs/siteicons/d3067746e5ec12230b13fc7fedfbdaf1.ico
Binary file not shown.
Binary file removed docs/siteicons/d30f85678cdff251d9cecea21d32060f.ico
Binary file not shown.
Empty file.
Binary file removed docs/siteicons/d4b7217bba56a47dd0a55118680e29d0.jpg
Diff not rendered.
Binary file removed docs/siteicons/d4f23c6cab0cbf1587305c18d9551a83.png
Diff not rendered.
Binary file removed docs/siteicons/d5aa0b364bcc575edc585a672998dcbb.jpg
Diff not rendered.
Binary file removed docs/siteicons/d755fb5c537e96bb5380bd3775dc1113.ico
Binary file not shown.
Binary file removed docs/siteicons/d77cf6b768b7ea04a2eb46dc74f2f762.jpg
Diff not rendered.
Binary file removed docs/siteicons/d7b3cd2400f564d004e873ac1634874a.png
Diff not rendered.
Binary file removed docs/siteicons/dbd336b75d1b810e5cf48bf556917855.jpg
Diff not rendered.
Binary file removed docs/siteicons/dc897b554b4adb29245db4db1a550bd6.ico
Binary file not shown.
Binary file removed docs/siteicons/df2da2390ae9bfe9fd19e654cfb0544d.ico
Binary file not shown.
Binary file removed docs/siteicons/e219c851b74accc55a3aa6560173a8eb.png
Diff not rendered.
Binary file removed docs/siteicons/e44c542cc6ee3633aff95141ace057b2.ico
Binary file not shown.
Binary file removed docs/siteicons/e6a9dc66179d8c9f34288b16a02f987e.ico
Binary file not shown.
Binary file removed docs/siteicons/e9e1afdacf341a6accc5226a83ed3afc.ico
Binary file not shown.
Binary file removed docs/siteicons/ebe1bd75307c54ac2d28034df5499370.ico
Binary file not shown.
Binary file removed docs/siteicons/ed1ccb5622fc0761345e8b638f1f2432.ico
Binary file not shown.
Binary file removed docs/siteicons/eec3b00d19c99ce60fd19e6bc55abfb2.ico
Binary file not shown.
Binary file removed docs/siteicons/f4442c28398da7eef7012f50cf3a337c.ico
Binary file not shown.
Binary file removed docs/siteicons/f5d6e284c9ac6d8c7613ef1eba7cee49.ico
Binary file not shown.
Binary file removed docs/siteicons/f6644057949af3bd9612bcf3a50a2149.ico
Binary file not shown.
Binary file removed docs/siteicons/f76891dfa7e8a000d51411c771bdd271.ico
Binary file not shown.
Binary file removed docs/siteicons/fd00dcf5b9a53b1e7d49d11b71e2a634.ico
Binary file not shown.
Binary file removed docs/siteicons/febc2376cce92f3c3d4c4b5ee613fd17.png
Diff not rendered.
7 changes: 0 additions & 7 deletions docs/static/css/main.20975575.css

This file was deleted.

1 change: 0 additions & 1 deletion docs/static/css/main.20975575.css.map

This file was deleted.

2 changes: 0 additions & 2 deletions docs/static/js/main.e8f44506.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/static/js/main.e8f44506.js.map

This file was deleted.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"bootstrap": "4.1.3",
"case-sensitive-paths-webpack-plugin": "2.1.1",
"chalk": "1.1.3",
"chroma-js": "^1.4.0",
"css-loader": "0.28.7",
"dotenv": "4.0.0",
"dotenv-expand": "4.2.0",
Expand All @@ -37,7 +38,7 @@
"react": "^16.5.1",
"react-dev-utils": "^5.0.2",
"react-dom": "^16.5.1",
"react-lazy-load": "^3.0.13",
"react-router-dom": "^4.3.1",
"resolve": "1.6.0",
"style-loader": "0.19.0",
"sw-precache-webpack-plugin": "0.11.4",
Expand Down
6 changes: 2 additions & 4 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,15 @@
</noscript>

<div class="d-flex flex-column flex-md-row align-items-center p-3 px-md-4 mb-3 header border-bottom box-shadow">
<h5 class="my-0 mr-md-auto">Green Spider</h5>
<h5 class="my-0 mr-md-auto"><a href="/">Green Spider</a></h5>
<nav class="my-2 my-md-0 mr-md-3">
<span id="status" class="p-2">Lade Daten...</span>
<a class="p-2 text-light" href="https://github.com/netzbegruenung/green-spider/"><i class="ion-logo-github"></i> GitHub</a>
<a class="p-2 text-light" href="https://blog.netzbegruenung.de/projekte/green-spider/"><i class="ion-md-information-circle"></i> Über</a>
</nav>
</div>

<div class="container-fluid"></div>
<div id="root"></div>
</div>
<div id="root" class="container"></div>

</body>
</html>
142 changes: 142 additions & 0 deletions src/LocationLabel.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
import React, { Component } from 'react';

class TypeField extends Component {
render() {
var label = '';
var title = '';

if (this.props.level === 'DE:BUNDESVERBAND') {
if (this.props.type === 'YOUTH_ORGANIZATION') {
title = 'Grüne Jugend Bundesverband';
label = 'GJ BV';
} else {
title = 'Bundesverband';
label = 'BV';
}
} else if (this.props.level === 'DE:LANDESVERBAND') {
if (this.props.type === 'YOUTH_ORGANIZATION') {
title = 'Grüne Jugend Landesverband';
label = 'GJ LV';
} else {
title = 'Landesverband';
label = 'LV';
}
} else if (this.props.level === 'DE:REGIONALVERBAND') {
title = 'Regionalverband';
label = 'RV';
} else if (this.props.level === 'DE:BEZIRKSVERBAND') {
title = 'Bezirksverband';
label = 'BeV';
} else if (this.props.level === 'DE:KREISVERBAND') {
if (this.props.type === 'YOUTH_ORGANIZATION') {
title = 'Grüne Jugend Kreisverband';
label = 'GJ KV';
} else {
title = 'Kreisverband';
label = 'KV';
}
} else if (this.props.level === 'DE:ORTSVERBAND') {
title = 'Ortsverband';
label = 'OV';
}

return <abbr className='TypeField' title={title}>{label}</abbr>;
}
}

class StateField extends Component {
render() {
var label = this.props.state;

switch (this.props.state) {
case 'Nordrhein-Westfalen':
label = 'NW';
break;
case 'Rheinland-Pfalz':
label = 'RP';
break;
case 'Niedersachsen':
label = 'NS';
break;
case 'Baden-Württemberg':
label = 'BW';
break;
case 'Bayern':
label = 'BY';
break;
case 'Berlin':
label = 'BE';
break;
case 'Brandenburg':
label = 'BB';
break;
case 'Bremen':
label = 'HB';
break;
case 'Hamburg':
label = 'HB';
break;
case 'Hessen':
label = 'HE';
break;
case 'Mecklenburg-Vorpommern':
label = 'MV';
break;
case 'Saarland':
label = 'SL';
break;
case 'Sachsen':
label = 'SN';
break;
case 'Sachsen-Anhalt':
label = 'SA';
break;
case 'Schleswig-Holstein':
label = 'SH';
break;
case 'Thüringen':
label = 'SN';
break;
default:
label = this.props.state;
}

return <abbr title={this.props.state}>{label}</abbr>;
}
}

class LocationLabel extends Component {
render() {
var brief = true;
if (typeof this.props.brief !== 'undefined') {
brief = this.props.brief;
}

var label = '';
var type = <TypeField level={this.props.level} type={this.props.type} />;

var stateField = brief ? <StateField state={this.props.state} /> : <span>{this.props.state}</span>;

var className = 'LocationLabel';
if (this.props.truncate) {
className += ' text-truncate';
}

if (this.props.city === null && this.props.district !== null) {
label = this.props.district;
return <span className={className}>{type} {label}, {stateField}</span>;
} else if (this.props.city !== null && this.props.district === null) {
label = this.props.city;
return <span className={className}>{type} {label}, {stateField}</span>;
} else if (this.props.city !== null && this.props.district !== null) {
label = `${this.props.city}, ${this.props.district}`;
return <span className={className}>{type} {label}, {stateField}</span>;
}

label = this.props.state;
return <span className={className}>{type} {label}</span>;
}
}

export default LocationLabel;
export { TypeField, StateField };
32 changes: 32 additions & 0 deletions src/ResultsList.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
.TypeField {
font-size: 85%;
font-weight: 700;
text-decoration-line: none;
color: #333;
}

.ResultsList {
font-size: 1.3rem;
padding: 0.2rem 0;
margin: 0.3rem 0;
border-radius: 0.3rem;
}

div.ResultsList:hover {
background-color: #eee;
}

a.ResultsList:hover {
text-decoration: none;
}

.LocationLabel {
display: block;
color: #666;
}

.URLField {
display: block;
font-size: 90%;
color: #999;
}
Loading

0 comments on commit 1d36f17

Please sign in to comment.