Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
466 changes: 247 additions & 219 deletions .editorconfig

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -423,3 +423,5 @@ api/
.manifest

.playwright-mcp/

_manifest/
61 changes: 22 additions & 39 deletions Bookmarkly.App/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,50 +1,33 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices.WindowsRuntime;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Controls.Primitives;
using Microsoft.UI.Xaml.Data;
using Microsoft.UI.Xaml.Input;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Navigation;
using Microsoft.UI.Xaml.Shapes;
using Windows.ApplicationModel;
using Windows.ApplicationModel.Activation;
using Windows.Foundation;
using Windows.Foundation.Collections;
using Microsoft.UI.Xaml;

// To learn more about WinUI, the WinUI project structure,
// and more about our project templates, see: http://aka.ms/winui-project-info.

namespace Bookmarkly.App
namespace Bookmarkly.App;

/// <summary>
/// Provides application-specific behavior to supplement the default Application class.
/// </summary>
public partial class App : Application
{
private Window? _window;

/// <summary>
/// Provides application-specific behavior to supplement the default Application class.
/// Initializes the singleton application object. This is the first line of authored code
/// executed, and as such is the logical equivalent of main() or WinMain().
/// </summary>
public partial class App : Application
public App()
{
private Window? _window;

/// <summary>
/// Initializes the singleton application object. This is the first line of authored code
/// executed, and as such is the logical equivalent of main() or WinMain().
/// </summary>
public App()
{
InitializeComponent();
}
InitializeComponent();
}

/// <summary>
/// Invoked when the application is launched.
/// </summary>
/// <param name="args">Details about the launch request and process.</param>
protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args)
{
_window = new MainWindow();
_window.Activate();
}
/// <summary>
/// Invoked when the application is launched.
/// </summary>
/// <param name="args">Details about the launch request and process.</param>
protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args)
{
_window = new MainWindow();
_window.Activate();
}
}
2 changes: 1 addition & 1 deletion Bookmarkly.App/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
</Window.SystemBackdrop>

<Grid Loaded="OnWindowLoaded">
<ListView ItemsSource="{x:Bind datas, Mode=OneWay}"/>
<ListView ItemsSource="{x:Bind _datas, Mode=OneWay}"/>
</Grid>
</Window>
85 changes: 35 additions & 50 deletions Bookmarkly.App/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,70 +1,55 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices.WindowsRuntime;
using Cyclotron.Telemetry.DependencyInjection;

Check failure on line 2 in Bookmarkly.App/MainWindow.xaml.cs

View workflow job for this annotation

GitHub Actions / Build Solution

The type or namespace name 'DependencyInjection' does not exist in the namespace 'Cyclotron.Telemetry' (are you missing an assembly reference?)
using Cyclotron.Telemetry.Logging;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Controls.Primitives;
using Microsoft.UI.Xaml.Data;
using Microsoft.UI.Xaml.Input;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Navigation;
using Windows.Foundation;
using Windows.Foundation.Collections;
using Windows.Storage;


// To learn more about WinUI, the WinUI project structure,
// and more about our project templates, see: http://aka.ms/winui-project-info.

namespace Bookmarkly.App
namespace Bookmarkly.App;

