diff --git a/public/img/book6.png b/public/img/unused PNG/book6.png similarity index 100% rename from public/img/book6.png rename to public/img/unused PNG/book6.png diff --git a/public/img/cancel.png b/public/img/unused PNG/cancel.png similarity index 100% rename from public/img/cancel.png rename to public/img/unused PNG/cancel.png diff --git a/public/img/coins.png b/public/img/unused PNG/coins.png similarity index 100% rename from public/img/coins.png rename to public/img/unused PNG/coins.png diff --git a/public/img/del_mes.png b/public/img/unused PNG/del_mes.png similarity index 100% rename from public/img/del_mes.png rename to public/img/unused PNG/del_mes.png diff --git a/public/img/done.png b/public/img/unused PNG/done.png similarity index 100% rename from public/img/done.png rename to public/img/unused PNG/done.png diff --git a/public/img/love.png b/public/img/unused PNG/love.png similarity index 100% rename from public/img/love.png rename to public/img/unused PNG/love.png diff --git a/public/img/regenerate.png b/public/img/unused PNG/regenerate.png similarity index 100% rename from public/img/regenerate.png rename to public/img/unused PNG/regenerate.png diff --git a/public/img/send3.png b/public/img/unused PNG/send3.png similarity index 100% rename from public/img/send3.png rename to public/img/unused PNG/send3.png diff --git a/public/img/address-book-solid.svg b/public/img/unused SVG/address-book-solid.svg similarity index 100% rename from public/img/address-book-solid.svg rename to public/img/unused SVG/address-book-solid.svg diff --git a/public/img/book-atlas-solid.svg b/public/img/unused SVG/book-atlas-solid.svg similarity index 100% rename from public/img/book-atlas-solid.svg rename to public/img/unused SVG/book-atlas-solid.svg diff --git a/public/img/book-solid.svg b/public/img/unused SVG/book-solid.svg similarity index 100% rename from public/img/book-solid.svg rename to public/img/unused SVG/book-solid.svg diff --git a/public/img/bookmark-solid.svg b/public/img/unused SVG/bookmark-solid.svg similarity index 100% rename from public/img/bookmark-solid.svg rename to public/img/unused SVG/bookmark-solid.svg diff --git a/public/img/check-solid.svg b/public/img/unused SVG/check-solid.svg similarity index 100% rename from public/img/check-solid.svg rename to public/img/unused SVG/check-solid.svg diff --git a/public/img/chevron-down-solid.svg b/public/img/unused SVG/chevron-down-solid.svg similarity index 100% rename from public/img/chevron-down-solid.svg rename to public/img/unused SVG/chevron-down-solid.svg diff --git a/public/img/chevron-up-solid.svg b/public/img/unused SVG/chevron-up-solid.svg similarity index 100% rename from public/img/chevron-up-solid.svg rename to public/img/unused SVG/chevron-up-solid.svg diff --git a/public/img/circle-chevron-down-solid.svg b/public/img/unused SVG/circle-chevron-down-solid.svg similarity index 100% rename from public/img/circle-chevron-down-solid.svg rename to public/img/unused SVG/circle-chevron-down-solid.svg diff --git a/public/img/circle-chevron-up-solid.svg b/public/img/unused SVG/circle-chevron-up-solid.svg similarity index 100% rename from public/img/circle-chevron-up-solid.svg rename to public/img/unused SVG/circle-chevron-up-solid.svg diff --git a/public/img/clock-rotate-left-solid.svg b/public/img/unused SVG/clock-rotate-left-solid.svg similarity index 100% rename from public/img/clock-rotate-left-solid.svg rename to public/img/unused SVG/clock-rotate-left-solid.svg diff --git a/public/img/cloud-arrow-up-solid.svg b/public/img/unused SVG/cloud-arrow-up-solid.svg similarity index 100% rename from public/img/cloud-arrow-up-solid.svg rename to public/img/unused SVG/cloud-arrow-up-solid.svg diff --git a/public/img/comment-dots-solid.svg b/public/img/unused SVG/comment-dots-solid.svg similarity index 100% rename from public/img/comment-dots-solid.svg rename to public/img/unused SVG/comment-dots-solid.svg diff --git a/public/img/comment-medical-solid.svg b/public/img/unused SVG/comment-medical-solid.svg similarity index 100% rename from public/img/comment-medical-solid.svg rename to public/img/unused SVG/comment-medical-solid.svg diff --git a/public/img/copy-solid.svg b/public/img/unused SVG/copy-solid.svg similarity index 100% rename from public/img/copy-solid.svg rename to public/img/unused SVG/copy-solid.svg diff --git a/public/img/cubes-solid.svg b/public/img/unused SVG/cubes-solid.svg similarity index 100% rename from public/img/cubes-solid.svg rename to public/img/unused SVG/cubes-solid.svg diff --git a/public/img/dice-solid.svg b/public/img/unused SVG/dice-solid.svg similarity index 100% rename from public/img/dice-solid.svg rename to public/img/unused SVG/dice-solid.svg diff --git a/public/img/face-smile-regular.svg b/public/img/unused SVG/face-smile-regular.svg similarity index 100% rename from public/img/face-smile-regular.svg rename to public/img/unused SVG/face-smile-regular.svg diff --git a/public/img/file-arrow-up-solid.svg b/public/img/unused SVG/file-arrow-up-solid.svg similarity index 100% rename from public/img/file-arrow-up-solid.svg rename to public/img/unused SVG/file-arrow-up-solid.svg diff --git a/public/img/file-export-solid.svg b/public/img/unused SVG/file-export-solid.svg similarity index 100% rename from public/img/file-export-solid.svg rename to public/img/unused SVG/file-export-solid.svg diff --git a/public/img/file-image-solid.svg b/public/img/unused SVG/file-image-solid.svg similarity index 100% rename from public/img/file-image-solid.svg rename to public/img/unused SVG/file-image-solid.svg diff --git a/public/img/font-solid.svg b/public/img/unused SVG/font-solid.svg similarity index 100% rename from public/img/font-solid.svg rename to public/img/unused SVG/font-solid.svg diff --git a/public/img/gear-solid.svg b/public/img/unused SVG/gear-solid.svg similarity index 100% rename from public/img/gear-solid.svg rename to public/img/unused SVG/gear-solid.svg diff --git a/public/img/hourglass-half-solid.svg b/public/img/unused SVG/hourglass-half-solid.svg similarity index 100% rename from public/img/hourglass-half-solid.svg rename to public/img/unused SVG/hourglass-half-solid.svg diff --git a/public/img/id-card-regular.svg b/public/img/unused SVG/id-card-regular.svg similarity index 100% rename from public/img/id-card-regular.svg rename to public/img/unused SVG/id-card-regular.svg diff --git a/public/img/image-solid.svg b/public/img/unused SVG/image-solid.svg similarity index 100% rename from public/img/image-solid.svg rename to public/img/unused SVG/image-solid.svg diff --git a/public/img/left-long-solid.svg b/public/img/unused SVG/left-long-solid.svg similarity index 100% rename from public/img/left-long-solid.svg rename to public/img/unused SVG/left-long-solid.svg diff --git a/public/img/list-ul-solid.svg b/public/img/unused SVG/list-ul-solid.svg similarity index 100% rename from public/img/list-ul-solid.svg rename to public/img/unused SVG/list-ul-solid.svg diff --git a/public/img/load.svg b/public/img/unused SVG/load.svg similarity index 100% rename from public/img/load.svg rename to public/img/unused SVG/load.svg diff --git a/public/img/load2.svg b/public/img/unused SVG/load2.svg similarity index 100% rename from public/img/load2.svg rename to public/img/unused SVG/load2.svg diff --git a/public/img/lock-open-solid.svg b/public/img/unused SVG/lock-open-solid.svg similarity index 100% rename from public/img/lock-open-solid.svg rename to public/img/unused SVG/lock-open-solid.svg diff --git a/public/img/lock-solid.svg b/public/img/unused SVG/lock-solid.svg similarity index 100% rename from public/img/lock-solid.svg rename to public/img/unused SVG/lock-solid.svg diff --git a/public/img/minus-solid.svg b/public/img/unused SVG/minus-solid.svg similarity index 100% rename from public/img/minus-solid.svg rename to public/img/unused SVG/minus-solid.svg diff --git a/public/img/panorama-solid.svg b/public/img/unused SVG/panorama-solid.svg similarity index 100% rename from public/img/panorama-solid.svg rename to public/img/unused SVG/panorama-solid.svg diff --git a/public/img/pencil-solid.svg b/public/img/unused SVG/pencil-solid.svg similarity index 100% rename from public/img/pencil-solid.svg rename to public/img/unused SVG/pencil-solid.svg diff --git a/public/img/plug-circle-exclamation-solid.svg b/public/img/unused SVG/plug-circle-exclamation-solid.svg similarity index 100% rename from public/img/plug-circle-exclamation-solid.svg rename to public/img/unused SVG/plug-circle-exclamation-solid.svg diff --git a/public/img/plug-solid.svg b/public/img/unused SVG/plug-solid.svg similarity index 100% rename from public/img/plug-solid.svg rename to public/img/unused SVG/plug-solid.svg diff --git a/public/img/plus-solid.svg b/public/img/unused SVG/plus-solid.svg similarity index 100% rename from public/img/plus-solid.svg rename to public/img/unused SVG/plus-solid.svg diff --git a/public/img/repeat-solid.svg b/public/img/unused SVG/repeat-solid.svg similarity index 100% rename from public/img/repeat-solid.svg rename to public/img/unused SVG/repeat-solid.svg diff --git a/public/img/scissors-solid.svg b/public/img/unused SVG/scissors-solid.svg similarity index 100% rename from public/img/scissors-solid.svg rename to public/img/unused SVG/scissors-solid.svg diff --git a/public/img/sliders-solid.svg b/public/img/unused SVG/sliders-solid.svg similarity index 100% rename from public/img/sliders-solid.svg rename to public/img/unused SVG/sliders-solid.svg diff --git a/public/img/spinner-solid.svg b/public/img/unused SVG/spinner-solid.svg similarity index 100% rename from public/img/spinner-solid.svg rename to public/img/unused SVG/spinner-solid.svg diff --git a/public/img/trash-can-solid.svg b/public/img/unused SVG/trash-can-solid.svg similarity index 100% rename from public/img/trash-can-solid.svg rename to public/img/unused SVG/trash-can-solid.svg diff --git a/public/img/user-check-solid.svg b/public/img/unused SVG/user-check-solid.svg similarity index 100% rename from public/img/user-check-solid.svg rename to public/img/unused SVG/user-check-solid.svg diff --git a/public/img/user-group-solid.svg b/public/img/unused SVG/user-group-solid.svg similarity index 100% rename from public/img/user-group-solid.svg rename to public/img/unused SVG/user-group-solid.svg diff --git a/public/img/user-group-solidplus.svg b/public/img/unused SVG/user-group-solidplus.svg similarity index 100% rename from public/img/user-group-solidplus.svg rename to public/img/unused SVG/user-group-solidplus.svg diff --git a/public/img/user-pen-solid.svg b/public/img/unused SVG/user-pen-solid.svg similarity index 100% rename from public/img/user-pen-solid.svg rename to public/img/unused SVG/user-pen-solid.svg diff --git a/public/img/user-plus-solid.svg b/public/img/unused SVG/user-plus-solid.svg similarity index 100% rename from public/img/user-plus-solid.svg rename to public/img/unused SVG/user-plus-solid.svg diff --git a/public/img/user-slash-solid.svg b/public/img/unused SVG/user-slash-solid.svg similarity index 100% rename from public/img/user-slash-solid.svg rename to public/img/unused SVG/user-slash-solid.svg diff --git a/public/img/user-solid.svg b/public/img/unused SVG/user-solid.svg similarity index 100% rename from public/img/user-solid.svg rename to public/img/unused SVG/user-solid.svg diff --git a/public/img/wifi-solid.svg b/public/img/unused SVG/wifi-solid.svg similarity index 100% rename from public/img/wifi-solid.svg rename to public/img/unused SVG/wifi-solid.svg diff --git a/public/img/xmark-solid.svg b/public/img/unused SVG/xmark-solid.svg similarity index 100% rename from public/img/xmark-solid.svg rename to public/img/unused SVG/xmark-solid.svg diff --git a/public/index.html b/public/index.html index 819fe0b18..d3cf401df 100644 --- a/public/index.html +++ b/public/index.html @@ -5,13 +5,12 @@ - - + - + @@ -66,14 +65,14 @@
-
+
@@ -666,7 +665,7 @@
Main prompt
- +
@@ -680,7 +679,7 @@
NSFW prompt
- +
@@ -694,7 +693,7 @@
Jailbreak prompt
- +
@@ -751,7 +750,7 @@
-
+
@@ -776,7 +775,7 @@
Example: http://127.0.0.1:5000/api
- +
@@ -791,7 +790,7 @@

