Compare commits

..

No commits in common. "master" and "dev/multiple-notes" have entirely different histories.

16 changed files with 28 additions and 58 deletions

View File

@ -1,12 +0,0 @@
{
"version": 1,
"isRoot": true,
"tools": {
"dotnet-ef": {
"version": "8.0.0",
"commands": [
"dotnet-ef"
]
}
}
}

3
.gitignore vendored
View File

@ -229,9 +229,6 @@ _pkginfo.txt
# but keep track of directories ending in .cache # but keep track of directories ending in .cache
!?*.[Cc]ache/ !?*.[Cc]ache/
# exclude notes
notes/*
# Others # Others
ClientBin/ ClientBin/
~$* ~$*

View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS> <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>

View File

@ -8,9 +8,12 @@ namespace BinaryDad.Notes.Controllers
{ {
private readonly INoteService noteService; private readonly INoteService noteService;
public ApiController(INoteService noteService) => this.noteService = noteService; public ApiController(INoteService noteService)
{
this.noteService = noteService;
}
[Route("note/{noteName}")] [Route("note/{noteName}")]
public string Note(string noteName) => noteService.GetNote(noteName); public string Note(string noteName) => noteService.GetText(noteName);
} }
} }

View File

@ -8,13 +8,6 @@ namespace BinaryDad.Notes.Controllers
{ {
public class LoginController : Controller public class LoginController : Controller
{ {
private readonly IConfiguration configuration;
public LoginController(IConfiguration configuration)
{
this.configuration = configuration;
}
[Route("login")] [Route("login")]
public IActionResult Login() public IActionResult Login()
{ {
@ -28,7 +21,7 @@ namespace BinaryDad.Notes.Controllers
{ {
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
var appPassphrase = configuration["APP_PASSPHRASE"]; var appPassphrase = Environment.GetEnvironmentVariable("APP_PASSPHRASE");
if (passphrase == appPassphrase) if (passphrase == appPassphrase)
{ {

View File

@ -10,7 +10,10 @@ public class NoteController : Controller
{ {
private readonly INoteService noteService; private readonly INoteService noteService;
public NoteController(INoteService noteService) => this.noteService = noteService; public NoteController(INoteService noteService)
{
this.noteService = noteService;
}
[Route("{noteName=default}")] [Route("{noteName=default}")]
public IActionResult Index(string noteName) public IActionResult Index(string noteName)
@ -18,7 +21,7 @@ public class NoteController : Controller
var model = new ContentModel var model = new ContentModel
{ {
CurrentNote = noteName, CurrentNote = noteName,
Text = noteService.GetNote(noteName), Text = noteService.GetText(noteName),
NoteNames = noteService.GetNoteNames() NoteNames = noteService.GetNoteNames()
}; };

View File

@ -1,14 +1,13 @@
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
WORKDIR /src WORKDIR /src
COPY . . COPY . .
RUN dotnet publish "BinaryDad.Notes.csproj" -c Release -o /app/publish /p:UseAppHost=false RUN dotnet publish "BinaryDad.Notes.csproj" -c Release -o /app/publish /p:UseAppHost=false
FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
WORKDIR /app WORKDIR /app
RUN mkdir notes
COPY --from=build /app/publish . COPY --from=build /app/publish .
EXPOSE 8080 EXPOSE 80
ENTRYPOINT ["dotnet", "BinaryDad.Notes.dll"] ENTRYPOINT ["dotnet", "BinaryDad.Notes.dll"]

View File

@ -1,10 +1,8 @@
using BinaryDad.Notes.Services; using BinaryDad.Notes.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.SignalR; using Microsoft.AspNetCore.SignalR;
namespace BinaryDad.Notes namespace BinaryDad.Notes
{ {
[Authorize]
public class NoteHub : Hub public class NoteHub : Hub
{ {
private readonly INoteService noteService; private readonly INoteService noteService;
@ -23,9 +21,9 @@ namespace BinaryDad.Notes
return base.OnConnectedAsync(); return base.OnConnectedAsync();
} }
public async Task SaveNote(string content, string noteName) public async Task SaveNote(string content, string? noteName)
{ {
noteService.SaveNote(content, noteName); noteService.SaveText(content, noteName);
// find all other connections except for the current one // find all other connections except for the current one
var clientConnections = NoteContext.ClientNotes var clientConnections = NoteContext.ClientNotes

View File

@ -4,8 +4,6 @@ using Microsoft.AspNetCore.Authentication.Cookies;
var builder = WebApplication.CreateBuilder(args); var builder = WebApplication.CreateBuilder(args);
builder.Configuration.AddEnvironmentVariables();
// Add services to the container. // Add services to the container.
builder.Services.AddControllersWithViews(); builder.Services.AddControllersWithViews();
builder.Services.AddSignalR(); builder.Services.AddSignalR();
@ -16,7 +14,6 @@ builder.Services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationSc
o.LoginPath = "/login"; o.LoginPath = "/login";
o.Cookie.Name = "NotesUser"; o.Cookie.Name = "NotesUser";
o.Cookie.MaxAge = TimeSpan.FromDays(3); o.Cookie.MaxAge = TimeSpan.FromDays(3);
o.SlidingExpiration = true;
}); });
var app = builder.Build(); var app = builder.Build();

View File

@ -14,7 +14,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<WebPublishMethod>FileSystem</WebPublishMethod> <WebPublishMethod>FileSystem</WebPublishMethod>
<_TargetId>Folder</_TargetId> <_TargetId>Folder</_TargetId>
<SiteUrlToLaunchAfterPublish /> <SiteUrlToLaunchAfterPublish />
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier> <RuntimeIdentifier>win-x64</RuntimeIdentifier>
<ProjectGuid>bf137709-fcd2-4bb0-ade0-8fc71a244485</ProjectGuid> <ProjectGuid>bf137709-fcd2-4bb0-ade0-8fc71a244485</ProjectGuid>
<SelfContained>false</SelfContained> <SelfContained>false</SelfContained>

View File

@ -16,7 +16,7 @@
} }
} }
public string GetNote(string noteName) public string GetText(string noteName)
{ {
CheckFile(noteName); CheckFile(noteName);
@ -30,7 +30,7 @@
.ToList(); .ToList();
} }
public void SaveNote(string content, string noteName) public void SaveText(string content, string noteName)
{ {
File.WriteAllText(GetFilePath(noteName), content); File.WriteAllText(GetFilePath(noteName), content);
} }
@ -51,7 +51,7 @@
{ {
Directory.CreateDirectory(folderPath); Directory.CreateDirectory(folderPath);
SaveNote("Hi! Feel free to start typing. Everything will be saved soon after you are done typing.", noteName); SaveText("Hi! Feel free to start typing. Everything will be saved soon after you are done typing.", noteName);
} }
} }

View File

@ -3,8 +3,8 @@
public interface INoteService public interface INoteService
{ {
ICollection<string> GetNoteNames(); ICollection<string> GetNoteNames();
string GetNote(string noteName); string GetText(string noteName);
void SaveNote(string content, string noteName); void SaveText(string content, string noteName);
void DeleteNote(string noteName); void DeleteNote(string noteName);
} }
} }

View File

@ -19,7 +19,4 @@
<script> <script>
var noteName = '@Model.CurrentNote'; var noteName = '@Model.CurrentNote';
</script> </script>
<script src="~/lib/signalr/dist/browser/signalr.min.js"></script>
<script src="~/js/site.js" asp-append-version="true"></script>
} }

View File

@ -11,10 +11,12 @@
<body> <body>
@RenderBody() @RenderBody()
<script src="~/lib/jquery/dist/jquery.min.js"></script>
@RenderSection("scripts", false) @RenderSection("scripts", false)
<script src="~/lib/jquery/dist/jquery.min.js"></script>
<script src="~/lib/signalr/dist/browser/signalr.min.js"></script>
<script src="~/js/site.js" asp-append-version="true"></script>
</body> </body>
</html> </html>

View File

@ -1,7 +0,0 @@
#! /bin/bash
# build the image
sudo docker build -f ./Dockerfile . -t docker.io/binarydad/notes:latest
# push the image
sudo docker push docker.io/binarydad/notes:latest

View File

@ -9,7 +9,7 @@ function start() {
console.log('Started websocket listener'); console.log('Started websocket listener');
}).catch(function (err) { }).catch(function (err) {
console.error(err.toString()); console.error(err.toString());
location.reload(); return alert('Connection error. Reload page.');
}); });
} }