Backmerge main 14 jan 2021 (#831)

* Doc: Add outline (#815) * doc: add categories * refactor: doc structure refactored * fix: package-lock.json removed * refactor: create outline sub-directories * refactor: rename test to testing * Update netty-all to 4.1.73.Final (#811) * Feature: API to modify headers (#824) * feat(Headers):added new api to update headers * renamed api * Feature: Signed Cookie (#751) * feat(cookie): added secret in cookie * feat(cookie): added signcookie middleware * feat(cookie): scalafmt * fix(cookie): sign cookie while encoding * scalafmt * fix(Cookie): added unsign method for cookie * fix(cookie): minor changes * fix(signCookieMiddleware: simplified signCookies * fix(cookie): removed try catch from signContent * cookie: throw error in verify * cookie: throw error in verify * verify method changes * fixed test cases * fix: removed decodeResponseSignedCookie * fix: middlewareSpec * added modifyheaders in middleware * removed unwanted changes * scalafmt * refactoring * refactoring * build fix * build fix * fix: decodeResponseCookie * added modify * Update sbt-scalafix to 0.9.34 (#805) * Fix: Echo streaming (#828) * Failing test * Fix echo streaming * Pr Comments * ZIO 2 support (#809) * upgrade to zio 2.0.0-RC1 * bump timeout for failing test * other fixes * increase timeout * rejigger broken test * try, try again * get compiling & tests passing Co-authored-by: Kit Langton <kit.langton@gmail.com> * ZIO2 changes * scalafmt * renamed Co-authored-by: Shubham Girdhar <girdharshubham@hotmail.com> Co-authored-by: Shruti Verma <62893271+ShrutiVerma97@users.noreply.github.com> Co-authored-by: John A. De Goes <john@degoes.net> Co-authored-by: Kit Langton <kit.langton@gmail.com>
zio · Jan 15, 2022 · 5ead963 · 5ead963
1 parent 33c7264
commit 5ead963
Show file tree

Hide file tree

Showing 60 changed files with 247 additions and 11,030 deletions.
diff --git a/docs/website/docs/client/_category_.json b/docs/website/docs/client/_category_.json
@@ -0,0 +1,4 @@
+{
+    "label": "Client",
+    "position": 4
+}
diff --git a/docs/website/docs/client/index.md b/docs/website/docs/client/index.md
@@ -0,0 +1 @@
+# Work in progress
diff --git a/docs/website/docs/dsl/_category_.json b/docs/website/docs/dsl/_category_.json
@@ -0,0 +1,4 @@
+{
+    "label": "DSL",
+    "position": 3
+}
diff --git a/docs/website/docs/dsl/cookies/_category_.json b/docs/website/docs/dsl/cookies/_category_.json
@@ -0,0 +1,4 @@
+{
+    "label": "Cookies",
+    "position": 6
+}
diff --git a/docs/website/docs/dsl/cookies/index.md b/docs/website/docs/dsl/cookies/index.md
@@ -0,0 +1 @@
+# Work in progress
diff --git a/docs/website/docs/dsl/headers/_category_.json b/docs/website/docs/dsl/headers/_category_.json
@@ -0,0 +1,4 @@
+{
+    "label": "Headers",
+    "position": 5
+}
diff --git a/docs/website/docs/dsl/headers/index.md b/docs/website/docs/dsl/headers/index.md
@@ -0,0 +1 @@
+# Work in progress
diff --git a/docs/website/docs/dsl/http-data/_category_.json b/docs/website/docs/dsl/http-data/_category_.json
@@ -0,0 +1,4 @@
+{
+    "label": "HttpData",
+    "position": 4
+}
diff --git a/docs/website/docs/dsl/http-data/index.md b/docs/website/docs/dsl/http-data/index.md
@@ -0,0 +1 @@
+# Work in progress
diff --git a/docs/website/docs/dsl/http-endpoint/_category_.json b/docs/website/docs/dsl/http-endpoint/_category_.json
@@ -0,0 +1,4 @@
+{
+    "label": "Endpoint",
+    "position": 7
+}
diff --git a/docs/website/docs/dsl/http-endpoint/index.md b/docs/website/docs/dsl/http-endpoint/index.md
@@ -0,0 +1 @@
+# Work in progress
diff --git a/docs/website/docs/dsl/http/_category_.json b/docs/website/docs/dsl/http/_category_.json
@@ -0,0 +1,4 @@
+{
+    "label": "Http",
+    "position": 1
+}
diff --git a/docs/website/docs/dsl/http/index.md b/docs/website/docs/dsl/http/index.md
@@ -0,0 +1 @@
+# Work in progress
diff --git a/docs/website/docs/dsl/middleware/_category_.json b/docs/website/docs/dsl/middleware/_category_.json
@@ -0,0 +1,4 @@
+{
+    "label": "Middleware",
+    "position": 9
+}
diff --git a/docs/website/docs/dsl/middleware/index.md b/docs/website/docs/dsl/middleware/index.md
@@ -0,0 +1 @@
+# Work in progress
diff --git a/docs/website/docs/dsl/request/_category_.json b/docs/website/docs/dsl/request/_category_.json
@@ -0,0 +1,4 @@
+{
+    "label": "Request",
+    "position": 2
+}
diff --git a/docs/website/docs/dsl/request/index.md b/docs/website/docs/dsl/request/index.md
@@ -0,0 +1 @@
+# Work in progress
diff --git a/docs/website/docs/dsl/response/_category_.json b/docs/website/docs/dsl/response/_category_.json
@@ -0,0 +1,4 @@
+{
+    "label": "Response",
+    "position": 3
+}
diff --git a/docs/website/docs/dsl/response/index.md b/docs/website/docs/dsl/response/index.md
@@ -0,0 +1 @@
+# Work in progress
diff --git a/docs/website/docs/dsl/server/_category_.json b/docs/website/docs/dsl/server/_category_.json
@@ -0,0 +1,4 @@
+{
+    "label": "Server",
+    "position": 8
+}
diff --git a/docs/website/docs/dsl/server/config.md b/docs/website/docs/dsl/server/config.md
@@ -0,0 +1,3 @@
+# Config
+
+Work in progress
diff --git a/docs/website/docs/dsl/socket/_category_.json b/docs/website/docs/dsl/socket/_category_.json
@@ -0,0 +1,4 @@
+{
+    "label": "Socket",
+    "position": 10
+}
diff --git a/docs/website/docs/dsl/socket/index.md b/docs/website/docs/dsl/socket/index.md
@@ -0,0 +1 @@
+# Work in progress
diff --git a/docs/website/docs/examples/_category_.json b/docs/website/docs/examples/_category_.json
@@ -0,0 +1,4 @@
+{
+    "label": "Examples",
+    "position": 7
+}
diff --git a/...te/docs/advanced-examples/_category_.json → ...xamples/advanced-examples/_category_.json b/...te/docs/advanced-examples/_category_.json → ...xamples/advanced-examples/_category_.json
@@ -1,4 +1,4 @@
 {
   "label": "Advanced Examples",
-  "position": 3
+  "position": 2
 }
diff --git a/.../docs/advanced-examples/authentication.md → ...mples/advanced-examples/authentication.md b/.../docs/advanced-examples/authentication.md → ...mples/advanced-examples/authentication.md
diff --git a/...docs/advanced-examples/concrete-entity.md → ...ples/advanced-examples/concrete-entity.md b/...docs/advanced-examples/concrete-entity.md → ...ples/advanced-examples/concrete-entity.md
diff --git a/docs/website/docs/advanced-examples/cors.md → ...e/docs/examples/advanced-examples/cors.md b/docs/website/docs/advanced-examples/cors.md → ...e/docs/examples/advanced-examples/cors.md
diff --git a/...advanced-examples/hello-world-advanced.md → ...advanced-examples/hello-world-advanced.md b/...advanced-examples/hello-world-advanced.md → ...advanced-examples/hello-world-advanced.md
diff --git a/.../docs/advanced-examples/sticky-threads.md → ...mples/advanced-examples/sticky-threads.md b/.../docs/advanced-examples/sticky-threads.md → ...mples/advanced-examples/sticky-threads.md
diff --git a/...ite/docs/advanced-examples/stream-file.md → ...examples/advanced-examples/stream-file.md b/...ite/docs/advanced-examples/stream-file.md → ...examples/advanced-examples/stream-file.md
diff --git a/...docs/advanced-examples/stream-response.md → ...ples/advanced-examples/stream-response.md b/...docs/advanced-examples/stream-response.md → ...ples/advanced-examples/stream-response.md
diff --git a/.../advanced-examples/web-socket-advanced.md → .../advanced-examples/web-socket-advanced.md b/.../advanced-examples/web-socket-advanced.md → .../advanced-examples/web-socket-advanced.md
diff --git a/...s/zio-http-basic-examples/_category_.json → ...s/zio-http-basic-examples/_category_.json b/...s/zio-http-basic-examples/_category_.json → ...s/zio-http-basic-examples/_category_.json
@@ -1,4 +1,4 @@
 {
   "label": "Basic Examples",
-  "position": 2
+  "position": 1
 }
diff --git a/...cs/zio-http-basic-examples/hello-world.md → ...es/zio-http-basic-examples/hello-world.md b/...cs/zio-http-basic-examples/hello-world.md → ...es/zio-http-basic-examples/hello-world.md
diff --git a/...s/zio-http-basic-examples/https-client.md → ...s/zio-http-basic-examples/https-client.md b/...s/zio-http-basic-examples/https-client.md → ...s/zio-http-basic-examples/https-client.md
diff --git a/...s/zio-http-basic-examples/https-server.md → ...s/zio-http-basic-examples/https-server.md b/...s/zio-http-basic-examples/https-server.md → ...s/zio-http-basic-examples/https-server.md
diff --git a/.../zio-http-basic-examples/simple-client.md → .../zio-http-basic-examples/simple-client.md b/.../zio-http-basic-examples/simple-client.md → .../zio-http-basic-examples/simple-client.md
diff --git a/...ocs/zio-http-basic-examples/web-socket.md → ...les/zio-http-basic-examples/web-socket.md b/...ocs/zio-http-basic-examples/web-socket.md → ...les/zio-http-basic-examples/web-socket.md
diff --git a/docs/website/docs/index.md b/docs/website/docs/index.md
@@ -1,5 +1,6 @@
 ---
 sidebar_position: 1
+sidebar_label: "Setup"
 ---
 
 # Getting Started
@@ -37,7 +38,7 @@ import zhttp.http._
 val a = Http.collect[Request] { case Method.GET -> Root / "a"  => Response.ok }
 val b = Http.collect[Request] { case Method.GET -> Root / "b"  => Response.ok }
 
-val app = a <> b
+val app = a ++ b
 ```
 
 Apps can be composed using the `<>` operator. The way it works is, if none of the routes match in `a` , or a `NotFound` error is thrown from `a`, and then the control is passed on to the `b` app.

diff --git a/docs/website/docs/integrations/_category_.json b/docs/website/docs/integrations/_category_.json
@@ -0,0 +1,4 @@
+{
+    "label": "Integrations",
+    "position": 6
+}
diff --git a/docs/website/docs/integrations/index.md b/docs/website/docs/integrations/index.md
@@ -0,0 +1 @@
+# Work in progress
diff --git a/docs/website/docs/testing/_category_.json b/docs/website/docs/testing/_category_.json
@@ -0,0 +1,4 @@
+{
+    "label": "Testing",
+    "position": 5
+}
diff --git a/docs/website/docs/testing/index.md b/docs/website/docs/testing/index.md
@@ -0,0 +1 @@
+# Work in progress