simon/smeagol
1
0
Fork 0
mirror of https://github.com/journeyman-cc/smeagol.git synced 2026-04-12 18:05:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

#13 WOW! It works! And it's beautiful!

Browse source
This commit is contained in:
simon 2017-07-26 14:50:17 +01:00
parent a1fa392699
commit fa944f1780
11 changed files with 498 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

33
resources/public/content/Introduction.md
View file

@ -24,8 +24,39 @@ Smeagol does not currently have any mechanism to upload images. You can, however
![Smeagol](http://vignette3.wikia.nocookie.net/lotr/images/e/e1/Gollum_Render.png/revision/latest?cb=20141218075509)
## Now with data visualisation
Inspired by [visdown](http://visdown.amitkaps.com/) and [vega-lite](https://vega.github.io/vega-lite/docs/), you can now embed visualisations into Smeagol pages, like this:
### Flight punctuality at London airports
Example cribbed in its entirety from [here](http://visdown.amitkaps.com/london):
```vis
data:
url: "data/london.csv"
transform:
-
filter: datum.year == 2016
mark: rect
encoding:
x:
type: nominal
field: source
y:
type: nominal
field: dest
color:
type: quantitative
field: flights
aggregate: sum
```
Note that this visualisation will not be rendered in the GitHub wiki, as it doesn't have Smeagol's data visualisation magic. This is what it should look like:
![Example visualisation](data/london.png)
## Advertisement
If you like what you see here, I am available for work on open source Clojure projects. Contact me via [WEFT](http://www.weft.scot/).
If you like what you see here, I am available for work on open source Clojure projects.
### Phoning home
Smeagol currently requests the WEFT logo in the page footer from my home site. This is mainly so I can get a feel for how many people are using the product. If you object to this, edit the file

9
resources/public/content/stylesheet.css
View file

@ -197,6 +197,11 @@ th {
border: thin solid silver;
}
.data-visualisation {
padding: 0.25em 5%;
}
.error {
width: 100%;
background-color: red;
@ -231,6 +236,10 @@ th {
color: white;
}
.vega-bindings, .vega-actions {
font-size: 66%;
}
.warn {
color: maroon;
}

158
resources/public/data/london.csv Normal file
View file

@ -0,0 +1,158 @@
"source","dest","airline","flights","onTimePerf","delayAverage","year"
"LHR","ORD","AA",2490,66.33,21.11,2010
"LHR","ORD","BA",1413,57.63,23.3,2010
"LHR","ORD","UA",2105,73.24,14.57,2010
"LHR","ORD","VS",218,77.06,11.1,2010
"LHR","LAX","AA",706,66.38,17.66,2010
"LHR","LAX","BA",1914,50.18,31.01,2010
"LHR","LAX","UA",698,81.81,13.62,2010
"LHR","LAX","VS",1285,56.86,21.92,2010
"LHR","JFK","AA",3205,67.36,20.31,2010
"LHR","JFK","BA",4181,66.59,20.84,2010
"LHR","JFK","DL",1611,62.12,23.74,2010
"LHR","JFK","KU",305,46.56,38.75,2010
"LHR","JFK","VS",2067,59.62,23.69,2010
"LHR","EWR","BA",1828,70.25,17.67,2010
"LHR","EWR","CO",2697,69.28,18.87,2010
"LHR","EWR","VS",1399,65.62,23.15,2010
"LHR","IAD","BA",2011,62.11,21.71,2010
"LHR","IAD","UA",2094,74.67,14.11,2010
"LHR","IAD","VS",700,66.24,19.75,2010
"LCY","JFK","BA",1012,89.12,5.67,2010
"LHR","ORD","AA",2532,76.87,13.34,2011
"LHR","ORD","BA",1440,76.32,14.42,2011
"LHR","ORD","UA",2106,79.36,15.2,2011
"LHR","ORD","VS",302,82.72,8.66,2011
"LHR","LAX","AA",730,75.48,13.66,2011
"LHR","LAX","BA",1984,63.46,18.47,2011
"LHR","LAX","UA",698,83.52,11.7,2011
"LHR","LAX","VS",1397,79,11.2,2011
"LHR","JFK","AA",2917,75.8,14.77,2011
"LHR","JFK","BA",4944,73.56,14.65,2011
"LHR","JFK","DL",2144,80.91,13.05,2011
"LHR","JFK","KU",302,52.65,30.02,2011
"LHR","JFK","VS",2104,76.32,15.09,2011
"LHR","EWR","BA",2129,80.7,11.24,2011
"LHR","EWR","CO",3503,78.42,14.19,2011
"LHR","EWR","VS",1410,77.52,13.39,2011
"LHR","IAD","BA",2157,74.08,14.11,2011
"LHR","IAD","UA",2516,80.79,14,2011
"LHR","IAD","VS",711,82.42,9.73,2011
"LCY","JFK","BA",1031,92.05,4.12,2011
"LHR","ORD","AA",2523,72.07,20.03,2012
"LHR","ORD","BA",1445,70.03,17.73,2012
"LHR","ORD","UA",2102,76.08,15.35,2012
"LHR","ORD","VS",308,83.77,8.31,2012
"LHR","LAX","AA",714,75.35,12.03,2012
"LHR","LAX","BA",1874,63.48,18.34,2012
"LHR","LAX","UA",693,76.16,14.88,2012
"LHR","LAX","VS",1324,76.13,14.08,2012
"LHR","JFK","AA",3367,75.72,12.75,2012
"LHR","JFK","BA",5129,69.28,17.68,2012
"LHR","JFK","DL",2151,77.63,13.59,2012
"LHR","JFK","KU",307,52.12,32.02,2012
"LHR","JFK","VS",2227,81.9,11.32,2012
"LHR","EWR","BA",1920,73.02,15.88,2012
"LHR","EWR","CO",612,84.48,9.24,2012
"LHR","EWR","UA",2872,69.76,17.91,2012
"LHR","EWR","VS",1421,76.14,16.68,2012
"LHR","IAD","BA",2014,71.45,16.23,2012
"LHR","IAD","UA",2444,69.04,18.98,2012
"LHR","IAD","VS",703,87.06,7.71,2012
"LCY","JFK","BA",474,91.33,3.74,2012
"LCY","JFK","BA",537,89.37,4.71,2012
"LHR","ORD","AA",2513,74.69,15.29,2013
"LHR","ORD","BA",1440,65.35,20.84,2013
"LHR","ORD","UA",2110,78.39,14.13,2013
"LHR","ORD","VS",324,83.02,9.05,2013
"LHR","LAX","AA",728,76.48,12.56,2013
"LHR","LAX","BA",1864,59.5,27.43,2013
"LHR","LAX","UA",702,85.47,9.86,2013
"LHR","LAX","VS",1288,79,13.76,2013
"LHR","JFK","AA",2991,76.4,13.73,2013
"LHR","JFK","BA",5350,66.97,18.95,2013
"LHR","JFK","DL",2166,82.09,10.81,2013
"LHR","JFK","KU",306,62.42,21.53,2013
"LHR","JFK","VS",2825,81.91,10.53,2013
"LHR","EWR","BA",1838,71.44,16.72,2013
"LHR","EWR","UA",3494,80.59,12.36,2013
"LHR","EWR","VS",1419,81.66,11.7,2013
"LHR","IAD","BA",2012,71.02,18.67,2013
"LHR","IAD","UA",2496,80.39,12.82,2013
"LHR","IAD","VS",702,86.89,7.1,2013
"LCY","JFK","BA",945,90.64,4.58,2013
"LGW","LAX","DY",105,72.38,36.83,2014
"LGW","JFK","DY",156,51.92,27.79,2014
"LHR","ORD","AA",2476,73.5,22.09,2014
"LHR","ORD","BA",1444,65.28,18.7,2014
"LHR","ORD","UA",2110,77.56,13.68,2014
"LHR","ORD","VS",348,81.32,8.86,2014
"LHR","LAX","AA",728,76.79,18.56,2014
"LHR","LAX","BA",1450,56.84,23.1,2014
"LHR","LAX","DL",127,92.13,6.92,2014
"LHR","LAX","UA",698,85.1,8.53,2014
"LHR","LAX","VS",1217,80.99,12.58,2014
"LHR","JFK","AA",2287,78.18,14.74,2014
"LHR","JFK","BA",6018,71.29,16.59,2014
"LHR","JFK","DL",2123,82.13,11.19,2014
"LHR","JFK","KU",310,48.22,33.17,2014
"LHR","JFK","VS",2820,79.77,12.45,2014
"LHR","EWR","BA",1943,71.46,19.7,2014
"LHR","EWR","UA",3485,78.3,15.19,2014
"LHR","EWR","VS",1420,86.6,8.37,2014
"LHR","IAD","BA",1807,74.58,15.31,2014
"LHR","IAD","UA",2130,81.13,13.61,2014
"LHR","IAD","VS",695,89.06,6.9,2014
"LCY","JFK","BA",1003,91.23,4.43,2014
"LGW","LAX","DY",328,66.46,21.41,2015
"LGW","JFK","DY",543,64.09,31.78,2015
"LHR","ORD","AA",2062,72.09,27.59,2015
"LHR","ORD","BA",1442,71.4,16.24,2015
"LHR","ORD","UA",2099,83.94,10.37,2015
"LHR","ORD","VS",330,78.79,11.61,2015
"LHR","LAX","AA",1265,75.42,14.5,2015
"LHR","LAX","BA",1450,66.9,17.67,2015
"LHR","LAX","DL",540,79.44,10.97,2015
"LHR","LAX","UA",704,89.2,7.5,2015
"LHR","LAX","VS",1230,80.81,12.74,2015
"LHR","JFK","AA",2130,77.45,15.21,2015
"LHR","JFK","BA",5994,77.84,13.61,2015
"LHR","JFK","DL",2069,80.75,13.51,2015
"LHR","JFK","KU",310,59.22,32.67,2015
"LHR","JFK","VS",3363,76.35,13.82,2015
"LHR","EWR","BA",1459,76.47,14.03,2015
"LHR","EWR","DL",381,95.54,2.88,2015
"LHR","EWR","UA",3493,79.23,16.31,2015
"LHR","EWR","VS",871,81.75,10.7,2015
"LHR","IAD","BA",1421,76.89,12.03,2015
"LHR","IAD","UA",2126,81.74,14.02,2015
"LHR","IAD","VS",703,85.49,12.59,2015
"LCY","JFK","BA",937,92.74,4.52,2015
"LTN","EWR","DJT",316,81.53,18.18,2015
"LGW","LAX","DY",421,59.86,23.64,2016
"LGW","LAX","DI",38,65.79,14.39,2016
"LGW","JFK","BA",486,69.75,18.02,2016
"LGW","JFK","DY",689,65.31,28.18,2016
"LGW","JFK","DI",39,69.23,15.49,2016
"LHR","ORD","AA",2453,71.82,26.15,2016
"LHR","ORD","BA",1443,68.88,17.58,2016
"LHR","ORD","UA",2085,82.25,14.2,2016
"LHR","ORD","VS",333,89.79,5.07,2016
"LHR","LAX","AA",1411,68.25,19.46,2016
"LHR","LAX","BA",1452,54.34,24.89,2016
"LHR","LAX","UA",700,87,8.48,2016
"LHR","LAX","VS",1376,79.58,10.13,2016
"LHR","JFK","AA",2623,76.82,21.41,2016
"LHR","JFK","BA",5625,69.97,17.15,2016
"LHR","JFK","DL",2081,80.37,13.42,2016
"LHR","JFK","KU",253,19.76,71.96,2016
"LHR","JFK","VS",3489,79.67,11.44,2016
"LHR","EWR","AI",118,65.25,21.14,2016
"LHR","EWR","BA",1444,76.11,13.49,2016
"LHR","EWR","UA",3472,79.03,15.71,2016
"LHR","EWR","VS",722,82.27,9.48,2016
"LHR","IAD","BA",1415,71.59,17.44,2016
"LHR","IAD","UA",2134,82.05,13.24,2016
"LHR","IAD","VS",699,84.69,8.02,2016
"LCY","JFK","BA",921,90.01,5.26,2016
"LTN","EWR","DJT",333,87.05,8.44,2016
1 source dest airline flights onTimePerf delayAverage year
2 LHR ORD AA 2490 66.33 21.11 2010
3 LHR ORD BA 1413 57.63 23.3 2010
4 LHR ORD UA 2105 73.24 14.57 2010
5 LHR ORD VS 218 77.06 11.1 2010
6 LHR LAX AA 706 66.38 17.66 2010
7 LHR LAX BA 1914 50.18 31.01 2010
8 LHR LAX UA 698 81.81 13.62 2010
9 LHR LAX VS 1285 56.86 21.92 2010
10 LHR JFK AA 3205 67.36 20.31 2010
11 LHR JFK BA 4181 66.59 20.84 2010
12 LHR JFK DL 1611 62.12 23.74 2010
13 LHR JFK KU 305 46.56 38.75 2010
14 LHR JFK VS 2067 59.62 23.69 2010
15 LHR EWR BA 1828 70.25 17.67 2010
16 LHR EWR CO 2697 69.28 18.87 2010
17 LHR EWR VS 1399 65.62 23.15 2010
18 LHR IAD BA 2011 62.11 21.71 2010
19 LHR IAD UA 2094 74.67 14.11 2010
20 LHR IAD VS 700 66.24 19.75 2010
21 LCY JFK BA 1012 89.12 5.67 2010
22 LHR ORD AA 2532 76.87 13.34 2011
23 LHR ORD BA 1440 76.32 14.42 2011
24 LHR ORD UA 2106 79.36 15.2 2011
25 LHR ORD VS 302 82.72 8.66 2011
26 LHR LAX AA 730 75.48 13.66 2011
27 LHR LAX BA 1984 63.46 18.47 2011
28 LHR LAX UA 698 83.52 11.7 2011
29 LHR LAX VS 1397 79 11.2 2011
30 LHR JFK AA 2917 75.8 14.77 2011
31 LHR JFK BA 4944 73.56 14.65 2011
32 LHR JFK DL 2144 80.91 13.05 2011
33 LHR JFK KU 302 52.65 30.02 2011
34 LHR JFK VS 2104 76.32 15.09 2011
35 LHR EWR BA 2129 80.7 11.24 2011
36 LHR EWR CO 3503 78.42 14.19 2011
37 LHR EWR VS 1410 77.52 13.39 2011
38 LHR IAD BA 2157 74.08 14.11 2011
39 LHR IAD UA 2516 80.79 14 2011
40 LHR IAD VS 711 82.42 9.73 2011
41 LCY JFK BA 1031 92.05 4.12 2011
42 LHR ORD AA 2523 72.07 20.03 2012
43 LHR ORD BA 1445 70.03 17.73 2012
44 LHR ORD UA 2102 76.08 15.35 2012
45 LHR ORD VS 308 83.77 8.31 2012
46 LHR LAX AA 714 75.35 12.03 2012
47 LHR LAX BA 1874 63.48 18.34 2012
48 LHR LAX UA 693 76.16 14.88 2012
49 LHR LAX VS 1324 76.13 14.08 2012
50 LHR JFK AA 3367 75.72 12.75 2012
51 LHR JFK BA 5129 69.28 17.68 2012
52 LHR JFK DL 2151 77.63 13.59 2012
53 LHR JFK KU 307 52.12 32.02 2012
54 LHR JFK VS 2227 81.9 11.32 2012
55 LHR EWR BA 1920 73.02 15.88 2012
56 LHR EWR CO 612 84.48 9.24 2012
57 LHR EWR UA 2872 69.76 17.91 2012
58 LHR EWR VS 1421 76.14 16.68 2012
59 LHR IAD BA 2014 71.45 16.23 2012
60 LHR IAD UA 2444 69.04 18.98 2012
61 LHR IAD VS 703 87.06 7.71 2012
62 LCY JFK BA 474 91.33 3.74 2012
63 LCY JFK BA 537 89.37 4.71 2012
64 LHR ORD AA 2513 74.69 15.29 2013
65 LHR ORD BA 1440 65.35 20.84 2013
66 LHR ORD UA 2110 78.39 14.13 2013
67 LHR ORD VS 324 83.02 9.05 2013
68 LHR LAX AA 728 76.48 12.56 2013
69 LHR LAX BA 1864 59.5 27.43 2013
70 LHR LAX UA 702 85.47 9.86 2013
71 LHR LAX VS 1288 79 13.76 2013
72 LHR JFK AA 2991 76.4 13.73 2013
73 LHR JFK BA 5350 66.97 18.95 2013
74 LHR JFK DL 2166 82.09 10.81 2013
75 LHR JFK KU 306 62.42 21.53 2013
76 LHR JFK VS 2825 81.91 10.53 2013
77 LHR EWR BA 1838 71.44 16.72 2013
78 LHR EWR UA 3494 80.59 12.36 2013
79 LHR EWR VS 1419 81.66 11.7 2013
80 LHR IAD BA 2012 71.02 18.67 2013
81 LHR IAD UA 2496 80.39 12.82 2013
82 LHR IAD VS 702 86.89 7.1 2013
83 LCY JFK BA 945 90.64 4.58 2013
84 LGW LAX DY 105 72.38 36.83 2014
85 LGW JFK DY 156 51.92 27.79 2014
86 LHR ORD AA 2476 73.5 22.09 2014
87 LHR ORD BA 1444 65.28 18.7 2014
88 LHR ORD UA 2110 77.56 13.68 2014
89 LHR ORD VS 348 81.32 8.86 2014
90 LHR LAX AA 728 76.79 18.56 2014
91 LHR LAX BA 1450 56.84 23.1 2014
92 LHR LAX DL 127 92.13 6.92 2014
93 LHR LAX UA 698 85.1 8.53 2014
94 LHR LAX VS 1217 80.99 12.58 2014
95 LHR JFK AA 2287 78.18 14.74 2014
96 LHR JFK BA 6018 71.29 16.59 2014
97 LHR JFK DL 2123 82.13 11.19 2014
98 LHR JFK KU 310 48.22 33.17 2014
99 LHR JFK VS 2820 79.77 12.45 2014
100 LHR EWR BA 1943 71.46 19.7 2014
101 LHR EWR UA 3485 78.3 15.19 2014
102 LHR EWR VS 1420 86.6 8.37 2014
103 LHR IAD BA 1807 74.58 15.31 2014
104 LHR IAD UA 2130 81.13 13.61 2014
105 LHR IAD VS 695 89.06 6.9 2014
106 LCY JFK BA 1003 91.23 4.43 2014
107 LGW LAX DY 328 66.46 21.41 2015
108 LGW JFK DY 543 64.09 31.78 2015
109 LHR ORD AA 2062 72.09 27.59 2015
110 LHR ORD BA 1442 71.4 16.24 2015
111 LHR ORD UA 2099 83.94 10.37 2015
112 LHR ORD VS 330 78.79 11.61 2015
113 LHR LAX AA 1265 75.42 14.5 2015
114 LHR LAX BA 1450 66.9 17.67 2015
115 LHR LAX DL 540 79.44 10.97 2015
116 LHR LAX UA 704 89.2 7.5 2015
117 LHR LAX VS 1230 80.81 12.74 2015
118 LHR JFK AA 2130 77.45 15.21 2015
119 LHR JFK BA 5994 77.84 13.61 2015
120 LHR JFK DL 2069 80.75 13.51 2015
121 LHR JFK KU 310 59.22 32.67 2015
122 LHR JFK VS 3363 76.35 13.82 2015
123 LHR EWR BA 1459 76.47 14.03 2015
124 LHR EWR DL 381 95.54 2.88 2015
125 LHR EWR UA 3493 79.23 16.31 2015
126 LHR EWR VS 871 81.75 10.7 2015
127 LHR IAD BA 1421 76.89 12.03 2015
128 LHR IAD UA 2126 81.74 14.02 2015
129 LHR IAD VS 703 85.49 12.59 2015
130 LCY JFK BA 937 92.74 4.52 2015
131 LTN EWR DJT 316 81.53 18.18 2015
132 LGW LAX DY 421 59.86 23.64 2016
133 LGW LAX DI 38 65.79 14.39 2016
134 LGW JFK BA 486 69.75 18.02 2016
135 LGW JFK DY 689 65.31 28.18 2016
136 LGW JFK DI 39 69.23 15.49 2016
137 LHR ORD AA 2453 71.82 26.15 2016
138 LHR ORD BA 1443 68.88 17.58 2016
139 LHR ORD UA 2085 82.25 14.2 2016
140 LHR ORD VS 333 89.79 5.07 2016
141 LHR LAX AA 1411 68.25 19.46 2016
142 LHR LAX BA 1452 54.34 24.89 2016
143 LHR LAX UA 700 87 8.48 2016
144 LHR LAX VS 1376 79.58 10.13 2016
145 LHR JFK AA 2623 76.82 21.41 2016
146 LHR JFK BA 5625 69.97 17.15 2016
147 LHR JFK DL 2081 80.37 13.42 2016
148 LHR JFK KU 253 19.76 71.96 2016
149 LHR JFK VS 3489 79.67 11.44 2016
150 LHR EWR AI 118 65.25 21.14 2016
151 LHR EWR BA 1444 76.11 13.49 2016
152 LHR EWR UA 3472 79.03 15.71 2016
153 LHR EWR VS 722 82.27 9.48 2016
154 LHR IAD BA 1415 71.59 17.44 2016
155 LHR IAD UA 2134 82.05 13.24 2016
156 LHR IAD VS 699 84.69 8.02 2016
157 LCY JFK BA 921 90.01 5.26 2016
158 LTN EWR DJT 333 87.05 8.44 2016

BIN
resources/public/data/london.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.7 KiB

1
resources/templates/base.html
View file

@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="{{servlet-context}}/content/stylesheet.css" media="screen" rel="stylesheet" type="text/css" />
<link href="{{servlet-context}}/css/print.css" media="print" rel="stylesheet" type="text/css" />
{% block extra-headers %}
{% endblock %}
</head>

13
resources/templates/wiki.html
View file

@ -1,5 +1,18 @@
{% extends "templates/base.html" %}
{% block extra-headers %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/vega/3.0.0-rc2/vega.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/vega-lite/2.0.0-beta.10/vega-lite.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/vega-embed/3.0.0-beta.19/vega-embed.js"></script>
<style media="screen">
/* Add space between Vega-Embed links */
.vega-actions a {
margin-right: 5px;
}
</style>
{% endblock %}
{% block content %}
<div id="content" class="wiki">
{% if editable %}