Merge branch 'development'

src/Artemis.UI/Routing/Routes.cs

@@ -34,10 +34,8 @@ public static class Routes
                     {
                         new RouteRegistration<ProfileListViewModel>("profiles/{page:int}"),
                         new RouteRegistration<ProfileDetailsViewModel>("profiles/details/{entryId:long}"),
-#if DEBUG
                         new RouteRegistration<LayoutListViewModel>("layouts/{page:int}"),
                         new RouteRegistration<LayoutDetailsViewModel>("layouts/details/{entryId:long}"),
-#endif
                     }
                 },
                 new RouteRegistration<WorkshopLibraryViewModel>("library")

src/Artemis.UI/Screens/Sidebar/SidebarViewModel.cs

@@ -42,9 +42,7 @@ public partial class SidebarViewModel : ActivatableViewModelBase
             new(MaterialIconKind.TestTube, "Workshop", "workshop", null, new ObservableCollection<SidebarScreenViewModel>
             {
                 new(MaterialIconKind.FolderVideo, "Profiles", "workshop/entries/profiles/1", "workshop/entries/profiles"),
-#if DEBUG
                 new(MaterialIconKind.KeyboardVariant, "Layouts", "workshop/entries/layouts/1", "workshop/entries/layouts"),
-#endif
                 new(MaterialIconKind.Bookshelf, "Library", "workshop/library"),
             }),
 

src/Artemis.UI/Screens/Workshop/Entries/EntriesViewModel.cs

@@ -25,9 +25,7 @@ public partial class EntriesViewModel : RoutableHostScreen<RoutableScreen>
         Tabs = new ObservableCollection<RouteViewModel>
         {
             new("Profiles", "workshop/entries/profiles/1", "workshop/entries/profiles"),
-#if DEBUG
             new("Layouts", "workshop/entries/layouts/1", "workshop/entries/layouts")
-#endif
         };
 
         this.WhenActivated(d =>

src/Artemis.UI/Screens/Workshop/Home/WorkshopHomeView.axaml

@@ -49,7 +49,7 @@
                         </StackPanel>
                     </Button>
 
-                    <Button Width="150" Height="180" Command="{CompiledBinding Navigate}" CommandParameter="workshop/entries/layouts/1" VerticalContentAlignment="Top" IsVisible="{CompiledBinding ShowLayouts}">
+                    <Button Width="150" Height="180" Command="{CompiledBinding Navigate}" CommandParameter="workshop/entries/layouts/1" VerticalContentAlignment="Top">
                         <StackPanel>
                             <avalonia:MaterialIcon Kind="KeyboardVariant" HorizontalAlignment="Left" Width="60" Height="60" Margin="0 5" />
                             <TextBlock TextWrapping="Wrap" FontSize="16" Margin="0 5">Layouts</TextBlock>

src/Artemis.UI/Screens/Workshop/Home/WorkshopHomeViewModel.cs

@@ -26,12 +26,6 @@ public partial class WorkshopHomeViewModel : RoutableScreen
         this.WhenActivatedAsync(async d => WorkshopReachable = await workshopService.ValidateWorkshopStatus(d.AsCancellationToken()));
     }
     
-#if DEBUG
-    public bool ShowLayouts => true;
-# else
-    public bool ShowLayouts => false;
-#endif
-    
     public ReactiveCommand<Unit, Unit> AddSubmission { get; }
     public ReactiveCommand<string, Unit> Navigate { get; }
 

src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/EntryTypeStepView.axaml

@@ -36,8 +36,7 @@
             </RadioButton.Content>
         </RadioButton>
         <RadioButton GroupName="EntryType" 
-                     IsChecked="{CompiledBinding SelectedEntryType, Converter={StaticResource EnumBoolConverter}, ConverterParameter={x:Static workshop:EntryType.Layout}}"
+                     IsChecked="{CompiledBinding SelectedEntryType, Converter={StaticResource EnumBoolConverter}, ConverterParameter={x:Static workshop:EntryType.Layout}}">
-                     IsVisible="{CompiledBinding ShowLayouts}">
             <RadioButton.Content>
                 <StackPanel>
                     <TextBlock>Layout</TextBlock>

src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/EntryTypeStepViewModel.cs

@@ -16,12 +16,6 @@ public partial class EntryTypeStepViewModel : SubmissionViewModel
         Continue = ReactiveCommand.Create(ExecuteContinue, this.WhenAnyValue(vm => vm.SelectedEntryType).Select(e => e != null));
     }
 
-#if DEBUG
-    public bool ShowLayouts => true;
-# else
-    public bool ShowLayouts => false;
-#endif
-
     private void ExecuteContinue()
     {
         if (SelectedEntryType == null)

src/Artemis.WebClient.Workshop/WorkshopConstants.cs

@@ -2,9 +2,9 @@ namespace Artemis.WebClient.Workshop;
 
 public static class WorkshopConstants
 {
-    public const string AUTHORITY_URL = "https://localhost:5001";
+    // public const string AUTHORITY_URL = "https://localhost:5001";
-    public const string WORKSHOP_URL = "https://localhost:7281";
+    // public const string WORKSHOP_URL = "https://localhost:7281";
-    // public const string AUTHORITY_URL = "https://identity.artemis-rgb.com";
+    public const string AUTHORITY_URL = "https://identity.artemis-rgb.com";
-    // public const string WORKSHOP_URL = "https://workshop.artemis-rgb.com";
+    public const string WORKSHOP_URL = "https://workshop.artemis-rgb.com";
     public const string WORKSHOP_CLIENT_NAME = "WorkshopApiClient";
 }