web search done right
Rename to stract
Mikkel Denkerf74fe6934cd5
diff --git a/.gitmodules b/.gitmodulesindex 3faf8832..7e9313b7 100644--- a/.gitmodules+++ b/.gitmodules@@ -1,3 +1,3 @@[submodule "optics/testcases"]path = optics/testcases- url = https://github.com/Cuely/sample-optics+ url = https://github.com/StractOrg/sample-opticsdiff --git a/.lfsconfig b/.lfsconfigdeleted file mode 100644index c58d84d2..00000000--- a/.lfsconfig+++ /dev/null@@ -1,2 +0,0 @@-[lfs]-url = "https://lfs.cuely.io/api/Cuely/Cuely"diff --git a/CONTRIBUTING.md b/CONTRIBUTING.mdindex 6fc6c4ac..f871042c 100644--- a/CONTRIBUTING.md+++ b/CONTRIBUTING.md@@ -1,10 +1,10 @@-# Contributing to Cuely-There are many ways to contribute to Cuely.+# Contributing to Stract+There are many ways to contribute to Stract.Code contribution are welcome of course, but alsobug reports, feature request, and evangelizing are as valuable.# Submitting a PR-Check if your issue is already listed [github](https://github.com/cuely/cuely/issues).+Check if your issue is already listed [github](https://github.com/StractOrg/stract/issues).If it is not, create your own issue.Please add the following phrase at the end of your commit. `Closes #<Issue Number>`.@@ -16,11 +16,11 @@ Feel free to send your contribution in an unfinished state to get early feedbackIn that case, simply mark the PR with the tag [WIP] (standing for work in progress).# Signing the CLA-Cuely is an opensource project licensed a AGPLv3.+Stract is an opensource project licensed a AGPLv3.Contributors are required to sign a Contributor License Agreement.The process is simple and fast. Upon your first pull request, you will be prompted to-[sign our CLA by visiting this link](https://cla-assistant.io/cuely/cuely).+[sign our CLA by visiting this link](https://cla-assistant.io/StractOrg/stract).# Development## Setupdiff --git a/Cargo.lock b/Cargo.lockindex 9ba03511..94a74300 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -808,75 +808,6 @@ dependencies = ["memchr",]-[[package]]-name = "cuely"-version = "0.1.0"-dependencies = [- "anyhow",- "askama",- "async-stream",- "async-trait",- "axum",- "axum-extra",- "axum-macros",- "base64 0.13.1",- "bincode",- "bitvec",- "byteorder",- "bzip2",- "chitchat",- "chrono",- "clap 3.2.23",- "criterion",- "crossbeam-channel",- "csv",- "encoding_rs",- "flate2",- "fst",- "futures",- "html-escape",- "http",- "image",- "indicatif 0.16.2",- "itertools 0.10.5",- "kuchiki",- "lalrpop",- "lalrpop-util",- "logos",- "maplit",- "md5",- "memmap",- "min-max-heap",- "num_cpus",- "once_cell",- "onnxruntime",- "optics",- "parse_wiki_text",- "quick-xml",- "rand 0.8.5",- "rayon",- "regex",- "reqwest",- "rocksdb",- "rust-stemmers",- "scylla",- "serde",- "serde_json",- "serde_urlencoded",- "tantivy",- "thiserror",- "tokenizers",- "tokio",- "tokio-stream",- "toml",- "tower-http",- "tracing",- "tracing-subscriber",- "urlencoding",- "uuid",- "whatlang",-]-[[package]]name = "cxx"version = "1.0.90"@@ -2396,7 +2327,7 @@ dependencies = [[[package]]name = "onnxruntime"version = "0.0.14"-source = "git+https://github.com/Cuely/onnxruntime-rs#b8d281e0e6f1e180700e8df437f6a07a36fec931"+source = "git+https://github.com/StractOrg/onnxruntime-rs#b8d281e0e6f1e180700e8df437f6a07a36fec931"dependencies = ["lazy_static","ndarray",@@ -2408,7 +2339,7 @@ dependencies = [[[package]]name = "onnxruntime-sys"version = "0.0.14"-source = "git+https://github.com/Cuely/onnxruntime-rs#b8d281e0e6f1e180700e8df437f6a07a36fec931"+source = "git+https://github.com/StractOrg/onnxruntime-rs#b8d281e0e6f1e180700e8df437f6a07a36fec931"dependencies = ["flate2","tar",@@ -3440,6 +3371,75 @@ version = "1.1.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"+[[package]]+name = "stract"+version = "0.1.0"+dependencies = [+ "anyhow",+ "askama",+ "async-stream",+ "async-trait",+ "axum",+ "axum-extra",+ "axum-macros",+ "base64 0.13.1",+ "bincode",+ "bitvec",+ "byteorder",+ "bzip2",+ "chitchat",+ "chrono",+ "clap 3.2.23",+ "criterion",+ "crossbeam-channel",+ "csv",+ "encoding_rs",+ "flate2",+ "fst",+ "futures",+ "html-escape",+ "http",+ "image",+ "indicatif 0.16.2",+ "itertools 0.10.5",+ "kuchiki",+ "lalrpop",+ "lalrpop-util",+ "logos",+ "maplit",+ "md5",+ "memmap",+ "min-max-heap",+ "num_cpus",+ "once_cell",+ "onnxruntime",+ "optics",+ "parse_wiki_text",+ "quick-xml",+ "rand 0.8.5",+ "rayon",+ "regex",+ "reqwest",+ "rocksdb",+ "rust-stemmers",+ "scylla",+ "serde",+ "serde_json",+ "serde_urlencoded",+ "tantivy",+ "thiserror",+ "tokenizers",+ "tokio",+ "tokio-stream",+ "toml",+ "tower-http",+ "tracing",+ "tracing-subscriber",+ "urlencoding",+ "uuid",+ "whatlang",+]+[[package]]name = "string_cache"version = "0.8.4"diff --git a/Cargo.toml b/Cargo.tomlindex 7c634f79..19c017a8 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -64,7 +64,7 @@ maplit = "1.0.2"rand = "0.8.5"crossbeam-channel = "0.5.6"num_cpus = "1.15.0"-onnxruntime = { git = "https://github.com/Cuely/onnxruntime-rs" }+onnxruntime = { git = "https://github.com/StractOrg/onnxruntime-rs" }tokenizers = "0.13.2"byteorder = "1.4.3"async-stream = "0.3.3"diff --git a/Dockerfile b/Dockerfileindex f0a5cbe9..0c2bf7f4 100644--- a/Dockerfile+++ b/Dockerfile@@ -1,6 +1,6 @@FROM rust:bullseye AS builder-WORKDIR /cuely+WORKDIR /stractRUN echo "Adding Node.js PPA" \&& curl -s https://deb.nodesource.com/setup_18.x | bash@@ -22,13 +22,13 @@ COPY . .RUN cd frontend && npm install && npm run buildRUN ORT_STRATEGY=system ORT_LIB_LOCATION=/usr/lib/libonnxruntime.so.1.13.1 cargo build --release \- && mkdir /cuely/bin \- && find target/release -maxdepth 1 -perm /a+x -type f -exec mv {} /cuely/bin \;+ && mkdir /stract/bin \+ && find target/release -maxdepth 1 -perm /a+x -type f -exec mv {} /stract/bin \;-FROM debian:bullseye-slim AS cuely+FROM debian:bullseye-slim AS stract-LABEL org.opencontainers.image.title="Cuely"-LABEL maintainer="Cuely <[email protected]>"+LABEL org.opencontainers.image.title="Stract"+LABEL maintainer="Stract <[email protected]>"LABEL org.opencontainers.image.licenses="AGPL-3.0"RUN apt-get -y update \@@ -36,11 +36,11 @@ RUN apt-get -y update \libssl1.1 \&& rm -rf /var/lib/apt/lists/*-WORKDIR /cuely+WORKDIR /stract-COPY --from=builder /cuely/bin/cuely /usr/local/bin/cuely-COPY --from=builder /cuely/frontend/dist frontend/dist+COPY --from=builder /stract/bin/stract /usr/local/bin/stract+COPY --from=builder /stract/frontend/dist frontend/distCOPY --from=builder /usr/lib/libonnxruntime.so.1.13.1 /usr/libCOPY --from=builder /usr/lib/libonnxruntime.so /usr/lib-ENTRYPOINT ["/usr/local/bin/cuely"]+ENTRYPOINT ["/usr/local/bin/stract"]diff --git a/README.md b/README.mdindex 513992ef..3bb66841 100644--- a/README.md+++ b/README.md@@ -3,7 +3,7 @@</p><br />-Cuely is an open source web search engine hosted at [cuely.io](https://cuely.io/) targeted towards tinkerers and developers.+Stract is an open source web search engine hosted at [trystract.com](https://trystract.com/) targeted towards tinkerers and developers.<br /><p align="center">@@ -21,20 +21,20 @@ Cuely is an open source web search engine hosted at [cuely.io](https://cuely.io/* De-rank websites with third-party trackers* Prioritize fresh content* Regional search-* Customize how signals are combined during search for the final search result-* Use [optics](https://github.com/Cuely/sample-optics/blob/main/quickstart.optic) to almost endlessly customize your search results.+* Use [optics](https://github.com/StractOrg/sample-optics/blob/main/quickstart.optic) to almost endlessly customize your search results.+ * Customize how signals are combined during search for the final search result* Prioritize links (centrality) from the sites you trust.# π©βπ» Setup-We recommend everyone to use the hosted version at [cuely.io](https://cuely.io/), but you can also follow the steps outlined in [CONTRIBUTING.md](CONTRIBUTING.md) to setup the engine locally.+We recommend everyone to use the hosted version at [trystract.com](https://trystract.com/), but you can also follow the steps outlined in [CONTRIBUTING.md](CONTRIBUTING.md) to setup the engine locally.# βπΌ License-Cuely is offered under the terms defined under the [LICENSE.md](LICENSE.md) file.+Stract is offered under the terms defined under the [LICENSE.md](LICENSE.md) file.# π¬ Contact-You can contact us at [[email protected]](mailto:[email protected]) or in our [Discord server](https://discord.gg/BmzKHffWJM).+You can contact us at [[email protected]](mailto:[email protected]) or in our [Discord server](https://discord.gg/BmzKHffWJM).# π Thank you!We truly stand on the shoulders of giants and this project would not have been even remotely feasible without them. An especially huge thank you to-* The authors and contributors of Tantivy for providing the inverted index library on which Cuely is built.+* The authors and contributors of Tantivy for providing the inverted index library on which Stract is built.* The commoncrawl organization for crawling the web and making the dataset readily available.\ No newline at end of filediff --git a/core/Cargo.toml b/core/Cargo.tomlindex 2594f324..b5eef1e2 100644--- a/core/Cargo.toml+++ b/core/Cargo.toml@@ -1,10 +1,10 @@[package]-name = "cuely"+name = "stract"version = "0.1.0"edition = "2021"license = "AGPL-3.0-or-later"-authors = ['Cuely ApS. <[email protected]>']-default-run = "cuely"+authors = ['Stract ApS. <[email protected]>']+default-run = "stract"# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html@@ -12,7 +12,7 @@ default-run = "cuely"dev = [][[bin]]-name = "cuely"+name = "stract"path = "src/main.rs"[dependencies]diff --git a/core/benches/abstractive-summarizer.rs b/core/benches/abstractive-summarizer.rsindex 3ec12432..34cc354e 100644--- a/core/benches/abstractive-summarizer.rs+++ b/core/benches/abstractive-summarizer.rs@@ -1,5 +1,5 @@use criterion::{criterion_group, criterion_main, Criterion};-use cuely::summarizer::{AbstractiveModel, AbstractiveSummarizer, GenerationConfig};+use stract::summarizer::{AbstractiveModel, AbstractiveSummarizer, GenerationConfig};pub fn criterion_benchmark(c: &mut Criterion) {let model =diff --git a/core/benches/harmonic-centrality.rs b/core/benches/harmonic-centrality.rsindex 7540b0d3..33a6393d 100644--- a/core/benches/harmonic-centrality.rs+++ b/core/benches/harmonic-centrality.rs@@ -1,5 +1,5 @@use criterion::{criterion_group, criterion_main, Criterion};-use cuely::webgraph::{centrality::harmonic::HarmonicCentrality, WebgraphBuilder};+use stract::webgraph::{centrality::harmonic::HarmonicCentrality, WebgraphBuilder};const WEBGRAPH_PATH: &str = "data/webgraph";diff --git a/core/benches/online-harmonic.rs b/core/benches/online-harmonic.rsindex 21c04c36..aa402093 100644--- a/core/benches/online-harmonic.rs+++ b/core/benches/online-harmonic.rs@@ -1,5 +1,5 @@use criterion::{criterion_group, criterion_main, Criterion};-use cuely::{+use stract::{ranking::centrality_store::HarmonicCentralityStore,webgraph::{centrality::{harmonic::HarmonicCentrality, online_harmonic::OnlineHarmonicCentrality},@@ -13,7 +13,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {let webgraph = WebgraphBuilder::new(WEBGRAPH_PATH).open();let centrality = HarmonicCentrality::calculate(&webgraph);- let harmonic_centrality_store = HarmonicCentralityStore::open(cuely::gen_temp_path());+ let harmonic_centrality_store = HarmonicCentralityStore::open(stract::gen_temp_path());for (node, centrality) in centrality.host {harmonic_centrality_store.hostdiff --git a/core/benches/search-preindexed-optic.rs b/core/benches/search-preindexed-optic.rsindex 8dabe84c..ea66f0d4 100644--- a/core/benches/search-preindexed-optic.rs+++ b/core/benches/search-preindexed-optic.rs@@ -1,5 +1,5 @@use criterion::{criterion_group, criterion_main, Criterion};-use cuely::{+use stract::{index::Index,searcher::{LocalSearcher, SearchQuery},};diff --git a/core/benches/search-preindexed.rs b/core/benches/search-preindexed.rsindex f6db97ed..605c1128 100644--- a/core/benches/search-preindexed.rs+++ b/core/benches/search-preindexed.rs@@ -1,5 +1,5 @@use criterion::{criterion_group, criterion_main, Criterion};-use cuely::{+use stract::{index::Index,ranking::centrality_store::CentralityStore,searcher::{LocalSearcher, SearchQuery},diff --git a/core/examples/mapreduce_manager.rs b/core/examples/mapreduce_manager.rsindex e13fa4a5..0c2846b4 100644--- a/core/examples/mapreduce_manager.rs+++ b/core/examples/mapreduce_manager.rs@@ -1,7 +1,7 @@use std::net::SocketAddr;-use cuely::mapreduce::{Manager, Map, Reduce, StatelessWorker};use serde::{Deserialize, Serialize};+use stract::mapreduce::{Manager, Map, Reduce, StatelessWorker};use tracing::Level;use tracing_subscriber::FmtSubscriber;diff --git a/core/examples/mapreduce_worker.rs b/core/examples/mapreduce_worker.rsindex 9d136537..ccf2dc00 100644--- a/core/examples/mapreduce_worker.rs+++ b/core/examples/mapreduce_worker.rs@@ -1,7 +1,7 @@use std::net::SocketAddr;-use cuely::mapreduce::{Map, Reduce, StatelessWorker, Worker};use serde::{Deserialize, Serialize};+use stract::mapreduce::{Map, Reduce, StatelessWorker, Worker};use tracing::Level;use tracing_subscriber::FmtSubscriber;diff --git a/core/examples/print_approx_harmonic_centrality.rs b/core/examples/print_approx_harmonic_centrality.rsindex 57ab0cd7..1be026d7 100644--- a/core/examples/print_approx_harmonic_centrality.rs+++ b/core/examples/print_approx_harmonic_centrality.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License as@@ -19,7 +19,7 @@ use std::{collections::{BinaryHeap, HashMap},};-use cuely::{+use stract::{ranking::centrality_store::CentralityStore,webgraph::{centrality::online_harmonic::Scorer, Node, NodeID, WebgraphBuilder},webpage::Url,diff --git a/core/examples/print_inbound_links.rs b/core/examples/print_inbound_links.rsindex 6026728c..711fb14f 100644--- a/core/examples/print_inbound_links.rs+++ b/core/examples/print_inbound_links.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License as@@ -14,7 +14,7 @@// You should have received a copy of the GNU Affero General Public License// along with this program. If not, see <https://www.gnu.org/licenses/>.-use cuely::{+use stract::{ranking::inbound_similarity::InboundSimilarity,webgraph::{Node, WebgraphBuilder},};diff --git a/core/src/api/about.rs b/core/src/api/about.rsindex e945436a..053e9a65 100644--- a/core/src/api/about.rs+++ b/core/src/api/about.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/api/autosuggest.rs b/core/src/api/autosuggest.rsindex 3ca4434e..ff387dcb 100644--- a/core/src/api/autosuggest.rs+++ b/core/src/api/autosuggest.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/api/improvement.rs b/core/src/api/improvement.rsindex d7b59c73..5521884f 100644--- a/core/src/api/improvement.rs+++ b/core/src/api/improvement.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/api/index.rs b/core/src/api/index.rsindex 0245910b..a9a90dfd 100644--- a/core/src/api/index.rs+++ b/core/src/api/index.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/api/metrics.rs b/core/src/api/metrics.rsindex 0d57d1f8..73fdc44d 100644--- a/core/src/api/metrics.rs+++ b/core/src/api/metrics.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/api/mod.rs b/core/src/api/mod.rsindex 53e85274..7d4aca09 100644--- a/core/src/api/mod.rs+++ b/core/src/api/mod.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/api/opensearch.rs b/core/src/api/opensearch.rsindex 09e7447b..4b3cd75f 100644--- a/core/src/api/opensearch.rs+++ b/core/src/api/opensearch.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/api/optics.rs b/core/src/api/optics.rsindex 0209a17f..ae2e1173 100644--- a/core/src/api/optics.rs+++ b/core/src/api/optics.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License as@@ -21,15 +21,16 @@ use axum::response::IntoResponse;pub const DEFAULT_OPTICS: [OpticLink; 3] = [OpticLink {name: "Copycats removal",- url: "https://raw.githubusercontent.com/Cuely/sample-optics/main/copycats_removal.optic",+ url:+ "https://raw.githubusercontent.com/StractOrg/sample-optics/main/copycats_removal.optic",},OpticLink {name: "Hacker News",- url: "https://raw.githubusercontent.com/Cuely/sample-optics/main/hacker_news.optic",+ url: "https://raw.githubusercontent.com/StractOrg/sample-optics/main/hacker_news.optic",},OpticLink {name: "Discussions",- url: "https://raw.githubusercontent.com/Cuely/sample-optics/main/discussions.optic",+ url: "https://raw.githubusercontent.com/StractOrg/sample-optics/main/discussions.optic",},];diff --git a/core/src/api/privacy.rs b/core/src/api/privacy.rsindex ebf54d38..918c7209 100644--- a/core/src/api/privacy.rs+++ b/core/src/api/privacy.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/api/search.rs b/core/src/api/search.rsindex d2a12c37..ced98610 100644--- a/core/src/api/search.rs+++ b/core/src/api/search.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/api/sites.rs b/core/src/api/sites.rsindex 7b3fa5c5..3c7a8fe8 100644--- a/core/src/api/sites.rs+++ b/core/src/api/sites.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/api/summarize.rs b/core/src/api/summarize.rsindex e2aad853..a4377e44 100644--- a/core/src/api/summarize.rs+++ b/core/src/api/summarize.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2023 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/autosuggest.rs b/core/src/autosuggest.rsindex fbfea16f..12375258 100644--- a/core/src/autosuggest.rs+++ b/core/src/autosuggest.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/bangs.rs b/core/src/bangs.rsindex b00e7a40..e79f440d 100644--- a/core/src/bangs.rs+++ b/core/src/bangs.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/cluster/member.rs b/core/src/cluster/member.rsindex 45ddbe8f..f1c470bb 100644--- a/core/src/cluster/member.rs+++ b/core/src/cluster/member.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/cluster/mod.rs b/core/src/cluster/mod.rsindex e3ff824f..682508be 100644--- a/core/src/cluster/mod.rs+++ b/core/src/cluster/mod.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License as@@ -24,7 +24,7 @@ use tracing::error;use self::member::{Member, Service};-const CLUSTER_ID: &str = "cuely-cluster";+const CLUSTER_ID: &str = "stract-cluster";const GOSSIP_INTERVAL: Duration = Duration::from_secs(1);const SERVICE_KEY: &str = "service";diff --git a/core/src/collector.rs b/core/src/collector.rsindex 6801f658..fec463a8 100644--- a/core/src/collector.rs+++ b/core/src/collector.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/directory.rs b/core/src/directory.rsindex 776933cc..9d33ee33 100644--- a/core/src/directory.rs+++ b/core/src/directory.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/entity_index/entity.rs b/core/src/entity_index/entity.rsindex f143c0f4..7ec29058 100644--- a/core/src/entity_index/entity.rs+++ b/core/src/entity_index/entity.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/entity_index/mod.rs b/core/src/entity_index/mod.rsindex c8a5b632..d370bf9e 100644--- a/core/src/entity_index/mod.rs+++ b/core/src/entity_index/mod.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/entrypoint/autosuggest_scrape.rs b/core/src/entrypoint/autosuggest_scrape.rsindex 294cd47b..7c05a951 100644--- a/core/src/entrypoint/autosuggest_scrape.rs+++ b/core/src/entrypoint/autosuggest_scrape.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/entrypoint/centrality.rs b/core/src/entrypoint/centrality.rsindex f5f5c32a..0f2d501a 100644--- a/core/src/entrypoint/centrality.rs+++ b/core/src/entrypoint/centrality.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/entrypoint/configure.rs b/core/src/entrypoint/configure.rsindex cde0b0f7..252ccd86 100644--- a/core/src/entrypoint/configure.rs+++ b/core/src/entrypoint/configure.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License as@@ -27,7 +27,7 @@ use std::path::Path;use super::{webgraph, Centrality, EntityIndexer};const DATA_PATH: &str = "data";-const BUCKET_NAME: &str = "s3.cuely.io";+const BUCKET_NAME: &str = "public";fn download_files() {tokio::runtime::Builder::new_current_thread()@@ -43,7 +43,7 @@ fn download_files() {"content.rdf.u8.gz",] {info!("Downloading {}", name);- let body = reqwest::get(format!("http://s3.cuely.io/{BUCKET_NAME}/{name}"))+ let body = reqwest::get(format!("http://s3.trystract.com/{BUCKET_NAME}/{name}")).await.unwrap();diff --git a/core/src/entrypoint/crawl_stability.rs b/core/src/entrypoint/crawl_stability.rsindex 86760192..07d9aa2f 100644--- a/core/src/entrypoint/crawl_stability.rs+++ b/core/src/entrypoint/crawl_stability.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/entrypoint/dmoz_parser.rs b/core/src/entrypoint/dmoz_parser.rsindex 6ce5e588..41bd5ca6 100644--- a/core/src/entrypoint/dmoz_parser.rs+++ b/core/src/entrypoint/dmoz_parser.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/entrypoint/entity.rs b/core/src/entrypoint/entity.rsindex e584404d..709fb574 100644--- a/core/src/entrypoint/entity.rs+++ b/core/src/entrypoint/entity.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/entrypoint/frontend.rs b/core/src/entrypoint/frontend.rsindex 0a278eee..3111b916 100644--- a/core/src/entrypoint/frontend.rs+++ b/core/src/entrypoint/frontend.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/entrypoint/indexer.rs b/core/src/entrypoint/indexer.rsindex 697ac77c..9dbe950d 100644--- a/core/src/entrypoint/indexer.rs+++ b/core/src/entrypoint/indexer.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/entrypoint/mod.rs b/core/src/entrypoint/mod.rsindex 036cc66f..0933d804 100644--- a/core/src/entrypoint/mod.rs+++ b/core/src/entrypoint/mod.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/entrypoint/search_server.rs b/core/src/entrypoint/search_server.rsindex 84d69820..9bfc4207 100644--- a/core/src/entrypoint/search_server.rs+++ b/core/src/entrypoint/search_server.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/entrypoint/topic_centrality.rs b/core/src/entrypoint/topic_centrality.rsindex 9c2a7cbc..79658ab8 100644--- a/core/src/entrypoint/topic_centrality.rs+++ b/core/src/entrypoint/topic_centrality.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/entrypoint/webgraph.rs b/core/src/entrypoint/webgraph.rsindex f81d4915..a739c50f 100644--- a/core/src/entrypoint/webgraph.rs+++ b/core/src/entrypoint/webgraph.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/executor.rs b/core/src/executor.rsindex b3300c88..53a088f7 100644--- a/core/src/executor.rs+++ b/core/src/executor.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/fastfield_reader.rs b/core/src/fastfield_reader.rsindex eca35961..e335d8f6 100644--- a/core/src/fastfield_reader.rs+++ b/core/src/fastfield_reader.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/human_website_annotations.rs b/core/src/human_website_annotations.rsindex cb3ab7a7..6d20c784 100644--- a/core/src/human_website_annotations.rs+++ b/core/src/human_website_annotations.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/hyperloglog.rs b/core/src/hyperloglog.rsindex 7846fdb3..5f02fa04 100644--- a/core/src/hyperloglog.rs+++ b/core/src/hyperloglog.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/image_downloader.rs b/core/src/image_downloader.rsindex 97e56fd5..011e8918 100644--- a/core/src/image_downloader.rs+++ b/core/src/image_downloader.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/image_store.rs b/core/src/image_store.rsindex c3bb50b7..3c9fba42 100644--- a/core/src/image_store.rs+++ b/core/src/image_store.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/index.rs b/core/src/index.rsindex 9f3859f1..b9d734ce 100644--- a/core/src/index.rs+++ b/core/src/index.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/intmap.rs b/core/src/intmap.rsindex 319d0cd4..e56b9311 100644--- a/core/src/intmap.rs+++ b/core/src/intmap.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/inverted_index.rs b/core/src/inverted_index.rsindex f0c7935c..18f4cd91 100644--- a/core/src/inverted_index.rs+++ b/core/src/inverted_index.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/kahan_sum.rs b/core/src/kahan_sum.rsindex 0e0afe49..6349c439 100644--- a/core/src/kahan_sum.rs+++ b/core/src/kahan_sum.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/kv/mod.rs b/core/src/kv/mod.rsindex 9a5ca1c0..d7884a38 100644--- a/core/src/kv/mod.rs+++ b/core/src/kv/mod.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/kv/rocksdb_store.rs b/core/src/kv/rocksdb_store.rsindex 655feed2..028ca5ed 100644--- a/core/src/kv/rocksdb_store.rs+++ b/core/src/kv/rocksdb_store.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/leaky_queue.rs b/core/src/leaky_queue.rsindex d5389c6a..4c922c19 100644--- a/core/src/leaky_queue.rs+++ b/core/src/leaky_queue.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/lib.rs b/core/src/lib.rsindex a84f82b7..703ec8f3 100644--- a/core/src/lib.rs+++ b/core/src/lib.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/main.rs b/core/src/main.rsindex c5c1a546..6c9dce60 100644--- a/core/src/main.rs+++ b/core/src/main.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License as@@ -15,16 +15,16 @@// along with this program. If not, see <https://www.gnu.org/licenses/>.use anyhow::Result;use clap::{Parser, Subcommand};-use cuely::entrypoint::autosuggest_scrape::{self, Gl};-#[cfg(feature = "dev")]-use cuely::entrypoint::configure;-use cuely::entrypoint::indexer::IndexPointer;-use cuely::entrypoint::{self, frontend, search_server};-use cuely::webgraph::WebgraphBuilder;-use cuely::{FrontendConfig, SearchServerConfig};use serde::de::DeserializeOwned;use std::fs;use std::path::Path;+use stract::entrypoint::autosuggest_scrape::{self, Gl};+#[cfg(feature = "dev")]+use stract::entrypoint::configure;+use stract::entrypoint::indexer::IndexPointer;+use stract::entrypoint::{self, frontend, search_server};+use stract::webgraph::WebgraphBuilder;+use stract::{FrontendConfig, SearchServerConfig};use tracing::Level;use tracing_subscriber::FmtSubscriber;diff --git a/core/src/mapreduce/mod.rs b/core/src/mapreduce/mod.rsindex c1f1f0f0..5c62ad35 100644--- a/core/src/mapreduce/mod.rs+++ b/core/src/mapreduce/mod.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/mapreduce/worker.rs b/core/src/mapreduce/worker.rsindex 464057d5..fa357820 100644--- a/core/src/mapreduce/worker.rs+++ b/core/src/mapreduce/worker.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/metrics.rs b/core/src/metrics.rsindex 11b8b5a8..dab806e8 100644--- a/core/src/metrics.rs+++ b/core/src/metrics.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/prehashed.rs b/core/src/prehashed.rsindex a049e72f..e7a11c70 100644--- a/core/src/prehashed.rs+++ b/core/src/prehashed.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/qa_model.rs b/core/src/qa_model.rsindex d0fcdfc2..e5b79938 100644--- a/core/src/qa_model.rs+++ b/core/src/qa_model.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/query/const_query.rs b/core/src/query/const_query.rsindex a9bfd9f7..eebbd663 100644--- a/core/src/query/const_query.rs+++ b/core/src/query/const_query.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/query/intersection.rs b/core/src/query/intersection.rsindex f216b896..7a3a31e7 100644--- a/core/src/query/intersection.rs+++ b/core/src/query/intersection.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/query/mod.rs b/core/src/query/mod.rsindex b76354f8..3b9dd147 100644--- a/core/src/query/mod.rs+++ b/core/src/query/mod.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/query/optic.rs b/core/src/query/optic.rsindex 03f6a1f4..c3466294 100644--- a/core/src/query/optic.rs+++ b/core/src/query/optic.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/query/parser.rs b/core/src/query/parser.rsindex 252a6e8f..5e714c9c 100644--- a/core/src/query/parser.rs+++ b/core/src/query/parser.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/query/pattern_query.rs b/core/src/query/pattern_query.rsindex 39515a9a..a2b9865a 100644--- a/core/src/query/pattern_query.rs+++ b/core/src/query/pattern_query.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/query/union.rs b/core/src/query/union.rsindex 2327d24d..6234885f 100644--- a/core/src/query/union.rs+++ b/core/src/query/union.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/query_store.rs b/core/src/query_store.rsindex 67446347..402d5403 100644--- a/core/src/query_store.rs+++ b/core/src/query_store.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/ranking/bitvec_similarity.rs b/core/src/ranking/bitvec_similarity.rsindex 45556538..a608c222 100644--- a/core/src/ranking/bitvec_similarity.rs+++ b/core/src/ranking/bitvec_similarity.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/ranking/centrality_store.rs b/core/src/ranking/centrality_store.rsindex 82825937..c5d00dbb 100644--- a/core/src/ranking/centrality_store.rs+++ b/core/src/ranking/centrality_store.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/ranking/inbound_similarity.rs b/core/src/ranking/inbound_similarity.rsindex b418cbc2..b12d11ce 100644--- a/core/src/ranking/inbound_similarity.rs+++ b/core/src/ranking/inbound_similarity.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/ranking/initial.rs b/core/src/ranking/initial.rsindex 45aa5f0c..cdc659dc 100644--- a/core/src/ranking/initial.rs+++ b/core/src/ranking/initial.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/ranking/mod.rs b/core/src/ranking/mod.rsindex fd738f2c..9c4bc390 100644--- a/core/src/ranking/mod.rs+++ b/core/src/ranking/mod.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/ranking/models/cross_encoder.rs b/core/src/ranking/models/cross_encoder.rsindex 80c187fc..0265f45e 100644--- a/core/src/ranking/models/cross_encoder.rs+++ b/core/src/ranking/models/cross_encoder.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/ranking/models/mod.rs b/core/src/ranking/models/mod.rsindex 5a80c249..8638a905 100644--- a/core/src/ranking/models/mod.rs+++ b/core/src/ranking/models/mod.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/ranking/optics.rs b/core/src/ranking/optics.rsindex 8012d0a6..9fc485c5 100644--- a/core/src/ranking/optics.rs+++ b/core/src/ranking/optics.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/ranking/pipeline.rs b/core/src/ranking/pipeline.rsindex 6b2523b4..ff405207 100644--- a/core/src/ranking/pipeline.rs+++ b/core/src/ranking/pipeline.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/ranking/signal.rs b/core/src/ranking/signal.rsindex dcb5ad32..68fb313c 100644--- a/core/src/ranking/signal.rs+++ b/core/src/ranking/signal.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/schema.rs b/core/src/schema.rsindex 2b0ef4de..837f8ff5 100644--- a/core/src/schema.rs+++ b/core/src/schema.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/search_ctx.rs b/core/src/search_ctx.rsindex 753b5718..e924dcb8 100644--- a/core/src/search_ctx.rs+++ b/core/src/search_ctx.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/search_prettifier/entity.rs b/core/src/search_prettifier/entity.rsindex d0889d56..2386340d 100644--- a/core/src/search_prettifier/entity.rs+++ b/core/src/search_prettifier/entity.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/search_prettifier/mod.rs b/core/src/search_prettifier/mod.rsindex f6142799..650a4c78 100644--- a/core/src/search_prettifier/mod.rs+++ b/core/src/search_prettifier/mod.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/search_prettifier/stack_overflow.rs b/core/src/search_prettifier/stack_overflow.rsindex 900b9822..163bd706 100644--- a/core/src/search_prettifier/stack_overflow.rs+++ b/core/src/search_prettifier/stack_overflow.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/searcher/distributed.rs b/core/src/searcher/distributed.rsindex 5bb6c4cc..36b1e9f4 100644--- a/core/src/searcher/distributed.rs+++ b/core/src/searcher/distributed.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/searcher/local.rs b/core/src/searcher/local.rsindex d93ccca4..f75e26fc 100644--- a/core/src/searcher/local.rs+++ b/core/src/searcher/local.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/searcher/mod.rs b/core/src/searcher/mod.rsindex 5938301a..774f476f 100644--- a/core/src/searcher/mod.rs+++ b/core/src/searcher/mod.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/simhash.rs b/core/src/simhash.rsindex 7e47aace..0df0456e 100644--- a/core/src/simhash.rs+++ b/core/src/simhash.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/snippet.rs b/core/src/snippet.rsindex cb5e7057..606bc003 100644--- a/core/src/snippet.rs+++ b/core/src/snippet.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/sonic.rs b/core/src/sonic.rsindex 2a3a4800..10073cf1 100644--- a/core/src/sonic.rs+++ b/core/src/sonic.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/spell/dictionary.rs b/core/src/spell/dictionary.rsindex 73552243..a035fd1e 100644--- a/core/src/spell/dictionary.rs+++ b/core/src/spell/dictionary.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/spell/distance.rs b/core/src/spell/distance.rsindex f294f218..21857482 100644--- a/core/src/spell/distance.rs+++ b/core/src/spell/distance.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/spell/mod.rs b/core/src/spell/mod.rsindex 8613917c..f97f4d21 100644--- a/core/src/spell/mod.rs+++ b/core/src/spell/mod.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/spell/spell_checker.rs b/core/src/spell/spell_checker.rsindex ef413f0d..b4abd0dc 100644--- a/core/src/spell/spell_checker.rs+++ b/core/src/spell/spell_checker.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/spell/splitter.rs b/core/src/spell/splitter.rsindex 876d098f..d77830a6 100644--- a/core/src/spell/splitter.rs+++ b/core/src/spell/splitter.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/spell/word2vec.rs b/core/src/spell/word2vec.rsindex 9095f7b0..162f4717 100644--- a/core/src/spell/word2vec.rs+++ b/core/src/spell/word2vec.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/subdomain_count.rs b/core/src/subdomain_count.rsindex 8676989a..0a945087 100644--- a/core/src/subdomain_count.rs+++ b/core/src/subdomain_count.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/summarizer.rs b/core/src/summarizer.rsindex 6ec1c565..f7a8ed89 100644--- a/core/src/summarizer.rs+++ b/core/src/summarizer.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/tokenizer.rs b/core/src/tokenizer.rsindex a4451e4d..7063ae68 100644--- a/core/src/tokenizer.rs+++ b/core/src/tokenizer.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/ttl_cache.rs b/core/src/ttl_cache.rsindex c775e4c3..65151d4d 100644--- a/core/src/ttl_cache.rs+++ b/core/src/ttl_cache.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/warc.rs b/core/src/warc.rsindex 542f7cc5..861c9525 100644--- a/core/src/warc.rs+++ b/core/src/warc.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/webgraph/centrality/betweenness.rs b/core/src/webgraph/centrality/betweenness.rsindex 924972cd..b2601ddf 100644--- a/core/src/webgraph/centrality/betweenness.rs+++ b/core/src/webgraph/centrality/betweenness.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/webgraph/centrality/harmonic.rs b/core/src/webgraph/centrality/harmonic.rsindex 64a0c143..2ddb1237 100644--- a/core/src/webgraph/centrality/harmonic.rs+++ b/core/src/webgraph/centrality/harmonic.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/webgraph/centrality/mod.rs b/core/src/webgraph/centrality/mod.rsindex 2343dec6..459d0eba 100644--- a/core/src/webgraph/centrality/mod.rs+++ b/core/src/webgraph/centrality/mod.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/webgraph/centrality/online_harmonic.rs b/core/src/webgraph/centrality/online_harmonic.rsindex 6e548013..bfd03cb1 100644--- a/core/src/webgraph/centrality/online_harmonic.rs+++ b/core/src/webgraph/centrality/online_harmonic.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/webgraph/centrality/topic.rs b/core/src/webgraph/centrality/topic.rsindex 1e1f35d3..7ae41d20 100644--- a/core/src/webgraph/centrality/topic.rs+++ b/core/src/webgraph/centrality/topic.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/webgraph/mod.rs b/core/src/webgraph/mod.rsindex 462941fc..1dd0a844 100644--- a/core/src/webgraph/mod.rs+++ b/core/src/webgraph/mod.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/webgraph/segment.rs b/core/src/webgraph/segment.rsindex 3be12bae..92c49930 100644--- a/core/src/webgraph/segment.rs+++ b/core/src/webgraph/segment.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/webpage/just_text.rs b/core/src/webpage/just_text.rsindex 69fdecdd..c9f843b1 100644--- a/core/src/webpage/just_text.rs+++ b/core/src/webpage/just_text.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/webpage/mod.rs b/core/src/webpage/mod.rsindex 89689528..5c196e67 100644--- a/core/src/webpage/mod.rs+++ b/core/src/webpage/mod.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/webpage/region.rs b/core/src/webpage/region.rsindex 6852578e..ee64c6ea 100644--- a/core/src/webpage/region.rs+++ b/core/src/webpage/region.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/webpage/schema_org/json_ld.rs b/core/src/webpage/schema_org/json_ld.rsindex 55c8bd0b..a6670f21 100644--- a/core/src/webpage/schema_org/json_ld.rs+++ b/core/src/webpage/schema_org/json_ld.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/webpage/schema_org/microdata.rs b/core/src/webpage/schema_org/microdata.rsindex 4d7ba9e0..597999a1 100644--- a/core/src/webpage/schema_org/microdata.rs+++ b/core/src/webpage/schema_org/microdata.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/webpage/schema_org/mod.rs b/core/src/webpage/schema_org/mod.rsindex 39f6fba3..bc3b27b9 100644--- a/core/src/webpage/schema_org/mod.rs+++ b/core/src/webpage/schema_org/mod.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/webpage/url.rs b/core/src/webpage/url.rsindex ce38af79..2823b3e6 100644--- a/core/src/webpage/url.rs+++ b/core/src/webpage/url.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/widgets/calculator.rs b/core/src/widgets/calculator.rsindex 1f8d99e1..c8211a09 100644--- a/core/src/widgets/calculator.rs+++ b/core/src/widgets/calculator.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/src/widgets/mod.rs b/core/src/widgets/mod.rsindex 8c7417cc..03052f24 100644--- a/core/src/widgets/mod.rs+++ b/core/src/widgets/mod.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/core/testcases/parsing/whut.html b/core/testcases/parsing/whut.htmlindex 3b8d3f21..09f05741 100644--- a/core/testcases/parsing/whut.html+++ b/core/testcases/parsing/whut.html@@ -1,705 +1,1825 @@-[2m2022-06-28T11:47:33.208202Z[0m [32m INFO[0m [2mcuely::entrypoint::indexer[0m[2m:[0m processing CC-MAIN-20220116093137-20220116123137-00049.warc.gz-[2m2022-06-28T11:47:33.210243Z[0m [34mDEBUG[0m [2mcuely::entrypoint::indexer[0m[2m:[0m downlooading warc file-[2m2022-06-28T11:47:33.399716Z[0m [34mDEBUG[0m [2mcuely::entrypoint::indexer[0m[2m:[0m finished downloading-[2m2022-06-28T11:47:33.521878Z[0m [34mDEBUG[0m [2mcuely::entrypoint::indexer[0m[2m:[0m EmptyField("title")---<script type="text/javascript" src="/?OWM4%21PVhE1%21KkMFESIXJmkGwX%5Erg%5EumzbbIVdPmw7OSJspIK5uwYdOrWI9Xw6yAa%5EUm4xvCPNCifJR7Gb1B0QUmPjrma0eWdujqM1hIR9cOzSIDcrjhWqCC5%5EdvXzKCfx%5EsCasNNRn7m4qVzWM7TOKdNCT0aZMRLLwaUXP8x7d2SKBiKvR2OZPAunNmSum%3BeSGJlBrZ8Qe3123d57TTKb%5EPwuDsap6u%21BbrWj0XP7DMltlnwj0%3BBb3l58R%5Ee0pK9iwoo"></script><script type="text/javascript">-if(typeof(u_global_data)!='object') u_global_data={};-function ug_clund(){- if(typeof(u_global_data.clunduse)!='undefined' && u_global_data.clunduse>0 || (u_global_data && u_global_data.is_u_main_h)){- if(typeof(console)=='object' && typeof(console.log)=='function') console.log('utarget already loaded');- return;- }- u_global_data.clunduse=1;- if('0'=='1'){- var d=new Date();d.setTime(d.getTime()+86400000);document.cookie='adbetnetshowed=2; path=/; expires='+d;- if(location.search.indexOf('clk2398502361292193773143=1')==-1){- return;- }- }else{-- window.addEventListener("click", function(event){- if(typeof(u_global_data.clunduse)!='undefined' && u_global_data.clunduse>1) return;- if(typeof(console)=='object' && typeof(console.log)=='function') console.log('utarget click');- var d=new Date();d.setTime(d.getTime()+86400000);document.cookie='adbetnetshowed=1; path=/; expires='+d;- u_global_data.clunduse=2;- new Image().src = "//counter.yadro.ru/hit;ucoz_desktop_click?r"+escape(document.referrer)+(screen&&";s"+screen.width+"*"+screen.height+"*"+(screen.colorDepth||screen.pixelDepth))+";u"+escape(document.URL)+";"+Date.now();- });-- }-- var utarget_rand = Math.floor(Math.random()*10000);- var utarget_cookie = document.cookie.indexOf("u_8cf18a626b=")+1;- var utarget_script = document.createElement("script");- utarget_script.type = 'text/javascript';- utarget_script.async = true;- utarget_script.src = "https://utarget.ru/ranging/8cf18a626b/js/?rand="+utarget_rand+"&cookie="+utarget_cookie;- document.body.appendChild(utarget_script);- if(typeof(console)=='object' && typeof(console.log)=='function') console.log('utarget loaded');-- new Image().src = "//counter.yadro.ru/hit;desktop_click_load?r"+escape(document.referrer)+(screen&&";s"+screen.width+"*"+screen.height+"*"+(screen.colorDepth||screen.pixelDepth))+";u"+escape(document.URL)+";"+Date.now();-}--setTimeout(function(){- if(typeof(u_global_data.preroll_video_57322)=='object' && u_global_data.preroll_video_57322.active_video=='adbetnet') {- if(typeof(console)=='object' && typeof(console.log)=='function') console.log('utarget suspend, preroll active');- setTimeout(ug_clund,8000);- }- else ug_clund();-},3000);-</script>- <script type="text/javascript">new Image().src = "//counter.yadro.ru/hit;narodadst1?r"+escape(document.referrer)+(screen&&";s"+screen.width+"*"+screen.height+"*"+(screen.colorDepth||screen.pixelDepth))+";u"+escape(document.URL)+";"+Date.now();</script>- <script type="text/javascript">new Image().src = "//counter.yadro.ru/hit;narod_desktop_ad?r"+escape(document.referrer)+(screen&&";s"+screen.width+"*"+screen.height+"*"+(screen.colorDepth||screen.pixelDepth))+";u"+escape(document.URL)+";"+Date.now();</script><script type="text/javascript" src="//al20102007.narod.ru/.s/src/jquery-3.3.1.min.js"></script><script type="text/javascript" src="//s200.ucoz.net/cgi/uutils.fcg?a=uSD&ca=2&ug=999&isp=0&r=0.943717713888187"></script>+<script type="text/javascript"+ src="/?OWM4%21PVhE1%21KkMFESIXJmkGwX%5Erg%5EumzbbIVdPmw7OSJspIK5uwYdOrWI9Xw6yAa%5EUm4xvCPNCifJR7Gb1B0QUmPjrma0eWdujqM1hIR9cOzSIDcrjhWqCC5%5EdvXzKCfx%5EsCasNNRn7m4qVzWM7TOKdNCT0aZMRLLwaUXP8x7d2SKBiKvR2OZPAunNmSum%3BeSGJlBrZ8Qe3123d57TTKb%5EPwuDsap6u%21BbrWj0XP7DMltlnwj0%3BBb3l58R%5Ee0pK9iwoo"></script>+<script type="text/javascript">+ if (typeof (u_global_data) != 'object') u_global_data = {};+ function ug_clund() {+ if (typeof (u_global_data.clunduse) != 'undefined' && u_global_data.clunduse > 0 || (u_global_data && u_global_data.is_u_main_h)) {+ if (typeof (console) == 'object' && typeof (console.log) == 'function') console.log('utarget already loaded');+ return;+ }+ u_global_data.clunduse = 1;+ if ('0' == '1') {+ var d = new Date(); d.setTime(d.getTime() + 86400000); document.cookie = 'adbetnetshowed=2; path=/; expires=' + d;+ if (location.search.indexOf('clk2398502361292193773143=1') == -1) {+ return;+ }+ } else {++ window.addEventListener("click", function (event) {+ if (typeof (u_global_data.clunduse) != 'undefined' && u_global_data.clunduse > 1) return;+ if (typeof (console) == 'object' && typeof (console.log) == 'function') console.log('utarget click');+ var d = new Date(); d.setTime(d.getTime() + 86400000); document.cookie = 'adbetnetshowed=1; path=/; expires=' + d;+ u_global_data.clunduse = 2;+ new Image().src = "//counter.yadro.ru/hit;ucoz_desktop_click?r" + escape(document.referrer) + (screen && ";s" + screen.width + "*" + screen.height + "*" + (screen.colorDepth || screen.pixelDepth)) + ";u" + escape(document.URL) + ";" + Date.now();+ });++ }++ var utarget_rand = Math.floor(Math.random() * 10000);+ var utarget_cookie = document.cookie.indexOf("u_8cf18a626b=") + 1;+ var utarget_script = document.createElement("script");+ utarget_script.type = 'text/javascript';+ utarget_script.async = true;+ utarget_script.src = "https://utarget.ru/ranging/8cf18a626b/js/?rand=" + utarget_rand + "&cookie=" + utarget_cookie;+ document.body.appendChild(utarget_script);+ if (typeof (console) == 'object' && typeof (console.log) == 'function') console.log('utarget loaded');++ new Image().src = "//counter.yadro.ru/hit;desktop_click_load?r" + escape(document.referrer) + (screen && ";s" + screen.width + "*" + screen.height + "*" + (screen.colorDepth || screen.pixelDepth)) + ";u" + escape(document.URL) + ";" + Date.now();+ }++ setTimeout(function () {+ if (typeof (u_global_data.preroll_video_57322) == 'object' && u_global_data.preroll_video_57322.active_video == 'adbetnet') {+ if (typeof (console) == 'object' && typeof (console.log) == 'function') console.log('utarget suspend, preroll active');+ setTimeout(ug_clund, 8000);+ }+ else ug_clund();+ }, 3000);+</script>+<script+ type="text/javascript">new Image().src = "//counter.yadro.ru/hit;narodadst1?r" + escape(document.referrer) + (screen && ";s" + screen.width + "*" + screen.height + "*" + (screen.colorDepth || screen.pixelDepth)) + ";u" + escape(document.URL) + ";" + Date.now();</script>+<script+ type="text/javascript">new Image().src = "//counter.yadro.ru/hit;narod_desktop_ad?r" + escape(document.referrer) + (screen && ";s" + screen.width + "*" + screen.height + "*" + (screen.colorDepth || screen.pixelDepth)) + ";u" + escape(document.URL) + ";" + Date.now();</script>+<script type="text/javascript" src="//al20102007.narod.ru/.s/src/jquery-3.3.1.min.js"></script>+<script type="text/javascript"+ src="//s200.ucoz.net/cgi/uutils.fcg?a=uSD&ca=2&ug=999&isp=0&r=0.943717713888187"></script><HTML>+<BODY>-<table border="1" width="100%">-<body bgcolor="#fff8b3">- <tr>- <td colspan="19" align="center"><font color="#008080"><strong><big> National Tournament 1 category-- Leningrad Winter 1935</big></strong></font></td>- </tr>- <tr>- <td><p align="center"><font color="#800080"><strong>Rk</strong></font></td>- <td><p align="center"><font color="#800080"><strong> Name</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 1</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 2</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 3</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 4</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 5</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 6</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 7</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 8</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 9</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 10</strong></font></td>- <td><p align="center"><strong><font color="#800080"> P</font></strong></td>- </tr>- <tr>- <td><p align="center">1</td>- <td><p align="center"> <strong> Tolush A.</strong></td>- <td><p align="center"> *</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1/2</td>- <td><p align="center"><strong> 7.0</strong></td>- </tr>- <tr>- <td><p align="center">2</td>- <td><p align="center"> <strong> Feofilov</strong></td>- <td><p align="center"> 1/2</td>- <td><p align="center"> *</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"><strong> 6.5</strong></td>- </tr>- <tr>- <td><p align="center">3</td>- <td><p align="center"> <strong> Sokolsky A.</strong></td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> *</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"><strong> 5.5</strong></td>- </tr>- <tr>- <td><p align="center">4</td>- <td><p align="center"> <strong> Shchipunov</strong></td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> *</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"><strong> 5.5</strong></td>- </tr>- <tr>- <td><p align="center">5</td>- <td><p align="center"> <strong> Travin</strong></td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> *</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"><strong> 5.0</strong></td>- </tr>- <tr>- <td><p align="center">6</td>- <td><p align="center"> <strong> Rabinkov</strong></td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 0</td>- <td><p align="center"> *</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"><strong>4.5 </strong></td>- </tr>- <tr>- <td><p align="center">7</td>- <td><p align="center"> <strong> Kalinin</strong></td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> *</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"><strong> 4.0</strong></td>- </tr>- <tr>- <td><p align="center">8</td>- <td><p align="center"> <strong> Kagan M.</strong></td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> *</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1/2</td>- <td><p align="center"><strong>3.5 </strong></td>- </tr>- <tr>- <td><p align="center">9</td>- <td><p align="center"> <strong> Frank</strong></td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> *</td>- <td><p align="center"> 1/2</td>- <td><p align="center"><strong> 2.0</strong></td>- </tr>- <tr>- <td><p align="center">10</td>- <td><p align="center"> <strong> Kojalovich B.</strong></td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> *</td>- <td><p align="center"><strong> 1.5</strong></td>- </tr>-</table>+ <table border="1" width="100%">++ <body bgcolor="#fff8b3">+ <tr>+ <td colspan="19" align="center">+ <font color="#008080"><strong><big> National Tournament 1 category-+ Leningrad Winter 1935</big></strong></font>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">+ <font color="#800080"><strong>Rk</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> Name</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 1</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 2</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 3</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 4</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 5</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 6</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 7</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 8</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 9</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 10</strong></font>+ </td>+ <td>+ <p align="center"><strong>+ <font color="#800080"> P</font>+ </strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">1+ </td>+ <td>+ <p align="center"> <strong> Tolush A.</strong>+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"><strong> 7.0</strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">2+ </td>+ <td>+ <p align="center"> <strong> Feofilov</strong>+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"><strong> 6.5</strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">3+ </td>+ <td>+ <p align="center"> <strong> Sokolsky A.</strong>+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"><strong> 5.5</strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">4+ </td>+ <td>+ <p align="center"> <strong> Shchipunov</strong>+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"><strong> 5.5</strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">5+ </td>+ <td>+ <p align="center"> <strong> Travin</strong>+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"><strong> 5.0</strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">6+ </td>+ <td>+ <p align="center"> <strong> Rabinkov</strong>+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"><strong>4.5 </strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">7+ </td>+ <td>+ <p align="center"> <strong> Kalinin</strong>+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"><strong> 4.0</strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">8+ </td>+ <td>+ <p align="center"> <strong> Kagan M.</strong>+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"><strong>3.5 </strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">9+ </td>+ <td>+ <p align="center"> <strong> Frank</strong>+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"><strong> 2.0</strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">10+ </td>+ <td>+ <p align="center"> <strong> Kojalovich B.</strong>+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"><strong> 1.5</strong>+ </td>+ </tr>+ </table>-<table border="1" width="100%">- <tr>- <td colspan="19" align="center"><font color="#008080"><strong><big> National Tournament 1 category-- Leningrad Winter 1935</big></strong></font></td>- </tr>- <tr>- <td><p align="center"><font color="#800080"><strong>Rk</strong></font></td>- <td><p align="center"><font color="#800080"><strong> Name</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 1</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 2</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 3</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 4</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 5</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 6</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 7</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 8</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 9</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 10</strong></font></td>- <td><p align="center"><strong><font color="#800080"> P</font></strong></td>- </tr>- <tr>- <td><p align="center">1</td>- <td><p align="center"> <strong> Yuriev B.</strong></td>- <td><p align="center"> *</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"><strong> 7.0</strong></td>- </tr>- <tr>- <td><p align="center">2</td>- <td><p align="center"> <strong> Vasiliev</strong></td>- <td><p align="center"> 0</td>- <td><p align="center"> *</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1/2</td>- <td><p align="center"><strong> 6.5</strong></td>- </tr>- <tr>- <td><p align="center">3</td>- <td><p align="center"> <strong> Chernikov O.</strong></td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> *</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"><strong> 5.5</strong></td>- </tr>- <tr>- <td><p align="center">4</td>- <td><p align="center"> <strong> Volk</strong></td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> *</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"><strong> 4.5</strong></td>- </tr>- <tr>- <td><p align="center">5</td>- <td><p align="center"> <strong> Kuzminykh E.</strong></td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> *</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"><strong> 4.0</strong></td>- </tr>- <tr>- <td><p align="center">6</td>- <td><p align="center"> <strong> Miasoedov</strong></td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> *</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"><strong>4.0 </strong></td>- </tr>- <tr>- <td><p align="center">7</td>- <td><p align="center"> <strong> Stepanov(Shneideman G.)</strong></td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> *</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"><strong> 4.0</strong></td>- </tr>- <tr>- <td><p align="center">8</td>- <td><p align="center"> <strong> Fedoseev</strong></td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> *</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"><strong>4.0 </strong></td>- </tr>- <tr>- <td><p align="center">9</td>- <td><p align="center"> <strong> Marach</strong></td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> *</td>- <td><p align="center"> 1</td>- <td><p align="center"><strong> 3.0</strong></td>- </tr>- <tr>- <td><p align="center">10</td>- <td><p align="center"> <strong> Dubrovsky</strong></td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> *</td>- <td><p align="center"><strong> 2.5</strong></td>- </tr>-</table>+ <table border="1" width="100%">+ <tr>+ <td colspan="19" align="center">+ <font color="#008080"><strong><big> National Tournament 1 category-+ Leningrad Winter 1935</big></strong></font>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">+ <font color="#800080"><strong>Rk</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> Name</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 1</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 2</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 3</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 4</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 5</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 6</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 7</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 8</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 9</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 10</strong></font>+ </td>+ <td>+ <p align="center"><strong>+ <font color="#800080"> P</font>+ </strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">1+ </td>+ <td>+ <p align="center"> <strong> Yuriev B.</strong>+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"><strong> 7.0</strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">2+ </td>+ <td>+ <p align="center"> <strong> Vasiliev</strong>+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"><strong> 6.5</strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">3+ </td>+ <td>+ <p align="center"> <strong> Chernikov O.</strong>+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"><strong> 5.5</strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">4+ </td>+ <td>+ <p align="center"> <strong> Volk</strong>+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"><strong> 4.5</strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">5+ </td>+ <td>+ <p align="center"> <strong> Kuzminykh E.</strong>+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"><strong> 4.0</strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">6+ </td>+ <td>+ <p align="center"> <strong> Miasoedov</strong>+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"><strong>4.0 </strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">7+ </td>+ <td>+ <p align="center"> <strong> Stepanov(Shneideman G.)</strong>+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"><strong> 4.0</strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">8+ </td>+ <td>+ <p align="center"> <strong> Fedoseev</strong>+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"><strong>4.0 </strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">9+ </td>+ <td>+ <p align="center"> <strong> Marach</strong>+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"><strong> 3.0</strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">10+ </td>+ <td>+ <p align="center"> <strong> Dubrovsky</strong>+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"><strong> 2.5</strong>+ </td>+ </tr>+ </table>-<table border="1" width="100%">- <tr>- <td colspan="19" align="center"><font color="#008080"><strong><big> National Tournament 1 category-- Leningrad Winter 1935</big></strong></font></td>- </tr>- <tr>- <td><p align="center"><font color="#800080"><strong>Rk</strong></font></td>- <td><p align="center"><font color="#800080"><strong> Name</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 1</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 2</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 3</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 4</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 5</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 6</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 7</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 8</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 9</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 10</strong></font></td>- <td><p align="center"><strong><font color="#800080"> P</font></strong></td>- </tr>- <tr>- <td><p align="center">1</td>- <td><p align="center"> <strong> Shamayev L.</strong></td>- <td><p align="center"> *</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"><strong> 8.5</strong></td>- </tr>- <tr>- <td><p align="center">2</td>- <td><p align="center"> <strong> Ber</strong></td>- <td><p align="center"> 0</td>- <td><p align="center"> *</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"><strong> 6.0</strong></td>- </tr>- <tr>- <td><p align="center">3</td>- <td><p align="center"> <strong> Preobrazhensky</strong></td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"> *</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1/2</td>- <td><p align="center"><strong> 6.0</strong></td>- </tr>- <tr>- <td><p align="center">4</td>- <td><p align="center"> <strong> Vainshtein S.</strong></td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> *</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"><strong> 5.5</strong></td>- </tr>- <tr>- <td><p align="center">5</td>- <td><p align="center"> <strong> Arsh</strong></td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> *</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"><strong> 4.5</strong></td>- </tr>- <tr>- <td><p align="center">6</td>- <td><p align="center"> <strong> Polonsky</strong></td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> *</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"><strong>4.0 </strong></td>- </tr>- <tr>- <td><p align="center">7</td>- <td><p align="center"> <strong> Kapustin</strong></td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> *</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1/2</td>- <td><p align="center"><strong> 3.5</strong></td>- </tr>- <tr>- <td><p align="center">8</td>- <td><p align="center"> <strong> Shtremer</strong></td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> *</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"><strong>3.0 </strong></td>- </tr>- <tr>- <td><p align="center">9</td>- <td><p align="center"> <strong> Guldin</strong></td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> *</td>- <td><p align="center"> 0</td>- <td><p align="center"><strong> 2.0</strong></td>- </tr>- <tr>- <td><p align="center">10</td>- <td><p align="center"> <strong> Itskov</strong></td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> *</td>- <td><p align="center"><strong> 2.0</strong></td>- </tr>-</table>+ <table border="1" width="100%">+ <tr>+ <td colspan="19" align="center">+ <font color="#008080"><strong><big> National Tournament 1 category-+ Leningrad Winter 1935</big></strong></font>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">+ <font color="#800080"><strong>Rk</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> Name</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 1</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 2</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 3</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 4</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 5</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 6</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 7</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 8</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 9</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 10</strong></font>+ </td>+ <td>+ <p align="center"><strong>+ <font color="#800080"> P</font>+ </strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">1+ </td>+ <td>+ <p align="center"> <strong> Shamayev L.</strong>+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"><strong> 8.5</strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">2+ </td>+ <td>+ <p align="center"> <strong> Ber</strong>+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"><strong> 6.0</strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">3+ </td>+ <td>+ <p align="center"> <strong> Preobrazhensky</strong>+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"><strong> 6.0</strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">4+ </td>+ <td>+ <p align="center"> <strong> Vainshtein S.</strong>+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"><strong> 5.5</strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">5+ </td>+ <td>+ <p align="center"> <strong> Arsh</strong>+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"><strong> 4.5</strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">6+ </td>+ <td>+ <p align="center"> <strong> Polonsky</strong>+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"><strong>4.0 </strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">7+ </td>+ <td>+ <p align="center"> <strong> Kapustin</strong>+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"><strong> 3.5</strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">8+ </td>+ <td>+ <p align="center"> <strong> Shtremer</strong>+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"><strong>3.0 </strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">9+ </td>+ <td>+ <p align="center"> <strong> Guldin</strong>+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"><strong> 2.0</strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">10+ </td>+ <td>+ <p align="center"> <strong> Itskov</strong>+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"><strong> 2.0</strong>+ </td>+ </tr>+ </table>-<table border="1" width="100%">- <tr>- <td colspan="19" align="center"><font color="#008080"><strong><big> National Tournament 1 category Central Chess Club-- Leningrad 1935</big></strong></font></td>- </tr>- <tr>- <td><p align="center"><font color="#800080"><strong>Rk</strong></font></td>- <td><p align="center"><font color="#800080"><strong> Name</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 1</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 2</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 3</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 4</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 5</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 6</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 7</strong></font></td>- <td><p align="center"><font color="#800080"><strong> 8</strong></font></td>- <td><p align="center"><strong><font color="#800080"> P</font></strong></td>- </tr>- <tr>- <td><p align="center">1</td>- <td><p align="center"> <strong> Feofilov</strong></td>- <td><p align="center"> *</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"><strong>5.0 </strong></td>- </tr>- <tr>- <td><p align="center">2</td>- <td><p align="center"> <strong> Tolush A.</strong></td>- <td><p align="center"> 1/2</td>- <td><p align="center"> *</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"><strong>4.5 </strong></td>- </tr>- <tr>- <td><p align="center">3</td>- <td><p align="center"> <strong> Shchipunov</strong></td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> *</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"><strong>4.0 </strong></td>- </tr>- <tr>- <td><p align="center">4</td>- <td><p align="center"> <strong> Budo A.</strong></td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> *</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"><strong>3.5 </strong></td>- </tr>- <tr>- <td><p align="center">5</td>- <td><p align="center"> <strong> Rovner D.</strong></td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> *</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 1</td>- <td><p align="center"><strong>3.5 </strong></td>- </tr>- <tr>- <td><p align="center">6</td>- <td><p align="center"> <strong> Stepanov(Shneideman) G. </strong></td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"> *</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1/2</td>- <td><p align="center"><strong>3.5 </strong></td>- </tr>- <tr>- <td><p align="center">7</td>- <td><p align="center"> <strong>Sokolsky A.</strong></td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 1</td>- <td><p align="center"> *</td>- <td><p align="center"><strong> 2.5</strong></td>- </tr>- <tr>- <td><p align="center">8</td>- <td><p align="center"> <strong> Ravinsky G.</strong></td>- <td><p align="center"> 0</td>- <td><p align="center"> 1</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 0</td>- <td><p align="center"> 1/2</td>- <td><p align="center"> 0</td>- <td><p align="center"> *</td>- <td><p align="center"><strong>1.5 </strong></td>- </tr>-</table>+ <table border="1" width="100%">+ <tr>+ <td colspan="19" align="center">+ <font color="#008080"><strong><big> National Tournament 1 category Central Chess Club-+ Leningrad 1935</big></strong></font>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">+ <font color="#800080"><strong>Rk</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> Name</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 1</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 2</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 3</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 4</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 5</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 6</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 7</strong></font>+ </td>+ <td>+ <p align="center">+ <font color="#800080"><strong> 8</strong></font>+ </td>+ <td>+ <p align="center"><strong>+ <font color="#800080"> P</font>+ </strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">1+ </td>+ <td>+ <p align="center"> <strong> Feofilov</strong>+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"><strong>5.0 </strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">2+ </td>+ <td>+ <p align="center"> <strong> Tolush A.</strong>+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"><strong>4.5 </strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">3+ </td>+ <td>+ <p align="center"> <strong> Shchipunov</strong>+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"><strong>4.0 </strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">4+ </td>+ <td>+ <p align="center"> <strong> Budo A.</strong>+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"><strong>3.5 </strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">5+ </td>+ <td>+ <p align="center"> <strong> Rovner D.</strong>+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"><strong>3.5 </strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">6+ </td>+ <td>+ <p align="center"> <strong> Stepanov(Shneideman) G. </strong>+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"><strong>3.5 </strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">7+ </td>+ <td>+ <p align="center"> <strong>Sokolsky A.</strong>+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"><strong> 2.5</strong>+ </td>+ </tr>+ <tr>+ <td>+ <p align="center">8+ </td>+ <td>+ <p align="center"> <strong> Ravinsky G.</strong>+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> 1/2+ </td>+ <td>+ <p align="center"> 0+ </td>+ <td>+ <p align="center"> *+ </td>+ <td>+ <p align="center"><strong>1.5 </strong>+ </td>+ </tr>+ </table>-<br>-database of games in PGN format <a href="leninb35.zip">leninb35.zip(games of 163)</a>-<br>+ <br>+ database of games in PGN format <a href="leninb35.zip">leninb35.zip(games of 163)</a>+ <br></BODY>-</html>-+</html>\ No newline at end of filediff --git a/frontend/public/favicon.ico b/frontend/public/favicon.icoindex ac2bd633..f6c98157 100644Binary files a/frontend/public/favicon.ico and b/frontend/public/favicon.ico differdiff --git a/frontend/public/images/biglogo.svg b/frontend/public/images/biglogo.svgnew file mode 100644index 00000000..27622154--- /dev/null+++ b/frontend/public/images/biglogo.svg@@ -0,0 +1,4 @@+<svg width="366" height="125" viewBox="0 0 366 125" fill="none" xmlns="http://www.w3.org/2000/svg">+<path d="M18.23 102.348H20.5737C20.4517 103.471 20.1302 104.476 19.6094 105.363C19.0885 106.25 18.3521 106.954 17.3999 107.475C16.4478 107.988 15.2596 108.244 13.8354 108.244C12.7938 108.244 11.8457 108.049 10.9912 107.658C10.1449 107.268 9.4165 106.714 8.80615 105.998C8.1958 105.274 7.7238 104.407 7.39014 103.398C7.06462 102.381 6.90186 101.25 6.90186 100.004V98.2344C6.90186 96.9893 7.06462 95.8621 7.39014 94.853C7.7238 93.8358 8.19987 92.965 8.81836 92.2407C9.44499 91.5164 10.1978 90.959 11.0767 90.5684C11.9556 90.1777 12.9443 89.9824 14.043 89.9824C15.3857 89.9824 16.521 90.2347 17.4487 90.7393C18.3765 91.2438 19.0967 91.9437 19.6094 92.8389C20.1302 93.7259 20.4517 94.7554 20.5737 95.9272H18.23C18.116 95.0972 17.9045 94.3851 17.5952 93.791C17.286 93.1888 16.8465 92.7249 16.2769 92.3994C15.7072 92.0739 14.9626 91.9111 14.043 91.9111C13.2536 91.9111 12.5578 92.0617 11.9556 92.3628C11.3615 92.6639 10.861 93.0911 10.4541 93.6445C10.0553 94.1979 9.75423 94.8612 9.55078 95.6343C9.34733 96.4074 9.24561 97.266 9.24561 98.21V100.004C9.24561 100.875 9.33512 101.693 9.51416 102.458C9.70133 103.223 9.9821 103.894 10.3564 104.472C10.7308 105.05 11.2069 105.506 11.7847 105.839C12.3625 106.165 13.0461 106.328 13.8354 106.328C14.8364 106.328 15.634 106.169 16.228 105.852C16.8221 105.534 17.2697 105.078 17.5708 104.484C17.88 103.89 18.0998 103.178 18.23 102.348ZM22.8442 101.542V101.262C22.8442 100.31 22.9826 99.4266 23.2593 98.6128C23.536 97.7909 23.9347 97.0788 24.4556 96.4766C24.9764 95.8662 25.6071 95.3942 26.3477 95.0605C27.0882 94.7188 27.9183 94.5479 28.8379 94.5479C29.7656 94.5479 30.5998 94.7188 31.3403 95.0605C32.089 95.3942 32.7238 95.8662 33.2446 96.4766C33.7736 97.0788 34.1764 97.7909 34.4531 98.6128C34.7298 99.4266 34.8682 100.31 34.8682 101.262V101.542C34.8682 102.495 34.7298 103.378 34.4531 104.191C34.1764 105.005 33.7736 105.717 33.2446 106.328C32.7238 106.93 32.0931 107.402 31.3525 107.744C30.6201 108.077 29.79 108.244 28.8623 108.244C27.9346 108.244 27.1004 108.077 26.3599 107.744C25.6193 107.402 24.9845 106.93 24.4556 106.328C23.9347 105.717 23.536 105.005 23.2593 104.191C22.9826 103.378 22.8442 102.495 22.8442 101.542ZM25.1025 101.262V101.542C25.1025 102.202 25.1799 102.824 25.3345 103.41C25.4891 103.988 25.721 104.501 26.0303 104.948C26.3477 105.396 26.7424 105.75 27.2144 106.01C27.6864 106.263 28.2357 106.389 28.8623 106.389C29.4808 106.389 30.022 106.263 30.4858 106.01C30.9578 105.75 31.3485 105.396 31.6577 104.948C31.967 104.501 32.1989 103.988 32.3535 103.41C32.5163 102.824 32.5977 102.202 32.5977 101.542V101.262C32.5977 100.611 32.5163 99.9963 32.3535 99.4185C32.1989 98.8325 31.9629 98.3158 31.6455 97.8682C31.3363 97.4124 30.9456 97.0544 30.4736 96.7939C30.0098 96.5335 29.4645 96.4033 28.8379 96.4033C28.2194 96.4033 27.6742 96.5335 27.2021 96.7939C26.7383 97.0544 26.3477 97.4124 26.0303 97.8682C25.721 98.3158 25.4891 98.8325 25.3345 99.4185C25.1799 99.9963 25.1025 100.611 25.1025 101.262ZM39.9463 97.4165V108H37.6758V94.792H39.8242L39.9463 97.4165ZM39.4824 100.896L38.4326 100.859C38.4408 99.9556 38.5588 99.1214 38.7866 98.3564C39.0145 97.5833 39.3522 96.9119 39.7998 96.3423C40.2474 95.7726 40.8049 95.3332 41.4722 95.0239C42.1395 94.7065 42.9126 94.5479 43.7915 94.5479C44.41 94.5479 44.9797 94.6374 45.5005 94.8164C46.0213 94.9873 46.473 95.2599 46.8555 95.6343C47.238 96.0086 47.535 96.4888 47.7466 97.0747C47.9582 97.6606 48.064 98.3687 48.064 99.1987V108H45.8057V99.3086C45.8057 98.6169 45.6877 98.0635 45.4517 97.6484C45.2238 97.2334 44.8983 96.9323 44.4751 96.7451C44.0519 96.5498 43.5555 96.4521 42.9858 96.4521C42.3185 96.4521 41.7611 96.5701 41.3135 96.8062C40.8659 97.0422 40.5078 97.3677 40.2393 97.7827C39.9707 98.1978 39.7754 98.6738 39.6533 99.2109C39.5394 99.7399 39.4824 100.301 39.4824 100.896ZM48.0396 99.6504L46.5259 100.114C46.534 99.39 46.652 98.6942 46.8799 98.0269C47.1159 97.3595 47.4536 96.7655 47.8931 96.2446C48.3407 95.7238 48.89 95.3128 49.541 95.0117C50.1921 94.7025 50.9367 94.5479 51.7749 94.5479C52.4829 94.5479 53.1095 94.6414 53.6548 94.8286C54.2082 95.0158 54.672 95.3047 55.0464 95.6953C55.4289 96.0778 55.7178 96.5701 55.9131 97.1724C56.1084 97.7746 56.2061 98.4907 56.2061 99.3208V108H53.9355V99.2964C53.9355 98.5558 53.8175 97.9821 53.5815 97.5752C53.3537 97.1602 53.0282 96.8713 52.605 96.7085C52.1899 96.5376 51.6935 96.4521 51.1157 96.4521C50.6193 96.4521 50.1799 96.5376 49.7974 96.7085C49.4149 96.8794 49.0934 97.1154 48.833 97.4165C48.5726 97.7095 48.3732 98.0472 48.2349 98.4297C48.1047 98.8122 48.0396 99.2191 48.0396 99.6504ZM61.8823 97.3311V113.078H59.6118V94.792H61.687L61.8823 97.3311ZM70.7812 101.286V101.542C70.7812 102.503 70.6673 103.394 70.4395 104.216C70.2116 105.03 69.8779 105.738 69.4385 106.34C69.0072 106.942 68.4741 107.41 67.8394 107.744C67.2046 108.077 66.4762 108.244 65.6543 108.244C64.8161 108.244 64.0755 108.106 63.4326 107.829C62.7897 107.552 62.2445 107.15 61.7969 106.621C61.3493 106.092 60.9912 105.457 60.7227 104.716C60.4622 103.976 60.2832 103.142 60.1855 102.214V100.847C60.2832 99.8701 60.4663 98.9953 60.7349 98.2222C61.0034 97.4491 61.3574 96.7899 61.7969 96.2446C62.2445 95.6912 62.7856 95.2721 63.4204 94.9873C64.0552 94.6943 64.7876 94.5479 65.6177 94.5479C66.4478 94.5479 67.1842 94.7106 67.8271 95.0361C68.4701 95.3535 69.0112 95.8092 69.4507 96.4033C69.8901 96.9974 70.2197 97.7095 70.4395 98.5396C70.6673 99.3615 70.7812 100.277 70.7812 101.286ZM68.5107 101.542V101.286C68.5107 100.627 68.4416 100.008 68.3032 99.4307C68.1649 98.8447 67.9492 98.332 67.6562 97.8926C67.3714 97.445 67.0052 97.0951 66.5576 96.8428C66.11 96.5824 65.577 96.4521 64.9585 96.4521C64.3888 96.4521 63.8924 96.5498 63.4692 96.7451C63.0542 96.9404 62.7002 97.2049 62.4072 97.5386C62.1143 97.8641 61.8742 98.2384 61.687 98.6616C61.508 99.0767 61.3737 99.508 61.2842 99.9556V103.117C61.4469 103.687 61.6748 104.224 61.9678 104.729C62.2607 105.225 62.6514 105.628 63.1396 105.937C63.6279 106.238 64.2424 106.389 64.9829 106.389C65.5933 106.389 66.1182 106.263 66.5576 106.01C67.0052 105.75 67.3714 105.396 67.6562 104.948C67.9492 104.501 68.1649 103.988 68.3032 103.41C68.4416 102.824 68.5107 102.202 68.5107 101.542ZM76.1157 89.25V108H73.8452V89.25H76.1157ZM85.2222 108.244C84.3026 108.244 83.4684 108.09 82.7197 107.78C81.9792 107.463 81.3403 107.019 80.8032 106.45C80.2743 105.88 79.8674 105.205 79.5825 104.423C79.2977 103.642 79.1553 102.788 79.1553 101.86V101.347C79.1553 100.273 79.314 99.3167 79.6313 98.4785C79.9487 97.6322 80.38 96.916 80.9253 96.3301C81.4705 95.7441 82.089 95.3006 82.7808 94.9995C83.4725 94.6984 84.1886 94.5479 84.9292 94.5479C85.8732 94.5479 86.687 94.7106 87.3706 95.0361C88.0623 95.3617 88.6279 95.8174 89.0674 96.4033C89.5068 96.9811 89.8324 97.6647 90.0439 98.4541C90.2555 99.2354 90.3613 100.09 90.3613 101.018V102.031H80.498V100.188H88.103V100.017C88.0705 99.4307 87.9484 98.861 87.7368 98.3076C87.5334 97.7542 87.2078 97.2985 86.7603 96.9404C86.3127 96.5824 85.7023 96.4033 84.9292 96.4033C84.4165 96.4033 83.9445 96.5132 83.5132 96.7329C83.0819 96.9445 82.7116 97.2619 82.4023 97.6851C82.0931 98.1082 81.853 98.625 81.6821 99.2354C81.5112 99.8457 81.4258 100.55 81.4258 101.347V101.86C81.4258 102.486 81.5112 103.076 81.6821 103.63C81.8612 104.175 82.1175 104.655 82.4512 105.07C82.793 105.485 83.2039 105.811 83.6841 106.047C84.1724 106.283 84.7257 106.401 85.3442 106.401C86.1418 106.401 86.8172 106.238 87.3706 105.913C87.924 105.587 88.4082 105.152 88.8232 104.606L90.1904 105.693C89.9056 106.124 89.5435 106.535 89.104 106.926C88.6646 107.316 88.1234 107.634 87.4805 107.878C86.8457 108.122 86.0929 108.244 85.2222 108.244ZM98.5278 94.792V96.5254H91.3867V94.792H98.5278ZM93.8037 91.5815H96.062V104.729C96.062 105.176 96.1312 105.514 96.2695 105.742C96.4079 105.97 96.5869 106.12 96.8066 106.193C97.0264 106.267 97.2624 106.303 97.5146 106.303C97.7018 106.303 97.8971 106.287 98.1006 106.254C98.3122 106.214 98.4709 106.181 98.5767 106.157L98.5889 108C98.4098 108.057 98.1738 108.11 97.8809 108.159C97.596 108.216 97.2502 108.244 96.8433 108.244C96.2899 108.244 95.7812 108.134 95.3174 107.915C94.8535 107.695 94.4832 107.329 94.2065 106.816C93.938 106.295 93.8037 105.595 93.8037 104.716V91.5815ZM106.658 108.244C105.738 108.244 104.904 108.09 104.155 107.78C103.415 107.463 102.776 107.019 102.239 106.45C101.71 105.88 101.303 105.205 101.018 104.423C100.733 103.642 100.591 102.788 100.591 101.86V101.347C100.591 100.273 100.75 99.3167 101.067 98.4785C101.384 97.6322 101.816 96.916 102.361 96.3301C102.906 95.7441 103.525 95.3006 104.216 94.9995C104.908 94.6984 105.624 94.5479 106.365 94.5479C107.309 94.5479 108.123 94.7106 108.806 95.0361C109.498 95.3617 110.063 95.8174 110.503 96.4033C110.942 96.9811 111.268 97.6647 111.479 98.4541C111.691 99.2354 111.797 100.09 111.797 101.018V102.031H101.934V100.188H109.539V100.017C109.506 99.4307 109.384 98.861 109.172 98.3076C108.969 97.7542 108.643 97.2985 108.196 96.9404C107.748 96.5824 107.138 96.4033 106.365 96.4033C105.852 96.4033 105.38 96.5132 104.949 96.7329C104.517 96.9445 104.147 97.2619 103.838 97.6851C103.529 98.1082 103.289 98.625 103.118 99.2354C102.947 99.8457 102.861 100.55 102.861 101.347V101.86C102.861 102.486 102.947 103.076 103.118 103.63C103.297 104.175 103.553 104.655 103.887 105.07C104.229 105.485 104.639 105.811 105.12 106.047C105.608 106.283 106.161 106.401 106.78 106.401C107.577 106.401 108.253 106.238 108.806 105.913C109.36 105.587 109.844 105.152 110.259 104.606L111.626 105.693C111.341 106.124 110.979 106.535 110.54 106.926C110.1 107.316 109.559 107.634 108.916 107.878C108.281 108.122 107.528 108.244 106.658 108.244ZM116.887 89.25V108H114.617V89.25H116.887ZM124.224 106.633L127.898 94.792H130.315L125.017 110.039C124.895 110.364 124.732 110.714 124.529 111.088C124.333 111.471 124.081 111.833 123.772 112.175C123.463 112.517 123.088 112.793 122.649 113.005C122.218 113.225 121.701 113.334 121.099 113.334C120.92 113.334 120.692 113.31 120.415 113.261C120.138 113.212 119.943 113.172 119.829 113.139L119.817 111.308C119.882 111.316 119.984 111.324 120.122 111.333C120.269 111.349 120.37 111.357 120.427 111.357C120.94 111.357 121.375 111.288 121.733 111.149C122.091 111.019 122.393 110.795 122.637 110.478C122.889 110.169 123.105 109.742 123.284 109.196L124.224 106.633ZM121.526 94.792L124.956 105.046L125.542 107.426L123.918 108.256L119.06 94.792H121.526ZM152.581 98.5518V99.6748C152.581 101.009 152.414 102.206 152.08 103.264C151.746 104.322 151.266 105.221 150.64 105.961C150.013 106.702 149.26 107.268 148.381 107.658C147.511 108.049 146.534 108.244 145.452 108.244C144.402 108.244 143.438 108.049 142.559 107.658C141.688 107.268 140.931 106.702 140.288 105.961C139.653 105.221 139.161 104.322 138.811 103.264C138.461 102.206 138.286 101.009 138.286 99.6748V98.5518C138.286 97.2171 138.457 96.0249 138.799 94.9751C139.149 93.9172 139.641 93.0179 140.276 92.2773C140.911 91.5286 141.663 90.959 142.534 90.5684C143.413 90.1777 144.377 89.9824 145.427 89.9824C146.51 89.9824 147.486 90.1777 148.357 90.5684C149.236 90.959 149.989 91.5286 150.615 92.2773C151.25 93.0179 151.734 93.9172 152.068 94.9751C152.41 96.0249 152.581 97.2171 152.581 98.5518ZM150.249 99.6748V98.5273C150.249 97.4694 150.139 96.5335 149.919 95.7197C149.708 94.9059 149.395 94.2223 148.979 93.6689C148.564 93.1156 148.056 92.6965 147.454 92.4116C146.86 92.1268 146.184 91.9844 145.427 91.9844C144.695 91.9844 144.032 92.1268 143.438 92.4116C142.852 92.6965 142.347 93.1156 141.924 93.6689C141.509 94.2223 141.187 94.9059 140.959 95.7197C140.732 96.5335 140.618 97.4694 140.618 98.5273V99.6748C140.618 100.741 140.732 101.685 140.959 102.507C141.187 103.321 141.513 104.008 141.936 104.57C142.367 105.123 142.876 105.542 143.462 105.827C144.056 106.112 144.719 106.254 145.452 106.254C146.217 106.254 146.896 106.112 147.49 105.827C148.084 105.542 148.585 105.123 148.992 104.57C149.407 104.008 149.72 103.321 149.932 102.507C150.143 101.685 150.249 100.741 150.249 99.6748ZM158.025 97.3311V113.078H155.754V94.792H157.83L158.025 97.3311ZM166.924 101.286V101.542C166.924 102.503 166.81 103.394 166.582 104.216C166.354 105.03 166.021 105.738 165.581 106.34C165.15 106.942 164.617 107.41 163.982 107.744C163.347 108.077 162.619 108.244 161.797 108.244C160.959 108.244 160.218 108.106 159.575 107.829C158.932 107.552 158.387 107.15 157.939 106.621C157.492 106.092 157.134 105.457 156.865 104.716C156.605 103.976 156.426 103.142 156.328 102.214V100.847C156.426 99.8701 156.609 98.9953 156.877 98.2222C157.146 97.4491 157.5 96.7899 157.939 96.2446C158.387 95.6912 158.928 95.2721 159.563 94.9873C160.198 94.6943 160.93 94.5479 161.76 94.5479C162.59 94.5479 163.327 94.7106 163.97 95.0361C164.613 95.3535 165.154 95.8092 165.593 96.4033C166.033 96.9974 166.362 97.7095 166.582 98.5396C166.81 99.3615 166.924 100.277 166.924 101.286ZM164.653 101.542V101.286C164.653 100.627 164.584 100.008 164.446 99.4307C164.307 98.8447 164.092 98.332 163.799 97.8926C163.514 97.445 163.148 97.0951 162.7 96.8428C162.253 96.5824 161.72 96.4521 161.101 96.4521C160.531 96.4521 160.035 96.5498 159.612 96.7451C159.197 96.9404 158.843 97.2049 158.55 97.5386C158.257 97.8641 158.017 98.2384 157.83 98.6616C157.651 99.0767 157.516 99.508 157.427 99.9556V103.117C157.59 103.687 157.817 104.224 158.11 104.729C158.403 105.225 158.794 105.628 159.282 105.937C159.771 106.238 160.385 106.389 161.125 106.389C161.736 106.389 162.261 106.263 162.7 106.01C163.148 105.75 163.514 105.396 163.799 104.948C164.092 104.501 164.307 103.988 164.446 103.41C164.584 102.824 164.653 102.202 164.653 101.542ZM175.286 108.244C174.366 108.244 173.532 108.09 172.783 107.78C172.043 107.463 171.404 107.019 170.867 106.45C170.338 105.88 169.931 105.205 169.646 104.423C169.361 103.642 169.219 102.788 169.219 101.86V101.347C169.219 100.273 169.377 99.3167 169.695 98.4785C170.012 97.6322 170.444 96.916 170.989 96.3301C171.534 95.7441 172.153 95.3006 172.844 94.9995C173.536 94.6984 174.252 94.5479 174.993 94.5479C175.937 94.5479 176.75 94.7106 177.434 95.0361C178.126 95.3617 178.691 95.8174 179.131 96.4033C179.57 96.9811 179.896 97.6647 180.107 98.4541C180.319 99.2354 180.425 100.09 180.425 101.018V102.031H170.562V100.188H178.167V100.017C178.134 99.4307 178.012 98.861 177.8 98.3076C177.597 97.7542 177.271 97.2985 176.824 96.9404C176.376 96.5824 175.766 96.4033 174.993 96.4033C174.48 96.4033 174.008 96.5132 173.577 96.7329C173.145 96.9445 172.775 97.2619 172.466 97.6851C172.157 98.1082 171.917 98.625 171.746 99.2354C171.575 99.8457 171.489 100.55 171.489 101.347V101.86C171.489 102.486 171.575 103.076 171.746 103.63C171.925 104.175 172.181 104.655 172.515 105.07C172.856 105.485 173.267 105.811 173.748 106.047C174.236 106.283 174.789 106.401 175.408 106.401C176.205 106.401 176.881 106.238 177.434 105.913C177.987 105.587 178.472 105.152 178.887 104.606L180.254 105.693C179.969 106.124 179.607 106.535 179.167 106.926C178.728 107.316 178.187 107.634 177.544 107.878C176.909 108.122 176.156 108.244 175.286 108.244ZM185.32 97.6118V108H183.062V94.792H185.198L185.32 97.6118ZM184.783 100.896L183.843 100.859C183.851 99.9556 183.985 99.1214 184.246 98.3564C184.506 97.5833 184.872 96.9119 185.344 96.3423C185.816 95.7726 186.378 95.3332 187.029 95.0239C187.688 94.7065 188.416 94.5479 189.214 94.5479C189.865 94.5479 190.451 94.6374 190.972 94.8164C191.493 94.9873 191.936 95.264 192.302 95.6465C192.677 96.029 192.961 96.5254 193.157 97.1357C193.352 97.738 193.45 98.4744 193.45 99.3452V108H191.179V99.3208C191.179 98.6291 191.077 98.0757 190.874 97.6606C190.671 97.2375 190.374 96.9323 189.983 96.7451C189.592 96.5498 189.112 96.4521 188.542 96.4521C187.981 96.4521 187.468 96.5701 187.004 96.8062C186.549 97.0422 186.154 97.3677 185.82 97.7827C185.495 98.1978 185.238 98.6738 185.051 99.2109C184.872 99.7399 184.783 100.301 184.783 100.896ZM212.896 103.508C212.896 103.093 212.83 102.727 212.7 102.409C212.578 102.084 212.358 101.791 212.041 101.53C211.732 101.27 211.3 101.022 210.747 100.786C210.202 100.55 209.51 100.31 208.672 100.065C207.793 99.805 207 99.5161 206.292 99.1987C205.583 98.8732 204.977 98.5029 204.473 98.0879C203.968 97.6729 203.582 97.1968 203.313 96.6597C203.044 96.1226 202.91 95.5081 202.91 94.8164C202.91 94.1247 203.053 93.4858 203.337 92.8999C203.622 92.314 204.029 91.8053 204.558 91.374C205.095 90.9346 205.734 90.5928 206.475 90.3486C207.215 90.1045 208.041 89.9824 208.953 89.9824C210.287 89.9824 211.418 90.2388 212.346 90.7515C213.282 91.256 213.994 91.9193 214.482 92.7412C214.971 93.555 215.215 94.4258 215.215 95.3535H212.871C212.871 94.6862 212.729 94.0962 212.444 93.5835C212.159 93.0627 211.728 92.6558 211.15 92.3628C210.572 92.0617 209.84 91.9111 208.953 91.9111C208.114 91.9111 207.423 92.0373 206.877 92.2896C206.332 92.5418 205.925 92.8836 205.657 93.3149C205.396 93.7463 205.266 94.2386 205.266 94.792C205.266 95.1663 205.343 95.5081 205.498 95.8174C205.661 96.1185 205.909 96.3993 206.243 96.6597C206.584 96.9201 207.016 97.1602 207.537 97.3799C208.066 97.5996 208.696 97.8112 209.429 98.0146C210.438 98.2995 211.309 98.6169 212.041 98.9668C212.773 99.3167 213.376 99.7114 213.848 100.151C214.328 100.582 214.682 101.075 214.91 101.628C215.146 102.173 215.264 102.792 215.264 103.483C215.264 104.208 215.117 104.863 214.824 105.449C214.531 106.035 214.112 106.535 213.567 106.95C213.022 107.365 212.367 107.687 211.602 107.915C210.845 108.134 209.998 108.244 209.062 108.244C208.241 108.244 207.431 108.13 206.633 107.902C205.844 107.674 205.124 107.333 204.473 106.877C203.83 106.421 203.313 105.86 202.922 105.192C202.54 104.517 202.349 103.736 202.349 102.849H204.692C204.692 103.459 204.81 103.984 205.046 104.423C205.282 104.855 205.604 105.213 206.011 105.498C206.426 105.782 206.894 105.994 207.415 106.132C207.944 106.263 208.493 106.328 209.062 106.328C209.884 106.328 210.58 106.214 211.15 105.986C211.72 105.758 212.151 105.432 212.444 105.009C212.745 104.586 212.896 104.086 212.896 103.508ZM223.406 108.244C222.486 108.244 221.652 108.09 220.903 107.78C220.163 107.463 219.524 107.019 218.987 106.45C218.458 105.88 218.051 105.205 217.766 104.423C217.481 103.642 217.339 102.788 217.339 101.86V101.347C217.339 100.273 217.498 99.3167 217.815 98.4785C218.132 97.6322 218.564 96.916 219.109 96.3301C219.654 95.7441 220.273 95.3006 220.964 94.9995C221.656 94.6984 222.372 94.5479 223.113 94.5479C224.057 94.5479 224.871 94.7106 225.554 95.0361C226.246 95.3617 226.812 95.8174 227.251 96.4033C227.69 96.9811 228.016 97.6647 228.228 98.4541C228.439 99.2354 228.545 100.09 228.545 101.018V102.031H218.682V100.188H226.287V100.017C226.254 99.4307 226.132 98.861 225.92 98.3076C225.717 97.7542 225.391 97.2985 224.944 96.9404C224.496 96.5824 223.886 96.4033 223.113 96.4033C222.6 96.4033 222.128 96.5132 221.697 96.7329C221.265 96.9445 220.895 97.2619 220.586 97.6851C220.277 98.1082 220.037 98.625 219.866 99.2354C219.695 99.8457 219.609 100.55 219.609 101.347V101.86C219.609 102.486 219.695 103.076 219.866 103.63C220.045 104.175 220.301 104.655 220.635 105.07C220.977 105.485 221.388 105.811 221.868 106.047C222.356 106.283 222.909 106.401 223.528 106.401C224.325 106.401 225.001 106.238 225.554 105.913C226.108 105.587 226.592 105.152 227.007 104.606L228.374 105.693C228.089 106.124 227.727 106.535 227.288 106.926C226.848 107.316 226.307 107.634 225.664 107.878C225.029 108.122 224.277 108.244 223.406 108.244ZM238.97 105.742V98.9424C238.97 98.4215 238.864 97.9699 238.652 97.5874C238.449 97.1968 238.14 96.8957 237.725 96.6841C237.31 96.4725 236.797 96.3667 236.187 96.3667C235.617 96.3667 235.116 96.4644 234.685 96.6597C234.262 96.855 233.928 97.1113 233.684 97.4287C233.448 97.7461 233.33 98.0879 233.33 98.4541H231.072C231.072 97.9821 231.194 97.5142 231.438 97.0503C231.682 96.5864 232.032 96.1673 232.488 95.793C232.952 95.4105 233.505 95.1094 234.148 94.8896C234.799 94.6618 235.523 94.5479 236.321 94.5479C237.281 94.5479 238.127 94.7106 238.86 95.0361C239.6 95.3617 240.178 95.854 240.593 96.5132C241.016 97.1642 241.228 97.9821 241.228 98.9668V105.119C241.228 105.559 241.265 106.027 241.338 106.523C241.419 107.019 241.537 107.447 241.692 107.805V108H239.336C239.222 107.74 239.132 107.394 239.067 106.962C239.002 106.523 238.97 106.116 238.97 105.742ZM239.36 99.9922L239.385 101.579H237.102C236.459 101.579 235.885 101.632 235.381 101.738C234.876 101.835 234.453 101.986 234.111 102.189C233.77 102.393 233.509 102.649 233.33 102.958C233.151 103.26 233.062 103.614 233.062 104.021C233.062 104.436 233.155 104.814 233.342 105.156C233.529 105.498 233.81 105.77 234.185 105.974C234.567 106.169 235.035 106.267 235.588 106.267C236.28 106.267 236.89 106.12 237.419 105.827C237.948 105.534 238.368 105.176 238.677 104.753C238.994 104.33 239.165 103.919 239.189 103.52L240.154 104.606C240.097 104.948 239.942 105.327 239.69 105.742C239.438 106.157 239.1 106.556 238.677 106.938C238.262 107.312 237.765 107.626 237.188 107.878C236.618 108.122 235.975 108.244 235.259 108.244C234.364 108.244 233.578 108.069 232.903 107.719C232.236 107.369 231.715 106.901 231.34 106.315C230.974 105.721 230.791 105.058 230.791 104.326C230.791 103.618 230.929 102.995 231.206 102.458C231.483 101.913 231.882 101.461 232.402 101.103C232.923 100.737 233.55 100.46 234.282 100.273C235.015 100.086 235.833 99.9922 236.736 99.9922H239.36ZM247.039 96.8672V108H244.78V94.792H246.978L247.039 96.8672ZM251.165 94.7188L251.152 96.8184C250.965 96.7777 250.786 96.7533 250.615 96.7451C250.452 96.7288 250.265 96.7207 250.054 96.7207C249.533 96.7207 249.073 96.8021 248.674 96.9648C248.276 97.1276 247.938 97.3555 247.661 97.6484C247.384 97.9414 247.165 98.2913 247.002 98.6982C246.847 99.097 246.746 99.5365 246.697 100.017L246.062 100.383C246.062 99.5853 246.139 98.8366 246.294 98.1367C246.457 97.4368 246.705 96.8184 247.039 96.2812C247.372 95.736 247.795 95.3128 248.308 95.0117C248.829 94.7025 249.447 94.5479 250.164 94.5479C250.326 94.5479 250.514 94.5682 250.725 94.6089C250.937 94.6414 251.083 94.6781 251.165 94.7188ZM258.293 106.389C258.831 106.389 259.327 106.279 259.783 106.059C260.238 105.839 260.613 105.538 260.906 105.156C261.199 104.765 261.366 104.322 261.406 103.825H263.555C263.514 104.606 263.25 105.335 262.761 106.01C262.281 106.678 261.65 107.219 260.869 107.634C260.088 108.041 259.229 108.244 258.293 108.244C257.301 108.244 256.434 108.069 255.693 107.719C254.961 107.369 254.351 106.889 253.862 106.279C253.382 105.668 253.02 104.969 252.776 104.179C252.54 103.382 252.422 102.539 252.422 101.652V101.14C252.422 100.253 252.54 99.4144 252.776 98.625C253.02 97.8275 253.382 97.1235 253.862 96.5132C254.351 95.9028 254.961 95.4227 255.693 95.0728C256.434 94.7228 257.301 94.5479 258.293 94.5479C259.327 94.5479 260.23 94.7594 261.003 95.1826C261.777 95.5977 262.383 96.1673 262.822 96.8916C263.27 97.6077 263.514 98.4215 263.555 99.333H261.406C261.366 98.7878 261.211 98.2954 260.942 97.856C260.682 97.4165 260.324 97.0666 259.868 96.8062C259.421 96.5376 258.896 96.4033 258.293 96.4033C257.602 96.4033 257.02 96.5417 256.548 96.8184C256.084 97.0869 255.714 97.4531 255.437 97.917C255.168 98.3727 254.973 98.8813 254.851 99.4429C254.737 99.9963 254.68 100.562 254.68 101.14V101.652C254.68 102.23 254.737 102.8 254.851 103.361C254.965 103.923 255.156 104.431 255.425 104.887C255.701 105.343 256.072 105.709 256.536 105.986C257.008 106.254 257.594 106.389 258.293 106.389ZM268.352 89.25V108H266.094V89.25H268.352ZM267.815 100.896L266.875 100.859C266.883 99.9556 267.017 99.1214 267.278 98.3564C267.538 97.5833 267.904 96.9119 268.376 96.3423C268.848 95.7726 269.41 95.3332 270.061 95.0239C270.72 94.7065 271.449 94.5479 272.246 94.5479C272.897 94.5479 273.483 94.6374 274.004 94.8164C274.525 94.9873 274.968 95.264 275.334 95.6465C275.709 96.029 275.994 96.5254 276.189 97.1357C276.384 97.738 276.482 98.4744 276.482 99.3452V108H274.211V99.3208C274.211 98.6291 274.11 98.0757 273.906 97.6606C273.703 97.2375 273.406 96.9323 273.015 96.7451C272.625 96.5498 272.144 96.4521 271.575 96.4521C271.013 96.4521 270.5 96.5701 270.037 96.8062C269.581 97.0422 269.186 97.3677 268.853 97.7827C268.527 98.1978 268.271 98.6738 268.083 99.2109C267.904 99.7399 267.815 100.301 267.815 100.896ZM297.698 106.083V108H288.286V106.083H297.698ZM288.762 90.2266V108H286.406V90.2266H288.762ZM296.453 97.8682V99.7847H288.286V97.8682H296.453ZM297.576 90.2266V92.1553H288.286V90.2266H297.576ZM302.532 97.6118V108H300.273V94.792H302.41L302.532 97.6118ZM301.995 100.896L301.055 100.859C301.063 99.9556 301.197 99.1214 301.458 98.3564C301.718 97.5833 302.084 96.9119 302.556 96.3423C303.028 95.7726 303.59 95.3332 304.241 95.0239C304.9 94.7065 305.628 94.5479 306.426 94.5479C307.077 94.5479 307.663 94.6374 308.184 94.8164C308.704 94.9873 309.148 95.264 309.514 95.6465C309.889 96.029 310.173 96.5254 310.369 97.1357C310.564 97.738 310.662 98.4744 310.662 99.3452V108H308.391V99.3208C308.391 98.6291 308.289 98.0757 308.086 97.6606C307.882 97.2375 307.585 96.9323 307.195 96.7451C306.804 96.5498 306.324 96.4521 305.754 96.4521C305.193 96.4521 304.68 96.5701 304.216 96.8062C303.761 97.0422 303.366 97.3677 303.032 97.7827C302.707 98.1978 302.45 98.6738 302.263 99.2109C302.084 99.7399 301.995 100.301 301.995 100.896ZM322.649 94.792H324.7V107.719C324.7 108.883 324.464 109.876 323.992 110.698C323.52 111.52 322.861 112.142 322.014 112.565C321.176 112.997 320.208 113.212 319.109 113.212C318.653 113.212 318.116 113.139 317.498 112.993C316.887 112.854 316.285 112.614 315.691 112.272C315.105 111.939 314.613 111.487 314.214 110.917L315.398 109.575C315.951 110.242 316.529 110.706 317.131 110.966C317.742 111.227 318.344 111.357 318.938 111.357C319.654 111.357 320.273 111.223 320.793 110.954C321.314 110.686 321.717 110.287 322.002 109.758C322.295 109.237 322.441 108.594 322.441 107.829V97.6973L322.649 94.792ZM313.555 101.542V101.286C313.555 100.277 313.673 99.3615 313.909 98.5396C314.153 97.7095 314.499 96.9974 314.946 96.4033C315.402 95.8092 315.951 95.3535 316.594 95.0361C317.237 94.7106 317.961 94.5479 318.767 94.5479C319.597 94.5479 320.321 94.6943 320.94 94.9873C321.567 95.2721 322.096 95.6912 322.527 96.2446C322.966 96.7899 323.312 97.4491 323.564 98.2222C323.817 98.9953 323.992 99.8701 324.089 100.847V101.97C324 102.938 323.825 103.809 323.564 104.582C323.312 105.355 322.966 106.014 322.527 106.56C322.096 107.105 321.567 107.524 320.94 107.817C320.313 108.102 319.581 108.244 318.743 108.244C317.953 108.244 317.237 108.077 316.594 107.744C315.959 107.41 315.414 106.942 314.958 106.34C314.503 105.738 314.153 105.03 313.909 104.216C313.673 103.394 313.555 102.503 313.555 101.542ZM315.813 101.286V101.542C315.813 102.202 315.878 102.82 316.008 103.398C316.147 103.976 316.354 104.484 316.631 104.924C316.916 105.363 317.278 105.709 317.717 105.961C318.157 106.206 318.682 106.328 319.292 106.328C320.041 106.328 320.659 106.169 321.147 105.852C321.636 105.534 322.022 105.115 322.307 104.594C322.6 104.073 322.828 103.508 322.991 102.897V99.9556C322.901 99.508 322.763 99.0767 322.576 98.6616C322.397 98.2384 322.161 97.8641 321.868 97.5386C321.583 97.2049 321.229 96.9404 320.806 96.7451C320.382 96.5498 319.886 96.4521 319.316 96.4521C318.698 96.4521 318.165 96.5824 317.717 96.8428C317.278 97.0951 316.916 97.445 316.631 97.8926C316.354 98.332 316.147 98.8447 316.008 99.4307C315.878 100.008 315.813 100.627 315.813 101.286ZM330.583 94.792V108H328.313V94.792H330.583ZM328.142 91.2886C328.142 90.9224 328.252 90.6131 328.472 90.3608C328.7 90.1086 329.033 89.9824 329.473 89.9824C329.904 89.9824 330.234 90.1086 330.461 90.3608C330.697 90.6131 330.815 90.9224 330.815 91.2886C330.815 91.6385 330.697 91.9396 330.461 92.1919C330.234 92.436 329.904 92.5581 329.473 92.5581C329.033 92.5581 328.7 92.436 328.472 92.1919C328.252 91.9396 328.142 91.6385 328.142 91.2886ZM336.467 97.6118V108H334.209V94.792H336.345L336.467 97.6118ZM335.93 100.896L334.99 100.859C334.998 99.9556 335.133 99.1214 335.393 98.3564C335.653 97.5833 336.02 96.9119 336.492 96.3423C336.964 95.7726 337.525 95.3332 338.176 95.0239C338.835 94.7065 339.564 94.5479 340.361 94.5479C341.012 94.5479 341.598 94.6374 342.119 94.8164C342.64 94.9873 343.083 95.264 343.45 95.6465C343.824 96.029 344.109 96.5254 344.304 97.1357C344.5 97.738 344.597 98.4744 344.597 99.3452V108H342.327V99.3208C342.327 98.6291 342.225 98.0757 342.021 97.6606C341.818 97.2375 341.521 96.9323 341.13 96.7451C340.74 96.5498 340.26 96.4521 339.69 96.4521C339.128 96.4521 338.616 96.5701 338.152 96.8062C337.696 97.0422 337.301 97.3677 336.968 97.7827C336.642 98.1978 336.386 98.6738 336.199 99.2109C336.02 99.7399 335.93 100.301 335.93 100.896ZM353.508 108.244C352.589 108.244 351.755 108.09 351.006 107.78C350.265 107.463 349.626 107.019 349.089 106.45C348.56 105.88 348.153 105.205 347.869 104.423C347.584 103.642 347.441 102.788 347.441 101.86V101.347C347.441 100.273 347.6 99.3167 347.917 98.4785C348.235 97.6322 348.666 96.916 349.211 96.3301C349.757 95.7441 350.375 95.3006 351.067 94.9995C351.759 94.6984 352.475 94.5479 353.215 94.5479C354.159 94.5479 354.973 94.7106 355.657 95.0361C356.348 95.3617 356.914 95.8174 357.354 96.4033C357.793 96.9811 358.118 97.6647 358.33 98.4541C358.542 99.2354 358.647 100.09 358.647 101.018V102.031H348.784V100.188H356.389V100.017C356.357 99.4307 356.235 98.861 356.023 98.3076C355.819 97.7542 355.494 97.2985 355.046 96.9404C354.599 96.5824 353.988 96.4033 353.215 96.4033C352.703 96.4033 352.231 96.5132 351.799 96.7329C351.368 96.9445 350.998 97.2619 350.688 97.6851C350.379 98.1082 350.139 98.625 349.968 99.2354C349.797 99.8457 349.712 100.55 349.712 101.347V101.86C349.712 102.486 349.797 103.076 349.968 103.63C350.147 104.175 350.404 104.655 350.737 105.07C351.079 105.485 351.49 105.811 351.97 106.047C352.458 106.283 353.012 106.401 353.63 106.401C354.428 106.401 355.103 106.238 355.657 105.913C356.21 105.587 356.694 105.152 357.109 104.606L358.477 105.693C358.192 106.124 357.83 106.535 357.39 106.926C356.951 107.316 356.41 107.634 355.767 107.878C355.132 108.122 354.379 108.244 353.508 108.244Z" fill="#6B7280"/>+<path d="M69.2179 66.35C65.5779 66.35 62.1245 65.7433 58.8579 64.53C55.6379 63.27 53.1412 61.66 51.3679 59.7L52.9779 57.04C54.6579 58.7667 56.9445 60.2367 59.8379 61.45C62.7779 62.6167 65.8812 63.2 69.1479 63.2C72.4145 63.2 75.0745 62.78 77.1279 61.94C79.2279 61.0533 80.7679 59.8867 81.7479 58.44C82.7745 56.9933 83.2879 55.3833 83.2879 53.61C83.2879 51.51 82.7279 49.83 81.6079 48.57C80.4879 47.31 79.0179 46.3067 77.1979 45.56C75.3779 44.8133 73.3945 44.1833 71.2479 43.67C69.1012 43.1567 66.9312 42.62 64.7379 42.06C62.5445 41.4533 60.5379 40.6833 58.7179 39.75C56.8979 38.8167 55.4279 37.5567 54.3079 35.97C53.2345 34.3367 52.6979 32.2367 52.6979 29.67C52.6979 27.3367 53.3045 25.19 54.5179 23.23C55.7312 21.27 57.6212 19.6833 60.1879 18.47C62.7545 17.2567 66.0445 16.65 70.0579 16.65C72.7645 16.65 75.4245 17.0467 78.0379 17.84C80.6979 18.6333 82.9612 19.7067 84.8279 21.06L83.4979 23.93C81.4445 22.53 79.2279 21.5033 76.8479 20.85C74.5145 20.15 72.2512 19.8 70.0579 19.8C66.9312 19.8 64.3412 20.2433 62.2879 21.13C60.2345 22.0167 58.7179 23.2067 57.7379 24.7C56.7579 26.1467 56.2679 27.78 56.2679 29.6C56.2679 31.7 56.8045 33.38 57.8779 34.64C58.9979 35.9 60.4679 36.9033 62.2879 37.65C64.1079 38.3967 66.1145 39.0267 68.3079 39.54C70.5012 40.0533 72.6712 40.6133 74.8179 41.22C76.9645 41.78 78.9479 42.5267 80.7679 43.46C82.5879 44.3933 84.0579 45.6533 85.1779 47.24C86.2979 48.8267 86.8579 50.88 86.8579 53.4C86.8579 55.6867 86.2279 57.8333 84.9679 59.84C83.7079 61.8 81.7712 63.3867 79.1579 64.6C76.5912 65.7667 73.2779 66.35 69.2179 66.35ZM107.691 66V20.22H90.0505V17H128.901V20.22H111.261V66H107.691ZM137.754 66V17H155.324C159.431 17 162.954 17.6533 165.894 18.96C168.834 20.2667 171.097 22.1567 172.684 24.63C174.271 27.0567 175.064 30.02 175.064 33.52C175.064 36.9267 174.271 39.8667 172.684 42.34C171.097 44.7667 168.834 46.6567 165.894 48.01C162.954 49.3167 159.431 49.97 155.324 49.97H139.714L141.324 48.29V66H137.754ZM171.774 66L159.034 48.22H163.094L175.834 66H171.774ZM141.324 48.5L139.714 46.82H155.324C160.597 46.82 164.587 45.6533 167.294 43.32C170.047 40.9867 171.424 37.72 171.424 33.52C171.424 29.2733 170.047 26.0067 167.294 23.72C164.587 21.3867 160.597 20.22 155.324 20.22H139.714L141.324 18.47V48.5ZM179.945 66L202.485 17H206.055L228.595 66H224.745L203.465 19.24H205.005L183.795 66H179.945ZM188.205 52.21L189.395 49.2H218.725L219.915 52.21H188.205ZM257.527 66.35C253.887 66.35 250.503 65.7433 247.377 64.53C244.297 63.27 241.613 61.52 239.327 59.28C237.04 57.04 235.267 54.4267 234.007 51.44C232.747 48.4067 232.117 45.0933 232.117 41.5C232.117 37.9067 232.747 34.6167 234.007 31.63C235.267 28.5967 237.04 25.96 239.327 23.72C241.66 21.48 244.367 19.7533 247.447 18.54C250.527 17.28 253.887 16.65 257.527 16.65C260.98 16.65 264.2 17.21 267.187 18.33C270.22 19.45 272.81 21.1533 274.957 23.44L272.717 25.75C270.617 23.6967 268.283 22.2267 265.717 21.34C263.197 20.4067 260.513 19.94 257.667 19.94C254.54 19.94 251.623 20.4767 248.917 21.55C246.257 22.6233 243.923 24.14 241.917 26.1C239.957 28.06 238.417 30.3467 237.297 32.96C236.223 35.5733 235.687 38.42 235.687 41.5C235.687 44.58 236.223 47.4267 237.297 50.04C238.417 52.6533 239.957 54.94 241.917 56.9C243.923 58.86 246.257 60.3767 248.917 61.45C251.623 62.5233 254.54 63.06 257.667 63.06C260.513 63.06 263.197 62.6167 265.717 61.73C268.283 60.7967 270.617 59.28 272.717 57.18L274.957 59.49C272.81 61.7767 270.22 63.5033 267.187 64.67C264.2 65.79 260.98 66.35 257.527 66.35ZM295.679 66V20.22H278.039V17H316.889V20.22H299.249V66H295.679Z" fill="#0B7BFF"/>+</svg>diff --git a/frontend/public/images/logo.svg b/frontend/public/images/logo.svgindex e81efc8d..b4d33e87 100644--- a/frontend/public/images/logo.svg+++ b/frontend/public/images/logo.svg@@ -1,23 +1,15 @@-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">-<g clip-path="url(#clip0_402_3)">-<mask id="path-1-inside-1_402_3" fill="white">-<path fill-rule="evenodd" clip-rule="evenodd" d="M23.817 20.4857C22.0574 22.002 19.8551 23.0854 17.44 23.6229C16.325 23.868 15.156 24 13.952 24C11.9582 24.0013 9.9875 23.6348 8.17366 22.9253C6.35982 22.2159 4.74538 21.18 3.44002 19.8883C1.21671 17.7027 -0.00562695 14.8997 1.9475e-05 12C1.9475e-05 8.98029 1.29802 6.22114 3.44002 4.11171C4.74538 2.81997 6.35982 1.78418 8.17366 1.0747C9.9875 0.365225 11.9582 -0.00130679 13.952 3.50069e-06C15.156 3.50069e-06 16.325 0.132003 17.44 0.377146C19.8551 0.914537 22.0574 1.99798 23.817 3.51429L18.884 7.75714C18.238 7.19964 17.4696 6.75733 16.6231 6.45574C15.7766 6.15415 14.8687 5.99925 13.952 6C10.1 6 6.97602 8.68629 6.97602 12L6.97802 12.1543C7.07402 15.3977 10.16 18 13.952 18C15.878 18 17.622 17.328 18.884 16.2429L23.817 20.4857Z"/>-</mask>-<path fill-rule="evenodd" clip-rule="evenodd" d="M23.817 20.4857C22.0574 22.002 19.8551 23.0854 17.44 23.6229C16.325 23.868 15.156 24 13.952 24C11.9582 24.0013 9.9875 23.6348 8.17366 22.9253C6.35982 22.2159 4.74538 21.18 3.44002 19.8883C1.21671 17.7027 -0.00562695 14.8997 1.9475e-05 12C1.9475e-05 8.98029 1.29802 6.22114 3.44002 4.11171C4.74538 2.81997 6.35982 1.78418 8.17366 1.0747C9.9875 0.365225 11.9582 -0.00130679 13.952 3.50069e-06C15.156 3.50069e-06 16.325 0.132003 17.44 0.377146C19.8551 0.914537 22.0574 1.99798 23.817 3.51429L18.884 7.75714C18.238 7.19964 17.4696 6.75733 16.6231 6.45574C15.7766 6.15415 14.8687 5.99925 13.952 6C10.1 6 6.97602 8.68629 6.97602 12L6.97802 12.1543C7.07402 15.3977 10.16 18 13.952 18C15.878 18 17.622 17.328 18.884 16.2429L23.817 20.4857Z" fill="#0B7BFF" stroke="#1D1D1F" stroke-width="0.1" mask="url(#path-1-inside-1_402_3)"/>-<path fill-rule="evenodd" clip-rule="evenodd" d="M18.884 7.75713C18.238 7.19963 17.4696 6.75732 16.6231 6.45573C15.7766 6.15414 14.8688 5.99925 13.952 5.99999C10.1 5.99999 6.97603 8.68628 6.97603 12C6.9731 10.4247 7.33257 8.86439 8.03386 7.40835C8.73515 5.95228 9.7645 4.62903 11.063 3.51428C12.8226 1.99797 15.025 0.914529 17.44 0.377136L18.884 7.75713Z" fill="url(#paint0_linear_402_3)"/>-<path d="M7.78497 20.837L8.63461 18.8274L9.43923 19.1676C9.58707 19.2301 9.70112 19.3042 9.78136 19.3898C9.86161 19.4754 9.91014 19.5676 9.92694 19.6665C9.94402 19.7647 9.93127 19.8641 9.88867 19.9649C9.85548 20.0434 9.81061 20.1058 9.75404 20.152C9.69775 20.1976 9.6341 20.2278 9.56311 20.2425C9.49305 20.2568 9.41971 20.257 9.34307 20.2431L9.33478 20.2628C9.40993 20.2984 9.47243 20.3503 9.52229 20.4184C9.5728 20.4868 9.60377 20.5658 9.61521 20.6555C9.62693 20.7445 9.61191 20.8383 9.57015 20.9371C9.52507 21.0438 9.45833 21.1277 9.36994 21.1891C9.28248 21.25 9.17717 21.283 9.054 21.288C8.93083 21.293 8.79402 21.2636 8.64356 21.2L7.78497 20.837ZM8.35671 20.6693L8.70309 20.8158C8.82149 20.8658 8.91739 20.8798 8.99076 20.8576C9.06442 20.8347 9.11729 20.7854 9.14937 20.7095C9.17288 20.6539 9.18021 20.5992 9.17137 20.5453C9.16253 20.4914 9.13836 20.4419 9.09888 20.3967C9.06005 20.3517 9.00662 20.3149 8.93859 20.2861L8.5824 20.1355L8.35671 20.6693ZM8.70395 19.848L9.01893 19.9812C9.07715 20.0058 9.13312 20.0175 9.18683 20.0163C9.24147 20.0147 9.28989 20.0005 9.3321 19.9736C9.37496 19.947 9.4076 19.9072 9.43 19.8542C9.4607 19.7816 9.45961 19.7122 9.42674 19.6458C9.39452 19.5798 9.33132 19.5268 9.23712 19.487L8.91429 19.3505L8.70395 19.848Z" fill="white"/>-<path d="M11.0422 21.8422L11.3433 19.6813L12.7994 19.8842L12.7469 20.2609L11.7477 20.1217L11.676 20.6366L12.6003 20.7654L12.5478 21.1421L11.6235 21.0133L11.5516 21.5292L12.555 21.6691L12.5025 22.0457L11.0422 21.8422Z" fill="white"/>-<path d="M13.8144 20.1909L13.7678 19.8134L15.5461 19.5935L15.5928 19.9709L14.9299 20.0529L15.151 21.8408L14.6985 21.8968L14.4774 20.1089L13.8144 20.1909Z" fill="white"/>-<path d="M17.8133 21.062L17.358 21.2545L17.2021 18.9516L17.7497 18.7201L19.2921 20.4368L18.8368 20.6293L17.6779 19.2918L17.6622 19.2984L17.8133 21.062ZM17.4509 20.2841L18.5263 19.8294L18.6666 20.1611L17.5911 20.6158L17.4509 20.2841Z" fill="white"/>+<svg width="161" height="197" viewBox="0 0 161 197" fill="none" xmlns="http://www.w3.org/2000/svg">+<g clip-path="url(#clip0_604_16)">+<path d="M79.616 193.56C65.6213 193.56 52.224 191.597 39.424 187.672C26.624 183.576 16.4693 178.371 8.96 172.056L20.48 146.2C27.648 151.832 36.5227 156.525 47.104 160.28C57.6853 164.035 68.5227 165.912 79.616 165.912C89.0027 165.912 96.5973 164.888 102.4 162.84C108.203 160.792 112.469 158.061 115.2 154.648C117.931 151.064 119.296 147.053 119.296 142.616C119.296 137.155 117.333 132.803 113.408 129.56C109.483 126.147 104.363 123.501 98.048 121.624C91.904 119.576 84.992 117.699 77.312 115.992C69.8027 114.285 62.208 112.323 54.528 110.104C47.0187 107.715 40.1067 104.728 33.792 101.144C27.648 97.3893 22.6133 92.44 18.688 86.296C14.7627 80.152 12.8 72.3013 12.8 62.744C12.8 53.016 15.36 44.1413 20.48 36.12C25.7707 27.928 33.7067 21.4427 44.288 16.664C55.04 11.7147 68.608 9.23999 84.992 9.23999C95.744 9.23999 106.411 10.6053 116.992 13.336C127.573 16.0667 136.789 19.992 144.64 25.112L134.144 50.968C126.123 46.1893 117.845 42.6907 109.312 40.472C100.779 38.0827 92.5867 36.888 84.736 36.888C75.52 36.888 68.0107 37.9973 62.208 40.216C56.576 42.4347 52.3947 45.336 49.664 48.92C47.104 52.504 45.824 56.6 45.824 61.208C45.824 66.6693 47.7013 71.1067 51.456 74.52C55.3813 77.7627 60.416 80.3227 66.56 82.2C72.8747 84.0773 79.872 85.9547 87.552 87.832C95.232 89.5387 102.827 91.5013 110.336 93.72C118.016 95.9387 124.928 98.84 131.072 102.424C137.387 106.008 142.421 110.872 146.176 117.016C150.101 123.16 152.064 130.925 152.064 140.312C152.064 149.869 149.419 158.744 144.128 166.936C139.008 174.957 131.072 181.443 120.32 186.392C109.568 191.171 96 193.56 79.616 193.56Z" fill="#2A8BFF"/>+<path d="M44 50.5L44.7672 46.664C45.2544 44.2279 45.9933 41.849 46.9719 39.5656L47.5404 38.2391C48.1783 36.7507 48.9747 35.3354 49.9159 34.0177V34.0177C50.6374 33.0076 51.4411 32.0589 52.3188 31.1812L55 28.5L58 26L58.9322 25.2009C60.6417 23.7357 62.4587 22.4008 64.3679 21.2076L65.5 20.5L69 18.5L73.5 16.5L79.5 14.5L87 12.5L89.0039 11.999C91.6624 11.3344 94.3761 10.914 97.111 10.7431L101 10.5L105.322 10.7401C108.432 10.9129 111.516 11.4082 114.524 12.2181L123 14.5L131 17.5L141.5 23L145 25L134.5 51L120.5 44.5L111.5 41.5L105.5 39.5L100.5 38.5L96.4728 37.8288C95.1598 37.61 93.8311 37.5 92.5 37.5V37.5L86 37H80L74.5 37.5L71 38L68 38.5L64.5 39.5V39.5C62.5025 40.1658 60.5548 40.9726 58.6716 41.9142L58.5 42L56.5 43L55 44L54.6971 44.2272C53.5671 45.0747 52.4987 46.0013 51.5 47V47L50.4385 48.3268C49.8139 49.1076 49.2559 49.9393 48.7704 50.8133V50.8133C47.6021 52.9161 46.8702 55.2331 46.6184 57.6254L46.5152 58.6061C46.1757 61.8313 46.5306 65.0918 47.5562 68.1685L48.5 71V71C44.9421 65.8248 43.2734 59.5829 43.7742 53.3227L44 50.5Z" fill="url(#paint0_linear_604_16)"/></g><defs>-<linearGradient id="paint0_linear_402_3" x1="18.5" y1="3.49999" x2="7" y2="5.99999" gradientUnits="userSpaceOnUse">-<stop stop-color="#0E7DFF" stop-opacity="0.911017"/>-<stop offset="0.0001" stop-color="#0074FC" stop-opacity="0.65"/>-<stop offset="0.734375" stop-color="white"/>+<linearGradient id="paint0_linear_604_16" x1="41.5" y1="56" x2="125.5" y2="22" gradientUnits="userSpaceOnUse">+<stop offset="0.146614" stop-color="white"/>+<stop offset="1" stop-color="#D9D9D9" stop-opacity="0"/></linearGradient>-<clipPath id="clip0_402_3">-<rect width="24" height="24" fill="white"/>+<clipPath id="clip0_604_16">+<rect width="161" height="197" fill="white"/></clipPath></defs></svg>diff --git a/frontend/public/images/logo16.png b/frontend/public/images/logo16.pngindex 16f5501f..45e7922b 100644Binary files a/frontend/public/images/logo16.png and b/frontend/public/images/logo16.png differdiff --git a/frontend/public/images/logo180.png b/frontend/public/images/logo180.pngindex 6f6fa9ad..d6fbf044 100644Binary files a/frontend/public/images/logo180.png and b/frontend/public/images/logo180.png differdiff --git a/frontend/public/images/logo32.png b/frontend/public/images/logo32.pngindex de94414e..a43aa540 100644Binary files a/frontend/public/images/logo32.png and b/frontend/public/images/logo32.png differdiff --git a/frontend/public/images/logo58.png b/frontend/public/images/logo58.pngindex 1348ac7d..a6f52019 100644Binary files a/frontend/public/images/logo58.png and b/frontend/public/images/logo58.png differdiff --git a/frontend/public/images/logo_beta.svg b/frontend/public/images/logo_beta.svgnew file mode 100644index 00000000..9584d315--- /dev/null+++ b/frontend/public/images/logo_beta.svg@@ -0,0 +1,16 @@+<svg width="180" height="294" viewBox="0 0 180 294" fill="none" xmlns="http://www.w3.org/2000/svg">+<g clip-path="url(#clip0_708_10)">+<path d="M88.616 216.56C74.6213 216.56 61.224 214.597 48.424 210.672C35.624 206.576 25.4693 201.371 17.96 195.056L29.48 169.2C36.648 174.832 45.5227 179.525 56.104 183.28C66.6853 187.035 77.5227 188.912 88.616 188.912C98.0027 188.912 105.597 187.888 111.4 185.84C117.203 183.792 121.469 181.061 124.2 177.648C126.931 174.064 128.296 170.053 128.296 165.616C128.296 160.155 126.333 155.803 122.408 152.56C118.483 149.147 113.363 146.501 107.048 144.624C100.904 142.576 93.992 140.699 86.312 138.992C78.8027 137.285 71.208 135.323 63.528 133.104C56.0187 130.715 49.1067 127.728 42.792 124.144C36.648 120.389 31.6133 115.44 27.688 109.296C23.7627 103.152 21.8 95.3013 21.8 85.744C21.8 76.016 24.36 67.1413 29.48 59.12C34.7707 50.928 42.7067 44.4427 53.288 39.664C64.04 34.7147 77.608 32.24 93.992 32.24C104.744 32.24 115.411 33.6053 125.992 36.336C136.573 39.0667 145.789 42.992 153.64 48.112L143.144 73.968C135.123 69.1893 126.845 65.6907 118.312 63.472C109.779 61.0827 101.587 59.888 93.736 59.888C84.52 59.888 77.0107 60.9973 71.208 63.216C65.576 65.4347 61.3947 68.336 58.664 71.92C56.104 75.504 54.824 79.6 54.824 84.208C54.824 89.6693 56.7013 94.1067 60.456 97.52C64.3813 100.763 69.416 103.323 75.56 105.2C81.8747 107.077 88.872 108.955 96.552 110.832C104.232 112.539 111.827 114.501 119.336 116.72C127.016 118.939 133.928 121.84 140.072 125.424C146.387 129.008 151.421 133.872 155.176 140.016C159.101 146.16 161.064 153.925 161.064 163.312C161.064 172.869 158.419 181.744 153.128 189.936C148.008 197.957 140.072 204.443 129.32 209.392C118.568 214.171 105 216.56 88.616 216.56Z" fill="#2A8BFF"/>+<path d="M53 73.5L53.7672 69.664C54.2544 67.2279 54.9933 64.849 55.9719 62.5656L56.5404 61.2391C57.1783 59.7507 57.9747 58.3354 58.9159 57.0177V57.0177C59.6374 56.0076 60.4411 55.0589 61.3188 54.1812L64 51.5L67 49L67.9322 48.2009C69.6417 46.7357 71.4587 45.4008 73.3679 44.2076L74.5 43.5L78 41.5L82.5 39.5L88.5 37.5L96 35.5L98.0039 34.999C100.662 34.3344 103.376 33.914 106.111 33.7431L110 33.5L114.322 33.7401C117.432 33.9129 120.516 34.4082 123.524 35.2181L132 37.5L140 40.5L150.5 46L154 48L143.5 74L129.5 67.5L120.5 64.5L114.5 62.5L109.5 61.5L105.473 60.8288C104.16 60.61 102.831 60.5 101.5 60.5V60.5L95 60H89L83.5 60.5L80 61L77 61.5L73.5 62.5V62.5C71.5025 63.1658 69.5548 63.9726 67.6716 64.9142L67.5 65L65.5 66L64 67L63.6971 67.2272C62.5671 68.0747 61.4987 69.0013 60.5 70V70L59.4385 71.3268C58.8139 72.1076 58.2559 72.9393 57.7704 73.8133V73.8133C56.6021 75.9161 55.8702 78.2331 55.6184 80.6254L55.5152 81.6061C55.1757 84.8313 55.5306 88.0918 56.5562 91.1685L57.5 94V94C53.9421 88.8248 52.2734 82.5829 52.7742 76.3227L53 73.5Z" fill="url(#paint0_linear_708_10)"/>+</g>+<path d="M11.5773 289V244.2H30.9053C35.8973 244.2 39.7586 245.203 42.4893 247.208C45.2626 249.213 46.6493 252.051 46.6493 255.72C46.6493 258.152 46.0733 260.2 44.9213 261.864C43.8119 263.528 42.2759 264.787 40.3133 265.64C38.3933 266.493 36.2813 266.92 33.9773 266.92L35.0653 265.384C37.9239 265.384 40.3773 265.832 42.4253 266.728C44.5159 267.581 46.1373 268.883 47.2893 270.632C48.4413 272.339 49.0173 274.472 49.0173 277.032C49.0173 280.829 47.6093 283.773 44.7933 285.864C42.0199 287.955 37.8173 289 32.1853 289H11.5773ZM16.3133 285.096H32.1213C36.0466 285.096 39.0546 284.435 41.1453 283.112C43.2359 281.747 44.2812 279.592 44.2812 276.648C44.2812 273.747 43.2359 271.635 41.1453 270.312C39.0546 268.947 36.0466 268.264 32.1213 268.264H15.8013V264.36H30.5853C34.1693 264.36 36.9426 263.677 38.9053 262.312C40.9106 260.947 41.9132 258.92 41.9132 256.232C41.9132 253.501 40.9106 251.475 38.9053 250.152C36.9426 248.787 34.1693 248.104 30.5853 248.104H16.3133V285.096ZM64.0513 264.232H87.7313V268.264H64.0513V264.232ZM64.5633 284.904H91.5073V289H59.8273V244.2H90.5473V248.296H64.5633V284.904ZM111.344 289V248.296H95.5998V244.2H131.824V248.296H116.08V289H111.344ZM129.972 289L150.452 244.2H155.124L175.604 289H170.612L151.796 246.952H153.716L134.9 289H129.972ZM138.036 277.032L139.444 273.192H165.492L166.9 277.032H138.036Z" fill="#828282"/>+<defs>+<linearGradient id="paint0_linear_708_10" x1="50.5" y1="79" x2="134.5" y2="45" gradientUnits="userSpaceOnUse">+<stop offset="0.146614" stop-color="white"/>+<stop offset="1" stop-color="#D9D9D9" stop-opacity="0"/>+</linearGradient>+<clipPath id="clip0_708_10">+<rect width="161" height="197" fill="white" transform="translate(9 23)"/>+</clipPath>+</defs>+</svg>diff --git a/frontend/public/opensearch.xml b/frontend/public/opensearch.xmlindex 87188067..6cc7fc08 100644--- a/frontend/public/opensearch.xml+++ b/frontend/public/opensearch.xml@@ -1,9 +1,9 @@<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/">- <ShortName>Cuely</ShortName>+ <ShortName>Stract</ShortName><Description>Open source search engine.</Description><InputEncoding>UTF-8</InputEncoding>- <Image width="32" height="32" type="image/x-icon">https://cuely.io/favicon.ico</Image>- <Url rel="results" type="text/html" template="https://cuely.io/search?q={searchTerms}"/>- <Url rel="suggestions" type="application/x-suggestions+json" template="https://cuely.io/autosuggest/browser?q={searchTerms}"/>- <moz:SearchForm>https://cuely.io/</moz:SearchForm>+ <Image width="32" height="32" type="image/x-icon">https://trystract.com/favicon.ico</Image>+ <Url rel="results" type="text/html" template="https://trystract.com/search?q={searchTerms}"/>+ <Url rel="suggestions" type="application/x-suggestions+json" template="https://trystract.com/autosuggest/browser?q={searchTerms}"/>+ <moz:SearchForm>https://trystract.com/</moz:SearchForm></OpenSearchDescription>diff --git a/frontend/src/components/Header.astro b/frontend/src/components/Header.astroindex b5bde26d..9b978158 100644--- a/frontend/src/components/Header.astro+++ b/frontend/src/components/Header.astro@@ -15,9 +15,9 @@ const { icon = true, searchbar } = Astro.props;>{icon && (- <div class="col-start-1 mr-4 sm:mr-0">+ <div class="col-start-1 mr-4 sm:mr-0 h-12"><a href="/">- <img src="/images/logo.svg" class="h-full w-full" />+ <img src="/images/logo_beta.svg" class="h-full w-full" /></a></div>)diff --git a/frontend/src/components/Navbar.astro b/frontend/src/components/Navbar.astroindex a89d94fd..18fa576e 100644--- a/frontend/src/components/Navbar.astro+++ b/frontend/src/components/Navbar.astro@@ -13,7 +13,7 @@ const icons = [icon: "simple-icons:discord",},{- url: "https://github.com/cuely/cuely",+ url: "https://github.com/StractOrg/stract",title: "GitHub",icon: "simple-icons:github",},diff --git a/frontend/src/components/OpticSelector.astro b/frontend/src/components/OpticSelector.astroindex 50932c13..aa3d2440 100644--- a/frontend/src/components/OpticSelector.astro+++ b/frontend/src/components/OpticSelector.astro@@ -42,4 +42,4 @@ import { askama } from "$/askama";<script>import "$/alpine";-</script>+</script>\ No newline at end of filediff --git a/frontend/src/layouts/Layout.astro b/frontend/src/layouts/Layout.astroindex 61488bdf..951825ee 100644--- a/frontend/src/layouts/Layout.astro+++ b/frontend/src/layouts/Layout.astro@@ -1,7 +1,4 @@----import "@fontsource/montserrat";-import "@fontsource/montserrat/variable.css";-export interface Props {title: string;}@@ -19,7 +16,7 @@ const { title } = Astro.props;<linkrel="search"type="application/opensearchdescription+xml"- title="Cuely Search"+ title="Stract Search"href="/opensearch.xml"/><title>{title}</title>diff --git a/frontend/src/layouts/Settings.astro b/frontend/src/layouts/Settings.astroindex 564810ef..b8c43c74 100644--- a/frontend/src/layouts/Settings.astro+++ b/frontend/src/layouts/Settings.astro@@ -4,7 +4,7 @@ import Layout from "./Layout.astro";import Header from "../components/Header.astro";import SettingsMenu from "../components/SettingsMenu.astro";----<Layout title="Cuely">+<Layout title="Stract"><div class="flex h-full w-full flex-col"><Header />diff --git a/frontend/src/pages/about.mdx b/frontend/src/pages/about.mdxindex dbb7aebc..f568eee3 100644--- a/frontend/src/pages/about.mdx+++ b/frontend/src/pages/about.mdx@@ -5,12 +5,12 @@ title: About us# About Us-Cuely is an open source search engine where the user has the ability to see exactly what is going on and customize almost everything about their search results. It's a search engine made for hackers just like us. No more searches where some of the terms in the query arent used, and the engine tries to guess what you _really_ meant. You get what you search for.+Stract is an open source search engine where the user has the ability to see exactly what is going on and customize almost everything about their search results. It's a search engine made for hackers just like us. No more searches where some of the terms in the query arent used, and the engine tries to guess what you _really_ meant. You get what you search for.## Our Values-- _Complete transparency_ -- You can view our code and follow the development directly on [Github](https://github.com/cuely/cuely)-- _Privacy focussed_ -- We will never track you. Period. And you can always verify this in our [source code.](https://github.com/cuely/cuely)+- _Complete transparency_ -- You can view our code and follow the development directly on [Github](https://github.com/StractOrg/stract)+- _Privacy focussed_ -- We will never track you. Period. And you can always verify this in our [source code.](https://github.com/StractOrg/stract)- _Immensely customizable_ -- We aim to give you the ability to customize everything about the search. e.g. block sites, boost sites, prioritize links from specific sites and much more.Oh, and if we ever become evil (maybe by changing our motto) please take our code and start a competitor. The fact that you have this ability will make sure that our values will always be aligned with our users.diff --git a/frontend/src/pages/index.astro b/frontend/src/pages/index.astroindex 63c3db56..033aa863 100644--- a/frontend/src/pages/index.astro+++ b/frontend/src/pages/index.astro@@ -5,20 +5,16 @@ import Searchbar from "../components/Searchbar.astro";import Layout from "../layouts/Layout.astro";----<Layout title="Cuely">+<Layout title="Stract"><div class="relative grid h-full grid-rows-[auto_1fr_auto]"><Header icon={false} /><div class="absolute top-1/4 grid w-full place-items-center"><divclass="flex w-full flex-col items-center justify-center px-2 md:max-w-2xl md:px-0">- <div class="flex">- <h1 class="mb-1 text-5xl uppercase text-brand">cuely</h1>- <span class="text-gray-500">BETA</span>+ <div class="flex w-64 mb-6">+ <img src="/images/biglogo.svg" class="h-full w-full" /></div>-- <h2 class="mb-8 text-gray-500">Completely Open Search Engine</h2>-<Searchbar autofocus /></div></div>diff --git a/frontend/src/pages/privacy-and-happy-lawyers.mdx b/frontend/src/pages/privacy-and-happy-lawyers.mdxindex e7c811f1..834933e4 100644--- a/frontend/src/pages/privacy-and-happy-lawyers.mdx+++ b/frontend/src/pages/privacy-and-happy-lawyers.mdx@@ -5,7 +5,7 @@ title: Privacy# We will always respect your privacy.-When using Cuely, you can have peace of mind knowing that we do whatever is possible to keep your private information - private.+When using Stract, you can have peace of mind knowing that we do whatever is possible to keep your private information - private.We mostly do this by simply not storing any of your private information at all. This keeps things simple, both for you and for us.Here is a brief overview of your privacy:@@ -18,15 +18,15 @@ Here is a brief overview of your privacy:- We serve all images and other static content directly from our servers to prevent tracking from third parties.- We use HTTPS encryption everywhere.-You don't have to take our word for these claims as our [source code is available to everyone.](https://github.com/cuely/cuely)+You don't have to take our word for these claims as our [source code is available to everyone.](https://github.com/StractOrg/stract)## Terms of Service-Keep in mind that all services provided in Cuely are provided βas isβ and there are no warranties. By using our services you agree with the following terms.+Keep in mind that all services provided in Stract are provided βas isβ and there are no warranties. By using our services you agree with the following terms.#### Introduction-These Terms of Service ("Terms") govern your use of Cuely (the "Services").+These Terms of Service ("Terms") govern your use of Stract (the "Services").#### Privacy Policy@@ -34,23 +34,23 @@ We use the information we receive through the Services as described in our Priva#### Source code-The source code for Cuely is distributed under the license described in the [git repository.](https://github.com/Cuely/Cuely/blob/main/LICENSE.md)+The source code for Stract is distributed under the license described in the [git repository.](https://github.com/StractOrg/Stract/blob/main/LICENSE.md)#### Indemnification-You agree to defend, indemnify and hold harmless Cuely, its contractors, contributors, licensors, and partners, and their respective directors, officers, employees and agents ("Indemnified Parties") from and against any and all third party claims and expenses, including attorneys' fees, arising out of or related to your use of the Services.+You agree to defend, indemnify and hold harmless Stract, its contractors, contributors, licensors, and partners, and their respective directors, officers, employees and agents ("Indemnified Parties") from and against any and all third party claims and expenses, including attorneys' fees, arising out of or related to your use of the Services.#### Limitation of Liability-THE SERVICES ARE PROVIDED "AS IS" WITH ALL FAULTS. TO THE EXTENT PERMITTED BY LAW, CUELY AND THE INDEMNIFIED PARTIES HEREBY DISCLAIM ALL WARRANTIES, WHETHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION WARRANTIES THAT THE SERVICES ARE FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, AND NON-INFRINGING. YOU BEAR THE ENTIRE RISK AS TO SELECTING THE SERVICES FOR YOUR PURPOSES AND AS TO THE QUALITY AND PERFORMANCE OF THE SERVICES, INCLUDING WITHOUT LIMITATION THE RISK THAT YOUR CONTENT IS DELETED OR CORRUPTED OR THAT SOMEONE ELSE ACCESSES YOUR ONLINE ACCOUNTS. THIS LIMITATION WILL APPLY NOTWITHSTANDING THE FAILURE OF ESSENTIAL PURPOSE OF ANY REMEDY. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF IMPLIED WARRANTIES, SO THIS DISCLAIMER MAY NOT APPLY TO YOU. EXCEPT AS REQUIRED BY LAW, CUELY AND THE INDEMNIFIED PARTIES WILL NOT BE LIABLE FOR ANY INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL, OR EXEMPLARY DAMAGES ARISING OUT OF OR IN ANY WAY RELATING TO THESE TERMS OR THE USE OF OR INABILITY TO USE THE SERVICES, INCLUDING WITHOUT LIMITATION DIRECT AND INDIRECT DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, LOST PROFITS, LOSS OF DATA, AND COMPUTER FAILURE OR MALFUNCTION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES AND REGARDLESS OF THE THEORY (CONTRACT, TORT, OR OTHERWISE) UPON WHICH SUCH CLAIM IS BASED. THE COLLECTIVE LIABILITY OF CUELY AND THE INDEMNIFIED PARTIES UNDER THIS AGREEMENT WILL NOT EXCEED $500 (FIVE HUNDRED DOLLARS). SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL, CONSEQUENTIAL, OR SPECIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.+THE SERVICES ARE PROVIDED "AS IS" WITH ALL FAULTS. TO THE EXTENT PERMITTED BY LAW, STRACT AND THE INDEMNIFIED PARTIES HEREBY DISCLAIM ALL WARRANTIES, WHETHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION WARRANTIES THAT THE SERVICES ARE FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, AND NON-INFRINGING. YOU BEAR THE ENTIRE RISK AS TO SELECTING THE SERVICES FOR YOUR PURPOSES AND AS TO THE QUALITY AND PERFORMANCE OF THE SERVICES, INCLUDING WITHOUT LIMITATION THE RISK THAT YOUR CONTENT IS DELETED OR CORRUPTED OR THAT SOMEONE ELSE ACCESSES YOUR ONLINE ACCOUNTS. THIS LIMITATION WILL APPLY NOTWITHSTANDING THE FAILURE OF ESSENTIAL PURPOSE OF ANY REMEDY. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF IMPLIED WARRANTIES, SO THIS DISCLAIMER MAY NOT APPLY TO YOU. EXCEPT AS REQUIRED BY LAW, STRACT AND THE INDEMNIFIED PARTIES WILL NOT BE LIABLE FOR ANY INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL, OR EXEMPLARY DAMAGES ARISING OUT OF OR IN ANY WAY RELATING TO THESE TERMS OR THE USE OF OR INABILITY TO USE THE SERVICES, INCLUDING WITHOUT LIMITATION DIRECT AND INDIRECT DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, LOST PROFITS, LOSS OF DATA, AND COMPUTER FAILURE OR MALFUNCTION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES AND REGARDLESS OF THE THEORY (CONTRACT, TORT, OR OTHERWISE) UPON WHICH SUCH CLAIM IS BASED. THE COLLECTIVE LIABILITY OF STRACT AND THE INDEMNIFIED PARTIES UNDER THIS AGREEMENT WILL NOT EXCEED $500 (FIVE HUNDRED DOLLARS). SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL, CONSEQUENTIAL, OR SPECIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.#### Modifications to these-Terms Cuely may update these Terms from time to time to address a new feature of the Services or to clarify a provision. The updated Terms will be posted online. If the changes are substantive, we will announce the update through Cuely's usual channels for such announcements such as Discord. Your continued use of the Services after the effective date of such changes constitutes your acceptance of such changes.+Terms Stract may update these Terms from time to time to address a new feature of the Services or to clarify a provision. The updated Terms will be posted online. If the changes are substantive, we will announce the update through Stract's usual channels for such announcements such as Discord. Your continued use of the Services after the effective date of such changes constitutes your acceptance of such changes.#### Miscellaneous-These Terms constitute the entire agreement between you and Cuely concerning the Services and are governed by the laws of Denmark, excluding its conflict of law provisions. If any portion of these Terms is held to be invalid or unenforceable, the remaining portions will remain in full force and effect. In the event of a conflict between a translated version of these terms and the English language version, the English language version shall control.+These Terms constitute the entire agreement between you and Stract concerning the Services and are governed by the laws of Denmark, excluding its conflict of law provisions. If any portion of these Terms is held to be invalid or unenforceable, the remaining portions will remain in full force and effect. In the event of a conflict between a translated version of these terms and the English language version, the English language version shall control.## Changelogdiff --git a/frontend/src/pages/search.astro b/frontend/src/pages/search.astroindex 713f35af..bbaadd33 100644--- a/frontend/src/pages/search.astro+++ b/frontend/src/pages/search.astro@@ -13,7 +13,7 @@ import DirectAnswer from "../components/DirectAnswer.astro";import { askama } from "../askama";----<Layout title="{{ query }} - Cuely">+<Layout title="{{ query }} - Stract"><main class="flex w-full flex-col"><div class="border-b bg-neutral-50"><Header searchbar={{ query: askama`query` }} />diff --git a/frontend/src/pages/settings/index.astro b/frontend/src/pages/settings/index.astroindex 5f9cc1d6..c805cb26 100644--- a/frontend/src/pages/settings/index.astro+++ b/frontend/src/pages/settings/index.astro@@ -13,7 +13,7 @@ import { askama } from "../../askama";</div><div class="mt-3 text-sm">See our <a- href="https://github.com/Cuely/sample-optics/blob/main/quickstart.optic"+ href="https://github.com/StractOrg/sample-optics/blob/main/quickstart.optic">quickstart</a> for how to get started. Once you have developed your optic, you can addit here to be used during your search.diff --git a/frontend/src/pages/settings/privacy.astro b/frontend/src/pages/settings/privacy.astroindex 10629a7d..d8721927 100644--- a/frontend/src/pages/settings/privacy.astro+++ b/frontend/src/pages/settings/privacy.astro@@ -11,7 +11,7 @@ import SettingsLayout from "../../layouts/Settings.astro";<div class="text-sm">It is important to note, that <b class="font-extrabold">no</b> personal information is stored about your search. We don't store your IP, browser fingerprint or even a precise timestamp.- In fact, you can see exactly what gets stored <a href="https://github.com/Cuely/Cuely/blob/main/core/src/query_store.rs#L36">here</a>.+ In fact, you can see exactly what gets stored <a href="https://github.com/StractOrg/Stract/blob/main/core/src/query_store.rs#L36">here</a>.</div><div class="text-sm">diff --git a/git-assets/big-logo.svg b/git-assets/big-logo.svgindex bf10607f..27622154 100644--- a/git-assets/big-logo.svg+++ b/git-assets/big-logo.svg@@ -1,4 +1,4 @@-<svg width="216" height="80" viewBox="0 0 216 80" fill="none" xmlns="http://www.w3.org/2000/svg">-<path d="M15.1762 63.072C14.5442 63.072 13.9602 62.968 13.4242 62.76C12.8882 62.544 12.4242 62.244 12.0322 61.86C11.6402 61.476 11.3322 61.024 11.1082 60.504C10.8922 59.984 10.7842 59.416 10.7842 58.8C10.7842 58.184 10.8922 57.616 11.1082 57.096C11.3322 56.576 11.6402 56.124 12.0322 55.74C12.4322 55.356 12.9002 55.06 13.4362 54.852C13.9722 54.636 14.5562 54.528 15.1882 54.528C15.7962 54.528 16.3682 54.632 16.9042 54.84C17.4402 55.04 17.8922 55.344 18.2602 55.752L17.6962 56.316C17.3522 55.964 16.9722 55.712 16.5562 55.56C16.1402 55.4 15.6922 55.32 15.2122 55.32C14.7082 55.32 14.2402 55.408 13.8082 55.584C13.3762 55.752 13.0002 55.996 12.6802 56.316C12.3602 56.628 12.1082 56.996 11.9242 57.42C11.7482 57.836 11.6602 58.296 11.6602 58.8C11.6602 59.304 11.7482 59.768 11.9242 60.192C12.1082 60.608 12.3602 60.976 12.6802 61.296C13.0002 61.608 13.3762 61.852 13.8082 62.028C14.2402 62.196 14.7082 62.28 15.2122 62.28C15.6922 62.28 16.1402 62.2 16.5562 62.04C16.9722 61.88 17.3522 61.624 17.6962 61.272L18.2602 61.836C17.8922 62.244 17.4402 62.552 16.9042 62.76C16.3682 62.968 15.7922 63.072 15.1762 63.072ZM22.2599 63.06C21.6519 63.06 21.1039 62.924 20.6159 62.652C20.1359 62.372 19.7559 61.992 19.4759 61.512C19.1959 61.024 19.0559 60.468 19.0559 59.844C19.0559 59.212 19.1959 58.656 19.4759 58.176C19.7559 57.696 20.1359 57.32 20.6159 57.048C21.0959 56.776 21.6439 56.64 22.2599 56.64C22.8839 56.64 23.4359 56.776 23.9159 57.048C24.4039 57.32 24.7839 57.696 25.0559 58.176C25.3359 58.656 25.4759 59.212 25.4759 59.844C25.4759 60.468 25.3359 61.024 25.0559 61.512C24.7839 61.992 24.4039 62.372 23.9159 62.652C23.4279 62.924 22.8759 63.06 22.2599 63.06ZM22.2599 62.304C22.7159 62.304 23.1199 62.204 23.4719 62.004C23.8239 61.796 24.0999 61.508 24.2999 61.14C24.5079 60.764 24.6119 60.332 24.6119 59.844C24.6119 59.348 24.5079 58.916 24.2999 58.548C24.0999 58.18 23.8239 57.896 23.4719 57.696C23.1199 57.488 22.7199 57.384 22.2719 57.384C21.8239 57.384 21.4239 57.488 21.0719 57.696C20.7199 57.896 20.4399 58.18 20.2319 58.548C20.0239 58.916 19.9199 59.348 19.9199 59.844C19.9199 60.332 20.0239 60.764 20.2319 61.14C20.4399 61.508 20.7199 61.796 21.0719 62.004C21.4239 62.204 21.8199 62.304 22.2599 62.304ZM35.0873 56.64C35.5993 56.64 36.0433 56.74 36.4193 56.94C36.8033 57.132 37.0993 57.428 37.3073 57.828C37.5233 58.228 37.6313 58.732 37.6313 59.34V63H36.7793V59.424C36.7793 58.76 36.6193 58.26 36.2993 57.924C35.9873 57.58 35.5433 57.408 34.9673 57.408C34.5353 57.408 34.1593 57.5 33.8393 57.684C33.5273 57.86 33.2833 58.12 33.1073 58.464C32.9393 58.8 32.8553 59.208 32.8553 59.688V63H32.0033V59.424C32.0033 58.76 31.8433 58.26 31.5233 57.924C31.2033 57.58 30.7553 57.408 30.1793 57.408C29.7553 57.408 29.3833 57.5 29.0633 57.684C28.7433 57.86 28.4953 58.12 28.3193 58.464C28.1513 58.8 28.0673 59.208 28.0673 59.688V63H27.2153V56.7H28.0313V58.404L27.8993 58.104C28.0913 57.648 28.3993 57.292 28.8233 57.036C29.2553 56.772 29.7633 56.64 30.3473 56.64C30.9633 56.64 31.4873 56.796 31.9193 57.108C32.3513 57.412 32.6313 57.872 32.7593 58.488L32.4233 58.356C32.6073 57.844 32.9313 57.432 33.3953 57.12C33.8673 56.8 34.4313 56.64 35.0873 56.64ZM43.1939 63.06C42.6499 63.06 42.1579 62.936 41.7179 62.688C41.2779 62.432 40.9259 62.068 40.6619 61.596C40.4059 61.116 40.2779 60.532 40.2779 59.844C40.2779 59.156 40.4059 58.576 40.6619 58.104C40.9179 57.624 41.2659 57.26 41.7059 57.012C42.1459 56.764 42.6419 56.64 43.1939 56.64C43.7939 56.64 44.3299 56.776 44.8019 57.048C45.2819 57.312 45.6579 57.688 45.9299 58.176C46.2019 58.656 46.3379 59.212 46.3379 59.844C46.3379 60.484 46.2019 61.044 45.9299 61.524C45.6579 62.004 45.2819 62.38 44.8019 62.652C44.3299 62.924 43.7939 63.06 43.1939 63.06ZM39.9419 65.328V56.7H40.7579V58.596L40.6739 59.856L40.7939 61.128V65.328H39.9419ZM43.1339 62.304C43.5819 62.304 43.9819 62.204 44.3339 62.004C44.6859 61.796 44.9659 61.508 45.1739 61.14C45.3819 60.764 45.4859 60.332 45.4859 59.844C45.4859 59.356 45.3819 58.928 45.1739 58.56C44.9659 58.192 44.6859 57.904 44.3339 57.696C43.9819 57.488 43.5819 57.384 43.1339 57.384C42.6859 57.384 42.2819 57.488 41.9219 57.696C41.5699 57.904 41.2899 58.192 41.0819 58.56C40.8819 58.928 40.7819 59.356 40.7819 59.844C40.7819 60.332 40.8819 60.764 41.0819 61.14C41.2899 61.508 41.5699 61.796 41.9219 62.004C42.2819 62.204 42.6859 62.304 43.1339 62.304ZM48.0747 63V54.096H48.9267V63H48.0747ZM53.9734 63.06C53.3174 63.06 52.7414 62.924 52.2454 62.652C51.7494 62.372 51.3614 61.992 51.0814 61.512C50.8014 61.024 50.6614 60.468 50.6614 59.844C50.6614 59.22 50.7934 58.668 51.0574 58.188C51.3294 57.708 51.6974 57.332 52.1614 57.06C52.6334 56.78 53.1614 56.64 53.7454 56.64C54.3374 56.64 54.8614 56.776 55.3174 57.048C55.7814 57.312 56.1454 57.688 56.4094 58.176C56.6734 58.656 56.8054 59.212 56.8054 59.844C56.8054 59.884 56.8014 59.928 56.7934 59.976C56.7934 60.016 56.7934 60.06 56.7934 60.108H51.3094V59.472H56.3374L56.0014 59.724C56.0014 59.268 55.9014 58.864 55.7014 58.512C55.5094 58.152 55.2454 57.872 54.9094 57.672C54.5734 57.472 54.1854 57.372 53.7454 57.372C53.3134 57.372 52.9254 57.472 52.5814 57.672C52.2374 57.872 51.9694 58.152 51.7774 58.512C51.5854 58.872 51.4894 59.284 51.4894 59.748V59.88C51.4894 60.36 51.5934 60.784 51.8014 61.152C52.0174 61.512 52.3134 61.796 52.6894 62.004C53.0734 62.204 53.5094 62.304 53.9974 62.304C54.3814 62.304 54.7374 62.236 55.0654 62.1C55.4014 61.964 55.6894 61.756 55.9294 61.476L56.4094 62.028C56.1294 62.364 55.7774 62.62 55.3534 62.796C54.9374 62.972 54.4774 63.06 53.9734 63.06ZM60.5316 63.06C59.9396 63.06 59.4836 62.9 59.1636 62.58C58.8436 62.26 58.6836 61.808 58.6836 61.224V55.308H59.5356V61.176C59.5356 61.544 59.6276 61.828 59.8116 62.028C60.0036 62.228 60.2756 62.328 60.6276 62.328C61.0036 62.328 61.3156 62.22 61.5636 62.004L61.8636 62.616C61.6956 62.768 61.4916 62.88 61.2516 62.952C61.0196 63.024 60.7796 63.06 60.5316 63.06ZM57.5556 57.408V56.7H61.4556V57.408H57.5556ZM65.8679 63.06C65.2119 63.06 64.6359 62.924 64.1399 62.652C63.6439 62.372 63.2559 61.992 62.9759 61.512C62.6959 61.024 62.5559 60.468 62.5559 59.844C62.5559 59.22 62.6879 58.668 62.9519 58.188C63.2239 57.708 63.5919 57.332 64.0559 57.06C64.5279 56.78 65.0559 56.64 65.6399 56.64C66.2319 56.64 66.7559 56.776 67.2119 57.048C67.6759 57.312 68.0399 57.688 68.3039 58.176C68.5679 58.656 68.6999 59.212 68.6999 59.844C68.6999 59.884 68.6959 59.928 68.6879 59.976C68.6879 60.016 68.6879 60.06 68.6879 60.108H63.2039V59.472H68.2319L67.8959 59.724C67.8959 59.268 67.7959 58.864 67.5959 58.512C67.4039 58.152 67.1399 57.872 66.8039 57.672C66.4679 57.472 66.0799 57.372 65.6399 57.372C65.2079 57.372 64.8199 57.472 64.4759 57.672C64.1319 57.872 63.8639 58.152 63.6719 58.512C63.4799 58.872 63.3839 59.284 63.3839 59.748V59.88C63.3839 60.36 63.4879 60.784 63.6959 61.152C63.9119 61.512 64.2079 61.796 64.5839 62.004C64.9679 62.204 65.4039 62.304 65.8919 62.304C66.2759 62.304 66.6319 62.236 66.9599 62.1C67.2959 61.964 67.5839 61.756 67.8239 61.476L68.3039 62.028C68.0239 62.364 67.6719 62.62 67.2479 62.796C66.8319 62.972 66.3719 63.06 65.8679 63.06ZM70.4341 63V54.096H71.2861V63H70.4341ZM73.7048 65.388C73.4088 65.388 73.1248 65.34 72.8528 65.244C72.5888 65.148 72.3607 65.004 72.1687 64.812L72.5648 64.176C72.7248 64.328 72.8968 64.444 73.0808 64.524C73.2728 64.612 73.4848 64.656 73.7168 64.656C73.9968 64.656 74.2368 64.576 74.4368 64.416C74.6448 64.264 74.8408 63.992 75.0248 63.6L75.4328 62.676L75.5288 62.544L78.1208 56.7H78.9608L75.8048 63.756C75.6288 64.164 75.4328 64.488 75.2168 64.728C75.0088 64.968 74.7808 65.136 74.5328 65.232C74.2848 65.336 74.0088 65.388 73.7048 65.388ZM75.3848 63.18L72.4808 56.7H73.3688L75.9368 62.484L75.3848 63.18ZM87.1533 63.072C86.5213 63.072 85.9333 62.968 85.3893 62.76C84.8533 62.544 84.3853 62.244 83.9853 61.86C83.5933 61.468 83.2853 61.016 83.0613 60.504C82.8453 59.984 82.7373 59.416 82.7373 58.8C82.7373 58.184 82.8453 57.62 83.0613 57.108C83.2853 56.588 83.5933 56.136 83.9853 55.752C84.3853 55.36 84.8533 55.06 85.3893 54.852C85.9253 54.636 86.5133 54.528 87.1533 54.528C87.7853 54.528 88.3693 54.636 88.9053 54.852C89.4413 55.06 89.9053 55.356 90.2973 55.74C90.6973 56.124 91.0053 56.576 91.2213 57.096C91.4453 57.616 91.5573 58.184 91.5573 58.8C91.5573 59.416 91.4453 59.984 91.2213 60.504C91.0053 61.024 90.6973 61.476 90.2973 61.86C89.9053 62.244 89.4413 62.544 88.9053 62.76C88.3693 62.968 87.7853 63.072 87.1533 63.072ZM87.1533 62.28C87.6573 62.28 88.1213 62.196 88.5453 62.028C88.9773 61.852 89.3493 61.608 89.6613 61.296C89.9813 60.976 90.2293 60.608 90.4053 60.192C90.5813 59.768 90.6693 59.304 90.6693 58.8C90.6693 58.296 90.5813 57.836 90.4053 57.42C90.2293 56.996 89.9813 56.628 89.6613 56.316C89.3493 55.996 88.9773 55.752 88.5453 55.584C88.1213 55.408 87.6573 55.32 87.1533 55.32C86.6493 55.32 86.1813 55.408 85.7493 55.584C85.3173 55.752 84.9413 55.996 84.6213 56.316C84.3093 56.628 84.0613 56.996 83.8773 57.42C83.7013 57.836 83.6133 58.296 83.6133 58.8C83.6133 59.296 83.7013 59.756 83.8773 60.18C84.0613 60.604 84.3093 60.976 84.6213 61.296C84.9413 61.608 85.3173 61.852 85.7493 62.028C86.1813 62.196 86.6493 62.28 87.1533 62.28ZM96.6197 63.06C96.0757 63.06 95.5837 62.936 95.1437 62.688C94.7037 62.432 94.3517 62.068 94.0877 61.596C93.8317 61.116 93.7037 60.532 93.7037 59.844C93.7037 59.156 93.8317 58.576 94.0877 58.104C94.3437 57.624 94.6917 57.26 95.1317 57.012C95.5717 56.764 96.0677 56.64 96.6197 56.64C97.2197 56.64 97.7557 56.776 98.2277 57.048C98.7077 57.312 99.0837 57.688 99.3557 58.176C99.6277 58.656 99.7637 59.212 99.7637 59.844C99.7637 60.484 99.6277 61.044 99.3557 61.524C99.0837 62.004 98.7077 62.38 98.2277 62.652C97.7557 62.924 97.2197 63.06 96.6197 63.06ZM93.3677 65.328V56.7H94.1837V58.596L94.0997 59.856L94.2197 61.128V65.328H93.3677ZM96.5597 62.304C97.0077 62.304 97.4077 62.204 97.7597 62.004C98.1117 61.796 98.3917 61.508 98.5997 61.14C98.8077 60.764 98.9117 60.332 98.9117 59.844C98.9117 59.356 98.8077 58.928 98.5997 58.56C98.3917 58.192 98.1117 57.904 97.7597 57.696C97.4077 57.488 97.0077 57.384 96.5597 57.384C96.1117 57.384 95.7077 57.488 95.3477 57.696C94.9957 57.904 94.7157 58.192 94.5077 58.56C94.3077 58.928 94.2077 59.356 94.2077 59.844C94.2077 60.332 94.3077 60.764 94.5077 61.14C94.7157 61.508 94.9957 61.796 95.3477 62.004C95.7077 62.204 96.1117 62.304 96.5597 62.304ZM104.177 63.06C103.521 63.06 102.945 62.924 102.449 62.652C101.953 62.372 101.565 61.992 101.285 61.512C101.005 61.024 100.865 60.468 100.865 59.844C100.865 59.22 100.997 58.668 101.261 58.188C101.533 57.708 101.901 57.332 102.365 57.06C102.837 56.78 103.365 56.64 103.949 56.64C104.541 56.64 105.065 56.776 105.521 57.048C105.985 57.312 106.349 57.688 106.613 58.176C106.877 58.656 107.009 59.212 107.009 59.844C107.009 59.884 107.005 59.928 106.997 59.976C106.997 60.016 106.997 60.06 106.997 60.108H101.513V59.472H106.541L106.205 59.724C106.205 59.268 106.105 58.864 105.905 58.512C105.713 58.152 105.449 57.872 105.113 57.672C104.777 57.472 104.389 57.372 103.949 57.372C103.517 57.372 103.129 57.472 102.785 57.672C102.441 57.872 102.173 58.152 101.981 58.512C101.789 58.872 101.693 59.284 101.693 59.748V59.88C101.693 60.36 101.797 60.784 102.005 61.152C102.221 61.512 102.517 61.796 102.893 62.004C103.277 62.204 103.713 62.304 104.201 62.304C104.585 62.304 104.941 62.236 105.269 62.1C105.605 61.964 105.893 61.756 106.133 61.476L106.613 62.028C106.333 62.364 105.981 62.62 105.557 62.796C105.141 62.972 104.681 63.06 104.177 63.06ZM111.959 56.64C112.471 56.64 112.919 56.74 113.303 56.94C113.695 57.132 113.999 57.428 114.215 57.828C114.439 58.228 114.551 58.732 114.551 59.34V63H113.699V59.424C113.699 58.76 113.531 58.26 113.195 57.924C112.867 57.58 112.403 57.408 111.803 57.408C111.355 57.408 110.963 57.5 110.627 57.684C110.299 57.86 110.043 58.12 109.859 58.464C109.683 58.8 109.595 59.208 109.595 59.688V63H108.743V56.7H109.559V58.428L109.427 58.104C109.627 57.648 109.947 57.292 110.387 57.036C110.827 56.772 111.351 56.64 111.959 56.64ZM122.489 63.072C121.865 63.072 121.265 62.972 120.689 62.772C120.121 62.564 119.681 62.3 119.369 61.98L119.717 61.296C120.013 61.584 120.409 61.828 120.905 62.028C121.409 62.22 121.937 62.316 122.489 62.316C123.017 62.316 123.445 62.252 123.773 62.124C124.109 61.988 124.353 61.808 124.505 61.584C124.665 61.36 124.745 61.112 124.745 60.84C124.745 60.512 124.649 60.248 124.457 60.048C124.273 59.848 124.029 59.692 123.725 59.58C123.421 59.46 123.085 59.356 122.717 59.268C122.349 59.18 121.981 59.088 121.613 58.992C121.245 58.888 120.905 58.752 120.593 58.584C120.289 58.416 120.041 58.196 119.849 57.924C119.665 57.644 119.573 57.28 119.573 56.832C119.573 56.416 119.681 56.036 119.897 55.692C120.121 55.34 120.461 55.06 120.917 54.852C121.373 54.636 121.957 54.528 122.669 54.528C123.141 54.528 123.609 54.596 124.073 54.732C124.537 54.86 124.937 55.04 125.273 55.272L124.973 55.98C124.613 55.74 124.229 55.564 123.821 55.452C123.421 55.34 123.033 55.284 122.657 55.284C122.153 55.284 121.737 55.352 121.409 55.488C121.081 55.624 120.837 55.808 120.677 56.04C120.525 56.264 120.449 56.52 120.449 56.808C120.449 57.136 120.541 57.4 120.725 57.6C120.917 57.8 121.165 57.956 121.469 58.068C121.781 58.18 122.121 58.28 122.489 58.368C122.857 58.456 123.221 58.552 123.581 58.656C123.949 58.76 124.285 58.896 124.589 59.064C124.901 59.224 125.149 59.44 125.333 59.712C125.525 59.984 125.621 60.34 125.621 60.78C125.621 61.188 125.509 61.568 125.285 61.92C125.061 62.264 124.717 62.544 124.253 62.76C123.797 62.968 123.209 63.072 122.489 63.072ZM130.052 63.06C129.396 63.06 128.82 62.924 128.324 62.652C127.828 62.372 127.44 61.992 127.16 61.512C126.88 61.024 126.74 60.468 126.74 59.844C126.74 59.22 126.872 58.668 127.136 58.188C127.408 57.708 127.776 57.332 128.24 57.06C128.712 56.78 129.24 56.64 129.824 56.64C130.416 56.64 130.94 56.776 131.396 57.048C131.86 57.312 132.224 57.688 132.488 58.176C132.752 58.656 132.884 59.212 132.884 59.844C132.884 59.884 132.88 59.928 132.872 59.976C132.872 60.016 132.872 60.06 132.872 60.108H127.388V59.472H132.416L132.08 59.724C132.08 59.268 131.98 58.864 131.78 58.512C131.588 58.152 131.324 57.872 130.988 57.672C130.652 57.472 130.264 57.372 129.824 57.372C129.392 57.372 129.004 57.472 128.66 57.672C128.316 57.872 128.048 58.152 127.856 58.512C127.664 58.872 127.568 59.284 127.568 59.748V59.88C127.568 60.36 127.672 60.784 127.88 61.152C128.096 61.512 128.392 61.796 128.768 62.004C129.152 62.204 129.588 62.304 130.076 62.304C130.46 62.304 130.816 62.236 131.144 62.1C131.48 61.964 131.768 61.756 132.008 61.476L132.488 62.028C132.208 62.364 131.856 62.62 131.432 62.796C131.016 62.972 130.556 63.06 130.052 63.06ZM138.39 63V61.608L138.354 61.38V59.052C138.354 58.516 138.202 58.104 137.898 57.816C137.602 57.528 137.158 57.384 136.566 57.384C136.158 57.384 135.77 57.452 135.402 57.588C135.034 57.724 134.722 57.904 134.466 58.128L134.082 57.492C134.402 57.22 134.786 57.012 135.234 56.868C135.682 56.716 136.154 56.64 136.65 56.64C137.466 56.64 138.094 56.844 138.534 57.252C138.982 57.652 139.206 58.264 139.206 59.088V63H138.39ZM136.218 63.06C135.746 63.06 135.334 62.984 134.982 62.832C134.638 62.672 134.374 62.456 134.19 62.184C134.006 61.904 133.914 61.584 133.914 61.224C133.914 60.896 133.99 60.6 134.142 60.336C134.302 60.064 134.558 59.848 134.91 59.688C135.27 59.52 135.75 59.436 136.35 59.436H138.522V60.072H136.374C135.766 60.072 135.342 60.18 135.102 60.396C134.87 60.612 134.754 60.88 134.754 61.2C134.754 61.56 134.894 61.848 135.174 62.064C135.454 62.28 135.846 62.388 136.35 62.388C136.83 62.388 137.242 62.28 137.586 62.064C137.938 61.84 138.194 61.52 138.354 61.104L138.546 61.692C138.386 62.108 138.106 62.44 137.706 62.688C137.314 62.936 136.818 63.06 136.218 63.06ZM141.52 63V56.7H142.336V58.416L142.252 58.116C142.428 57.636 142.724 57.272 143.14 57.024C143.556 56.768 144.072 56.64 144.688 56.64V57.468C144.656 57.468 144.624 57.468 144.592 57.468C144.56 57.46 144.528 57.456 144.496 57.456C143.832 57.456 143.312 57.66 142.936 58.068C142.56 58.468 142.372 59.04 142.372 59.784V63H141.52ZM148.8 63.06C148.176 63.06 147.616 62.924 147.12 62.652C146.632 62.372 146.248 61.992 145.968 61.512C145.688 61.024 145.548 60.468 145.548 59.844C145.548 59.212 145.688 58.656 145.968 58.176C146.248 57.696 146.632 57.32 147.12 57.048C147.616 56.776 148.176 56.64 148.8 56.64C149.336 56.64 149.82 56.744 150.252 56.952C150.684 57.16 151.024 57.472 151.272 57.888L150.636 58.32C150.42 58 150.152 57.764 149.832 57.612C149.512 57.46 149.164 57.384 148.788 57.384C148.34 57.384 147.936 57.488 147.576 57.696C147.216 57.896 146.932 58.18 146.724 58.548C146.516 58.916 146.412 59.348 146.412 59.844C146.412 60.34 146.516 60.772 146.724 61.14C146.932 61.508 147.216 61.796 147.576 62.004C147.936 62.204 148.34 62.304 148.788 62.304C149.164 62.304 149.512 62.228 149.832 62.076C150.152 61.924 150.42 61.692 150.636 61.38L151.272 61.812C151.024 62.22 150.684 62.532 150.252 62.748C149.82 62.956 149.336 63.06 148.8 63.06ZM156.068 56.64C156.58 56.64 157.028 56.74 157.412 56.94C157.804 57.132 158.108 57.428 158.324 57.828C158.548 58.228 158.66 58.732 158.66 59.34V63H157.808V59.424C157.808 58.76 157.64 58.26 157.304 57.924C156.976 57.58 156.512 57.408 155.912 57.408C155.464 57.408 155.072 57.5 154.736 57.684C154.408 57.86 154.152 58.12 153.968 58.464C153.792 58.8 153.704 59.208 153.704 59.688V63H152.852V54.096H153.704V58.428L153.536 58.104C153.736 57.648 154.056 57.292 154.496 57.036C154.936 56.772 155.46 56.64 156.068 56.64ZM165.074 58.356H169.514V59.112H165.074V58.356ZM165.17 62.232H170.222V63H164.282V54.6H170.042V55.368H165.17V62.232ZM175.345 56.64C175.857 56.64 176.305 56.74 176.689 56.94C177.081 57.132 177.385 57.428 177.601 57.828C177.825 58.228 177.937 58.732 177.937 59.34V63H177.085V59.424C177.085 58.76 176.917 58.26 176.581 57.924C176.253 57.58 175.789 57.408 175.189 57.408C174.741 57.408 174.349 57.5 174.013 57.684C173.685 57.86 173.429 58.12 173.245 58.464C173.069 58.8 172.981 59.208 172.981 59.688V63H172.129V56.7H172.945V58.428L172.813 58.104C173.013 57.648 173.333 57.292 173.773 57.036C174.213 56.772 174.737 56.64 175.345 56.64ZM182.927 65.388C182.351 65.388 181.799 65.304 181.271 65.136C180.743 64.968 180.315 64.728 179.987 64.416L180.419 63.768C180.715 64.032 181.079 64.24 181.511 64.392C181.951 64.552 182.415 64.632 182.903 64.632C183.703 64.632 184.291 64.444 184.667 64.068C185.043 63.7 185.231 63.124 185.231 62.34V60.768L185.351 59.688L185.267 58.608V56.7H186.083V62.232C186.083 63.32 185.815 64.116 185.279 64.62C184.751 65.132 183.967 65.388 182.927 65.388ZM182.771 62.76C182.171 62.76 181.631 62.632 181.151 62.376C180.671 62.112 180.291 61.748 180.011 61.284C179.739 60.82 179.603 60.288 179.603 59.688C179.603 59.088 179.739 58.56 180.011 58.104C180.291 57.64 180.671 57.28 181.151 57.024C181.631 56.768 182.171 56.64 182.771 56.64C183.331 56.64 183.835 56.756 184.283 56.988C184.731 57.22 185.087 57.564 185.351 58.02C185.615 58.476 185.747 59.032 185.747 59.688C185.747 60.344 185.615 60.9 185.351 61.356C185.087 61.812 184.731 62.16 184.283 62.4C183.835 62.64 183.331 62.76 182.771 62.76ZM182.855 62.004C183.319 62.004 183.731 61.908 184.091 61.716C184.451 61.516 184.735 61.244 184.943 60.9C185.151 60.548 185.255 60.144 185.255 59.688C185.255 59.232 185.151 58.832 184.943 58.488C184.735 58.144 184.451 57.876 184.091 57.684C183.731 57.484 183.319 57.384 182.855 57.384C182.399 57.384 181.987 57.484 181.619 57.684C181.259 57.876 180.975 58.144 180.767 58.488C180.567 58.832 180.467 59.232 180.467 59.688C180.467 60.144 180.567 60.548 180.767 60.9C180.975 61.244 181.259 61.516 181.619 61.716C181.987 61.908 182.399 62.004 182.855 62.004ZM188.454 63V56.7H189.306V63H188.454ZM188.886 55.308C188.71 55.308 188.562 55.248 188.442 55.128C188.322 55.008 188.262 54.864 188.262 54.696C188.262 54.528 188.322 54.388 188.442 54.276C188.562 54.156 188.71 54.096 188.886 54.096C189.062 54.096 189.21 54.152 189.33 54.264C189.45 54.376 189.51 54.516 189.51 54.684C189.51 54.86 189.45 55.008 189.33 55.128C189.218 55.248 189.07 55.308 188.886 55.308ZM194.892 56.64C195.404 56.64 195.852 56.74 196.236 56.94C196.628 57.132 196.932 57.428 197.148 57.828C197.372 58.228 197.484 58.732 197.484 59.34V63H196.632V59.424C196.632 58.76 196.464 58.26 196.128 57.924C195.8 57.58 195.336 57.408 194.736 57.408C194.288 57.408 193.896 57.5 193.56 57.684C193.232 57.86 192.976 58.12 192.792 58.464C192.616 58.8 192.528 59.208 192.528 59.688V63H191.676V56.7H192.492V58.428L192.36 58.104C192.56 57.648 192.88 57.292 193.32 57.036C193.76 56.772 194.284 56.64 194.892 56.64ZM202.462 63.06C201.806 63.06 201.23 62.924 200.734 62.652C200.238 62.372 199.85 61.992 199.57 61.512C199.29 61.024 199.15 60.468 199.15 59.844C199.15 59.22 199.282 58.668 199.546 58.188C199.818 57.708 200.186 57.332 200.65 57.06C201.122 56.78 201.65 56.64 202.234 56.64C202.826 56.64 203.35 56.776 203.806 57.048C204.27 57.312 204.634 57.688 204.898 58.176C205.162 58.656 205.294 59.212 205.294 59.844C205.294 59.884 205.29 59.928 205.282 59.976C205.282 60.016 205.282 60.06 205.282 60.108H199.798V59.472H204.826L204.49 59.724C204.49 59.268 204.39 58.864 204.19 58.512C203.998 58.152 203.734 57.872 203.398 57.672C203.062 57.472 202.674 57.372 202.234 57.372C201.802 57.372 201.414 57.472 201.07 57.672C200.726 57.872 200.458 58.152 200.266 58.512C200.074 58.872 199.978 59.284 199.978 59.748V59.88C199.978 60.36 200.082 60.784 200.29 61.152C200.506 61.512 200.802 61.796 201.178 62.004C201.562 62.204 201.998 62.304 202.486 62.304C202.87 62.304 203.226 62.236 203.554 62.1C203.89 61.964 204.178 61.756 204.418 61.476L204.898 62.028C204.618 62.364 204.266 62.62 203.842 62.796C203.426 62.972 202.966 63.06 202.462 63.06Z" fill="#B0B0B0"/>-<path d="M61.1242 43.216C59.2282 43.216 57.4762 42.904 55.8682 42.28C54.2602 41.632 52.8682 40.732 51.6922 39.58C50.5162 38.428 49.5922 37.072 48.9202 35.512C48.2722 33.952 47.9482 32.248 47.9482 30.4C47.9482 28.552 48.2722 26.848 48.9202 25.288C49.5922 23.728 50.5162 22.372 51.6922 21.22C52.8922 20.068 54.2962 19.18 55.9042 18.556C57.5122 17.908 59.2642 17.584 61.1602 17.584C62.9842 17.584 64.7002 17.896 66.3082 18.52C67.9162 19.12 69.2722 20.032 70.3762 21.256L68.6842 22.948C67.6522 21.892 66.5122 21.136 65.2642 20.68C64.0162 20.2 62.6722 19.96 61.2322 19.96C59.7202 19.96 58.3162 20.224 57.0202 20.752C55.7242 21.256 54.5962 21.988 53.6362 22.948C52.6762 23.884 51.9202 24.988 51.3682 26.26C50.8402 27.508 50.5762 28.888 50.5762 30.4C50.5762 31.912 50.8402 33.304 51.3682 34.576C51.9202 35.824 52.6762 36.928 53.6362 37.888C54.5962 38.824 55.7242 39.556 57.0202 40.084C58.3162 40.588 59.7202 40.84 61.2322 40.84C62.6722 40.84 64.0162 40.6 65.2642 40.12C66.5122 39.64 67.6522 38.872 68.6842 37.816L70.3762 39.508C69.2722 40.732 67.9162 41.656 66.3082 42.28C64.7002 42.904 62.9722 43.216 61.1242 43.216ZM86.2072 43.216C82.9912 43.216 80.4592 42.292 78.6112 40.444C76.7632 38.596 75.8392 35.86 75.8392 32.236V17.8H78.5032V32.128C78.5032 35.104 79.1752 37.3 80.5192 38.716C81.8632 40.132 83.7592 40.84 86.2072 40.84C88.6792 40.84 90.5872 40.132 91.9312 38.716C93.2752 37.3 93.9472 35.104 93.9472 32.128V17.8H96.5392V32.236C96.5392 35.86 95.6152 38.596 93.7672 40.444C91.9432 42.292 89.4232 43.216 86.2072 43.216ZM106.943 29.068H120.263V31.336H106.943V29.068ZM107.231 40.696H122.387V43H104.567V17.8H121.847V20.104H107.231V40.696ZM128.649 43V17.8H131.313V40.696H145.425V43H128.649ZM153.188 43V33.64L153.8 35.296L143.108 17.8H145.952L155.348 33.172H153.836L163.232 17.8H165.896L155.204 35.296L155.816 33.64V43H153.188Z" fill="#0B7BFF"/>+<svg width="366" height="125" viewBox="0 0 366 125" fill="none" xmlns="http://www.w3.org/2000/svg">+<path d="M18.23 102.348H20.5737C20.4517 103.471 20.1302 104.476 19.6094 105.363C19.0885 106.25 18.3521 106.954 17.3999 107.475C16.4478 107.988 15.2596 108.244 13.8354 108.244C12.7938 108.244 11.8457 108.049 10.9912 107.658C10.1449 107.268 9.4165 106.714 8.80615 105.998C8.1958 105.274 7.7238 104.407 7.39014 103.398C7.06462 102.381 6.90186 101.25 6.90186 100.004V98.2344C6.90186 96.9893 7.06462 95.8621 7.39014 94.853C7.7238 93.8358 8.19987 92.965 8.81836 92.2407C9.44499 91.5164 10.1978 90.959 11.0767 90.5684C11.9556 90.1777 12.9443 89.9824 14.043 89.9824C15.3857 89.9824 16.521 90.2347 17.4487 90.7393C18.3765 91.2438 19.0967 91.9437 19.6094 92.8389C20.1302 93.7259 20.4517 94.7554 20.5737 95.9272H18.23C18.116 95.0972 17.9045 94.3851 17.5952 93.791C17.286 93.1888 16.8465 92.7249 16.2769 92.3994C15.7072 92.0739 14.9626 91.9111 14.043 91.9111C13.2536 91.9111 12.5578 92.0617 11.9556 92.3628C11.3615 92.6639 10.861 93.0911 10.4541 93.6445C10.0553 94.1979 9.75423 94.8612 9.55078 95.6343C9.34733 96.4074 9.24561 97.266 9.24561 98.21V100.004C9.24561 100.875 9.33512 101.693 9.51416 102.458C9.70133 103.223 9.9821 103.894 10.3564 104.472C10.7308 105.05 11.2069 105.506 11.7847 105.839C12.3625 106.165 13.0461 106.328 13.8354 106.328C14.8364 106.328 15.634 106.169 16.228 105.852C16.8221 105.534 17.2697 105.078 17.5708 104.484C17.88 103.89 18.0998 103.178 18.23 102.348ZM22.8442 101.542V101.262C22.8442 100.31 22.9826 99.4266 23.2593 98.6128C23.536 97.7909 23.9347 97.0788 24.4556 96.4766C24.9764 95.8662 25.6071 95.3942 26.3477 95.0605C27.0882 94.7188 27.9183 94.5479 28.8379 94.5479C29.7656 94.5479 30.5998 94.7188 31.3403 95.0605C32.089 95.3942 32.7238 95.8662 33.2446 96.4766C33.7736 97.0788 34.1764 97.7909 34.4531 98.6128C34.7298 99.4266 34.8682 100.31 34.8682 101.262V101.542C34.8682 102.495 34.7298 103.378 34.4531 104.191C34.1764 105.005 33.7736 105.717 33.2446 106.328C32.7238 106.93 32.0931 107.402 31.3525 107.744C30.6201 108.077 29.79 108.244 28.8623 108.244C27.9346 108.244 27.1004 108.077 26.3599 107.744C25.6193 107.402 24.9845 106.93 24.4556 106.328C23.9347 105.717 23.536 105.005 23.2593 104.191C22.9826 103.378 22.8442 102.495 22.8442 101.542ZM25.1025 101.262V101.542C25.1025 102.202 25.1799 102.824 25.3345 103.41C25.4891 103.988 25.721 104.501 26.0303 104.948C26.3477 105.396 26.7424 105.75 27.2144 106.01C27.6864 106.263 28.2357 106.389 28.8623 106.389C29.4808 106.389 30.022 106.263 30.4858 106.01C30.9578 105.75 31.3485 105.396 31.6577 104.948C31.967 104.501 32.1989 103.988 32.3535 103.41C32.5163 102.824 32.5977 102.202 32.5977 101.542V101.262C32.5977 100.611 32.5163 99.9963 32.3535 99.4185C32.1989 98.8325 31.9629 98.3158 31.6455 97.8682C31.3363 97.4124 30.9456 97.0544 30.4736 96.7939C30.0098 96.5335 29.4645 96.4033 28.8379 96.4033C28.2194 96.4033 27.6742 96.5335 27.2021 96.7939C26.7383 97.0544 26.3477 97.4124 26.0303 97.8682C25.721 98.3158 25.4891 98.8325 25.3345 99.4185C25.1799 99.9963 25.1025 100.611 25.1025 101.262ZM39.9463 97.4165V108H37.6758V94.792H39.8242L39.9463 97.4165ZM39.4824 100.896L38.4326 100.859C38.4408 99.9556 38.5588 99.1214 38.7866 98.3564C39.0145 97.5833 39.3522 96.9119 39.7998 96.3423C40.2474 95.7726 40.8049 95.3332 41.4722 95.0239C42.1395 94.7065 42.9126 94.5479 43.7915 94.5479C44.41 94.5479 44.9797 94.6374 45.5005 94.8164C46.0213 94.9873 46.473 95.2599 46.8555 95.6343C47.238 96.0086 47.535 96.4888 47.7466 97.0747C47.9582 97.6606 48.064 98.3687 48.064 99.1987V108H45.8057V99.3086C45.8057 98.6169 45.6877 98.0635 45.4517 97.6484C45.2238 97.2334 44.8983 96.9323 44.4751 96.7451C44.0519 96.5498 43.5555 96.4521 42.9858 96.4521C42.3185 96.4521 41.7611 96.5701 41.3135 96.8062C40.8659 97.0422 40.5078 97.3677 40.2393 97.7827C39.9707 98.1978 39.7754 98.6738 39.6533 99.2109C39.5394 99.7399 39.4824 100.301 39.4824 100.896ZM48.0396 99.6504L46.5259 100.114C46.534 99.39 46.652 98.6942 46.8799 98.0269C47.1159 97.3595 47.4536 96.7655 47.8931 96.2446C48.3407 95.7238 48.89 95.3128 49.541 95.0117C50.1921 94.7025 50.9367 94.5479 51.7749 94.5479C52.4829 94.5479 53.1095 94.6414 53.6548 94.8286C54.2082 95.0158 54.672 95.3047 55.0464 95.6953C55.4289 96.0778 55.7178 96.5701 55.9131 97.1724C56.1084 97.7746 56.2061 98.4907 56.2061 99.3208V108H53.9355V99.2964C53.9355 98.5558 53.8175 97.9821 53.5815 97.5752C53.3537 97.1602 53.0282 96.8713 52.605 96.7085C52.1899 96.5376 51.6935 96.4521 51.1157 96.4521C50.6193 96.4521 50.1799 96.5376 49.7974 96.7085C49.4149 96.8794 49.0934 97.1154 48.833 97.4165C48.5726 97.7095 48.3732 98.0472 48.2349 98.4297C48.1047 98.8122 48.0396 99.2191 48.0396 99.6504ZM61.8823 97.3311V113.078H59.6118V94.792H61.687L61.8823 97.3311ZM70.7812 101.286V101.542C70.7812 102.503 70.6673 103.394 70.4395 104.216C70.2116 105.03 69.8779 105.738 69.4385 106.34C69.0072 106.942 68.4741 107.41 67.8394 107.744C67.2046 108.077 66.4762 108.244 65.6543 108.244C64.8161 108.244 64.0755 108.106 63.4326 107.829C62.7897 107.552 62.2445 107.15 61.7969 106.621C61.3493 106.092 60.9912 105.457 60.7227 104.716C60.4622 103.976 60.2832 103.142 60.1855 102.214V100.847C60.2832 99.8701 60.4663 98.9953 60.7349 98.2222C61.0034 97.4491 61.3574 96.7899 61.7969 96.2446C62.2445 95.6912 62.7856 95.2721 63.4204 94.9873C64.0552 94.6943 64.7876 94.5479 65.6177 94.5479C66.4478 94.5479 67.1842 94.7106 67.8271 95.0361C68.4701 95.3535 69.0112 95.8092 69.4507 96.4033C69.8901 96.9974 70.2197 97.7095 70.4395 98.5396C70.6673 99.3615 70.7812 100.277 70.7812 101.286ZM68.5107 101.542V101.286C68.5107 100.627 68.4416 100.008 68.3032 99.4307C68.1649 98.8447 67.9492 98.332 67.6562 97.8926C67.3714 97.445 67.0052 97.0951 66.5576 96.8428C66.11 96.5824 65.577 96.4521 64.9585 96.4521C64.3888 96.4521 63.8924 96.5498 63.4692 96.7451C63.0542 96.9404 62.7002 97.2049 62.4072 97.5386C62.1143 97.8641 61.8742 98.2384 61.687 98.6616C61.508 99.0767 61.3737 99.508 61.2842 99.9556V103.117C61.4469 103.687 61.6748 104.224 61.9678 104.729C62.2607 105.225 62.6514 105.628 63.1396 105.937C63.6279 106.238 64.2424 106.389 64.9829 106.389C65.5933 106.389 66.1182 106.263 66.5576 106.01C67.0052 105.75 67.3714 105.396 67.6562 104.948C67.9492 104.501 68.1649 103.988 68.3032 103.41C68.4416 102.824 68.5107 102.202 68.5107 101.542ZM76.1157 89.25V108H73.8452V89.25H76.1157ZM85.2222 108.244C84.3026 108.244 83.4684 108.09 82.7197 107.78C81.9792 107.463 81.3403 107.019 80.8032 106.45C80.2743 105.88 79.8674 105.205 79.5825 104.423C79.2977 103.642 79.1553 102.788 79.1553 101.86V101.347C79.1553 100.273 79.314 99.3167 79.6313 98.4785C79.9487 97.6322 80.38 96.916 80.9253 96.3301C81.4705 95.7441 82.089 95.3006 82.7808 94.9995C83.4725 94.6984 84.1886 94.5479 84.9292 94.5479C85.8732 94.5479 86.687 94.7106 87.3706 95.0361C88.0623 95.3617 88.6279 95.8174 89.0674 96.4033C89.5068 96.9811 89.8324 97.6647 90.0439 98.4541C90.2555 99.2354 90.3613 100.09 90.3613 101.018V102.031H80.498V100.188H88.103V100.017C88.0705 99.4307 87.9484 98.861 87.7368 98.3076C87.5334 97.7542 87.2078 97.2985 86.7603 96.9404C86.3127 96.5824 85.7023 96.4033 84.9292 96.4033C84.4165 96.4033 83.9445 96.5132 83.5132 96.7329C83.0819 96.9445 82.7116 97.2619 82.4023 97.6851C82.0931 98.1082 81.853 98.625 81.6821 99.2354C81.5112 99.8457 81.4258 100.55 81.4258 101.347V101.86C81.4258 102.486 81.5112 103.076 81.6821 103.63C81.8612 104.175 82.1175 104.655 82.4512 105.07C82.793 105.485 83.2039 105.811 83.6841 106.047C84.1724 106.283 84.7257 106.401 85.3442 106.401C86.1418 106.401 86.8172 106.238 87.3706 105.913C87.924 105.587 88.4082 105.152 88.8232 104.606L90.1904 105.693C89.9056 106.124 89.5435 106.535 89.104 106.926C88.6646 107.316 88.1234 107.634 87.4805 107.878C86.8457 108.122 86.0929 108.244 85.2222 108.244ZM98.5278 94.792V96.5254H91.3867V94.792H98.5278ZM93.8037 91.5815H96.062V104.729C96.062 105.176 96.1312 105.514 96.2695 105.742C96.4079 105.97 96.5869 106.12 96.8066 106.193C97.0264 106.267 97.2624 106.303 97.5146 106.303C97.7018 106.303 97.8971 106.287 98.1006 106.254C98.3122 106.214 98.4709 106.181 98.5767 106.157L98.5889 108C98.4098 108.057 98.1738 108.11 97.8809 108.159C97.596 108.216 97.2502 108.244 96.8433 108.244C96.2899 108.244 95.7812 108.134 95.3174 107.915C94.8535 107.695 94.4832 107.329 94.2065 106.816C93.938 106.295 93.8037 105.595 93.8037 104.716V91.5815ZM106.658 108.244C105.738 108.244 104.904 108.09 104.155 107.78C103.415 107.463 102.776 107.019 102.239 106.45C101.71 105.88 101.303 105.205 101.018 104.423C100.733 103.642 100.591 102.788 100.591 101.86V101.347C100.591 100.273 100.75 99.3167 101.067 98.4785C101.384 97.6322 101.816 96.916 102.361 96.3301C102.906 95.7441 103.525 95.3006 104.216 94.9995C104.908 94.6984 105.624 94.5479 106.365 94.5479C107.309 94.5479 108.123 94.7106 108.806 95.0361C109.498 95.3617 110.063 95.8174 110.503 96.4033C110.942 96.9811 111.268 97.6647 111.479 98.4541C111.691 99.2354 111.797 100.09 111.797 101.018V102.031H101.934V100.188H109.539V100.017C109.506 99.4307 109.384 98.861 109.172 98.3076C108.969 97.7542 108.643 97.2985 108.196 96.9404C107.748 96.5824 107.138 96.4033 106.365 96.4033C105.852 96.4033 105.38 96.5132 104.949 96.7329C104.517 96.9445 104.147 97.2619 103.838 97.6851C103.529 98.1082 103.289 98.625 103.118 99.2354C102.947 99.8457 102.861 100.55 102.861 101.347V101.86C102.861 102.486 102.947 103.076 103.118 103.63C103.297 104.175 103.553 104.655 103.887 105.07C104.229 105.485 104.639 105.811 105.12 106.047C105.608 106.283 106.161 106.401 106.78 106.401C107.577 106.401 108.253 106.238 108.806 105.913C109.36 105.587 109.844 105.152 110.259 104.606L111.626 105.693C111.341 106.124 110.979 106.535 110.54 106.926C110.1 107.316 109.559 107.634 108.916 107.878C108.281 108.122 107.528 108.244 106.658 108.244ZM116.887 89.25V108H114.617V89.25H116.887ZM124.224 106.633L127.898 94.792H130.315L125.017 110.039C124.895 110.364 124.732 110.714 124.529 111.088C124.333 111.471 124.081 111.833 123.772 112.175C123.463 112.517 123.088 112.793 122.649 113.005C122.218 113.225 121.701 113.334 121.099 113.334C120.92 113.334 120.692 113.31 120.415 113.261C120.138 113.212 119.943 113.172 119.829 113.139L119.817 111.308C119.882 111.316 119.984 111.324 120.122 111.333C120.269 111.349 120.37 111.357 120.427 111.357C120.94 111.357 121.375 111.288 121.733 111.149C122.091 111.019 122.393 110.795 122.637 110.478C122.889 110.169 123.105 109.742 123.284 109.196L124.224 106.633ZM121.526 94.792L124.956 105.046L125.542 107.426L123.918 108.256L119.06 94.792H121.526ZM152.581 98.5518V99.6748C152.581 101.009 152.414 102.206 152.08 103.264C151.746 104.322 151.266 105.221 150.64 105.961C150.013 106.702 149.26 107.268 148.381 107.658C147.511 108.049 146.534 108.244 145.452 108.244C144.402 108.244 143.438 108.049 142.559 107.658C141.688 107.268 140.931 106.702 140.288 105.961C139.653 105.221 139.161 104.322 138.811 103.264C138.461 102.206 138.286 101.009 138.286 99.6748V98.5518C138.286 97.2171 138.457 96.0249 138.799 94.9751C139.149 93.9172 139.641 93.0179 140.276 92.2773C140.911 91.5286 141.663 90.959 142.534 90.5684C143.413 90.1777 144.377 89.9824 145.427 89.9824C146.51 89.9824 147.486 90.1777 148.357 90.5684C149.236 90.959 149.989 91.5286 150.615 92.2773C151.25 93.0179 151.734 93.9172 152.068 94.9751C152.41 96.0249 152.581 97.2171 152.581 98.5518ZM150.249 99.6748V98.5273C150.249 97.4694 150.139 96.5335 149.919 95.7197C149.708 94.9059 149.395 94.2223 148.979 93.6689C148.564 93.1156 148.056 92.6965 147.454 92.4116C146.86 92.1268 146.184 91.9844 145.427 91.9844C144.695 91.9844 144.032 92.1268 143.438 92.4116C142.852 92.6965 142.347 93.1156 141.924 93.6689C141.509 94.2223 141.187 94.9059 140.959 95.7197C140.732 96.5335 140.618 97.4694 140.618 98.5273V99.6748C140.618 100.741 140.732 101.685 140.959 102.507C141.187 103.321 141.513 104.008 141.936 104.57C142.367 105.123 142.876 105.542 143.462 105.827C144.056 106.112 144.719 106.254 145.452 106.254C146.217 106.254 146.896 106.112 147.49 105.827C148.084 105.542 148.585 105.123 148.992 104.57C149.407 104.008 149.72 103.321 149.932 102.507C150.143 101.685 150.249 100.741 150.249 99.6748ZM158.025 97.3311V113.078H155.754V94.792H157.83L158.025 97.3311ZM166.924 101.286V101.542C166.924 102.503 166.81 103.394 166.582 104.216C166.354 105.03 166.021 105.738 165.581 106.34C165.15 106.942 164.617 107.41 163.982 107.744C163.347 108.077 162.619 108.244 161.797 108.244C160.959 108.244 160.218 108.106 159.575 107.829C158.932 107.552 158.387 107.15 157.939 106.621C157.492 106.092 157.134 105.457 156.865 104.716C156.605 103.976 156.426 103.142 156.328 102.214V100.847C156.426 99.8701 156.609 98.9953 156.877 98.2222C157.146 97.4491 157.5 96.7899 157.939 96.2446C158.387 95.6912 158.928 95.2721 159.563 94.9873C160.198 94.6943 160.93 94.5479 161.76 94.5479C162.59 94.5479 163.327 94.7106 163.97 95.0361C164.613 95.3535 165.154 95.8092 165.593 96.4033C166.033 96.9974 166.362 97.7095 166.582 98.5396C166.81 99.3615 166.924 100.277 166.924 101.286ZM164.653 101.542V101.286C164.653 100.627 164.584 100.008 164.446 99.4307C164.307 98.8447 164.092 98.332 163.799 97.8926C163.514 97.445 163.148 97.0951 162.7 96.8428C162.253 96.5824 161.72 96.4521 161.101 96.4521C160.531 96.4521 160.035 96.5498 159.612 96.7451C159.197 96.9404 158.843 97.2049 158.55 97.5386C158.257 97.8641 158.017 98.2384 157.83 98.6616C157.651 99.0767 157.516 99.508 157.427 99.9556V103.117C157.59 103.687 157.817 104.224 158.11 104.729C158.403 105.225 158.794 105.628 159.282 105.937C159.771 106.238 160.385 106.389 161.125 106.389C161.736 106.389 162.261 106.263 162.7 106.01C163.148 105.75 163.514 105.396 163.799 104.948C164.092 104.501 164.307 103.988 164.446 103.41C164.584 102.824 164.653 102.202 164.653 101.542ZM175.286 108.244C174.366 108.244 173.532 108.09 172.783 107.78C172.043 107.463 171.404 107.019 170.867 106.45C170.338 105.88 169.931 105.205 169.646 104.423C169.361 103.642 169.219 102.788 169.219 101.86V101.347C169.219 100.273 169.377 99.3167 169.695 98.4785C170.012 97.6322 170.444 96.916 170.989 96.3301C171.534 95.7441 172.153 95.3006 172.844 94.9995C173.536 94.6984 174.252 94.5479 174.993 94.5479C175.937 94.5479 176.75 94.7106 177.434 95.0361C178.126 95.3617 178.691 95.8174 179.131 96.4033C179.57 96.9811 179.896 97.6647 180.107 98.4541C180.319 99.2354 180.425 100.09 180.425 101.018V102.031H170.562V100.188H178.167V100.017C178.134 99.4307 178.012 98.861 177.8 98.3076C177.597 97.7542 177.271 97.2985 176.824 96.9404C176.376 96.5824 175.766 96.4033 174.993 96.4033C174.48 96.4033 174.008 96.5132 173.577 96.7329C173.145 96.9445 172.775 97.2619 172.466 97.6851C172.157 98.1082 171.917 98.625 171.746 99.2354C171.575 99.8457 171.489 100.55 171.489 101.347V101.86C171.489 102.486 171.575 103.076 171.746 103.63C171.925 104.175 172.181 104.655 172.515 105.07C172.856 105.485 173.267 105.811 173.748 106.047C174.236 106.283 174.789 106.401 175.408 106.401C176.205 106.401 176.881 106.238 177.434 105.913C177.987 105.587 178.472 105.152 178.887 104.606L180.254 105.693C179.969 106.124 179.607 106.535 179.167 106.926C178.728 107.316 178.187 107.634 177.544 107.878C176.909 108.122 176.156 108.244 175.286 108.244ZM185.32 97.6118V108H183.062V94.792H185.198L185.32 97.6118ZM184.783 100.896L183.843 100.859C183.851 99.9556 183.985 99.1214 184.246 98.3564C184.506 97.5833 184.872 96.9119 185.344 96.3423C185.816 95.7726 186.378 95.3332 187.029 95.0239C187.688 94.7065 188.416 94.5479 189.214 94.5479C189.865 94.5479 190.451 94.6374 190.972 94.8164C191.493 94.9873 191.936 95.264 192.302 95.6465C192.677 96.029 192.961 96.5254 193.157 97.1357C193.352 97.738 193.45 98.4744 193.45 99.3452V108H191.179V99.3208C191.179 98.6291 191.077 98.0757 190.874 97.6606C190.671 97.2375 190.374 96.9323 189.983 96.7451C189.592 96.5498 189.112 96.4521 188.542 96.4521C187.981 96.4521 187.468 96.5701 187.004 96.8062C186.549 97.0422 186.154 97.3677 185.82 97.7827C185.495 98.1978 185.238 98.6738 185.051 99.2109C184.872 99.7399 184.783 100.301 184.783 100.896ZM212.896 103.508C212.896 103.093 212.83 102.727 212.7 102.409C212.578 102.084 212.358 101.791 212.041 101.53C211.732 101.27 211.3 101.022 210.747 100.786C210.202 100.55 209.51 100.31 208.672 100.065C207.793 99.805 207 99.5161 206.292 99.1987C205.583 98.8732 204.977 98.5029 204.473 98.0879C203.968 97.6729 203.582 97.1968 203.313 96.6597C203.044 96.1226 202.91 95.5081 202.91 94.8164C202.91 94.1247 203.053 93.4858 203.337 92.8999C203.622 92.314 204.029 91.8053 204.558 91.374C205.095 90.9346 205.734 90.5928 206.475 90.3486C207.215 90.1045 208.041 89.9824 208.953 89.9824C210.287 89.9824 211.418 90.2388 212.346 90.7515C213.282 91.256 213.994 91.9193 214.482 92.7412C214.971 93.555 215.215 94.4258 215.215 95.3535H212.871C212.871 94.6862 212.729 94.0962 212.444 93.5835C212.159 93.0627 211.728 92.6558 211.15 92.3628C210.572 92.0617 209.84 91.9111 208.953 91.9111C208.114 91.9111 207.423 92.0373 206.877 92.2896C206.332 92.5418 205.925 92.8836 205.657 93.3149C205.396 93.7463 205.266 94.2386 205.266 94.792C205.266 95.1663 205.343 95.5081 205.498 95.8174C205.661 96.1185 205.909 96.3993 206.243 96.6597C206.584 96.9201 207.016 97.1602 207.537 97.3799C208.066 97.5996 208.696 97.8112 209.429 98.0146C210.438 98.2995 211.309 98.6169 212.041 98.9668C212.773 99.3167 213.376 99.7114 213.848 100.151C214.328 100.582 214.682 101.075 214.91 101.628C215.146 102.173 215.264 102.792 215.264 103.483C215.264 104.208 215.117 104.863 214.824 105.449C214.531 106.035 214.112 106.535 213.567 106.95C213.022 107.365 212.367 107.687 211.602 107.915C210.845 108.134 209.998 108.244 209.062 108.244C208.241 108.244 207.431 108.13 206.633 107.902C205.844 107.674 205.124 107.333 204.473 106.877C203.83 106.421 203.313 105.86 202.922 105.192C202.54 104.517 202.349 103.736 202.349 102.849H204.692C204.692 103.459 204.81 103.984 205.046 104.423C205.282 104.855 205.604 105.213 206.011 105.498C206.426 105.782 206.894 105.994 207.415 106.132C207.944 106.263 208.493 106.328 209.062 106.328C209.884 106.328 210.58 106.214 211.15 105.986C211.72 105.758 212.151 105.432 212.444 105.009C212.745 104.586 212.896 104.086 212.896 103.508ZM223.406 108.244C222.486 108.244 221.652 108.09 220.903 107.78C220.163 107.463 219.524 107.019 218.987 106.45C218.458 105.88 218.051 105.205 217.766 104.423C217.481 103.642 217.339 102.788 217.339 101.86V101.347C217.339 100.273 217.498 99.3167 217.815 98.4785C218.132 97.6322 218.564 96.916 219.109 96.3301C219.654 95.7441 220.273 95.3006 220.964 94.9995C221.656 94.6984 222.372 94.5479 223.113 94.5479C224.057 94.5479 224.871 94.7106 225.554 95.0361C226.246 95.3617 226.812 95.8174 227.251 96.4033C227.69 96.9811 228.016 97.6647 228.228 98.4541C228.439 99.2354 228.545 100.09 228.545 101.018V102.031H218.682V100.188H226.287V100.017C226.254 99.4307 226.132 98.861 225.92 98.3076C225.717 97.7542 225.391 97.2985 224.944 96.9404C224.496 96.5824 223.886 96.4033 223.113 96.4033C222.6 96.4033 222.128 96.5132 221.697 96.7329C221.265 96.9445 220.895 97.2619 220.586 97.6851C220.277 98.1082 220.037 98.625 219.866 99.2354C219.695 99.8457 219.609 100.55 219.609 101.347V101.86C219.609 102.486 219.695 103.076 219.866 103.63C220.045 104.175 220.301 104.655 220.635 105.07C220.977 105.485 221.388 105.811 221.868 106.047C222.356 106.283 222.909 106.401 223.528 106.401C224.325 106.401 225.001 106.238 225.554 105.913C226.108 105.587 226.592 105.152 227.007 104.606L228.374 105.693C228.089 106.124 227.727 106.535 227.288 106.926C226.848 107.316 226.307 107.634 225.664 107.878C225.029 108.122 224.277 108.244 223.406 108.244ZM238.97 105.742V98.9424C238.97 98.4215 238.864 97.9699 238.652 97.5874C238.449 97.1968 238.14 96.8957 237.725 96.6841C237.31 96.4725 236.797 96.3667 236.187 96.3667C235.617 96.3667 235.116 96.4644 234.685 96.6597C234.262 96.855 233.928 97.1113 233.684 97.4287C233.448 97.7461 233.33 98.0879 233.33 98.4541H231.072C231.072 97.9821 231.194 97.5142 231.438 97.0503C231.682 96.5864 232.032 96.1673 232.488 95.793C232.952 95.4105 233.505 95.1094 234.148 94.8896C234.799 94.6618 235.523 94.5479 236.321 94.5479C237.281 94.5479 238.127 94.7106 238.86 95.0361C239.6 95.3617 240.178 95.854 240.593 96.5132C241.016 97.1642 241.228 97.9821 241.228 98.9668V105.119C241.228 105.559 241.265 106.027 241.338 106.523C241.419 107.019 241.537 107.447 241.692 107.805V108H239.336C239.222 107.74 239.132 107.394 239.067 106.962C239.002 106.523 238.97 106.116 238.97 105.742ZM239.36 99.9922L239.385 101.579H237.102C236.459 101.579 235.885 101.632 235.381 101.738C234.876 101.835 234.453 101.986 234.111 102.189C233.77 102.393 233.509 102.649 233.33 102.958C233.151 103.26 233.062 103.614 233.062 104.021C233.062 104.436 233.155 104.814 233.342 105.156C233.529 105.498 233.81 105.77 234.185 105.974C234.567 106.169 235.035 106.267 235.588 106.267C236.28 106.267 236.89 106.12 237.419 105.827C237.948 105.534 238.368 105.176 238.677 104.753C238.994 104.33 239.165 103.919 239.189 103.52L240.154 104.606C240.097 104.948 239.942 105.327 239.69 105.742C239.438 106.157 239.1 106.556 238.677 106.938C238.262 107.312 237.765 107.626 237.188 107.878C236.618 108.122 235.975 108.244 235.259 108.244C234.364 108.244 233.578 108.069 232.903 107.719C232.236 107.369 231.715 106.901 231.34 106.315C230.974 105.721 230.791 105.058 230.791 104.326C230.791 103.618 230.929 102.995 231.206 102.458C231.483 101.913 231.882 101.461 232.402 101.103C232.923 100.737 233.55 100.46 234.282 100.273C235.015 100.086 235.833 99.9922 236.736 99.9922H239.36ZM247.039 96.8672V108H244.78V94.792H246.978L247.039 96.8672ZM251.165 94.7188L251.152 96.8184C250.965 96.7777 250.786 96.7533 250.615 96.7451C250.452 96.7288 250.265 96.7207 250.054 96.7207C249.533 96.7207 249.073 96.8021 248.674 96.9648C248.276 97.1276 247.938 97.3555 247.661 97.6484C247.384 97.9414 247.165 98.2913 247.002 98.6982C246.847 99.097 246.746 99.5365 246.697 100.017L246.062 100.383C246.062 99.5853 246.139 98.8366 246.294 98.1367C246.457 97.4368 246.705 96.8184 247.039 96.2812C247.372 95.736 247.795 95.3128 248.308 95.0117C248.829 94.7025 249.447 94.5479 250.164 94.5479C250.326 94.5479 250.514 94.5682 250.725 94.6089C250.937 94.6414 251.083 94.6781 251.165 94.7188ZM258.293 106.389C258.831 106.389 259.327 106.279 259.783 106.059C260.238 105.839 260.613 105.538 260.906 105.156C261.199 104.765 261.366 104.322 261.406 103.825H263.555C263.514 104.606 263.25 105.335 262.761 106.01C262.281 106.678 261.65 107.219 260.869 107.634C260.088 108.041 259.229 108.244 258.293 108.244C257.301 108.244 256.434 108.069 255.693 107.719C254.961 107.369 254.351 106.889 253.862 106.279C253.382 105.668 253.02 104.969 252.776 104.179C252.54 103.382 252.422 102.539 252.422 101.652V101.14C252.422 100.253 252.54 99.4144 252.776 98.625C253.02 97.8275 253.382 97.1235 253.862 96.5132C254.351 95.9028 254.961 95.4227 255.693 95.0728C256.434 94.7228 257.301 94.5479 258.293 94.5479C259.327 94.5479 260.23 94.7594 261.003 95.1826C261.777 95.5977 262.383 96.1673 262.822 96.8916C263.27 97.6077 263.514 98.4215 263.555 99.333H261.406C261.366 98.7878 261.211 98.2954 260.942 97.856C260.682 97.4165 260.324 97.0666 259.868 96.8062C259.421 96.5376 258.896 96.4033 258.293 96.4033C257.602 96.4033 257.02 96.5417 256.548 96.8184C256.084 97.0869 255.714 97.4531 255.437 97.917C255.168 98.3727 254.973 98.8813 254.851 99.4429C254.737 99.9963 254.68 100.562 254.68 101.14V101.652C254.68 102.23 254.737 102.8 254.851 103.361C254.965 103.923 255.156 104.431 255.425 104.887C255.701 105.343 256.072 105.709 256.536 105.986C257.008 106.254 257.594 106.389 258.293 106.389ZM268.352 89.25V108H266.094V89.25H268.352ZM267.815 100.896L266.875 100.859C266.883 99.9556 267.017 99.1214 267.278 98.3564C267.538 97.5833 267.904 96.9119 268.376 96.3423C268.848 95.7726 269.41 95.3332 270.061 95.0239C270.72 94.7065 271.449 94.5479 272.246 94.5479C272.897 94.5479 273.483 94.6374 274.004 94.8164C274.525 94.9873 274.968 95.264 275.334 95.6465C275.709 96.029 275.994 96.5254 276.189 97.1357C276.384 97.738 276.482 98.4744 276.482 99.3452V108H274.211V99.3208C274.211 98.6291 274.11 98.0757 273.906 97.6606C273.703 97.2375 273.406 96.9323 273.015 96.7451C272.625 96.5498 272.144 96.4521 271.575 96.4521C271.013 96.4521 270.5 96.5701 270.037 96.8062C269.581 97.0422 269.186 97.3677 268.853 97.7827C268.527 98.1978 268.271 98.6738 268.083 99.2109C267.904 99.7399 267.815 100.301 267.815 100.896ZM297.698 106.083V108H288.286V106.083H297.698ZM288.762 90.2266V108H286.406V90.2266H288.762ZM296.453 97.8682V99.7847H288.286V97.8682H296.453ZM297.576 90.2266V92.1553H288.286V90.2266H297.576ZM302.532 97.6118V108H300.273V94.792H302.41L302.532 97.6118ZM301.995 100.896L301.055 100.859C301.063 99.9556 301.197 99.1214 301.458 98.3564C301.718 97.5833 302.084 96.9119 302.556 96.3423C303.028 95.7726 303.59 95.3332 304.241 95.0239C304.9 94.7065 305.628 94.5479 306.426 94.5479C307.077 94.5479 307.663 94.6374 308.184 94.8164C308.704 94.9873 309.148 95.264 309.514 95.6465C309.889 96.029 310.173 96.5254 310.369 97.1357C310.564 97.738 310.662 98.4744 310.662 99.3452V108H308.391V99.3208C308.391 98.6291 308.289 98.0757 308.086 97.6606C307.882 97.2375 307.585 96.9323 307.195 96.7451C306.804 96.5498 306.324 96.4521 305.754 96.4521C305.193 96.4521 304.68 96.5701 304.216 96.8062C303.761 97.0422 303.366 97.3677 303.032 97.7827C302.707 98.1978 302.45 98.6738 302.263 99.2109C302.084 99.7399 301.995 100.301 301.995 100.896ZM322.649 94.792H324.7V107.719C324.7 108.883 324.464 109.876 323.992 110.698C323.52 111.52 322.861 112.142 322.014 112.565C321.176 112.997 320.208 113.212 319.109 113.212C318.653 113.212 318.116 113.139 317.498 112.993C316.887 112.854 316.285 112.614 315.691 112.272C315.105 111.939 314.613 111.487 314.214 110.917L315.398 109.575C315.951 110.242 316.529 110.706 317.131 110.966C317.742 111.227 318.344 111.357 318.938 111.357C319.654 111.357 320.273 111.223 320.793 110.954C321.314 110.686 321.717 110.287 322.002 109.758C322.295 109.237 322.441 108.594 322.441 107.829V97.6973L322.649 94.792ZM313.555 101.542V101.286C313.555 100.277 313.673 99.3615 313.909 98.5396C314.153 97.7095 314.499 96.9974 314.946 96.4033C315.402 95.8092 315.951 95.3535 316.594 95.0361C317.237 94.7106 317.961 94.5479 318.767 94.5479C319.597 94.5479 320.321 94.6943 320.94 94.9873C321.567 95.2721 322.096 95.6912 322.527 96.2446C322.966 96.7899 323.312 97.4491 323.564 98.2222C323.817 98.9953 323.992 99.8701 324.089 100.847V101.97C324 102.938 323.825 103.809 323.564 104.582C323.312 105.355 322.966 106.014 322.527 106.56C322.096 107.105 321.567 107.524 320.94 107.817C320.313 108.102 319.581 108.244 318.743 108.244C317.953 108.244 317.237 108.077 316.594 107.744C315.959 107.41 315.414 106.942 314.958 106.34C314.503 105.738 314.153 105.03 313.909 104.216C313.673 103.394 313.555 102.503 313.555 101.542ZM315.813 101.286V101.542C315.813 102.202 315.878 102.82 316.008 103.398C316.147 103.976 316.354 104.484 316.631 104.924C316.916 105.363 317.278 105.709 317.717 105.961C318.157 106.206 318.682 106.328 319.292 106.328C320.041 106.328 320.659 106.169 321.147 105.852C321.636 105.534 322.022 105.115 322.307 104.594C322.6 104.073 322.828 103.508 322.991 102.897V99.9556C322.901 99.508 322.763 99.0767 322.576 98.6616C322.397 98.2384 322.161 97.8641 321.868 97.5386C321.583 97.2049 321.229 96.9404 320.806 96.7451C320.382 96.5498 319.886 96.4521 319.316 96.4521C318.698 96.4521 318.165 96.5824 317.717 96.8428C317.278 97.0951 316.916 97.445 316.631 97.8926C316.354 98.332 316.147 98.8447 316.008 99.4307C315.878 100.008 315.813 100.627 315.813 101.286ZM330.583 94.792V108H328.313V94.792H330.583ZM328.142 91.2886C328.142 90.9224 328.252 90.6131 328.472 90.3608C328.7 90.1086 329.033 89.9824 329.473 89.9824C329.904 89.9824 330.234 90.1086 330.461 90.3608C330.697 90.6131 330.815 90.9224 330.815 91.2886C330.815 91.6385 330.697 91.9396 330.461 92.1919C330.234 92.436 329.904 92.5581 329.473 92.5581C329.033 92.5581 328.7 92.436 328.472 92.1919C328.252 91.9396 328.142 91.6385 328.142 91.2886ZM336.467 97.6118V108H334.209V94.792H336.345L336.467 97.6118ZM335.93 100.896L334.99 100.859C334.998 99.9556 335.133 99.1214 335.393 98.3564C335.653 97.5833 336.02 96.9119 336.492 96.3423C336.964 95.7726 337.525 95.3332 338.176 95.0239C338.835 94.7065 339.564 94.5479 340.361 94.5479C341.012 94.5479 341.598 94.6374 342.119 94.8164C342.64 94.9873 343.083 95.264 343.45 95.6465C343.824 96.029 344.109 96.5254 344.304 97.1357C344.5 97.738 344.597 98.4744 344.597 99.3452V108H342.327V99.3208C342.327 98.6291 342.225 98.0757 342.021 97.6606C341.818 97.2375 341.521 96.9323 341.13 96.7451C340.74 96.5498 340.26 96.4521 339.69 96.4521C339.128 96.4521 338.616 96.5701 338.152 96.8062C337.696 97.0422 337.301 97.3677 336.968 97.7827C336.642 98.1978 336.386 98.6738 336.199 99.2109C336.02 99.7399 335.93 100.301 335.93 100.896ZM353.508 108.244C352.589 108.244 351.755 108.09 351.006 107.78C350.265 107.463 349.626 107.019 349.089 106.45C348.56 105.88 348.153 105.205 347.869 104.423C347.584 103.642 347.441 102.788 347.441 101.86V101.347C347.441 100.273 347.6 99.3167 347.917 98.4785C348.235 97.6322 348.666 96.916 349.211 96.3301C349.757 95.7441 350.375 95.3006 351.067 94.9995C351.759 94.6984 352.475 94.5479 353.215 94.5479C354.159 94.5479 354.973 94.7106 355.657 95.0361C356.348 95.3617 356.914 95.8174 357.354 96.4033C357.793 96.9811 358.118 97.6647 358.33 98.4541C358.542 99.2354 358.647 100.09 358.647 101.018V102.031H348.784V100.188H356.389V100.017C356.357 99.4307 356.235 98.861 356.023 98.3076C355.819 97.7542 355.494 97.2985 355.046 96.9404C354.599 96.5824 353.988 96.4033 353.215 96.4033C352.703 96.4033 352.231 96.5132 351.799 96.7329C351.368 96.9445 350.998 97.2619 350.688 97.6851C350.379 98.1082 350.139 98.625 349.968 99.2354C349.797 99.8457 349.712 100.55 349.712 101.347V101.86C349.712 102.486 349.797 103.076 349.968 103.63C350.147 104.175 350.404 104.655 350.737 105.07C351.079 105.485 351.49 105.811 351.97 106.047C352.458 106.283 353.012 106.401 353.63 106.401C354.428 106.401 355.103 106.238 355.657 105.913C356.21 105.587 356.694 105.152 357.109 104.606L358.477 105.693C358.192 106.124 357.83 106.535 357.39 106.926C356.951 107.316 356.41 107.634 355.767 107.878C355.132 108.122 354.379 108.244 353.508 108.244Z" fill="#6B7280"/>+<path d="M69.2179 66.35C65.5779 66.35 62.1245 65.7433 58.8579 64.53C55.6379 63.27 53.1412 61.66 51.3679 59.7L52.9779 57.04C54.6579 58.7667 56.9445 60.2367 59.8379 61.45C62.7779 62.6167 65.8812 63.2 69.1479 63.2C72.4145 63.2 75.0745 62.78 77.1279 61.94C79.2279 61.0533 80.7679 59.8867 81.7479 58.44C82.7745 56.9933 83.2879 55.3833 83.2879 53.61C83.2879 51.51 82.7279 49.83 81.6079 48.57C80.4879 47.31 79.0179 46.3067 77.1979 45.56C75.3779 44.8133 73.3945 44.1833 71.2479 43.67C69.1012 43.1567 66.9312 42.62 64.7379 42.06C62.5445 41.4533 60.5379 40.6833 58.7179 39.75C56.8979 38.8167 55.4279 37.5567 54.3079 35.97C53.2345 34.3367 52.6979 32.2367 52.6979 29.67C52.6979 27.3367 53.3045 25.19 54.5179 23.23C55.7312 21.27 57.6212 19.6833 60.1879 18.47C62.7545 17.2567 66.0445 16.65 70.0579 16.65C72.7645 16.65 75.4245 17.0467 78.0379 17.84C80.6979 18.6333 82.9612 19.7067 84.8279 21.06L83.4979 23.93C81.4445 22.53 79.2279 21.5033 76.8479 20.85C74.5145 20.15 72.2512 19.8 70.0579 19.8C66.9312 19.8 64.3412 20.2433 62.2879 21.13C60.2345 22.0167 58.7179 23.2067 57.7379 24.7C56.7579 26.1467 56.2679 27.78 56.2679 29.6C56.2679 31.7 56.8045 33.38 57.8779 34.64C58.9979 35.9 60.4679 36.9033 62.2879 37.65C64.1079 38.3967 66.1145 39.0267 68.3079 39.54C70.5012 40.0533 72.6712 40.6133 74.8179 41.22C76.9645 41.78 78.9479 42.5267 80.7679 43.46C82.5879 44.3933 84.0579 45.6533 85.1779 47.24C86.2979 48.8267 86.8579 50.88 86.8579 53.4C86.8579 55.6867 86.2279 57.8333 84.9679 59.84C83.7079 61.8 81.7712 63.3867 79.1579 64.6C76.5912 65.7667 73.2779 66.35 69.2179 66.35ZM107.691 66V20.22H90.0505V17H128.901V20.22H111.261V66H107.691ZM137.754 66V17H155.324C159.431 17 162.954 17.6533 165.894 18.96C168.834 20.2667 171.097 22.1567 172.684 24.63C174.271 27.0567 175.064 30.02 175.064 33.52C175.064 36.9267 174.271 39.8667 172.684 42.34C171.097 44.7667 168.834 46.6567 165.894 48.01C162.954 49.3167 159.431 49.97 155.324 49.97H139.714L141.324 48.29V66H137.754ZM171.774 66L159.034 48.22H163.094L175.834 66H171.774ZM141.324 48.5L139.714 46.82H155.324C160.597 46.82 164.587 45.6533 167.294 43.32C170.047 40.9867 171.424 37.72 171.424 33.52C171.424 29.2733 170.047 26.0067 167.294 23.72C164.587 21.3867 160.597 20.22 155.324 20.22H139.714L141.324 18.47V48.5ZM179.945 66L202.485 17H206.055L228.595 66H224.745L203.465 19.24H205.005L183.795 66H179.945ZM188.205 52.21L189.395 49.2H218.725L219.915 52.21H188.205ZM257.527 66.35C253.887 66.35 250.503 65.7433 247.377 64.53C244.297 63.27 241.613 61.52 239.327 59.28C237.04 57.04 235.267 54.4267 234.007 51.44C232.747 48.4067 232.117 45.0933 232.117 41.5C232.117 37.9067 232.747 34.6167 234.007 31.63C235.267 28.5967 237.04 25.96 239.327 23.72C241.66 21.48 244.367 19.7533 247.447 18.54C250.527 17.28 253.887 16.65 257.527 16.65C260.98 16.65 264.2 17.21 267.187 18.33C270.22 19.45 272.81 21.1533 274.957 23.44L272.717 25.75C270.617 23.6967 268.283 22.2267 265.717 21.34C263.197 20.4067 260.513 19.94 257.667 19.94C254.54 19.94 251.623 20.4767 248.917 21.55C246.257 22.6233 243.923 24.14 241.917 26.1C239.957 28.06 238.417 30.3467 237.297 32.96C236.223 35.5733 235.687 38.42 235.687 41.5C235.687 44.58 236.223 47.4267 237.297 50.04C238.417 52.6533 239.957 54.94 241.917 56.9C243.923 58.86 246.257 60.3767 248.917 61.45C251.623 62.5233 254.54 63.06 257.667 63.06C260.513 63.06 263.197 62.6167 265.717 61.73C268.283 60.7967 270.617 59.28 272.717 57.18L274.957 59.49C272.81 61.7767 270.22 63.5033 267.187 64.67C264.2 65.79 260.98 66.35 257.527 66.35ZM295.679 66V20.22H278.039V17H316.889V20.22H299.249V66H295.679Z" fill="#0B7BFF"/></svg>diff --git a/git-assets/screenshot.png b/git-assets/screenshot.pngindex c9efe791..d22f7508 100644Binary files a/git-assets/screenshot.png and b/git-assets/screenshot.png differdiff --git a/optics-lsp/README.md b/optics-lsp/README.mdindex 4014fc9b..f83514df 100644--- a/optics-lsp/README.md+++ b/optics-lsp/README.md@@ -1,5 +1,5 @@# Optics VS Code Extension-This extension makes it easier to edit `.optic` files. An optic is used by [Cuely](https://cuely.io) and gives you complete control over which search results gets returned and how they are ranked. This extension includes syntax highlighting for the optics language and an LSP to detect syntax errors.+This extension makes it easier to edit `.optic` files. An optic is used by [Stract](https://trystract.com) and gives you complete control over which search results gets returned and how they are ranked. This extension includes syntax highlighting for the optics language and an LSP to detect syntax errors.## Sample `.optic` syntaxThis small sample hopefully gives you a quick introduction to the optics language.@@ -31,4 +31,4 @@ Rule {};```-See our [quickstart](https://github.com/Cuely/sample-optics/blob/main/quickstart.optic) for a more thorough and up-to-date walk through.\ No newline at end of file+See our [quickstart](https://github.com/StractOrg/sample-optics/blob/main/quickstart.optic) for a more thorough and up-to-date walk through.\ No newline at end of filediff --git a/optics-lsp/package.json b/optics-lsp/package.jsonindex 3dcd049d..0039c3be 100644--- a/optics-lsp/package.json+++ b/optics-lsp/package.json@@ -4,7 +4,7 @@"engines": {"vscode": "^1.73.0"},- "publisher": "Cuely",+ "publisher": "Stract","scripts": {"vscode:prepublish": "npm run compile","compile": "just build && tsc -b",@@ -27,7 +27,7 @@},"repository": {"type": "git",- "url": "https://github.com/cuely/cuely"+ "url": "https://github.com/StractOrg/stract"},"icon": "optics_logo.png","categories": [@@ -57,4 +57,4 @@}]}-}+}\ No newline at end of filediff --git a/optics-lsp/src/lib.rs b/optics-lsp/src/lib.rsindex f650b378..97d1a0c6 100644--- a/optics-lsp/src/lib.rs+++ b/optics-lsp/src/lib.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License as@@ -214,11 +214,11 @@ impl OpticsBackend {optics::Token::Signal => Some("During ranking of the search results, a number of signals are combined in a weighted sum to create the final score for each search result. \`Signal` allows you to change the coefficient used for each signal, and thereby alter the search result ranking. Some supported signals are e.g. \"host_centrality\", \"bm25\" and \"tracker_score\". \- A complete list of the available signals can be found in the code (https://github.com/Cuely/Cuely/blob/main/src/ranking/signal.rs)".to_string()),+ A complete list of the available signals can be found in the code (https://github.com/StractOrg/Stract/blob/main/src/ranking/signal.rs)".to_string()),optics::Token::Field => Some("`Field` lets you change how the various text fields are prioritized during ranking (e.g. a search result matching text in the title is probably more relevant than a result where only the body matches). \Some supported fields are e.g. \"title\", \"body\", \"backlink_text\" and \"site\". \- A complete list of available fields can be seen in the code (https://github.com/Cuely/Cuely/blob/main/src/schema.rs)".to_string()),+ A complete list of available fields can be seen in the code (https://github.com/StractOrg/Stract/blob/main/src/schema.rs)".to_string()),optics::Token::Action => Some("`Action` defines which action should be applied to the matching search result. The result can either be boosted, downranked or discarded.".to_string()),diff --git a/optics/src/ast.rs b/optics/src/ast.rsindex 756bc9e1..59c43525 100644--- a/optics/src/ast.rs+++ b/optics/src/ast.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/optics/src/lexer.rs b/optics/src/lexer.rsindex eb76060b..ab02a610 100644--- a/optics/src/lexer.rs+++ b/optics/src/lexer.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/optics/src/lib.rs b/optics/src/lib.rsindex ff960b42..d7e26a04 100644--- a/optics/src/lib.rs+++ b/optics/src/lib.rs@@ -1,5 +1,5 @@-// Cuely is an open source web search engine.-// Copyright (C) 2022 Cuely ApS+// Stract is an open source web search engine.+// Copyright (C) 2023 Stract ApS//// This program is free software: you can redistribute it and/or modify// it under the terms of the GNU Affero General Public License asdiff --git a/optics/testcases b/optics/testcasesindex 8c44c1c7..515ef07a 160000--- a/optics/testcases+++ b/optics/testcases@@ -1 +1 @@-Subproject commit 8c44c1c73904ea44a4b8485790b0a7afcd3bf94d+Subproject commit 515ef07a18403ff0d97d0cfa9ddf3a95d4233f04diff --git a/scripts/export_abstractive_summary_model b/scripts/export_abstractive_summary_modelindex 8248edbc..3f9efd5b 100755--- a/scripts/export_abstractive_summary_model+++ b/scripts/export_abstractive_summary_model@@ -30,5 +30,5 @@ for q in quantizer:quantization_config=dqconfig)-urllib.request.urlretrieve("https://s3.eu-central-1.amazonaws.com/s3.cuely.io/truncated_word2vec.bin.gz",+urllib.request.urlretrieve("https://s3.trystract.com/public/truncated_word2vec.bin.gz","data/summarizer/word2vec.bin.gz")