Skip to content

Commit 939162f

Browse files
SuperJMNSuperJMN
authored
Add My Projects V2 (block-core#660)
1 parent 187c950 commit 939162f

File tree

103 files changed

+2486
-386
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+2486
-386
lines changed

‎.gitignore‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ mono_crash.*
2020
# Build results
2121
[Dd]ebug/
2222
[Dd]ebugPublic/
23-
[Rr]elease/
24-
[Rr]eleases/
23+
[Bb]in/[Rr]elease/
24+
[Bb]in/[Rr]eleases/
25+
[Oo]bj/[Rr]elease/
26+
[Oo]bj/[Rr]eleases/
2527
x64/
2628
x86/
2729
[Ww][Ii][Nn]32/

‎src/Angor/Avalonia/.gitignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ mono_crash.*
1919
# Build results
2020
[Dd]ebug/
2121
[Dd]ebugPublic/
22-
[Rr]elease/
23-
[Rr]eleases/
2422
x64/
2523
x86/
2624
[Ww][Ii][Nn]32/

‎src/Angor/Avalonia/AngorApp/App.axaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:ui="clr-namespace:Zafiro.UI;assembly=Zafiro.UI"
44
xmlns:common="clr-namespace:AngorApp.Model.Common;assembly=AngorApp.Model"
5+
xmlns:shared="clr-namespace:AngorApp.UI.Shared"
56
x:Class="AngorApp.App"
67
RequestedThemeVariant="Default">
78
<Application.Resources>
@@ -11,11 +12,12 @@
1112
<MergeResourceInclude Source="/UI/Shared/Controls/Common/CopyButton.axaml" />
1213
<MergeResourceInclude Source="UI/Shared/Controls/Header.axaml" />
1314
<MergeResourceInclude Source="UI/Shared/Controls/SectionItem.axaml" />
15+
<MergeResourceInclude Source="UI/Shared/Controls/NewCard.axaml" />
1416
<MergeResourceInclude Source="UI/Shared/Resources/Icons.axaml" />
1517
</ResourceDictionary.MergedDictionaries>
16-
18+
1719
<IconDataTemplate x:Key="IconDataTemplate" />
18-
20+
1921
<DataTemplate x:Key="BigIcon" DataType="x:Object">
2022
<ContentPresenter Content="{Binding}">
2123
<ContentPresenter.DataTemplates>
@@ -50,7 +52,7 @@
5052
<DataTypeViewLocator />
5153
<DataTemplateInclude Source="avares://Zafiro.Avalonia/DataTemplates.axaml" />
5254
<DataTemplate DataType="common:ClipboardText">
53-
<SelectableTextBlock VerticalAlignment="Center" TextWrapping="Wrap" Text="{Binding Text}" />
55+
<SelectableTextBlock VerticalAlignment="Center" TextWrapping="Wrap" Text="{Binding Text}" />
5456
</DataTemplate>
5557
</Application.DataTemplates>
5658

‎src/Angor/Avalonia/AngorApp/Composition/Registrations/ViewModels/ViewModels.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using AngorApp.UI.Sections.Browse.ProjectLookup;
66
using AngorApp.UI.Sections.Founder;
77
using AngorApp.UI.Sections.Founder.ProjectDetails;
8+
using AngorApp.UI.Sections.MyProjects;
89
using AngorApp.UI.Sections.Portfolio;
910
using AngorApp.UI.Sections.Portfolio.Penalties;
1011
using AngorApp.UI.Sections.Portfolio.Recover;
@@ -22,6 +23,7 @@
2223
using AngorApp.UI.Sections.Funds.Accounts;
2324
using AngorApp.UI.Sections.Funds.Empty;
2425
using AngorApp.UI.Sections.FindProjects.Details;
26+
using AngorApp.UI.Sections.MyProjects.ManageFunds;
2527

2628
namespace AngorApp.Composition.Registrations.ViewModels;
2729

@@ -35,14 +37,15 @@ public static IServiceCollection AddViewModels(this IServiceCollection services)
3537
.AddScoped<Func<IProjectLookupViewModel>>(provider => () => ActivatorUtilities.CreateInstance<ProjectLookupViewModel>(provider))
3638
.AddScoped<Func<ProjectId, IFoundedProjectOptionsViewModel>>(provider => projectId => ActivatorUtilities.CreateInstance<FoundedProjectOptionsViewModel>(provider, projectId))
3739
.AddScoped<Func<IFullProject, IDetailsViewModel>>(provider => project => ActivatorUtilities.CreateInstance<DetailsViewModel>(provider, project))
40+
.AddScoped<Func<ProjectId, IManageFundsViewModel>>(provider => project => ActivatorUtilities.CreateInstance<ManageFundsViewModel>(provider, project))
3841
.AddScoped<Func<ProjectId, IFounderProjectDetailsViewModel>>(provider => projectId => ActivatorUtilities.CreateInstance<FounderProjectDetailsViewModel>(provider, projectId))
3942
.AddScoped<Func<ProjectDto, IFounderProjectViewModel>>(provider => dto => ActivatorUtilities.CreateInstance<FounderProjectViewModel>(provider, dto))
4043
.AddTransient<IWalletSectionViewModel, WalletSectionViewModel>()
4144
.AddTransient<IAccountsViewModel, AccountsViewModel>()
4245
.AddTransient<IEmptyViewModel, EmptyViewModel>()
4346
.AddTransient<IBrowseSectionViewModel, BrowseSectionViewModel>()
4447
.AddTransient<IPortfolioSectionViewModel, PortfolioSectionViewModel>()
45-
.AddTransient<IFounderSectionViewModel, FounderSectionViewModel>()
48+
.AddTransient<IMyProjectsSectionViewModel, MyProjectsSectionViewModel>()
4649
.AddTransient<ISettingsSectionViewModel, SettingsSectionViewModel>()
4750
.AddScoped<IPenaltiesViewModel, PenaltiesViewModel>()
4851
.AddScoped<Func<IFullProject, IInvestViewModel>>(provider => proj => ActivatorUtilities.CreateInstance<InvestViewModel>(provider, proj))

‎src/Angor/Avalonia/AngorApp/UI/Flows/CreateProject/Wizard/FundProject/Payouts/PayoutsList.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<ItemsControl ItemsSource="{Binding Payouts, RelativeSource={RelativeSource AncestorType=payouts:PayoutsList}}" FontWeight="Bold" Foreground="{DynamicResource Accent}">
2222
<ItemsControl.ItemTemplate>
2323
<DataTemplate DataType="model:IPayoutConfig">
24-
<Border Classes="Translucid">
24+
<Border Classes="ColorPanel Accent">
2525
<Grid ColumnDefinitions="* Auto" ColumnSpacing="10">
2626
<StackPanel Orientation="Horizontal" Spacing="5" Grid.Column="0">
2727
<TextBlock Text="{Binding $parent[payouts:PayoutsList].Frequency}" />

‎src/Angor/Avalonia/AngorApp/UI/Flows/CreateProject/Wizard/FundProject/Payouts/PayoutsView.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
</HeaderedContainer>
135135

136136

137-
<EnhancedButton HorizontalAlignment="Stretch" Classes="Accent" HorizontalContentAlignment="Center" Command="{Binding GeneratePayouts}">Generate Payout Schedule</EnhancedButton>
137+
<EnhancedButton HorizontalAlignment="Stretch" Classes="Emphasized" HorizontalContentAlignment="Center" Command="{Binding GeneratePayouts}">Generate Payout Schedule</EnhancedButton>
138138
</StackPanel>
139139

140140

‎src/Angor/Avalonia/AngorApp/UI/Flows/CreateProject/Wizard/FundProject/ReviewAndDeployView.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
<Setter Property="BorderBrush" Value="{DynamicResource Stroke}" />
2121
<Setter Property="CornerRadius" Value="10" />
2222
<Setter Property="HorizontalAlignment" Value="Stretch" />
23-
<Setter Property="Background" Value="{DynamicResource Translucid}" />
23+
<Setter Property="Background" Value="{DynamicResource BrandWash}" />
2424
<Style Selector="^ /template/ ToggleButton">
25-
<Setter Property="Background" Value="{DynamicResource Translucid}" />
25+
<Setter Property="Background" Value="{DynamicResource BrandWash}" />
2626
</Style>
2727
</ControlTheme>
2828

‎src/Angor/Avalonia/AngorApp/UI/Flows/CreateProject/Wizard/InvestmentProject/ReviewAndDeployView.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<Setter Property="BorderBrush" Value="{DynamicResource Stroke}" />
2020
<Setter Property="CornerRadius" Value="10" />
2121
<Setter Property="HorizontalAlignment" Value="Stretch" />
22-
<Setter Property="Background" Value="{DynamicResource Translucid}" />
22+
<Setter Property="Background" Value="{DynamicResource BrandWash}" />
2323
<Style Selector="^ /template/ ToggleButton">
24-
<Setter Property="Background" Value="{DynamicResource Translucid}" />
24+
<Setter Property="Background" Value="{DynamicResource BrandWash}" />
2525
</Style>
2626
</ControlTheme>
2727

‎src/Angor/Avalonia/AngorApp/UI/Flows/CreateProject/Wizard/InvestmentProject/Stages/StagesAdvancedEditor.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@
9898
<Separator Grid.Column="2" />
9999
</Grid>
100100
<OverlayBorder Classes="Panel" Padding="0" Margin="0 20">
101-
<Grid ColumnDefinitions="Auto,120, *, Auto" RowDefinitions="Auto Auto">
101+
<Grid ColumnDefinitions="Auto,120, *, Auto" RowDefinitions="Auto Auto" ColumnSpacing="20">
102102
<Border Grid.RowSpan="2" Background="{DynamicResource SurfaceHover}" Padding="20">
103-
<Border CornerRadius="40" Width="40" Height="40" Background="{DynamicResource Translucid}" BorderBrush="{DynamicResource Dimmed}" BorderThickness="2">
103+
<Border CornerRadius="40" Width="40" Height="40" Background="{DynamicResource BrandWash}" BorderBrush="{DynamicResource Dimmed}" BorderThickness="2">
104104
<TextBlock x:Name="ItemIndex" Tag="{ItemIndex StartFromOne=True}" HorizontalAlignment="Center" Classes="Weight-Bold" VerticalAlignment="Center" Foreground="{DynamicResource Dimmed}" Text="{ItemIndex StartFromOne=True}" />
105105
</Border>
106106
</Border>

‎src/Angor/Avalonia/AngorApp/UI/Flows/CreateProject/Wizard/InvestmentProject/Stages/StagesCard.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<EdgePanel.EndContent>
1919
<StackPanel Orientation="Horizontal" Classes="SmallGap">
2020
<EnhancedButton IconOptions.Fill="{DynamicResource Accent}" Icon="{Icon fa-trash}" Classes="Outline" Command="{Binding ClearStages}">Delete</EnhancedButton>
21-
<EnhancedButton IconOptions.Fill="{DynamicResource PrimaryButtonForeground}" Icon="{Icon fa-pen-to-square}" Classes="Accent" Command="{Binding ToggleEditor}">Edit</EnhancedButton>
21+
<EnhancedButton IconOptions.Fill="{DynamicResource PrimaryButtonForeground}" Icon="{Icon fa-pen-to-square}" Classes="Emphasized" Command="{Binding ToggleEditor}">Edit</EnhancedButton>
2222
</StackPanel>
2323
</EdgePanel.EndContent>
2424
<TextBlock>Funding Stages</TextBlock>

0 commit comments

Comments
 (0)