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
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## `1.1.1` (2025-06-27)

### Fixes

- frontend: Fix login on press enter
- backend: Fix error 405 on update dynamic pages

## `1.1.0` (2025-05-22)

### Features
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.0
1.1.1
2 changes: 1 addition & 1 deletion backend/src/EasyVPN.Api/EasyVPN.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>1.1.0</Version>
<Version>1.1.1</Version>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>$(NoWarn);1591</NoWarn>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using EasyVPN.Application.Common.Interfaces.Persistence;
using EasyVPN.Application.Common.Interfaces.Services;
using EasyVPN.Domain.Common.Errors;
using EasyVPN.Domain.Entities;
using ErrorOr;
using MediatR;

Expand All @@ -25,23 +24,20 @@ public async Task<ErrorOr<Updated>> Handle(UpdateDynamicPageCommand command, Can
if (_dynamicPageRepository.Get(command.Route) is not { } page)
return Errors.DynamicPage.NotFound;

var newPage = new DynamicPage
{
Route = command.NewRoute,
Title = command.Title,
Content = command.Content,
Created = page.Created,
LastModified = _dateTimeProvider.UtcNow,
};

if (page.Route == newPage.Route)
page.Title = command.Title;
page.Content = command.Content;
page.LastModified = _dateTimeProvider.UtcNow;

if (page.Route == command.NewRoute)
{
_dynamicPageRepository.Update(newPage);
_dynamicPageRepository.Update(page);
}
else
{
_dynamicPageRepository.Remove(page.Route);
_dynamicPageRepository.Add(newPage);

page.Route = command.NewRoute;
_dynamicPageRepository.Add(page);
}

return Result.Updated;
Expand Down
2 changes: 1 addition & 1 deletion backend/src/EasyVPN.Application/EasyVPN.Application.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Version>1.1.0</Version>
<Version>1.1.1</Version>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\EasyVPN.Domain\EasyVPN.Domain.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion backend/src/EasyVPN.Contracts/EasyVPN.Contracts.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Version>1.1.0</Version>
<Version>1.1.1</Version>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion backend/src/EasyVPN.Domain/EasyVPN.Domain.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Version>1.1.0</Version>
<Version>1.1.1</Version>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ErrorOr" Version="2.0.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Version>1.1.0</Version>
<Version>1.1.1</Version>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\EasyVPN.Application\EasyVPN.Application.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
<Version>1.1.0</Version>
<Version>1.1.1</Version>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="7.0.0-alpha.4" />
Expand Down
4 changes: 2 additions & 2 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "easy-vpn-frontend",
"version": "1.1.0",
"version": "1.1.1",
"private": true,
"dependencies": {
"@emotion/react": "^11.13.3",
Expand Down
9 changes: 7 additions & 2 deletions frontend/src/modules/LoginForm/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,13 @@ const LoginForm: FC = () => {
Auth.login(login, password),
);

const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
event.preventDefault();
loginHandler(null, () => customNavigate(prevPage ?? '/'));
};

return (
<Box className="login-form">
<Box component="form" onSubmit={handleSubmit} className="login-form">
<TextField
sx={{ width: '25ch', my: 1 }}
label="Login"
Expand All @@ -47,7 +52,7 @@ const LoginForm: FC = () => {
sx={{ my: 1 }}
variant="contained"
size="large"
onClick={() => loginHandler(null, () => customNavigate(prevPage ?? '/'))}
type="submit"
loading={loading}
>
Sign In
Expand Down
15 changes: 10 additions & 5 deletions frontend/src/modules/RegisterForm/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,15 @@ const RegisterForm: FC = () => {
Auth.register({ firstName, lastName, login, password }),
);

const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
event.preventDefault();
if (remPassword === password) {
registerHandler(null, () => customNavigate(prevPage ?? '/'));
}
};

return (
<Box className="register-form">
<Box component="form" onSubmit={handleSubmit} className="register-form">
<TextField
sx={{ width: '25ch' }}
label="First name"
Expand Down Expand Up @@ -61,7 +68,7 @@ const RegisterForm: FC = () => {
<SecretOutlinedField
sx={{ width: '25ch' }}
error={remPassword !== password}
label="Repit password"
label="Repeat password"
onChange={(e) => setRemPassword(e.target.value)}
value={remPassword}
/>
Expand All @@ -70,9 +77,7 @@ const RegisterForm: FC = () => {
disabled={remPassword !== password}
variant="contained"
size="large"
onClick={() =>
registerHandler(null, () => customNavigate(prevPage ?? '/'))
}
type="submit"
loading={loading}
>
Sign Up
Expand Down
2 changes: 1 addition & 1 deletion init/init.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
VERSION=1.1.0
VERSION=1.1.1

echo ""
echo "🔧 Data Initialization Script"
Expand Down
2 changes: 1 addition & 1 deletion services/AmneziaWgVpn/cmd/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
service:
name: 'wireguard-vpn'
version: '1.1.0'
version: '1.1.1'
api:
port: "8010"
vpn:
Expand Down
4 changes: 2 additions & 2 deletions services/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@

### Сервисы управляющие своими vpn соеденениями, имеющие общее версионируемое `vpn-api`:

1. **WireguardVpn - `wireguard-vpn-service`** - vpn-сервис на **GO**, работающий на протаколе **WireGuard**.
1. **WireguardVpn - `wireguard-vpn-service`** - vpn-сервис на **GO**, работающий на протоколе **WireGuard**.

2. **AmneziaWgVpn - `amneziawg-vpn-service`** - vpn-сервис на **GO**, работающий на протаколе **AmneziaWG** (улучшенный WireGuard).
2. **AmneziaWgVpn - `amneziawg-vpn-service`** - vpn-сервис на **GO**, работающий на протоколе **AmneziaWG** (улучшенный WireGuard).


### Таблица потдержки версий `vpn-api`:
Expand Down
2 changes: 1 addition & 1 deletion services/TelegramBot/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "easy-vpn-telegram-bot"
version = "1.1.0"
version = "1.1.1"
description = "Telegram Notification Bot for Easy VPN"
authors = ["Alex Poryadin (sw1pr0g) <alex.poryadih@gmail.com>"]
license = "MIT"
Expand Down
2 changes: 1 addition & 1 deletion services/WireguardVpn/cmd/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
service:
name: 'wireguard-vpn'
version: '1.1.0'
version: '1.1.1'
api:
port: "8000"
vpn:
Expand Down
Loading