diff --git a/src/main/java/ee/carlrobert/codegpt/settings/service/YouServiceSelectionForm.java b/src/main/java/ee/carlrobert/codegpt/settings/service/YouServiceSelectionForm.java index 8944d64c..cd67ef11 100644 --- a/src/main/java/ee/carlrobert/codegpt/settings/service/YouServiceSelectionForm.java +++ b/src/main/java/ee/carlrobert/codegpt/settings/service/YouServiceSelectionForm.java @@ -154,24 +154,7 @@ public class YouServiceSelectionForm extends JPanel { JBTextField emailAddressField, JBPasswordField passwordField, @Nullable YouAuthenticationError error) { - var couponLabel = new JBLabel( - "" - + "" - + "

Free GPT-4

" - + "

" - + "Your coupon code" - + "

" - + "

" - + "CODEGPT" - + "

" - + "" - + "") - .withBorder(JBUI.Borders.emptyLeft(45)) // TODO - .setCopyable(true); - var contentPanelBuilder = FormBuilder.createFormBuilder() - .addComponentToRightColumn(JBUI.Panels.simplePanel().addToLeft(couponLabel)) .addLabeledComponent(CodeGPTBundle.get("settingsConfigurable.service.you.email.label"), emailAddressField) .addLabeledComponent(CodeGPTBundle.get("settingsConfigurable.service.you.password.label"), diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/BaseChatToolWindowTabPanel.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/BaseChatToolWindowTabPanel.java index 70f1fafc..10fd809e 100644 --- a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/BaseChatToolWindowTabPanel.java +++ b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/BaseChatToolWindowTabPanel.java @@ -59,14 +59,13 @@ public abstract class BaseChatToolWindowTabPanel implements ChatToolWindowTabPan this.conversation = conversation; this.useContextualSearch = useContextualSearch; conversationService = ConversationService.getInstance(); - var settings = SettingsState.getInstance(); - toolWindowScrollablePanel = new ChatToolWindowScrollablePanel(settings); + toolWindowScrollablePanel = new ChatToolWindowScrollablePanel(); totalTokensPanel = new TotalTokensPanel( conversation, EditorUtil.getSelectedEditorSelectedText(project), this); userPromptTextArea = new UserPromptTextArea(this::handleSubmit, totalTokensPanel); - rootPanel = createRootPanel(settings.getSelectedService()); + rootPanel = createRootPanel(); userPromptTextArea.requestFocusInWindow(); userPromptTextArea.requestFocus(); } @@ -216,7 +215,7 @@ public abstract class BaseChatToolWindowTabPanel implements ChatToolWindowTabPan return panel; } - private JPanel createRootPanel(ServiceType selectedService) { + private JPanel createRootPanel() { var gbc = new GridBagConstraints(); gbc.fill = GridBagConstraints.BOTH; gbc.weighty = 1; @@ -230,7 +229,8 @@ public abstract class BaseChatToolWindowTabPanel implements ChatToolWindowTabPan gbc.weighty = 0; gbc.fill = GridBagConstraints.HORIZONTAL; gbc.gridy = 1; - rootPanel.add(createUserPromptPanel(selectedService), gbc); + rootPanel.add( + createUserPromptPanel(SettingsState.getInstance().getSelectedService()), gbc); return rootPanel; } } \ No newline at end of file diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ChatToolWindowScrollablePanel.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ChatToolWindowScrollablePanel.java index 7bb8cff4..40860b29 100644 --- a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ChatToolWindowScrollablePanel.java +++ b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ChatToolWindowScrollablePanel.java @@ -2,11 +2,7 @@ package ee.carlrobert.codegpt.toolwindow.chat; import com.intellij.openapi.roots.ui.componentsList.components.ScrollablePanel; import com.intellij.openapi.roots.ui.componentsList.layout.VerticalStackLayout; -import ee.carlrobert.codegpt.completions.you.YouUserManager; -import ee.carlrobert.codegpt.settings.service.ServiceType; -import ee.carlrobert.codegpt.settings.state.SettingsState; import ee.carlrobert.codegpt.toolwindow.chat.components.ResponsePanel; -import ee.carlrobert.codegpt.util.UIUtil; import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -14,28 +10,18 @@ import java.util.UUID; import javax.swing.BoxLayout; import javax.swing.JComponent; import javax.swing.JPanel; -import javax.swing.JTextPane; public class ChatToolWindowScrollablePanel extends ScrollablePanel { - private final SettingsState settings; - private final YouUserManager youUserManager; - private final Map visibleMessagePanels; + private final Map visibleMessagePanels = new HashMap<>(); - ChatToolWindowScrollablePanel(SettingsState settings) { + ChatToolWindowScrollablePanel() { super(new VerticalStackLayout()); - this.settings = settings; - this.youUserManager = YouUserManager.getInstance(); - this.visibleMessagePanels = new HashMap<>(); } public void displayLandingView(JComponent landingView) { clearAll(); add(landingView); - if (settings.getSelectedService() == ServiceType.YOU - && (!youUserManager.isAuthenticated() || !youUserManager.isSubscribed())) { - add(new ResponsePanel().addContent(createYouCouponTextPane())); - } } public ResponsePanel getMessageResponsePanel(UUID messageId) { @@ -68,18 +54,4 @@ public class ChatToolWindowScrollablePanel extends ScrollablePanel { repaint(); revalidate(); } - - // TODO: Move - private JTextPane createYouCouponTextPane() { - return UIUtil.createTextPane( - "\n" - + "\n" - + "

Use CodeGPT coupon for free month of GPT-4.

\n" - + "

\n" - + " Sign up here\n" - + "

\n" - + "\n" - + "", - false); - } }