diff --git a/web/index.html b/web/index.html index 0650dc1..bfc45f5 100644 --- a/web/index.html +++ b/web/index.html @@ -31,19 +31,19 @@
diff --git a/web/login.html b/web/login.html index c61b58b..1183bd0 100644 --- a/web/login.html +++ b/web/login.html @@ -35,20 +35,20 @@
@@ -88,7 +88,7 @@
-
+
Telegram
diff --git a/web/pub.html b/web/pub.html index c2fe3d8..a841a04 100644 --- a/web/pub.html +++ b/web/pub.html @@ -36,14 +36,14 @@
diff --git a/web/style.css b/web/style.css index 21d99b7..d790d76 100644 --- a/web/style.css +++ b/web/style.css @@ -9,7 +9,7 @@ input[type=checkbox] { input[type=text] { display: flex; flex-grow: 1; - min-width: 64px; + width: 64px; height: 20px; border-color: #94a3b8; border-width: 1px; diff --git a/web/sub-details.html b/web/sub-details.html index c39601a..530298c 100644 --- a/web/sub-details.html +++ b/web/sub-details.html @@ -17,15 +17,23 @@ -
-

Subscription Details

+
+
+ + Subscription Details +
- Id - + Id +
- - + +
diff --git a/web/sub-details.js b/web/sub-details.js index 20d1ec8..4b729c2 100644 --- a/web/sub-details.js +++ b/web/sub-details.js @@ -20,34 +20,34 @@ function loadSubscription() { const id = urlParams.get("id"); document.getElementById("subId").innerHTML = urlParams.get("id"); // - // const data = {"description":"Exoplanets","enabled":true,"cond":{"gc":{"logic":"Or","group":[{"tc":{"id":"txt_651f009c25fef58d2c176c06","term":"exoplanet экзопланета экзопланет экзопланеты экзопланету"}},{"gc":{"group":[{"tc":{"id":"txt_651f009c25fef58d2c176c13","term":"planet"}},{"tc":{"id":"txt_651f009c25fef58d2c176c27","term":"extrasolar"}}]}}]}},"expires":"0001-01-01T00:00:00Z"}; - // editor.setValue(data.cond); + const data = {"description":"Exoplanets","enabled":true,"cond":{"gc":{"logic":"Or","group":[{"tc":{"id":"txt_651f009c25fef58d2c176c06","term":"exoplanet экзопланета экзопланет экзопланеты экзопланету"}},{"gc":{"group":[{"tc":{"id":"txt_651f009c25fef58d2c176c13","term":"planet"}},{"tc":{"id":"txt_651f009c25fef58d2c176c27","term":"extrasolar"}}]}}]}},"expires":"0001-01-01T00:00:00Z"}; + editor.setValue(data.cond); // - let authToken = sessionStorage.getItem("authToken"); - let userId = sessionStorage.getItem("userId"); - let optsReq = { - method: "GET", - headers: { - "Authorization": `Bearer ${authToken}`, - "X-Awakari-Group-Id": defaultGroupId, - "X-Awakari-User-Id": userId, - }, - cache: "default", - } - fetch(`/v1/sub/${id}`, optsReq) - .then(resp => { - if (!resp.ok) { - throw new Error(`Request failed with status: ${resp.status}`); - } - return resp.json(); - }) - .then(data => { - if (data != null) { - document.getElementById("subDescr").value = data.description; - editor.setValue(data.cond); - } - }) - .catch(err => { - alert(err); - }); + // let authToken = sessionStorage.getItem("authToken"); + // let userId = sessionStorage.getItem("userId"); + // let optsReq = { + // method: "GET", + // headers: { + // "Authorization": `Bearer ${authToken}`, + // "X-Awakari-Group-Id": defaultGroupId, + // "X-Awakari-User-Id": userId, + // }, + // cache: "default", + // } + // fetch(`/v1/sub/${id}`, optsReq) + // .then(resp => { + // if (!resp.ok) { + // throw new Error(`Request failed with status: ${resp.status}`); + // } + // return resp.json(); + // }) + // .then(data => { + // if (data != null) { + // document.getElementById("subDescr").value = data.description; + // editor.setValue(data.cond); + // } + // }) + // .catch(err => { + // alert(err); + // }); } diff --git a/web/sub.html b/web/sub.html index 61876ca..68a9c69 100644 --- a/web/sub.html +++ b/web/sub.html @@ -38,13 +38,13 @@
diff --git a/web/tailwind.output.css b/web/tailwind.output.css index c379132..dcfc2db 100644 --- a/web/tailwind.output.css +++ b/web/tailwind.output.css @@ -644,6 +644,10 @@ video { margin-right: -0.25rem; } +.-mt-1 { + margin-top: -0.25rem; +} + .-mt-4 { margin-top: -1rem; } @@ -942,6 +946,12 @@ video { margin-left: calc(0.5rem * calc(1 - var(--tw-space-x-reverse))); } +.space-y-1 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(0.25rem * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(0.25rem * var(--tw-space-y-reverse)); +} + .space-y-2 > :not([hidden]) ~ :not([hidden]) { --tw-space-y-reverse: 0; margin-top: calc(0.5rem * calc(1 - var(--tw-space-y-reverse)));