Model
- +

- +
@@ -838,7 +837,7 @@
Example: http://127.0.0.1:7860/
- +
@@ -855,7 +854,7 @@ - +
@@ -870,7 +869,7 @@
Instructions: -
+
    @@ -892,7 +891,7 @@
- +
@@ -917,7 +916,7 @@
-
+

Advanced Formatting @@ -997,7 +996,7 @@
-
+
@@ -1050,7 +1049,7 @@
-
+

User Settings

@@ -1223,7 +1222,7 @@
@@ -1241,7 +1240,7 @@
-
+
@@ -1277,22 +1276,20 @@
-
+
-
@@ -1378,9 +1365,7 @@
- +
@@ -1427,8 +1412,8 @@
- Remove - Add +
+
@@ -1439,7 +1424,7 @@
- +
@@ -1454,15 +1439,9 @@
- - - +
+
+
@@ -1677,9 +1656,7 @@
- +

@@ -1699,7 +1676,7 @@
- +
@@ -1709,7 +1686,7 @@
-
+
${characterName} @@ -1717,26 +1694,14 @@
-
+
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
+
+
+
+
+
+
@@ -1744,8 +1709,8 @@
-
- +
+
@@ -1788,27 +1753,28 @@ diff --git a/public/script.js b/public/script.js index 47c61895e..6c49fed03 100644 --- a/public/script.js +++ b/public/script.js @@ -302,7 +302,7 @@ $(document).ajaxError(function myErrorHandler(_, xhr) { } }); -function getTokenCount(str, padding=0) { +function getTokenCount(str, padding = 0) { if (main_api == 'poe' || main_api == 'openai') { return gpt3.encode(str).bpe.length + padding; } @@ -961,7 +961,9 @@ function addOneMessage(mes, type = "normal", insertAfter = null) { } newMessage.find('.avatar img').on('error', function () { - $(this).attr("src", "/img/user-slash-solid.svg"); + /* $(this).attr("src", "/img/user-slash-solid.svg"); */ + $(this).hide(); + $(this).parent().html(`
`); }); if (type === 'swipe') { @@ -1150,13 +1152,13 @@ function isStreamingEnabled() { class StreamingProcessor { showStopButton(messageId) { - $(`#chat .mes[mesid="${messageId}"] .mes_stop`).css({'display': 'block'}); - $(`#chat .mes[mesid="${messageId}"] .mes_edit`).css({'display': 'none'}); + $(`#chat .mes[mesid="${messageId}"] .mes_stop`).css({ 'display': 'block' }); + $(`#chat .mes[mesid="${messageId}"] .mes_edit`).css({ 'display': 'none' }); } hideStopButton(messageId) { - $(`#chat .mes[mesid="${messageId}"] .mes_stop`).css({'display': 'none'}); - $(`#chat .mes[mesid="${messageId}"] .mes_edit`).css({'display': 'block'}); + $(`#chat .mes[mesid="${messageId}"] .mes_stop`).css({ 'display': 'none' }); + $(`#chat .mes[mesid="${messageId}"] .mes_edit`).css({ 'display': 'block' }); } onStartStreaming(text) { @@ -1922,7 +1924,7 @@ async function Generate(type, automatic_trigger, force_name2) { getMessage = message_already_generated; } - + if (streamingProcessor.isFinished) { streamingProcessor.onFinishStreaming(streamingProcessor.messageId, getMessage); streamingProcessor = null; @@ -4929,6 +4931,7 @@ $(document).ready(function () { $(document).on('click', '.inline-drawer-toggle', function () { var icon = $(this).find('.inline-drawer-icon'); icon.toggleClass('down up'); + icon.toggleClass('fa-circle-chevron-down fa-circle-chevron-up'); $(this).closest('.inline-drawer').find('.inline-drawer-content').slideToggle(); }); diff --git a/public/scripts/RossAscends-mods.js b/public/scripts/RossAscends-mods.js index 189b828c0..15856e2fa 100644 --- a/public/scripts/RossAscends-mods.js +++ b/public/scripts/RossAscends-mods.js @@ -203,16 +203,18 @@ function RA_checkOnlineStatus() { $("#send_textarea").attr("placeholder", "Not connected to API!"); //Input bar placeholder tells users they are not connected $("#send_form").addClass('no-connection'); //entire input form area is red when not connected $("#send_but").css("display", "none"); //send button is hidden when not connected; - $("#API-status-top").addClass("redOverlayGlow"); + $("#API-status-top").removeClass("fa-plug"); + $("#API-status-top").addClass("fa-plug-circle-exclamation redOverlayGlow"); connection_made = false; } else { if (online_status !== undefined && online_status !== "no_connection") { $("#send_textarea").attr("placeholder", "Type a message..."); //on connect, placeholder tells user to type message - const formColor = power_user.fast_ui_mode ? "var(--black90a)" : "var(--black60a)"; + const formColor = power_user.fast_ui_mode ? "var(--SmartThemeFastUIBGColor)" : "var(--SmartThemeBlurTintColor)"; /* console.log("RA-AC -- connected, coloring input as " + formColor); */ $('#send_form').removeClass("no-connection"); $("#send_form").css("background-color", formColor); //on connect, form BG changes to transprent black - $("#API-status-top").removeClass("redOverlayGlow"); + $("#API-status-top").removeClass("fa-plug-circle-exclamation redOverlayGlow"); + $("#API-status-top").addClass("fa-plug"); connection_made = true; retry_delay = 100; RA_AC_retries = 1; diff --git a/public/scripts/extensions/dice/index.js b/public/scripts/extensions/dice/index.js index 2b098fce5..81b1129ce 100644 --- a/public/scripts/extensions/dice/index.js +++ b/public/scripts/extensions/dice/index.js @@ -7,13 +7,13 @@ const UPDATE_INTERVAL = 1000; function setDiceIcon() { const sendButton = document.getElementById('roll_dice'); - sendButton.style.backgroundImage = `url(/img/dice-solid.svg)`; + /* sendButton.style.backgroundImage = `url(/img/dice-solid.svg)`; */ sendButton.classList.remove('spin'); } async function doDiceRoll() { let value = $(this).data('value'); - + if (value == 'custom') { value = await callPopup('Enter the dice formula:
(for example, 2d6)', 'input'); } @@ -29,7 +29,7 @@ async function doDiceRoll() { function addDiceRollButton() { const buttonHtml = ` - +
  • d4
    • diff --git a/public/scripts/extensions/dice/style.css b/public/scripts/extensions/dice/style.css index 268e363b8..18edafdd2 100644 --- a/public/scripts/extensions/dice/style.css +++ b/public/scripts/extensions/dice/style.css @@ -3,6 +3,7 @@ width: 40px; height: 40px; margin: 0; + margin-right: 5px; padding: 1px; background: no-repeat; background-size: 26px auto; @@ -11,10 +12,10 @@ border: none; cursor: pointer; transition: 0.3s; - filter: invert(1); + font-size: 30px; opacity: 0.5; } #roll_dice:hover { opacity: 1; -} +} \ No newline at end of file diff --git a/public/scripts/extensions/expressions/index.js b/public/scripts/extensions/expressions/index.js index 1f7eddee1..9a42b8706 100644 --- a/public/scripts/extensions/expressions/index.js +++ b/public/scripts/extensions/expressions/index.js @@ -237,7 +237,7 @@ function onClickExpressionImage() {
    View supported images -
    +

    You are in offline mode. Click on the image below to set the expression.

    diff --git a/public/scripts/extensions/floating-prompt/index.js b/public/scripts/extensions/floating-prompt/index.js index 62a19264a..4d00ebce3 100644 --- a/public/scripts/extensions/floating-prompt/index.js +++ b/public/scripts/extensions/floating-prompt/index.js @@ -95,13 +95,13 @@ async function moduleWorker() { $('#extension_floating_counter').text(shouldAddPrompt ? 'This' : messagesTillInsertion); } -(function() { +(function () { function addExtensionsSettings() { const settingsHtml = `

    Author's Note / Character Bias

    - +