From 8c7a5e65fb002203f22cbf4ed49fcbad7017cf1c Mon Sep 17 00:00:00 2001 From: James Tombleson Date: Thu, 15 Jun 2023 21:50:03 -0700 Subject: [PATCH 1/8] fixing title and navbar --- Newsbot.Portal.Blazor.Server/Shared/MainLayout.razor | 4 +++- Newsbot.Portal.Blazor.Server/Shared/NavMenu.razor | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Newsbot.Portal.Blazor.Server/Shared/MainLayout.razor b/Newsbot.Portal.Blazor.Server/Shared/MainLayout.razor index c37bda4..a7cf3a1 100644 --- a/Newsbot.Portal.Blazor.Server/Shared/MainLayout.razor +++ b/Newsbot.Portal.Blazor.Server/Shared/MainLayout.razor @@ -1,6 +1,6 @@ @inherits LayoutComponentBase -Newsbot.Portal.Blazor.Server +Newsbot
@@ -8,8 +8,10 @@
+
About + Login
diff --git a/Newsbot.Portal.Blazor.Server/Shared/NavMenu.razor b/Newsbot.Portal.Blazor.Server/Shared/NavMenu.razor index e1df8e5..3877dd3 100644 --- a/Newsbot.Portal.Blazor.Server/Shared/NavMenu.razor +++ b/Newsbot.Portal.Blazor.Server/Shared/NavMenu.razor @@ -1,6 +1,6 @@ 
- Newsbot.Portal.Blazor.Server + Newsbot @@ -20,8 +20,8 @@
- - Fetch data + + Sources
From d6ab6fa4026c9b5d39cb8ba9669359937cd29658 Mon Sep 17 00:00:00 2001 From: James Tombleson Date: Thu, 15 Jun 2023 21:50:36 -0700 Subject: [PATCH 2/8] Moving Dockerfile to the root --- .dockerignore | 3 +++ Dockerfile | 20 ++++++++++++++++++++ Newsbot.Portal.Blazor.Server/Global.cs | 2 +- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 .dockerignore create mode 100644 Dockerfile diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..07c6bb4 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,3 @@ +appsettings.json +**/bin/ +**/obj/ \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..2320354 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,20 @@ +FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base +WORKDIR /app +EXPOSE 80 +EXPOSE 443 + +FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build +WORKDIR /src +COPY ["Newsbot.Portal.Blazor.Server/Newsbot.Portal.Blazor.Server.csproj", "Newsbot.Portal.Blazor.Server/"] +RUN dotnet restore "Newsbot.Portal.Blazor.Server/Newsbot.Portal.Blazor.Server.csproj" +COPY . . +WORKDIR "/src/Newsbot.Portal.Blazor.Server" +RUN dotnet build "Newsbot.Portal.Blazor.Server.csproj" -c Release -o /app/build + +FROM build AS publish +RUN dotnet publish "Newsbot.Portal.Blazor.Server.csproj" -c Release -o /app/publish /p:UseAppHost=false + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "Newsbot.Portal.Blazor.Server.dll"] diff --git a/Newsbot.Portal.Blazor.Server/Global.cs b/Newsbot.Portal.Blazor.Server/Global.cs index 0eda7bd..894e61a 100644 --- a/Newsbot.Portal.Blazor.Server/Global.cs +++ b/Newsbot.Portal.Blazor.Server/Global.cs @@ -2,6 +2,6 @@ namespace Newsbot.Portal.Blazor.Server; public static class Global { - public static HttpClient HttpClient { get; set; } + public static HttpClient? HttpClient { get; set; } public static string? DefaultInstanceUri { get; set; } } \ No newline at end of file From 23f0c2efae8921dd8ceafdd1ed145cf505568d61 Mon Sep 17 00:00:00 2001 From: James Tombleson Date: Thu, 15 Jun 2023 21:51:15 -0700 Subject: [PATCH 3/8] added example compose file --- docker-compose.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..b1da441 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,16 @@ +version: "3" + +networks: + newsbot: + +services: + portal: + image: newsbot.portal:latest + environment: + Logging__LogLevel__Default: "Information" + Logging__LogLevel__Microsoft.AspNetCore: "Warning" + DefaultInstanceUri: "http://192.168.1.225:5001" + ports: + - "5002:80" + networks: + - newsbot \ No newline at end of file From de52f8df79133447fea0e222d82ae02115ef8e23 Mon Sep 17 00:00:00 2001 From: James Tombleson Date: Thu, 15 Jun 2023 21:51:29 -0700 Subject: [PATCH 4/8] Attempting to push the docker image to docker hub --- .drone.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index e89e131..f5efdbe 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,15 +6,17 @@ name: build steps: - name: build image image: plugins/docker + environment: + PAT: + from_secret: DockerPushPat settings: - repo: 192.168.1.196:5000/jtom38/newsbot-portal - registry: 192.168.1.196:5000 - insecure: true - tags: - - latest + username: jtom38 + password: $PAT + repo: jtom38/newsbot-portal trigger: branch: - master + - releases/* --- kind: pipeline From 09d9543f3d121e623f420844008153ffc75f47f9 Mon Sep 17 00:00:00 2001 From: James Tombleson Date: Thu, 15 Jun 2023 21:51:37 -0700 Subject: [PATCH 5/8] makefile time --- makefile | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 makefile diff --git a/makefile b/makefile new file mode 100644 index 0000000..f940dbf --- /dev/null +++ b/makefile @@ -0,0 +1,20 @@ +.PHONY: help +help: ## Shows this help command + @egrep -h '\s##\s' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' + +build: ## builds the application + dotnet restore + dotnet build + +pub: ## Build and publish the artifacts + dotnet restore + dotnet publish -o out + rm ./out/appsettings.json + +docker-build: ## Generates the docker image + docker build -t "newsbot.portal" . + docker image ls | grep newsbot.portal + +docker-run: ## Runs the docker compose + docker compose up -d + From 7a7cd9966b7304bcb9379f1e2b97be7e45f097e9 Mon Sep 17 00:00:00 2001 From: James Tombleson Date: Thu, 15 Jun 2023 21:52:00 -0700 Subject: [PATCH 6/8] docker cleanup --- Newsbot.Portal.Blazor.Server/Dockerfile | 20 ------------------- .../Newsbot.Portal.Blazor.Server.csproj | 6 ------ 2 files changed, 26 deletions(-) delete mode 100644 Newsbot.Portal.Blazor.Server/Dockerfile diff --git a/Newsbot.Portal.Blazor.Server/Dockerfile b/Newsbot.Portal.Blazor.Server/Dockerfile deleted file mode 100644 index 2320354..0000000 --- a/Newsbot.Portal.Blazor.Server/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base -WORKDIR /app -EXPOSE 80 -EXPOSE 443 - -FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build -WORKDIR /src -COPY ["Newsbot.Portal.Blazor.Server/Newsbot.Portal.Blazor.Server.csproj", "Newsbot.Portal.Blazor.Server/"] -RUN dotnet restore "Newsbot.Portal.Blazor.Server/Newsbot.Portal.Blazor.Server.csproj" -COPY . . -WORKDIR "/src/Newsbot.Portal.Blazor.Server" -RUN dotnet build "Newsbot.Portal.Blazor.Server.csproj" -c Release -o /app/build - -FROM build AS publish -RUN dotnet publish "Newsbot.Portal.Blazor.Server.csproj" -c Release -o /app/publish /p:UseAppHost=false - -FROM base AS final -WORKDIR /app -COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "Newsbot.Portal.Blazor.Server.dll"] diff --git a/Newsbot.Portal.Blazor.Server/Newsbot.Portal.Blazor.Server.csproj b/Newsbot.Portal.Blazor.Server/Newsbot.Portal.Blazor.Server.csproj index a6da8b6..8ff23fb 100644 --- a/Newsbot.Portal.Blazor.Server/Newsbot.Portal.Blazor.Server.csproj +++ b/Newsbot.Portal.Blazor.Server/Newsbot.Portal.Blazor.Server.csproj @@ -7,12 +7,6 @@ Linux - - - .dockerignore - - - From ac5efe31132652ad9b94dabc5cb8b6b294725239 Mon Sep 17 00:00:00 2001 From: James Tombleson Date: Thu, 15 Jun 2023 21:53:24 -0700 Subject: [PATCH 7/8] using a card view to show the posts --- .../Articles/{Newest.razor => Latest.razor} | 11 ++++-- .../Pages/Articles/ListBySource.razor | 36 ++++++++++++------- .../Pages/Articles/Sources.razor | 33 ----------------- 3 files changed, 31 insertions(+), 49 deletions(-) rename Newsbot.Portal.Blazor.Server/Pages/Articles/{Newest.razor => Latest.razor} (76%) delete mode 100644 Newsbot.Portal.Blazor.Server/Pages/Articles/Sources.razor diff --git a/Newsbot.Portal.Blazor.Server/Pages/Articles/Newest.razor b/Newsbot.Portal.Blazor.Server/Pages/Articles/Latest.razor similarity index 76% rename from Newsbot.Portal.Blazor.Server/Pages/Articles/Newest.razor rename to Newsbot.Portal.Blazor.Server/Pages/Articles/Latest.razor index 9dc1b50..9be58cc 100644 --- a/Newsbot.Portal.Blazor.Server/Pages/Articles/Newest.razor +++ b/Newsbot.Portal.Blazor.Server/Pages/Articles/Latest.razor @@ -1,7 +1,9 @@ -@page "/articles/newest" +@page "/articles/latest" @using Newsbot.Collector.Client @using Newsbot.Collector.Client.Domain.Dto -

List Articles

+ +Latest +

Latest Posts

@@ -11,7 +13,10 @@
...
-
@item.Title
+
+ @item.Title +
+

@item.PubDate

@item.Description

View
diff --git a/Newsbot.Portal.Blazor.Server/Pages/Articles/ListBySource.razor b/Newsbot.Portal.Blazor.Server/Pages/Articles/ListBySource.razor index b64eaed..a97de87 100644 --- a/Newsbot.Portal.Blazor.Server/Pages/Articles/ListBySource.razor +++ b/Newsbot.Portal.Blazor.Server/Pages/Articles/ListBySource.razor @@ -2,32 +2,42 @@ @using Newsbot.Collector.Client.Domain.Dto @using Newsbot.Collector.Client -

ListBySource

+@Record?.Name +

@Record?.Name

- - - - - +
+
@foreach (var item in Data ??= new List()) { -
- - - +
+
+ ... +
+
+ @item.Title +
+

@item.PubDate

+

@item.Description

+ View +
+
+
} -
TitlePublish Date
- @item.Title
- 		@item.PubDate
+
+
@code { [Parameter] public string? Id { get; set; } List? Data { get; set; } + SourcesDto? Record { get; set; } protected override async Task OnInitializedAsync() { + var s = new SourcesClient(Global.HttpClient, Global.DefaultInstanceUri ?? ""); + Record = await s.GetAsync(Guid.Parse(Id ?? "")); + var c = new ArticlesClient(Global.HttpClient, Global.DefaultInstanceUri ?? ""); var items = await c.ListBySourceAsync(Guid.Parse(Id ?? "")); Data = items; diff --git a/Newsbot.Portal.Blazor.Server/Pages/Articles/Sources.razor b/Newsbot.Portal.Blazor.Server/Pages/Articles/Sources.razor deleted file mode 100644 index 2d73d3b..0000000 --- a/Newsbot.Portal.Blazor.Server/Pages/Articles/Sources.razor +++ /dev/null @@ -1,33 +0,0 @@ -@page "/articles/sources" -@using Newsbot.Collector.Client -@using Newsbot.Collector.Client.Domain.Dto -

Select Source

- - - - - - - -@foreach (var item in Items ??= new List()) -{ - - - - - -} -
SourceNameType
@item.Source - @item.Name - @item.Type
- -@code { - private List? Items { get; set; } - - protected override async Task OnInitializedAsync() - { - var c = new SourcesClient(Global.HttpClient, Global.DefaultInstanceUri ?? ""); - Items = await c.ListAsync(); - - } -} \ No newline at end of file From 4fd51e24d0d49e38de53411731de8ef50f805e0e Mon Sep 17 00:00:00 2001 From: James Tombleson Date: Thu, 15 Jun 2023 21:54:17 -0700 Subject: [PATCH 8/8] Added tags to sources --- .../Pages/Sources/List.razor | 27 +++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/Newsbot.Portal.Blazor.Server/Pages/Sources/List.razor b/Newsbot.Portal.Blazor.Server/Pages/Sources/List.razor index aa1b953..c4f10b0 100644 --- a/Newsbot.Portal.Blazor.Server/Pages/Sources/List.razor +++ b/Newsbot.Portal.Blazor.Server/Pages/Sources/List.razor @@ -1,4 +1,4 @@ -@page "/sources/list" +@page "/sources" @using Newsbot.Collector.Client @using Newsbot.Collector.Client.Domain.Dto @@ -8,6 +8,7 @@ Title Publish Date + Tags @foreach (var item in Data ??= new List()) { @@ -21,12 +22,34 @@ @item.Name
@item.Source + @FlattenTags(@item.Tags ??= new List()) + + View News + } @code { - private List Data { get; set; } + private List? Data { get; set; } + + private string FlattenTags(List tags) + { + + string res = ""; + foreach (var tag in tags) + { + if (res == "") + { + res = tag; + } + else + { + res += $", {tag}"; + } + } + return res; + } protected override async Task OnInitializedAsync() {