Skip to content

Commit

Permalink
Merge branch 'refs/heads/main' into import_curl_files
Browse files Browse the repository at this point in the history
# Conflicts:
#	Cargo.lock
#	src/app/app_logic/collection.rs
  • Loading branch information
Julien-cpsn committed May 5, 2024
2 parents ae71028 + 5500fe6 commit 6052af3
Show file tree
Hide file tree
Showing 55 changed files with 2,734 additions and 576 deletions.
935 changes: 822 additions & 113 deletions Cargo.lock

Large diffs are not rendered by default.

14 changes: 10 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "atac"
description = "Arguably a Terminal API Client. Feature-full, free, open-source, offline and account-less."
version = "0.14.0"
version = "0.15.1"
authors = ["julien-cpsn"]
edition = "2021"
license = "MIT"
Expand All @@ -23,24 +23,30 @@ reqwest_cookie_store = "0.6.0"
cookie_store = "0.20.0"
ratatui = "0.26.2"
crossterm = "0.27.0"
crokey = "0.6.4"
crokey = "1.0.0"
tui-big-text = "0.4.2"
tui-tree-widget = "0.19.0"
tui-textarea = { version = "0.4.0", features = ["ratatui"] }
throbber-widgets-tui = "0.5.0"
ratatui-image = { version = "1.0.0", features = ["crossterm"] }
image = "0.24.9"
syntect = "5.2.0"
serde = { version = "1.0.197", features = ["derive", "rc"] }
serde_json = "1.0.114"
serde_yaml = "0.9.34"
jsonxf = "1.1.1"
toml = "0.8.11"
envfile = "0.2.1"
boa_engine = { version = "0.18.0", default-features = false }
parse_postman_collection = "0.2.3"
parser4curls = "0.1"
clap = { version = "4.5.0", features = ["derive", "color"] }
arboard = "3.3.2"
tokio = { version = "1.36.0", features = ["rt", "rt-multi-thread", "macros"] }
futures-io = "0.3.30"
parking_lot = { version = "0.12.2", features = ["serde"] }
strum = "0.26.2"
lazy_static = "1.4.0"
nestify = "0.3.3"
snailquote = "0.3.1"
indexmap = { version = "2.2.6", features = ["serde"] }
base64 = "0.22.0"
regex = "1.10.3"
178 changes: 88 additions & 90 deletions README.md

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions base_collections/Environments.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@
],
"body": "no_body",
"auth": "no_auth",
"scripts": {
"pre_request_script": null,
"post_request_script": null
},
"settings": {
"use_config_proxy": true,
"allow_redirects": true,
Expand Down Expand Up @@ -98,6 +102,10 @@
"auth": {
"bearer_token": "bearer_{{ID}}="
},
"scripts": {
"pre_request_script": null,
"post_request_script": null
},
"settings": {
"use_config_proxy": true,
"allow_redirects": true,
Expand Down
20 changes: 20 additions & 0 deletions base_collections/HTTP_methods.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@
],
"body": "no_body",
"auth": "no_auth",
"scripts": {
"pre_request_script": null,
"post_request_script": null
},
"settings": {
"use_config_proxy": true,
"allow_redirects": true,
Expand Down Expand Up @@ -105,6 +109,10 @@
"json": "{\n\t\"my_json\": 42\n}"
},
"auth": "no_auth",
"scripts": {
"pre_request_script": null,
"post_request_script": null
},
"settings": {
"use_config_proxy": true,
"allow_redirects": true,
Expand Down Expand Up @@ -156,6 +164,10 @@
],
"body": "no_body",
"auth": "no_auth",
"scripts": {
"pre_request_script": null,
"post_request_script": null
},
"settings": {
"use_config_proxy": true,
"allow_redirects": true,
Expand Down Expand Up @@ -207,6 +219,10 @@
],
"body": "no_body",
"auth": "no_auth",
"scripts": {
"pre_request_script": null,
"post_request_script": null
},
"settings": {
"use_config_proxy": true,
"allow_redirects": true,
Expand Down Expand Up @@ -258,6 +274,10 @@
],
"body": "no_body",
"auth": "no_auth",
"scripts": {
"pre_request_script": null,
"post_request_script": null
},
"settings": {
"use_config_proxy": true,
"allow_redirects": true,
Expand Down
12 changes: 12 additions & 0 deletions base_collections/Response formats.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@
],
"body": "no_body",
"auth": "no_auth",
"scripts": {
"pre_request_script": null,
"post_request_script": null
},
"settings": {
"use_config_proxy": true,
"allow_redirects": true,
Expand Down Expand Up @@ -96,6 +100,10 @@
],
"body": "no_body",
"auth": "no_auth",
"scripts": {
"pre_request_script": null,
"post_request_script": null
},
"settings": {
"use_config_proxy": true,
"allow_redirects": true,
Expand Down Expand Up @@ -147,6 +155,10 @@
],
"body": "no_body",
"auth": "no_auth",
"scripts": {
"pre_request_script": null,
"post_request_script": null
},
"settings": {
"use_config_proxy": true,
"allow_redirects": true,
Expand Down
170 changes: 170 additions & 0 deletions base_collections/Scripts.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
{
"name": "Scripts",
"requests": [
{
"name": "Pre-request script",
"url": "https://httpbin.org/get",
"method": "GET",
"params": [],
"headers": [
{
"enabled": true,
"data": [
"cache-control",
"no-cache"
]
},
{
"enabled": true,
"data": [
"user-agent",
"ATAC/v0.14.0"
]
},
{
"enabled": true,
"data": [
"accept",
"*/*"
]
},
{
"enabled": true,
"data": [
"accept-encoding",
"gzip, deflate, br"
]
},
{
"enabled": true,
"data": [
"connection",
"keep-alive"
]
}
],
"body": "no_body",
"auth": "no_auth",
"scripts": {
"pre_request_script": "console.log(\"Hello\")\npretty_print(request)",
"post_request_script": null
},
"settings": {
"use_config_proxy": true,
"allow_redirects": true,
"store_received_cookies": true,
"pretty_print_response_content": true
}
},
{
"name": "Post-request script",
"url": "https://httpbin.org/get",
"method": "GET",
"params": [],
"headers": [
{
"enabled": true,
"data": [
"cache-control",
"no-cache"
]
},
{
"enabled": true,
"data": [
"user-agent",
"ATAC/v0.14.0"
]
},
{
"enabled": true,
"data": [
"accept",
"*/*"
]
},
{
"enabled": true,
"data": [
"accept-encoding",
"gzip, deflate, br"
]
},
{
"enabled": true,
"data": [
"connection",
"keep-alive"
]
}
],
"body": "no_body",
"auth": "no_auth",
"scripts": {
"pre_request_script": null,
"post_request_script": "console.log(\" World!\")\npretty_print(response)"
},
"settings": {
"use_config_proxy": true,
"allow_redirects": true,
"store_received_cookies": true,
"pretty_print_response_content": true
}
},
{
"name": "Both",
"url": "https://httpbin.org/get",
"method": "GET",
"params": [],
"headers": [
{
"enabled": true,
"data": [
"cache-control",
"no-cache"
]
},
{
"enabled": true,
"data": [
"user-agent",
"ATAC/v0.14.0"
]
},
{
"enabled": true,
"data": [
"accept",
"*/*"
]
},
{
"enabled": true,
"data": [
"accept-encoding",
"gzip, deflate, br"
]
},
{
"enabled": true,
"data": [
"connection",
"keep-alive"
]
}
],
"body": "no_body",
"auth": "no_auth",
"scripts": {
"pre_request_script": "console.log(\"Hello\")\n\nrequest.url = \"https://google.com\"\n\npretty_print(request)",
"post_request_script": "console.log(\" World!\")\n\nenv.ID = \"3\"\n\npretty_print(env)\npretty_print(response)"
},
"settings": {
"use_config_proxy": true,
"allow_redirects": true,
"store_received_cookies": true,
"pretty_print_response_content": true
}
}
]
}
8 changes: 8 additions & 0 deletions base_collections/auth.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@
"password"
]
},
"scripts": {
"pre_request_script": null,
"post_request_script": null
},
"settings": {
"use_config_proxy": true,
"allow_redirects": true,
Expand Down Expand Up @@ -103,6 +107,10 @@
"auth": {
"bearer_token": "my_bearer="
},
"scripts": {
"pre_request_script": null,
"post_request_script": null
},
"settings": {
"use_config_proxy": true,
"allow_redirects": true,
Expand Down
8 changes: 8 additions & 0 deletions base_collections/cookies.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@
],
"body": "no_body",
"auth": "no_auth",
"scripts": {
"pre_request_script": null,
"post_request_script": null
},
"settings": {
"use_config_proxy": true,
"allow_redirects": true,
Expand Down Expand Up @@ -104,6 +108,10 @@
],
"body": "no_body",
"auth": "no_auth",
"scripts": {
"pre_request_script": null,
"post_request_script": null
},
"settings": {
"use_config_proxy": true,
"allow_redirects": true,
Expand Down

0 comments on commit 6052af3

Please sign in to comment.