Merge branch 'development'

Artemis-RGB · Jan 16, 2024 · f0ab5fa · f0ab5fa
2 parents ff6efe9 + e73ae96
commit f0ab5fa
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 25 deletions.
diff --git a/src/Artemis.UI/Routing/Routes.cs b/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")

diff --git a/src/Artemis.UI/Screens/Sidebar/SidebarViewModel.cs b/src/Artemis.UI/Screens/Sidebar/SidebarViewModel.cs
@@ -42,9 +42,7 @@ public SidebarViewModel(IRouter router, IProfileService profileService, IWindowS
             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"),
             }),
 

diff --git a/src/Artemis.UI/Screens/Workshop/Entries/EntriesViewModel.cs b/src/Artemis.UI/Screens/Workshop/Entries/EntriesViewModel.cs
@@ -25,9 +25,7 @@ public EntriesViewModel(IRouter router)
         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 =>

diff --git a/src/Artemis.UI/Screens/Workshop/Home/WorkshopHomeView.axaml b/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>

diff --git a/src/Artemis.UI/Screens/Workshop/Home/WorkshopHomeViewModel.cs b/src/Artemis.UI/Screens/Workshop/Home/WorkshopHomeViewModel.cs
@@ -25,12 +25,6 @@ public WorkshopHomeViewModel(IRouter router, IWindowService windowService, IWork
 
         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; }

diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/EntryTypeStepView.axaml b/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}}"
-                     IsVisible="{CompiledBinding ShowLayouts}">
+                     IsChecked="{CompiledBinding SelectedEntryType, Converter={StaticResource EnumBoolConverter}, ConverterParameter={x:Static workshop:EntryType.Layout}}">
             <RadioButton.Content>
                 <StackPanel>
                     <TextBlock>Layout</TextBlock>

diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/EntryTypeStepViewModel.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/EntryTypeStepViewModel.cs
@@ -15,12 +15,6 @@ public EntryTypeStepViewModel()
         GoBack = ReactiveCommand.Create(() => State.ChangeScreen<WelcomeStepViewModel>());
         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()
     {

diff --git a/src/Artemis.WebClient.Workshop/WorkshopConstants.cs b/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 WORKSHOP_URL = "https://localhost:7281";
-    // public const string AUTHORITY_URL = "https://identity.artemis-rgb.com";
-    // public const string WORKSHOP_URL = "https://workshop.artemis-rgb.com";
+    // public const string AUTHORITY_URL = "https://localhost:5001";
+    // public const string WORKSHOP_URL = "https://localhost:7281";
+    public const string AUTHORITY_URL = "https://identity.artemis-rgb.com";
+    public const string WORKSHOP_URL = "https://workshop.artemis-rgb.com";
     public const string WORKSHOP_CLIENT_NAME = "WorkshopApiClient";
 }