Compare commits
14
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 SuperDooper
|
f548210387 | ||
|
SuperDooper
|
89659322ac | ||
|
SuperDooper
|
bfa476a276 | ||
|
SuperDooper
|
7f7024d976 | ||
|
SuperDooper
|
f6dc91f38c | ||
|
SuperDooper
|
721075d969 | ||
|
SuperDooper
|
87ce720a31 | ||
|
SuperDooper
|
1172fd8f4e | ||
|
SuperDooper
|
11f097b969 | ||
|
SuperDooper
|
6e992d56af | ||
|
SuperDooper
|
49a0a8c9dd | ||
|
SuperDooper
|
f63de02861 | ||
|
SuperDooper
|
acabb0e101 | ||
|
SuperDooper
|
4945097e8b |
+86
-8
@@ -15,16 +15,18 @@
|
||||
<SolidColorBrush x:Key="SurfaceBrush" Color="#FAFAFA" po:Freeze="False"/>
|
||||
<SolidColorBrush x:Key="BannerBgBrush" Color="#E8F2FB" po:Freeze="False"/>
|
||||
<SolidColorBrush x:Key="BannerBorderBrush" Color="#B3D6F5" po:Freeze="False"/>
|
||||
<SolidColorBrush x:Key="HoverBrush" Color="#EBEBEB" po:Freeze="False"/>
|
||||
<SolidColorBrush x:Key="BadgeBrush" Color="#F0F0F0" po:Freeze="False"/>
|
||||
|
||||
<Style x:Key="HeaderText" TargetType="TextBlock">
|
||||
<Setter Property="FontSize" Value="10"/>
|
||||
<Setter Property="FontWeight" Value="SemiBold"/>
|
||||
<Setter Property="Foreground" Value="{StaticResource SecondaryBrush}"/>
|
||||
<Setter Property="Foreground" Value="{DynamicResource SecondaryBrush}"/>
|
||||
<Setter Property="FontFamily" Value="Segoe UI"/>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="PrimaryButton" TargetType="Button">
|
||||
<Setter Property="Background" Value="{StaticResource BlueBrush}"/>
|
||||
<Setter Property="Background" Value="{DynamicResource BlueBrush}"/>
|
||||
<Setter Property="Foreground" Value="White"/>
|
||||
<Setter Property="BorderThickness" Value="0"/>
|
||||
<Setter Property="Padding" Value="14,6"/>
|
||||
@@ -53,10 +55,10 @@
|
||||
</Style>
|
||||
|
||||
<Style x:Key="SmallButton" TargetType="Button">
|
||||
<Setter Property="Background" Value="{StaticResource ButtonBrush}"/>
|
||||
<Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
|
||||
<Setter Property="Background" Value="{DynamicResource ButtonBrush}"/>
|
||||
<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
|
||||
<Setter Property="BorderThickness" Value="1"/>
|
||||
<Setter Property="Foreground" Value="{StaticResource TextBrush}"/>
|
||||
<Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
|
||||
<Setter Property="Padding" Value="10,4"/>
|
||||
<Setter Property="FontSize" Value="12"/>
|
||||
<Setter Property="FontFamily" Value="Segoe UI"/>
|
||||
@@ -72,7 +74,7 @@
|
||||
</Border>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsMouseOver" Value="True">
|
||||
<Setter Property="Background" Value="#F0F0F0"/>
|
||||
<Setter Property="Background" Value="{DynamicResource HoverBrush}"/>
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
@@ -81,8 +83,84 @@
|
||||
</Style>
|
||||
|
||||
<Style TargetType="ComboBox">
|
||||
<Setter Property="FontFamily" Value="Segoe UI"/>
|
||||
<Setter Property="FontSize" Value="12"/>
|
||||
<Setter Property="FontFamily" Value="Segoe UI"/>
|
||||
<Setter Property="FontSize" Value="12"/>
|
||||
<Setter Property="Background" Value="{DynamicResource CardBrush}"/>
|
||||
<Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
|
||||
<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
|
||||
<Setter Property="BorderThickness" Value="1"/>
|
||||
<Setter Property="Padding" Value="8,4"/>
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="ComboBox">
|
||||
<Grid>
|
||||
<Border x:Name="Border"
|
||||
Background="{TemplateBinding Background}"
|
||||
BorderBrush="{TemplateBinding BorderBrush}"
|
||||
BorderThickness="{TemplateBinding BorderThickness}"
|
||||
CornerRadius="4">
|
||||
<Grid>
|
||||
<ContentPresenter x:Name="ContentSite"
|
||||
IsHitTestVisible="False"
|
||||
Content="{TemplateBinding SelectionBoxItem}"
|
||||
ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
|
||||
Margin="{TemplateBinding Padding}"
|
||||
VerticalAlignment="Center" HorizontalAlignment="Left"/>
|
||||
<TextBlock Text="▾" FontSize="10"
|
||||
Foreground="{DynamicResource SecondaryBrush}"
|
||||
HorizontalAlignment="Right" VerticalAlignment="Center"
|
||||
Margin="0,0,8,0" IsHitTestVisible="False"/>
|
||||
<ToggleButton Focusable="False" ClickMode="Press"
|
||||
IsChecked="{Binding IsDropDownOpen, Mode=TwoWay,
|
||||
RelativeSource={RelativeSource TemplatedParent}}"
|
||||
Background="Transparent" BorderThickness="0"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
<Popup x:Name="Popup" Placement="Bottom"
|
||||
IsOpen="{TemplateBinding IsDropDownOpen}"
|
||||
AllowsTransparency="True" Focusable="False"
|
||||
PopupAnimation="Slide">
|
||||
<Border SnapsToDevicePixels="True"
|
||||
MinWidth="{TemplateBinding ActualWidth}"
|
||||
MaxHeight="{TemplateBinding MaxDropDownHeight}"
|
||||
Background="{DynamicResource CardBrush}"
|
||||
BorderBrush="{DynamicResource BorderBrush}"
|
||||
BorderThickness="1" CornerRadius="4">
|
||||
<ScrollViewer Margin="0,2">
|
||||
<ItemsPresenter/>
|
||||
</ScrollViewer>
|
||||
</Border>
|
||||
</Popup>
|
||||
</Grid>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
<Setter Property="ItemContainerStyle">
|
||||
<Setter.Value>
|
||||
<Style TargetType="ComboBoxItem">
|
||||
<Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
|
||||
<Setter Property="Background" Value="{DynamicResource CardBrush}"/>
|
||||
<Setter Property="Padding" Value="10,5"/>
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="ComboBoxItem">
|
||||
<Border x:Name="Bd"
|
||||
Background="{TemplateBinding Background}"
|
||||
Padding="{TemplateBinding Padding}">
|
||||
<ContentPresenter/>
|
||||
</Border>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsHighlighted" Value="True">
|
||||
<Setter TargetName="Bd" Property="Background"
|
||||
Value="{DynamicResource HoverBrush}"/>
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<Style TargetType="ScrollViewer">
|
||||
|
||||
@@ -8,6 +8,7 @@ public class AppSettings
|
||||
{
|
||||
public string CookieStore { get; set; } = "";
|
||||
public string BurnHistory { get; set; } = "";
|
||||
public string OrgId { get; set; } = "";
|
||||
public int RefreshInterval { get; set; } = 120;
|
||||
public bool ShowInTaskbar { get; set; } = true;
|
||||
public bool BetaChannel { get; set; } = false;
|
||||
|
||||
@@ -26,9 +26,7 @@
|
||||
<None Update="Assets\icon.ico">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="Assets\icon.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<Resource Include="Assets\icon.png"/>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
+45
-45
@@ -5,7 +5,7 @@
|
||||
Title="ClaudeChecker"
|
||||
Width="480" Height="660"
|
||||
WindowStartupLocation="CenterScreen"
|
||||
Background="{StaticResource BackgroundBrush}"
|
||||
Background="{DynamicResource BackgroundBrush}"
|
||||
FontFamily="Segoe UI"
|
||||
ShowInTaskbar="True"
|
||||
ResizeMode="NoResize">
|
||||
@@ -16,8 +16,8 @@
|
||||
|
||||
<!-- Update banner -->
|
||||
<Border x:Name="UpdateBanner" DockPanel.Dock="Top" Visibility="Collapsed"
|
||||
Background="{StaticResource BannerBgBrush}"
|
||||
BorderBrush="{StaticResource BannerBorderBrush}" BorderThickness="0,0,0,1"
|
||||
Background="{DynamicResource BannerBgBrush}"
|
||||
BorderBrush="{DynamicResource BannerBorderBrush}" BorderThickness="0,0,0,1"
|
||||
Cursor="Hand" MouseLeftButtonUp="UpdateBanner_Click">
|
||||
<Grid Margin="16,10">
|
||||
<Grid.ColumnDefinitions>
|
||||
@@ -26,21 +26,21 @@
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Grid.Column="0" Text="⬇" FontSize="14"
|
||||
Foreground="{StaticResource BlueBrush}" VerticalAlignment="Center"/>
|
||||
Foreground="{DynamicResource BlueBrush}" VerticalAlignment="Center"/>
|
||||
<StackPanel Grid.Column="1" Margin="10,0">
|
||||
<TextBlock x:Name="UpdateBannerTitle" FontSize="12" FontWeight="SemiBold"
|
||||
Foreground="{StaticResource TextBrush}"/>
|
||||
Foreground="{DynamicResource TextBrush}"/>
|
||||
<TextBlock Text="Click to view release notes and install."
|
||||
FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
|
||||
FontSize="11" Foreground="{DynamicResource SecondaryBrush}"/>
|
||||
</StackPanel>
|
||||
<Button Grid.Column="2" Content="Update" Style="{StaticResource SmallButton}"
|
||||
Foreground="{StaticResource BlueBrush}" Click="UpdateBanner_Click"/>
|
||||
Foreground="{DynamicResource BlueBrush}" Click="UpdateBanner_Click"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<!-- Footer -->
|
||||
<Border DockPanel.Dock="Bottom" BorderBrush="{StaticResource BorderBrush}"
|
||||
BorderThickness="0,1,0,0" Background="{StaticResource SurfaceBrush}">
|
||||
<Border DockPanel.Dock="Bottom" BorderBrush="{DynamicResource BorderBrush}"
|
||||
BorderThickness="0,1,0,0" Background="{DynamicResource SurfaceBrush}">
|
||||
<Grid Margin="12,8">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
@@ -55,7 +55,7 @@
|
||||
Width="12" Height="12" Visibility="Collapsed"
|
||||
Style="{x:Null}" Margin="0,0,6,0"/>
|
||||
<TextBlock x:Name="LastUpdatedText" FontSize="11"
|
||||
Foreground="{StaticResource SecondaryBrush}" VerticalAlignment="Center"/>
|
||||
Foreground="{DynamicResource SecondaryBrush}" VerticalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
<Button Grid.Column="1" Content="↻ Refresh"
|
||||
Style="{StaticResource SmallButton}" Click="Refresh_Click"/>
|
||||
@@ -72,17 +72,17 @@
|
||||
|
||||
<!-- Settings panel -->
|
||||
<Border x:Name="SettingsPanel" Visibility="Collapsed"
|
||||
Background="{StaticResource BackgroundBrush}">
|
||||
Background="{DynamicResource BackgroundBrush}">
|
||||
<DockPanel>
|
||||
<Border DockPanel.Dock="Top" BorderBrush="{StaticResource BorderBrush}"
|
||||
BorderThickness="0,0,0,1" Background="{StaticResource SurfaceBrush}" Padding="12,10">
|
||||
<Border DockPanel.Dock="Top" BorderBrush="{DynamicResource BorderBrush}"
|
||||
BorderThickness="0,0,0,1" Background="{DynamicResource SurfaceBrush}" Padding="12,10">
|
||||
<Grid>
|
||||
<Button Content="← Back" HorizontalAlignment="Left"
|
||||
Style="{StaticResource SmallButton}" BorderThickness="0"
|
||||
Foreground="{StaticResource BlueBrush}" Background="Transparent"
|
||||
Foreground="{DynamicResource BlueBrush}" Background="Transparent"
|
||||
Click="BackFromSettings_Click"/>
|
||||
<TextBlock Text="Settings" FontSize="14" FontWeight="SemiBold"
|
||||
Foreground="{StaticResource TextBrush}"
|
||||
Foreground="{DynamicResource TextBrush}"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
@@ -91,13 +91,13 @@
|
||||
<StackPanel Margin="20,16,20,20">
|
||||
|
||||
<TextBlock Text="AUTHENTICATION" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
|
||||
<Border Background="{StaticResource CardBrush}" CornerRadius="6"
|
||||
BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"
|
||||
<Border Background="{DynamicResource CardBrush}" CornerRadius="6"
|
||||
BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
|
||||
Padding="14,12" Margin="0,0,0,16">
|
||||
<StackPanel>
|
||||
<StackPanel x:Name="AuthPanel" Margin="0,0,0,10"/>
|
||||
<TextBlock Text="Your session is stored locally and persists across restarts."
|
||||
FontSize="11" Foreground="{StaticResource SecondaryBrush}"
|
||||
FontSize="11" Foreground="{DynamicResource SecondaryBrush}"
|
||||
TextWrapping="Wrap" Margin="0,0,0,10"/>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Button x:Name="SignInButton" Content="Sign In"
|
||||
@@ -112,8 +112,8 @@
|
||||
</Border>
|
||||
|
||||
<TextBlock Text="UPDATE CHANNEL" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
|
||||
<Border Background="{StaticResource CardBrush}" CornerRadius="6"
|
||||
BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"
|
||||
<Border Background="{DynamicResource CardBrush}" CornerRadius="6"
|
||||
BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
|
||||
Padding="14,12" Margin="0,0,0,16">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
@@ -122,9 +122,9 @@
|
||||
</Grid.ColumnDefinitions>
|
||||
<StackPanel>
|
||||
<TextBlock Text="Beta updates" FontSize="12" FontWeight="SemiBold"
|
||||
Foreground="{StaticResource TextBrush}"/>
|
||||
Foreground="{DynamicResource TextBrush}"/>
|
||||
<TextBlock Text="Receive early access builds — may be less stable"
|
||||
FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
|
||||
FontSize="11" Foreground="{DynamicResource SecondaryBrush}"/>
|
||||
</StackPanel>
|
||||
<CheckBox Grid.Column="1" x:Name="BetaToggle" VerticalAlignment="Center"
|
||||
Checked="BetaToggle_Changed" Unchecked="BetaToggle_Changed"/>
|
||||
@@ -132,8 +132,8 @@
|
||||
</Border>
|
||||
|
||||
<TextBlock Text="AUTO-REFRESH" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
|
||||
<Border Background="{StaticResource CardBrush}" CornerRadius="6"
|
||||
BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"
|
||||
<Border Background="{DynamicResource CardBrush}" CornerRadius="6"
|
||||
BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
|
||||
Padding="14,12" Margin="0,0,0,16">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
@@ -141,15 +141,15 @@
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="Refresh interval" FontSize="12" FontWeight="SemiBold"
|
||||
Foreground="{StaticResource TextBrush}" VerticalAlignment="Center"/>
|
||||
Foreground="{DynamicResource TextBrush}" VerticalAlignment="Center"/>
|
||||
<ComboBox Grid.Column="1" x:Name="RefreshPicker" Width="100"
|
||||
SelectionChanged="RefreshPicker_Changed"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<TextBlock Text="ABOUT" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
|
||||
<Border Background="{StaticResource CardBrush}" CornerRadius="6"
|
||||
BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"
|
||||
<Border Background="{DynamicResource CardBrush}" CornerRadius="6"
|
||||
BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
|
||||
Padding="14,12">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
@@ -162,16 +162,16 @@
|
||||
<StackPanel Grid.Column="1" VerticalAlignment="Center">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock Text="ClaudeChecker" FontSize="12" FontWeight="SemiBold"
|
||||
Foreground="{StaticResource TextBrush}"/>
|
||||
<Border Background="#F0F0F0" CornerRadius="3"
|
||||
Foreground="{DynamicResource TextBrush}"/>
|
||||
<Border Background="{DynamicResource BadgeBrush}" CornerRadius="3"
|
||||
Margin="6,0,0,0" Padding="5,1">
|
||||
<TextBlock x:Name="VersionLabel" FontSize="11"
|
||||
Foreground="{StaticResource SecondaryBrush}"
|
||||
Foreground="{DynamicResource SecondaryBrush}"
|
||||
FontFamily="Consolas"/>
|
||||
</Border>
|
||||
</StackPanel>
|
||||
<TextBlock Text="Built by superdooper86 & claude"
|
||||
FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
|
||||
FontSize="11" Foreground="{DynamicResource SecondaryBrush}"/>
|
||||
</StackPanel>
|
||||
<Button Grid.Column="2" x:Name="CheckUpdateButton"
|
||||
Style="{StaticResource SmallButton}"
|
||||
@@ -186,17 +186,17 @@
|
||||
|
||||
<!-- Update panel -->
|
||||
<Border x:Name="UpdatePanel" Visibility="Collapsed"
|
||||
Background="{StaticResource BackgroundBrush}">
|
||||
Background="{DynamicResource BackgroundBrush}">
|
||||
<DockPanel>
|
||||
<Border DockPanel.Dock="Top" BorderBrush="{StaticResource BorderBrush}"
|
||||
BorderThickness="0,0,0,1" Background="{StaticResource SurfaceBrush}" Padding="12,10">
|
||||
<Border DockPanel.Dock="Top" BorderBrush="{DynamicResource BorderBrush}"
|
||||
BorderThickness="0,0,0,1" Background="{DynamicResource SurfaceBrush}" Padding="12,10">
|
||||
<Grid>
|
||||
<Button Content="← Back" HorizontalAlignment="Left"
|
||||
Style="{StaticResource SmallButton}" BorderThickness="0"
|
||||
Foreground="{StaticResource BlueBrush}" Background="Transparent"
|
||||
Foreground="{DynamicResource BlueBrush}" Background="Transparent"
|
||||
Click="CloseUpdate_Click"/>
|
||||
<TextBlock Text="Update Available" FontSize="14" FontWeight="SemiBold"
|
||||
Foreground="{StaticResource TextBrush}"
|
||||
Foreground="{DynamicResource TextBrush}"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Center"/>
|
||||
<Button x:Name="NotNowButton" Content="Not Now" HorizontalAlignment="Right"
|
||||
Style="{StaticResource SmallButton}" Click="CloseUpdate_Click"/>
|
||||
@@ -204,8 +204,8 @@
|
||||
</Border>
|
||||
|
||||
<StackPanel Margin="20,16">
|
||||
<Border Background="{StaticResource CardBrush}" CornerRadius="6"
|
||||
BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"
|
||||
<Border Background="{DynamicResource CardBrush}" CornerRadius="6"
|
||||
BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
|
||||
Padding="14,12" Margin="0,0,0,12">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
@@ -217,26 +217,26 @@
|
||||
<StackPanel Grid.Column="1" VerticalAlignment="Center">
|
||||
<StackPanel Orientation="Horizontal" Margin="0,0,0,4">
|
||||
<TextBlock x:Name="CurrentVerLabel" FontSize="12" FontFamily="Consolas"
|
||||
Foreground="{StaticResource SecondaryBrush}" VerticalAlignment="Center"/>
|
||||
<TextBlock Text=" → " FontSize="11" Foreground="{StaticResource SecondaryBrush}"
|
||||
Foreground="{DynamicResource SecondaryBrush}" VerticalAlignment="Center"/>
|
||||
<TextBlock Text=" → " FontSize="11" Foreground="{DynamicResource SecondaryBrush}"
|
||||
VerticalAlignment="Center"/>
|
||||
<TextBlock x:Name="NewVerLabel" FontSize="13" FontWeight="SemiBold"
|
||||
FontFamily="Consolas" Foreground="{StaticResource BlueBrush}"
|
||||
FontFamily="Consolas" Foreground="{DynamicResource BlueBrush}"
|
||||
VerticalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
<TextBlock x:Name="ReleaseNotesText" FontSize="11" TextWrapping="Wrap"
|
||||
Foreground="{StaticResource SecondaryBrush}" MaxHeight="160"/>
|
||||
Foreground="{DynamicResource SecondaryBrush}" MaxHeight="160"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<TextBlock x:Name="UpdateStatusText" Foreground="{StaticResource SecondaryBrush}"
|
||||
<TextBlock x:Name="UpdateStatusText" Foreground="{DynamicResource SecondaryBrush}"
|
||||
FontSize="11" TextWrapping="Wrap" TextAlignment="Center"
|
||||
Visibility="Collapsed" Margin="0,0,0,8"/>
|
||||
<ProgressBar x:Name="UpdateProgress" Visibility="Collapsed"
|
||||
Height="4" Margin="0,0,0,12" Foreground="{StaticResource BlueBrush}"/>
|
||||
Height="4" Margin="0,0,0,12" Foreground="{DynamicResource BlueBrush}"/>
|
||||
<TextBlock Text="ClaudeChecker will download, replace itself, and relaunch automatically."
|
||||
FontSize="11" Foreground="{StaticResource SecondaryBrush}"
|
||||
FontSize="11" Foreground="{DynamicResource SecondaryBrush}"
|
||||
TextWrapping="Wrap" TextAlignment="Center" Margin="0,0,0,12"/>
|
||||
<Button x:Name="InstallButton" Content="⬇ Download & Install"
|
||||
Style="{StaticResource PrimaryButton}" HorizontalAlignment="Stretch"
|
||||
|
||||
@@ -255,7 +255,7 @@ public partial class PopupWindow : Window
|
||||
var label = new TextBlock
|
||||
{
|
||||
Text = VM.IsSignedIn ? $"Signed in — {VM.UserEmail}" : "Not signed in",
|
||||
FontSize = 13, FontWeight = FontWeights.SemiBold, Foreground = Brushes.White,
|
||||
FontSize = 13, FontWeight = FontWeights.SemiBold, Foreground = (SolidColorBrush)Application.Current.Resources["TextBrush"],
|
||||
VerticalAlignment = VerticalAlignment.Center,
|
||||
};
|
||||
var authRow = new StackPanel { Orientation = Orientation.Horizontal };
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
## What's new
|
||||
## What's new in beta.20
|
||||
|
||||
Initial Windows release.
|
||||
- Fixed: app now correctly shows you as signed in after login
|
||||
- Fixed: org ID is fetched from API rather than hardcoded; tries multiple JSON paths
|
||||
- Fixed: auth check now uses HTTP 200 from bootstrap (not whether org ID was found)
|
||||
- Added browser User-Agent header so API responds correctly
|
||||
|
||||
@@ -54,6 +54,8 @@ public static class ThemeManager
|
||||
Set(res, "SurfaceBrush", Color.FromRgb(0x25, 0x25, 0x27));
|
||||
Set(res, "BannerBgBrush", Color.FromRgb(0x1A, 0x31, 0x52));
|
||||
Set(res, "BannerBorderBrush", Color.FromRgb(0x2A, 0x4A, 0x72));
|
||||
Set(res, "HoverBrush", Color.FromRgb(0x4A, 0x4A, 0x4C));
|
||||
Set(res, "BadgeBrush", Color.FromRgb(0x3A, 0x3A, 0x3C));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -67,11 +69,13 @@ public static class ThemeManager
|
||||
Set(res, "SurfaceBrush", Color.FromRgb(0xFA, 0xFA, 0xFA));
|
||||
Set(res, "BannerBgBrush", Color.FromRgb(0xE8, 0xF2, 0xFB));
|
||||
Set(res, "BannerBorderBrush", Color.FromRgb(0xB3, 0xD6, 0xF5));
|
||||
Set(res, "HoverBrush", Color.FromRgb(0xEB, 0xEB, 0xEB));
|
||||
Set(res, "BadgeBrush", Color.FromRgb(0xF0, 0xF0, 0xF0));
|
||||
}
|
||||
}
|
||||
|
||||
private static void Set(ResourceDictionary res, string key, Color color)
|
||||
{
|
||||
if (res[key] is SolidColorBrush b) b.Color = color;
|
||||
res[key] = new SolidColorBrush(color);
|
||||
}
|
||||
}
|
||||
|
||||
+101
-23
@@ -13,7 +13,6 @@ namespace ClaudeCheckerWindows;
|
||||
|
||||
public class UsageViewModel : INotifyPropertyChanged
|
||||
{
|
||||
private static readonly string OrgId = "daf626a9-4924-4ff3-ba98-23b523062f8e";
|
||||
private static readonly JsonSerializerOptions JsonOpts = new() { PropertyNameCaseInsensitive = true };
|
||||
|
||||
private List<AgentLimit> _limits = [];
|
||||
@@ -83,24 +82,56 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
{
|
||||
await Application.Current.Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
IsSignedIn = false;
|
||||
IsSignedIn = false;
|
||||
ErrorMessage = "Not signed in — click Sign In to authenticate.";
|
||||
IsLoading = false;
|
||||
IsLoading = false;
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
using var http = BuildClient(cookies);
|
||||
|
||||
var usageTask = FetchAsync<UsageResponse>(http, $"https://claude.ai/api/organizations/{OrgId}/usage");
|
||||
var overageTask = FetchAsync<OverageSpendLimit>(http, $"https://claude.ai/api/organizations/{OrgId}/overage_spend_limit");
|
||||
var prepaidTask = FetchAsync<PrepaidCredits>(http, $"https://claude.ai/api/organizations/{OrgId}/prepaid/credits");
|
||||
var emailTask = FetchEmailAsync(http);
|
||||
// Bootstrap: 200 = authenticated. Non-200 = session expired.
|
||||
var bootstrapResp = await http.GetAsync("https://claude.ai/api/bootstrap");
|
||||
if (!bootstrapResp.IsSuccessStatusCode)
|
||||
{
|
||||
await Application.Current.Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
IsSignedIn = false;
|
||||
ErrorMessage = "Session expired — click Sign In to re-authenticate.";
|
||||
IsLoading = false;
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
await Task.WhenAll(usageTask, overageTask, prepaidTask, emailTask);
|
||||
// Parse email and org ID (best-effort — don't fail auth if org ID is missing)
|
||||
var bootstrapJson = await bootstrapResp.Content.ReadAsStringAsync();
|
||||
var (email, orgId) = ParseBootstrap(bootstrapJson);
|
||||
|
||||
var usage = usageTask.Result;
|
||||
var limits = BuildLimits(usage);
|
||||
// Resolve org ID through fallback chain
|
||||
if (string.IsNullOrEmpty(orgId))
|
||||
orgId = await FetchOrgIdFromListAsync(http);
|
||||
if (string.IsNullOrEmpty(orgId) && !string.IsNullOrEmpty(AppSettings.Default.OrgId))
|
||||
orgId = AppSettings.Default.OrgId;
|
||||
|
||||
List<AgentLimit> limits = [];
|
||||
OverageSpendLimit? overage = null;
|
||||
PrepaidCredits? prepaid = null;
|
||||
|
||||
if (!string.IsNullOrEmpty(orgId))
|
||||
{
|
||||
AppSettings.Default.OrgId = orgId;
|
||||
AppSettings.Default.Save();
|
||||
|
||||
var usageTask = FetchAsync<UsageResponse>(http, $"https://claude.ai/api/organizations/{orgId}/usage");
|
||||
var overageTask = FetchAsync<OverageSpendLimit>(http, $"https://claude.ai/api/organizations/{orgId}/overage_spend_limit");
|
||||
var prepaidTask = FetchAsync<PrepaidCredits>(http, $"https://claude.ai/api/organizations/{orgId}/prepaid/credits");
|
||||
await Task.WhenAll(usageTask, overageTask, prepaidTask);
|
||||
|
||||
limits = BuildLimits(usageTask.Result);
|
||||
overage = overageTask.Result;
|
||||
prepaid = prepaidTask.Result;
|
||||
}
|
||||
|
||||
foreach (var limit in limits)
|
||||
{
|
||||
@@ -115,14 +146,14 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
|
||||
await Application.Current.Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
Limits = limits;
|
||||
Overage = overageTask.Result;
|
||||
Prepaid = prepaidTask.Result;
|
||||
UserEmail = emailTask.Result ?? UserEmail;
|
||||
IsSignedIn = true;
|
||||
ErrorMessage = null;
|
||||
LastUpdated = DateTime.Now;
|
||||
IsLoading = false;
|
||||
Limits = limits;
|
||||
Overage = overage;
|
||||
Prepaid = prepaid;
|
||||
UserEmail = email ?? UserEmail;
|
||||
IsSignedIn = true;
|
||||
ErrorMessage = string.IsNullOrEmpty(orgId) ? "Signed in, but couldn't find your organization data." : null;
|
||||
LastUpdated = DateTime.Now;
|
||||
IsLoading = false;
|
||||
});
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -138,6 +169,7 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
public async Task SignOutAsync()
|
||||
{
|
||||
AppSettings.Default.CookieStore = "";
|
||||
AppSettings.Default.OrgId = "";
|
||||
AppSettings.Default.Save();
|
||||
|
||||
await Application.Current.Dispatcher.InvokeAsync(() =>
|
||||
@@ -149,7 +181,6 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
});
|
||||
}
|
||||
|
||||
// Cookie store: we persist cookies as JSON in settings after login
|
||||
public static async Task<List<(string Name, string Value, string Domain, string Path)>> GetCookiesAsync()
|
||||
{
|
||||
var raw = AppSettings.Default.CookieStore;
|
||||
@@ -178,6 +209,9 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
var handler = new HttpClientHandler { UseCookies = false };
|
||||
var http = new HttpClient(handler);
|
||||
http.DefaultRequestHeaders.Add("accept", "application/json");
|
||||
http.DefaultRequestHeaders.Add("User-Agent",
|
||||
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 " +
|
||||
"(KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36");
|
||||
var cookieHeader = string.Join("; ", cookies.Select(c => $"{c.Name}={c.Value}"));
|
||||
http.DefaultRequestHeaders.Add("Cookie", cookieHeader);
|
||||
return http;
|
||||
@@ -195,15 +229,59 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
catch { return null; }
|
||||
}
|
||||
|
||||
private static async Task<string?> FetchEmailAsync(HttpClient http)
|
||||
// Parse email and org ID out of bootstrap JSON (multiple fallback paths for org ID)
|
||||
private static (string? Email, string? OrgId) ParseBootstrap(string json)
|
||||
{
|
||||
try
|
||||
{
|
||||
var resp = await http.GetAsync("https://claude.ai/api/bootstrap");
|
||||
using var doc = JsonDocument.Parse(json);
|
||||
var root = doc.RootElement;
|
||||
|
||||
string? email = null;
|
||||
string? orgId = null;
|
||||
|
||||
if (root.TryGetProperty("account", out var acct) &&
|
||||
acct.TryGetProperty("email_address", out var em))
|
||||
email = em.GetString();
|
||||
|
||||
// Path 1: memberships[0].organization.uuid
|
||||
if (root.TryGetProperty("memberships", out var mems) && mems.GetArrayLength() > 0)
|
||||
{
|
||||
var first = mems[0];
|
||||
if (first.TryGetProperty("organization", out var org) &&
|
||||
org.TryGetProperty("uuid", out var uuid))
|
||||
orgId = uuid.GetString();
|
||||
}
|
||||
|
||||
// Path 2: organizations[0].uuid (flat list on root)
|
||||
if (string.IsNullOrEmpty(orgId) &&
|
||||
root.TryGetProperty("organizations", out var orgs) && orgs.GetArrayLength() > 0)
|
||||
{
|
||||
if (orgs[0].TryGetProperty("uuid", out var uuid))
|
||||
orgId = uuid.GetString();
|
||||
}
|
||||
|
||||
return (email, orgId);
|
||||
}
|
||||
catch { return (null, null); }
|
||||
}
|
||||
|
||||
private static async Task<string?> FetchOrgIdFromListAsync(HttpClient http)
|
||||
{
|
||||
try
|
||||
{
|
||||
var resp = await http.GetAsync("https://claude.ai/api/organizations");
|
||||
if (!resp.IsSuccessStatusCode) return null;
|
||||
var json = await resp.Content.ReadAsStringAsync();
|
||||
var boot = JsonSerializer.Deserialize<BootstrapResponse>(json, JsonOpts);
|
||||
return boot?.Account?.EmailAddress;
|
||||
using var doc = JsonDocument.Parse(json);
|
||||
var root = doc.RootElement;
|
||||
if (root.ValueKind == JsonValueKind.Array && root.GetArrayLength() > 0)
|
||||
{
|
||||
var first = root[0];
|
||||
if (first.TryGetProperty("uuid", out var uuid))
|
||||
return uuid.GetString();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
catch { return null; }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user