/// <summary>
/// An empty window that can be used on its own or navigated to within a Frame.
/// </summary>
public sealed partial class MainWindow : Window
{
/// <summary>
/// An empty window that can be used on its own or navigated to within a Frame.
/// </summary>
public sealed partial class MainWindow : Window
private readonly ObservableCollection<int> _datas = new();
public MainWindow()
{
ObservableCollection<int> datas = new();
public MainWindow()
{
datas.Add(1);
datas.Add(1);
datas.Add(1);
datas.Add(1);
datas.Add(1);
datas.Add(1);
datas.Add(1);
datas.Add(1);
datas.Add(1);
InitializeComponent();
}
_datas.Add(1);
_datas.Add(1);
_datas.Add(1);
_datas.Add(1);
_datas.Add(1);
_datas.Add(1);
_datas.Add(1);
_datas.Add(1);
_datas.Add(1);
InitializeComponent();
}

private void OnWindowLoaded(object sender, RoutedEventArgs e)
{
var services = new ServiceCollection();
private void OnWindowLoaded(object sender, RoutedEventArgs e)
{
var services = new ServiceCollection();

services.AddCyclotronTelemetry(options =>
{
options.ServiceName = "Bookmarkly";
options.ServiceVersion = "1.0.0";
options.DefaultModule = "main";
services.AddCyclotronTelemetry(options =>
{
options.ServiceName = "Bookmarkly";
options.ServiceVersion = "1.0.0";
options.DefaultModule = "main";

options.Logging.MinimumLevel = LogLevel.Debug;
options.Logging.File.Path = "{LocalAppData}/Bookmarkly/logs/app-.log";
options.Logging.File.RetainedFileCountLimit = 3; // Already set as default
options.Logging.File.RollingInterval = Serilog.RollingInterval.Day;
});
options.Logging.MinimumLevel = LogLevel.Debug;
options.Logging.File.Path = "{LocalAppData}/Bookmarkly/logs/app-.log";
options.Logging.File.RetainedFileCountLimit = 3; // Already set as default
options.Logging.File.RollingInterval = Serilog.RollingInterval.Day;
});

var provider = services.BuildServiceProvider();
var logger = provider.GetRequiredService<ICyclotronLogger>().ForModule("Instapaper");
var provider = services.BuildServiceProvider();
var logger = provider.GetRequiredService<ICyclotronLogger>().ForModule("Instapaper");

logger.LogInformation("Starting operation"); // Caller info auto-captured!
}
logger.LogInformation("Starting operation"); // Caller info auto-captured!
}
}
8 changes: 0 additions & 8 deletions Bookmarkly.Entities.Abstractions/Class1.cs

This file was deleted.

19 changes: 9 additions & 10 deletions Bookmarkly.Entities.Abstractions/IArticleContent.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
namespace Bookmarkly.Entities.Abstractions
namespace Bookmarkly.Entities.Abstractions;

public interface IArticleContent
{
public interface IArticleContent
{
string ArticleId { get; set; }
string ArticleId { get; set; }

string Content { get; set; }
}
string Content { get; set; }
}

public interface IUserArticleContent : IArticleContent
{
string UserId { get; set; }
}
public interface IUserArticleContent : IArticleContent
{
string UserId { get; set; }
}
17 changes: 8 additions & 9 deletions Bookmarkly.Entities.Abstractions/IArticleMetaData.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
namespace Bookmarkly.Entities.Abstractions
namespace Bookmarkly.Entities.Abstractions;

public interface IArticleMetaData
{
public interface IArticleMetaData
{
string Id { get; set; }
string Id { get; set; }

string Title { get; set; }
string Title { get; set; }

string Url { get; set; }
string Url { get; set; }

string Summary { get; set; }
string Summary { get; set; }

string ThumbnailUrl { get; set; }
}
string ThumbnailUrl { get; set; }
}
15 changes: 7 additions & 8 deletions Bookmarkly.Entities.Abstractions/IFolder.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
namespace Bookmarkly.Entities.Abstractions
namespace Bookmarkly.Entities.Abstractions;

public interface IFolder
{
public interface IFolder
{
string Id { get; set; }
string Id { get; set; }

string UserId { get; set; }
string UserId { get; set; }

string Name { get; set; }
string Name { get; set; }

string ParentFolderId { get; set; }
}
string ParentFolderId { get; set; }
}
11 changes: 5 additions & 6 deletions Bookmarkly.Entities.Abstractions/IUser.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
namespace Bookmarkly.Entities.Abstractions
namespace Bookmarkly.Entities.Abstractions;

