diff --git a/README.md b/README.md index cf2e69fcbc..077267b528 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,10 @@ Visualize distributed tracing with Jaeger. +| Trace Search | Trace Details | +| :------------------------------------: | :------------------------------------: | +| ![Trace Search](./media/ss_search.png) | ![Trace Details](./media/ss_trace.png) | + ## Contributing See [CONTRIBUTING](./CONTRIBUTING.md). @@ -46,17 +50,17 @@ ssh -fN -L 16686:$BACKEND_HOST:$BACKEND_PORT $BACKEND_PORT Start the development server with hot loading: ``` -cd packages/jaeger-ui && yarn start +yarn start ``` #### Commands -| Command | Description | -| ------------------------------------- | ------------------------------------------------------------------- | -| `cd packages/jaeger-ui && yarn start` | Starts development server with hot reloading and api proxy. | -| `yarn test` | Run all the tests | -| `yarn lint` | Lint the project (eslint, prettier, flow) | -| `yarn build` | Runs production build. Outputs files to `packages/jaeger-ui/build`. | +| Command | Description | +| ------------ | ------------------------------------------------------------------- | +| `yarn start` | Starts development server with hot reloading and api proxy. | +| `yarn test` | Run all the tests | +| `yarn lint` | Lint the project (eslint, prettier, flow) | +| `yarn build` | Runs production build. Outputs files to `packages/jaeger-ui/build`. | ## Build diff --git a/media/ss_search.png b/media/ss_search.png new file mode 100644 index 0000000000..02e12b80f2 Binary files /dev/null and b/media/ss_search.png differ diff --git a/media/ss_trace.png b/media/ss_trace.png new file mode 100644 index 0000000000..aacf479645 Binary files /dev/null and b/media/ss_trace.png differ diff --git a/package.json b/package.json index c9974228c9..eca60349a3 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,8 @@ "precommit": "lint-staged", "prettier": "prettier --write '{.,scripts}/*.{js,json,md}' 'packages/*/{src,demo/src}/**/*.{css,js,json,md}' 'packages/*/*.{css,js,json,md}'", - "test": "lerna run test" + "test": "lerna run test", + "start": "cd packages/jaeger-ui && yarn start" }, "prettier": { "printWidth": 110, diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/duck.js b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/duck.js index d4e1db9b49..a7180127a6 100644 --- a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/duck.js +++ b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/duck.js @@ -138,7 +138,9 @@ export function collapseOne(state, { payload }) { const childrenHiddenIDs = spans.reduce((res, curSpan) => { if (nearestCollapsedAncestor && curSpan.depth <= nearestCollapsedAncestor.depth) { res.add(nearestCollapsedAncestor.spanID); - nearestCollapsedAncestor = curSpan; + if (curSpan.hasChildren) { + nearestCollapsedAncestor = curSpan; + } } else if (curSpan.hasChildren && !res.has(curSpan.spanID)) { nearestCollapsedAncestor = curSpan; } diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/duck.test.js b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/duck.test.js index 499a668fb3..855fef08b7 100644 --- a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/duck.test.js +++ b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/duck.test.js @@ -135,12 +135,14 @@ describe('TraceTimelineViewer/duck', () => { // --- 2 // - 3 // --- 4 + // - 5 const spans = [ { spanID: 0, depth: 0, hasChildren: true }, { spanID: 1, depth: 1, hasChildren: true }, { spanID: 2, depth: 2, hasChildren: false }, { spanID: 3, depth: 1, hasChildren: true }, { spanID: 4, depth: 2, hasChildren: false }, + { spanID: 5, depth: 1, hasChildren: false }, ]; const oneSpanCollapsed = new Set([1]); diff --git a/packages/jaeger-ui/src/img/jaeger-logo.svg b/packages/jaeger-ui/src/img/jaeger-logo.svg index 3600db2a02..9bab082458 100644 --- a/packages/jaeger-ui/src/img/jaeger-logo.svg +++ b/packages/jaeger-ui/src/img/jaeger-logo.svg @@ -61,9 +61,10 @@ L 211.75 322.35 Q 214.5 322.65 215.7 325.1 215.7 325.15 215.75 325.15 215.7 330.15 211.05 331.25 210.8 331.3 210.5 331.4 206.4 332.8 201.4 333.2 198 333.5 194.35 333.6 190.7 333.7 187.55 333.3 189.55 332.85 192.4 332.85 201.35 332.95 208.7 331.35 210.95 330.45 213 329.3 L 213.1 329.3 Q 214.7 328.1 215 325.65 215.05 325.55 215.05 325.5 214.75 325.05 214.55 324.55 -M 231.7 310 -Q 231.51875 310.0453125 231.35 310.05 231.46875 310.05 231.6 310.05 231.65 310.05 231.7 310.05 -L 231.7 310 Z"/> +M 231.6 310.05 +Q 231.65 310.05 231.7 310.05 +L 231.7 310 +Q 231.51875 310.0453125 231.35 310.05 231.46875 310.05 231.6 310.05 Z"/> +M 172.55 333.4 +Q 172.5 333.4 172.45 333.45 167.05 333.95 164.9 337.7 164.9 339.35 165.95 339.9 166 339.95 166 340 166.65 340.35 167.35 340.7 167.4 340.7 167.45 340.7 167.45 340.65 167.45 340.6 167.4 340.55 167.35 340.5 167.25 340.5 167.25 340.45 166.75 340.05 166.25 339.65 166.25 339.55 166.2 339.5 165.85 338.9 165.85 337.8 166.7 335.9 168.5 334.95 168.55 334.95 168.55 334.9 170.5 334.3 172.35 333.55 172.4 333.55 172.45 333.55 172.55 333.55 172.7 333.55 172.75 333.55 172.8 333.55 172.8 333.5 172.8 333.45 172.7 333.4 172.55 333.4 Z"/> +Q 246.05 338.25 245.35 338.75 244.85 338.05 243.65 337.95 240.3 337.7 237.55 338.4 Z"/> +M 181.2 343.5 +Q 179.35 343.45 177.45 343.5 176.05 343.55 174 343.5 170.35 343.5 167.35 344.35 173.7 344.05 180.25 344.15 180.3 344.15 180.35 344.15 181.35 344.4 181.8 345.25 181.8 345.3 181.8 345.35 181.2 346.05 180.1 346.25 178.8 346.45 177.9 346.95 178.5 347.25 179.85 347.05 179.9 347.05 180 347.05 180.05 347.05 180.1 347.05 181 346.9 181.8 346.7 181.8 346.6 181.85 346.6 182.25 346.2 182.65 345.85 182.65 345.75 182.7 345.7 182.8 345.35 182.8 344.85 182.8 344.8 182.75 344.75 182.15 343.95 181.2 343.5 Z"/> +Q 233.2 339.75 232.8 339.4 232.75 339.4 232.7 339.4 Z"/> +Q 175.2 332.85 172.55 333.3 172.55 333.35 172.55 333.4 172.7 333.4 172.8 333.45 172.8 333.5 172.8 333.55 176.65 332.75 181.3 332.8 182.95 332.8 184.25 332.45 187.55 331.5 191.65 331.85 191.75 331.85 191.8 331.85 191.95 331.85 192.1 331.9 192.55 331.9 192.9 332 196.05 332.35 198.75 331.6 198.8 331.6 198.85 331.6 198.85 331.55 198.85 331.45 201.95 331.25 205.05 330.95 206.9 330.75 208.35 330.15 208.35 330.05 208.3 330.05 Z"/> - - - - - - +Q 240.85 319.1 243.6 317.35 244.9 316.55 245.2 314.9 245.9 311.2 242.05 310.7 238.4 310.25 234.5 310.1 229.45 309.9 224.4 309.7 Z"/> + + + + + + +M 75.4 363.45 +Q 75.45 363.4 75.45 363.35 78.85 361.85 83.05 361.15 85.3 360.75 87.85 360.6 90 360.45 91.25 361.15 91.65 361.4 92 361.75 92.15 362.65 91.65 362.9 91.65 362.95 91.65 363 90.75 363.35 89.85 363.65 89.2 363.95 88.4 364.1 88.3 364.1 88.25 364.15 83.95 365.45 79.2 366.25 79.15 366.3 79.1 366.3 78.65 366.15 78.35 365.8 78.3 365.8 78.25 365.8 75.4 366.45 75 364.2 74.95 364.15 74.95 364.1 75.15 363.75 75.4 363.45 Z"/> +Q 22.85 352.6 23.25 352.7 23.3 352.7 23.35 352.75 25.1 352.95 27.4 353 30.55 353.1 33 351.9 31.25 352.2 29.35 352.5 Z"/> +Q 22.65 351.3 23.1 352.05 23.15 352.1 23.15 352.15 24.25 352.65 25.45 352.2 25.5 352.15 25.55 352.15 26.35 351 28.1 351.75 28.35 351.85 27.85 351.9 27.95 352.7 29.35 352.5 31.25 352.2 33 351.9 30.55 353.1 27.4 353 25.1 352.95 23.35 352.75 24.95 353.15 27.15 353.1 29.25 353.05 31 352.8 33.15 352.5 34.3 351.2 Z"/> +Q 90.3 356.7 87.15 357.05 87.15 357.1 87.15 357.15 89.1 357.05 90.8 356.8 92.15 356.65 93.5 356.55 95.1 356.3 96.75 356.05 97.1 356 97.4 355.95 99.2 355.15 99.9 353.25 99.9 353.2 99.9 353.15 99.9 352.65 99.9 352.15 Z"/> +Q 80.9 348.45 81.75 348.8 81.8 348.8 81.8 348.85 83.85 348.85 85.8 349 85.85 349 85.9 349 85.9 348.95 85.9 348.85 85.9 348.8 85.9 348.75 86 348.75 86 348.7 86.05 348.7 86.05 348.65 86 348.65 85.9 348.65 83.9 348.6 82.25 348.15 82.2 348.15 82.15 348.15 81.05 347.85 80.8 346.7 80.95 346.35 81.05 345.95 81.05 345.9 81.05 345.85 81.25 345.55 81.5 345.3 81.55 345.3 81.55 345.2 82.8 344.5 84.2 343.95 83.3 344.2 82.4 344 82.35 344 82.3 344.05 81.7 344.25 81.15 344.5 81.15 344.55 81.15 344.6 80.7 345.05 80.2 345.45 Z"/> +Q 132.65 334.95 132.65 335.35 123.25 336.4 114.15 338 111.9 338.4 109.5 338.55 104.8 338.75 100.65 339.4 100.65 339.45 100.65 339.5 110.95 338.9 120.25 337.5 125.15 336.75 129.75 336 137.35 334.75 144.55 333.3 144.55 333.25 144.55 333.2 144.8 333.15 144.95 333.1 145 333.05 145.05 333.05 145.05 333 145.1 333 145.55 332.65 145.9 332.35 145.9 332.25 145.95 332.2 146.6 331 145.9 329.75 144.4 328.55 141.8 328.35 139.3 328.2 136.7 327.9 Z"/> +M 68.85 357.9 +Q 69.35 357.9 69.9 357.95 73.55 358.1 77.3 358 81.25 357.9 84.85 357.6 86.15 357.5 87.15 357.15 87.1 357.15 87 357.15 82.75 357.75 77.75 357.65 67.25 357.65 57.8 356.85 54.35 356.55 50.5 356.55 44.95 356.5 41.85 354.1 44.65 356.8 50.4 356.75 53.6 356.7 56.6 356.95 61.9 357.3 67.05 357.75 67.45 357.8 67.9 357.8 68.35 357.85 68.85 357.9 Z"/> +L 39.2 358.9 Z"/> +Q 43.5 346.7 43.45 346.7 39.75 347.45 38.35 350.45 38.35 351.1 38.45 351.65 38.45 351.75 38.45 351.8 38.85 352.2 39.3 352.55 39.3 352.6 39.3 352.65 40.4 353 41.15 353.6 41.2 353.6 41.25 353.6 41.55 353.45 41.85 353.45 42.2 353.45 42.15 353.3 41.75 352.4 40.3 351.9 Z"/> +Q 86.6 337.05 83.35 338.55 83.3 338.55 83.25 338.55 82.8 338.5 82.4 338.55 79.3 339.7 75.7 340.35 74.5 340.6 73.35 340.8 68.7 341.65 64.5 342.8 62.4 343.4 60.2 343.85 52.3 345.55 43.55 346.3 Z"/> +Q 323.1 294.2 323.05 294.15 322.65 293.7 322.25 293.3 321.4 292.35 320.55 291.45 320.55 291.5 320.55 291.55 321.05 294.95 321.4 298.5 321.35 298.5 321.25 298.5 319.55 298.65 317.6 298.6 317.6 298.7 317.6 298.75 320.55 298.75 323.2 298.5 323.25 298.5 323.35 298.5 323.2 296.6 323.05 294.25 Z"/> +M 248.6 201.5 +Q 246.45 203.3 243.95 204.8 237.1 208.8 226.35 208.95 222.9 209 219.8 208.5 210.55 207.05 204.3 202.35 204.25 202.35 204.2 202.35 203.7 202.25 203.25 202.1 208.95 207.25 218 209.05 221.45 209.75 225.5 209.8 236.5 209.9 243.25 205.85 245.75 204.3 248 202.65 248.65 202.2 248.9 201.5 248.95 201.35 248.6 201.5 Z"/> +M 94.7 292.15 +Q 94.7 292.25 94.65 292.25 94.1 293.15 93.7 294.25 93.65 294.25 93.6 294.25 92.9 295.1 92.15 295.95 92.15 296 92.15 296.05 97.3 296.05 101.2 297.25 102.6 297.7 104.15 297.9 104.15 297.85 104.15 297.75 103.2 294.55 102.45 291.05 102.4 291.05 102.35 291.1 99.15 291.95 94.7 292.15 Z"/> +Q 339.9 253.7 339.65 253.6 339.65 253.55 339.6 253.5 Z"/> +Q 73.4 280.35 73.15 285.1 73.1 286.15 72.9 286.35 72.85 286.35 72.85 286.3 71.7 282.6 71.7 277.8 72.5 267.7 76.25 260.5 77.85 257.5 80.05 255.05 82.95 251.9 86.05 248.95 88.1 247.8 90.55 247.05 90.6 247 90.65 247 90.65 246.95 90.65 246.9 Z"/> +Q 85.75 222.7 87.45 232.05 88.75 239 90.4 245.7 90.4 244.1 90.05 242.75 88.2 235.1 86.75 227.15 85.05 217.85 82.9 209.2 Z"/> +Q 89.5 148.7 90.15 147.95 90.2 147.9 90.2 147.85 89 148.35 88.55 149.75 88.15 150.95 87.55 152.1 83.85 159.25 82.2 168.6 80.5 177.9 80.95 188.5 Z"/> +Q 113.35 139.85 111.45 138.45 110.35 138.6 109.15 138.35 105.65 137.55 101.85 137.15 94.1 136.4 86.55 137.15 85.3 137.3 84.15 137.65 81.05 138.55 77.3 138.75 Z"/> +M 127.45 61.5 +Q 128.8 60.5 130 59.4 130.05 59.4 130.1 59.4 132.65 57.1 135.15 54.7 133.25 56.2 131.5 57.4 129.35 59.55 127.45 61.5 Z"/> +Q 91.75 105.95 93.5 107.8 93.8 108.2 94.2 108.5 99.8 113.5 103.15 120.55 103.3 120.9 103.2 121.2 Z"/> +Q 108.2 113 108.2 112.9 107.8 111.5 108.05 109.9 108.05 109.8 108.05 109.75 107.9 109.4 107.75 109.15 107.7 109.1 107.7 109.05 107.65 109.05 107.6 109 106.6 107.65 105.65 106.25 105.55 106.25 105.55 106.2 105.15 105.75 104.8 105.25 104.8 105.2 104.75 105.15 100.9 100.15 95.9 96.25 95.85 96.25 95.8 96.2 95.3 95.95 94.7 95.75 94.7 95.7 94.65 95.7 94.4 95.55 94.3 95.3 94.25 95.3 94.2 95.25 92.45 94.3 90.4 93.55 89.1 93.4 87.75 93.2 85.15 92.8 83.15 93.55 78.3 95.35 77.9 101.6 77.8 108.5 79.85 113.15 81.2 116.1 82.65 118.9 83.05 119.4 83.25 120.1 83.25 120.15 83.25 120.2 87.75 126.6 93.2 132.05 93.5 132.35 93.7 132.75 94.3 132.1 95 131.6 95.05 131.6 95.05 131.55 92.75 129.05 90.55 126.4 90.55 126.35 90.55 126.3 88.2 123.65 86.25 120.65 84.3 117.6 82.6 114.25 79.85 108.85 79.95 100.65 80.35 97.3 82.35 95.6 82.4 95.6 82.4 95.5 Z"/> +Q 122.7 144.85 129.55 148.85 136.45 152.9 143.25 157 146.65 159.05 151.25 160.05 153.65 160.55 156.25 160.95 158.35 161.3 160.4 160.85 161 160.75 161.75 160.75 164.75 159.85 166.05 157.25 166.05 157.2 166.1 157.2 166.1 156.65 166.1 156.1 166.1 156.05 166.1 156 165.85 155.4 165.55 154.9 165.5 154.85 165.5 154.8 165.1 154.4 164.4 154.25 Z"/> +Q 192.5 167.25 191.9 175.35 191.65 181.35 192.75 185.55 192.75 184.4 192.65 182.75 192.65 182.7 192.65 182.65 192.65 182.6 192.65 182.55 192.5 180.45 192.5 178.15 192.5 178.1 192.5 178 192.5 176.55 192.5 175.1 193 171.45 193.7 168.05 193.75 168 193.75 167.9 195.3 165.4 196.5 162.55 196.55 162.5 196.55 162.45 196.55 162.4 196.5 162.35 196.45 162.35 196.4 162.35 Z"/> +M 211.25 187.75 +Q 211.05 190.5 211.85 192.25 212.3 193.35 213.2 193.9 214.7 194.9 216 196.05 216.6 196.2 217.1 196.25 221.5 197 224.5 195.05 224.6 195.05 224.65 195.05 225.6 194.8 226.35 194.35 226.35 194.25 226.4 194.25 227.7 193.25 228.65 191.9 228.75 191.4 228.95 191.05 229.3 190.45 229.3 189.7 229.4 185.55 227.3 183.4 227.25 183.4 227.2 183.35 226.6 182.95 226.25 182.3 224.45 181.15 222.2 180.55 219.55 179.9 217.3 180.95 213.6 182.65 211.6 186.2 211.6 186.25 211.6 186.3 211.45 187 211.25 187.75 Z"/> +Q 161.55 252.2 155.4 253 149.65 253.75 145.85 251.4 144.6 250.65 143.5 249.7 140.55 247.15 140.55 241.65 141.6 231.8 147.75 227.05 149 226.1 150.35 225.25 154.55 222.65 158.95 220.25 158.95 220.2 158.9 220.15 158.55 219.25 158.2 218.4 158.2 218.35 158.2 218.3 158.2 217.1 158.2 215.85 158.4 215.6 158.35 215 Z"/> +Q 194.8 247 194.6 246.3 Z"/> + + - - +Q 186 244.6 179.5 245.05 Z"/> +Q 158.85 220.9 159.3 220.85 159.3 220.8 159.25 220.75 Z"/> @@ -876,10 +879,10 @@ M 154.4 169.5 Q 153.9 169 153.5 168.4 148.9 162.05 139.7 160.4 139.65 160.4 139.6 160.4 139.35 160.4 139.1 160.4 139.4 160.65 139.7 160.9 139.7 160.95 139.7 161 148.85 162.75 153.35 169.15 153.6 169.5 153.9 169.8 157.05 172.9 158.35 177.9 158.8 179.5 159.4 180.95 159.4 181.3 159.4 181.65 159.4 181.75 159.4 181.8 160.7 186 160.65 191.4 160.6 196.75 159 200.5 156.55 206.3 152.9 210.8 148.65 216.05 142.65 219.55 141.45 220.25 139.95 220.75 140 220.75 140.05 220.75 140.05 220.8 140.05 220.85 141.45 220.45 142.65 219.8 149.65 216 154.5 210 159.35 203.95 161 194.8 161.95 189.7 161.15 184.6 159.65 175.2 154.4 169.5 Z"/> +M 113.3 167.85 +Q 114.95 166.6 116.45 165.25 122.85 160.7 133.15 160.35 136.75 160.2 139.7 161 139.7 160.95 139.7 160.9 139.4 160.65 139.1 160.4 139.35 160.4 139.6 160.4 139.65 160.4 139.7 160.4 136.5 159.5 132.3 159.7 128.35 159.85 125.2 160.65 121.25 161.65 118.25 163.45 111.45 167.5 106.85 173.75 106.85 173.9 106.85 174 106.85 174.05 106.85 174.15 107.5 173.1 108.3 172.3 108.3 172.25 108.3 172.2 109.4 171.75 110.4 170.6 111.7 169.05 113.3 167.85 Z"/> +Q 239.05 71.4 237.9 72.15 237.85 72.15 237.8 72.15 235.25 72.8 233.75 71.3 233.75 71.35 233.75 71.4 233.1 72.15 232.8 70.8 Z"/> +M 163.55 30.85 +L 163.55 30.8 +Q 162.95 31.1 162.4 31.5 159.15 33.95 155.65 36.25 155.65 36.3 155.6 36.35 154.95 37.35 153.95 37.95 153.95 38 153.95 38.1 160.25 33.5 168.4 30.7 170.35 30.05 172.55 29.55 166.35 30.65 161 33.2 160.95 33.2 160.9 33.2 162.2 32.05 163.55 30.85 Z"/> @@ -961,8 +964,8 @@ M 281 88.95 Q 282 89.4 283.3 89.55 287.2 90.1 290.8 91.05 295.15 92.25 299.75 92.7 299.5 92.6 299.25 92.5 290.9 89.9 281 88.95 Z"/> +M 214.4 43.2 +Q 213.8 42.9 213.3 42.45 211.9 41.25 209.8 41.85 216 44.9 222.2 47.9 222.25 47.95 222.35 47.95 218.45 45.5 214.4 43.2 Z"/> +Q 217.55 135.05 217.5 135.1 216.7 136.05 215.65 136.75 215.65 136.85 215.65 136.9 215.65 136.95 215.65 137 222.4 132.9 229.35 129.05 236.45 125.15 243.35 121.15 250.2 117.15 257.35 113.3 264.4 109.55 272.15 106.3 273.1 105.95 274.05 105.5 281.7 102.25 290.45 100 299 97.75 307.5 95.4 311.05 94.4 313.6 92.55 315.6 91.1 315.9 88.2 316.05 87.1 315.3 86.75 314.85 86.55 314.5 86.8 314.45 86.8 314.45 86.9 314.5 87.7 314.55 88.45 314.55 88.5 314.55 88.6 312.2 93.3 306.2 94.65 Z"/> +Q 312.4 83.7 311.15 83.45 311.65 83.7 312.15 83.95 312.7 84.15 313.1 84.55 314.05 85.6 314.95 85.05 Z"/> +M 296.55 79.65 +Q 293.75 79.3 291.7 78.5 302 79.1 309.3 82.7 309.396875 82.796875 309.6 82.85 305.5435546875 81.898046875 301.3 80.65 298.95 79.95 296.55 79.65 Z"/> +M 291.7 78.5 +Q 293.75 79.3 296.55 79.65 298.95 79.95 301.3 80.65 305.5435546875 81.898046875 309.6 82.85 309.396875 82.796875 309.3 82.7 302 79.1 291.7 78.5 Z"/> +Q 234.95 82 235.25 82 235.7 81.7 234.75 81.65 234.7 81.65 234.6 81.65 233.5 82 232.75 82.65 232.95 81.75 234.1 81.35 234.15 81.35 234.15 81.3 234.85 81.3 235.6 81.3 235.65 81.3 235.7 81.3 236.3 81.6 236.75 82.1 236.75 82.15 236.8 82.15 237.05 82.65 237.25 83.2 Z"/> +Q 229.8 92.6 230.5 93.45 232.1 92.9 232.95 91.7 233.8 90.45 234.75 89.3 234.75 89.35 234.75 89.45 233.95 92.05 232.45 93.95 232.5 93.95 232.55 93.9 233.35 93.65 233.9 93.1 234.15 92.5 234.4 91.9 234.65 91.3 235.05 90.75 237.05 87.9 237.3 83.25 Z"/> - - - - +Q 243.8 65.45 245.2 62.15 245.2 62.1 245.2 62.05 Z"/> + + + + +Q 253.1 65.2 249.35 67.05 Z"/> +Q 252.45 57.3 253.35 55.5 253.35 55.4 253.35 55.35 253.6 54.05 253.75 52.85 Z"/> +Q 248.25 95.45 248.25 95.4 248.25 95.3 248.25 95.15 248.75 92.9 249.2 90.75 250.25 86.2 252.05 82.55 255.65 75.25 261 69.7 263.65 66.9 267.15 64.8 270.05 63.05 273.6 61.75 275.25 61.15 277.45 61.05 Z"/> +Q 278.65 37.4 277.1 37.25 277.05 37.25 276.95 37.25 Z"/> - - + + +M 245.1 46.95 +Q 245.05 46.95 245 47 242.1 52.35 239.35 57.9 239.55 59.35 240.25 57.85 241.25 55.8 242.4 53.9 246.55 47.15 250 39.6 250.05 39.55 249.95 39.3 247.3 43 245.1 47.05 +L 245.1 46.95 Z"/> + + - - +Q 323.2 296.6 323.35 298.5 323.25 298.5 323.2 298.5 320.55 298.75 317.6 298.75 317.6 298.8 317.6 298.85 321.2 298.7 324.55 299.05 324.7 299.05 324.8 299.25 326.3 299.5 328.35 299.2 330.15 299 331.95 298.95 332.25 298.95 332.2 298.75 Z"/> +Q 344.6 296.3 334.65 297.05 334.65 297.1 334.6 297.15 +L 333.5 298.15 +Q 333.3 298.25 333.05 298.4 332.75 298.5 332.45 298.6 332.45 298.7 332.45 298.75 342.85 298.25 351.8 296.25 353.35 295.9 354.75 295.35 355.65 293.2 353.9 292.05 351.4 290.4 347.8 289.8 346.55 289.6 345.15 289.25 343.9 289 342.45 288.9 Z"/> +Q 279.85 299.65 279.65 300.15 291.7 300.9 304.15 300.05 308.9 299.75 309 299.75 309.55 299.75 320 299.8 326.55 299.85 330.8 298.95 Z"/> +Q 168.6 213.85 170.4 213 171.15 212.65 172.7 212.1 173.6 211.7 173.7 211.25 173.9 210.65 173.35 210.2 173 209.9 172.3 209.9 Z"/> +L 101.2 282.65 101.05 282.75 +Q 100.95 282.2 100.7 282.05 100.6 281.85 100.45 282.15 +L 100.35 282.5 Z"/> +Q 140.9 220.9 143.45 218.35 143.75 218.05 143.8 217.75 143.8 217.3 143.45 217.3 Z"/> +Q 103.55 197.95 105 189.85 105.3 188.25 105.55 187.4 106.15 185.35 106.15 184.85 106.15 184.6 106 184.45 Z"/> +Q 98 128.2 97.95 128.1 Z"/> +Q 249.55 86.7 250 85.75 Z"/> +Q 243.35 147.35 243.25 147.3 243.2 147.25 243.15 147.25 243.1 147.2 243 147.2 242.5 146.9 242.2 146.85 Z"/> +Q 301.1 270.25 300.75 270.05 300.8 270.1 300.8 270.2 +L 300.8 270.25 300.9 270.4 Z"/> +L 216.6 85.45 Z"/> +Q 230.8 93.3 230.85 93.4 230.65 93.2 230.4 92.9 Z"/> +L 292.75 76.8 287.05 75.75 Z"/> +M 279.2 104.9 +Q 279.7 104.7 280.25 104.55 280.05 104.65 279.9 104.8 279.55 104.85 279.2 104.9 Z"/> +Q 339.65 283.7 339.75 284.1 339.6 284.5 339.4 285.1 339.3 286 340.05 286.15 340.7 286.2 341.1 285.2 341.6 283.95 341.8 281.75 342 279.3 341.9 277.05 341.95 276.15 341.9 275.9 341.9 275.25 341.7 274.05 341.35 271.3 340.45 269.2 340.1 268.35 339.65 267.6 339.1 265.8 337.45 263.75 336.55 262.55 335.75 261.9 335.4 261.6 333.8 260.35 332.2 259.25 331.3 258.85 331.2 258.8 331.1 258.75 330.4 258.3 329.95 258 329.1 257.2 328.35 256.65 327.25 255.8 324.6 254.15 317.2 249.8 312.7 248.45 310.55 247.8 307.4 247.25 302.9 246.6 300.2 247.05 296.1 247.75 294.05 250.6 291.85 254.05 293.05 258.65 293.95 262.2 297.2 265.85 297.75 266.4 298.15 266.55 298.6 266.75 298.9 266.6 299.25 266.6 299.4 266.35 299.7 266.05 299.55 265.6 299.55 265.45 299.35 265.25 298.9 264.95 298.7 264.8 +L 298.2 264.15 297.15 262.3 296.8 260.95 +Q 296.7 260.5 296.35 260.3 296.05 260.2 295.8 260.3 295.65 260.4 295.55 260.5 295.5 260.4 295.45 260.3 293.15 255.15 295.25 251.8 296.85 249.45 300.15 248.75 302.4 248.3 306.05 248.75 308.95 249.15 310.35 249.5 315.6 250.8 321.9 254.45 324.65 256 326.8 257.65 326.7 257.95 327.05 258.4 +L 327.1 258.45 +Q 326.4 258.45 326.2 258.9 326.05 259.1 326.1 259.35 Z"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2031,11 +2066,11 @@ L 543 1018 211 1018 62 0 395 0 Z"/> - + - + -Logo by Lev Polyakov www.polyakovproductions.com +Logo by Lev Polyakov www.polyakovproductions.com