public interface IUser
{
public interface IUser
{
string Id { get; set; }
string Id { get; set; }

string DisplayName { get; set; }
}
string DisplayName { get; set; }
}
19 changes: 9 additions & 10 deletions Bookmarkly.Entities.Abstractions/IUserArticleMetaData.cs
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
namespace Bookmarkly.Entities.Abstractions
namespace Bookmarkly.Entities.Abstractions;

public interface IUserArticleMetaData : IArticleMetaData
{
public interface IUserArticleMetaData : IArticleMetaData
{
string UserId { get; set; }
string UserId { get; set; }

string FolderId { get; set; }
string FolderId { get; set; }

DateTimeOffset CreatedAt { get; set; }
DateTimeOffset CreatedAt { get; set; }

DateTimeOffset UpdatedAt { get; set; }
DateTimeOffset UpdatedAt { get; set; }

bool IsRead { get; set; }
bool IsRead { get; set; }

bool IsFavorite { get; set; }
}
bool IsFavorite { get; set; }
}
8 changes: 7 additions & 1 deletion Bookmarkly.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,11 @@
"path": "."
}
],
"settings": {}
"settings": {
"github-actions.workflows.pinned.workflows": [
".github/workflows/msix-build-release.yml",
".github/workflows/test.yml",
".github/workflows/docfx.yml"
]
}
}
19 changes: 7 additions & 12 deletions Bookmarkly.slnx
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,32 @@
</Configurations>
<Folder Name="/Abstractions/">
<Project Path="Bookmarkly.Abstractions/Bookmarkly.Views.Abstractions.csproj" />
<Project Path="Bookmarkly.Entities.Abstractions/Bookmarkly.Entities.Abstractions.csproj"
Id="e4291e74-0bda-4ae8-a52a-b1d7f4763e94" />
<Project Path="Bookmarkly.Library.Abstractions/Bookmarkly.Library.Abstractions.csproj"
Id="2e38b811-5f56-4002-bbc3-f7c975ba3ff6" />
<Project Path="Bookmarkly.Entities.Abstractions/Bookmarkly.Entities.Abstractions.csproj" Id="e4291e74-0bda-4ae8-a52a-b1d7f4763e94" />
<Project Path="Bookmarkly.Library.Abstractions/Bookmarkly.Library.Abstractions.csproj" Id="2e38b811-5f56-4002-bbc3-f7c975ba3ff6" />
</Folder>
<Folder Name="/Infrastructure/">
<Project Path="Cyclotron/Cyclotron.FileSystemAdapter/Cyclotron.FileSystemAdapter.csproj" />
<Project Path="Cyclotron/Cyclotron.Telemetry/Cyclotron.Telemetry.csproj" />
<Project Path="Cyclotron/Cyclotron.Utilities/Cyclotron.Utilities.csproj" />
</Folder>
<Folder Name="/Instapaper/">
<Project Path="Instapaper/Instapaper.Entities/Instapaper.Entities.csproj"
Id="937bc212-0322-4714-890d-23a112f5b380" />
<Project Path="Instapaper/Instapaper.Library/Instapaper.Library.csproj"
Id="71f0f60b-6586-4c29-b8ed-6142d2d3ae64" />
<Project Path="Instapaper/Instapaper.Entities/Instapaper.Entities.csproj" Id="937bc212-0322-4714-890d-23a112f5b380" />
<Project Path="Instapaper/Instapaper.Library/Instapaper.Library.csproj" Id="71f0f60b-6586-4c29-b8ed-6142d2d3ae64" />
</Folder>
<Folder Name="/_Items/">
<File Path=".editorconfig" />
<File Path="Directory.Build.Props" />
<File Path="Directory.Packages.Props" />
</Folder>
<Folder Name="/_Tests/">
<Project Path="Tests/ArchitectureTests/ArchitectureTests.csproj"
Id="edef401a-ef1f-4d1f-ad39-835e698c835c" />
<Project Path="Tests/ArchitectureTests/ArchitectureTests.csproj" Id="edef401a-ef1f-4d1f-ad39-835e698c835c" />
</Folder>
<Project Path="Bookmarkly.App/Bookmarkly.App.csproj">
<Platform Solution="*|ARM64" Project="ARM64" />
<Platform Solution="*|x64" Project="x64" />
<Platform Solution="*|x86" Project="x86" />
<Deploy />
</Project>
<Project Path="Bookmarkly.ViewModels/Bookmarkly.ViewModels.csproj"
Id="01597b2f-54eb-40f5-9beb-d67310103cdd" />
<Project Path="Bookmarkly.ViewModels/Bookmarkly.ViewModels.csproj" Id="01597b2f-54eb-40f5-9beb-d67310103cdd" />
<Project Path="Bookmarkly.Views/Bookmarkly.Views.csproj" Id="c92089a8-1b8c-43b3-bf4c-4ef7cca44160" />
</Solution>
2 changes: 1 addition & 1 deletion Cyclotron
Submodule Cyclotron updated 33 files
+246 −0 .editorconfig
+1 −1 Cyclotron.FileSystemAdapter/Abstractions/Handlers/IFolderHandler.cs
+2 −2 Cyclotron.FileSystemAdapter/Abstractions/Pickers/IFileOpenPicker.cs
+1 −1 Cyclotron.FileSystemAdapter/Abstractions/Pickers/IFolderPicker.cs
+24 −20 Cyclotron.FileSystemAdapter/Cyclotron.FileSystemAdapter.csproj
+1 −1 Cyclotron.FileSystemAdapter/FileExtensions.cs
+34 −6 Cyclotron.FileSystemAdapter/FileSystemProvider.cs
+4 −6 Cyclotron.FileSystemAdapter/FolderExtensions.cs
+5 −4 Cyclotron.FileSystemAdapter/GlobalUsings.cs
+2 −0 Cyclotron.FileSystemAdapter/NativeMethods.txt
+6 −5 Cyclotron.FileSystemAdapter/ServiceCollectionExtensions.cs
+10 −2 Cyclotron.FileSystemAdapter/WinUI/FileSystemProvider.WinUI.cs
+8 −8 Cyclotron.FileSystemAdapter/WinUI/Handlers/WinUIFolderHandler.cs
+6 −6 Cyclotron.FileSystemAdapter/WinUI/Models/WinUIFile.cs
+5 −5 Cyclotron.FileSystemAdapter/WinUI/Models/WinUIFolder.cs
+16 −18 Cyclotron.FileSystemAdapter/WinUI/Pickers/WinUIFileOpenPicker.cs
+10 −12 Cyclotron.FileSystemAdapter/WinUI/Pickers/WinUIFileSavePicker.cs
+8 −10 Cyclotron.FileSystemAdapter/WinUI/Pickers/WinUIFolderPicker.cs
+45 −0 Cyclotron.FileSystemAdapter/WinUI/Pickers/WindowUtil.cs
+1 −3 Cyclotron.Telemetry/Configuration/LoggingOptions.cs
+15 −23 Cyclotron.Telemetry/Cyclotron.Telemetry.csproj
+1 −5 Cyclotron.Telemetry/DependencyInjection/ServiceCollectionExtensions.cs
+5 −5 Cyclotron.Telemetry/GlobalUsings.cs
+0 −3 Cyclotron.Telemetry/Logging/CallerInfoEnricher.cs
+0 −4 Cyclotron.Telemetry/Logging/CyclotronLogger.cs
+1 −1 Cyclotron.Telemetry/Logging/ICyclotronLogger.cs
+3 −4 Cyclotron.Utilities/CleanArchitecture/Request.cs
+3 −4 Cyclotron.Utilities/CleanArchitecture/Response.cs
+3 −3 Cyclotron.Utilities/Cyclotron.Utilities.csproj
+0 −3 Cyclotron.Utilities/GlobalUsings.cs
+1 −0 Cyclotron.slnx
+17 −11 Directory.Build.Props
+1 −0 Directory.Packages.props
Loading
Loading