Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop/1.2.0 #48

Merged
merged 18 commits into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b2147b4
fix #40: start trunk with --no-autoreload flag
PetoMPP Dec 18, 2023
f3b04ed
fix #31: Avoid substracting from usize equal to 0 in dec_page
PetoMPP Dec 18, 2023
a62e8d4
fix #37: Parse links correctly in markdown
PetoMPP Dec 18, 2023
ccb3a23
fix #27: localize missing string in editor
PetoMPP Dec 18, 2023
7ac6bfc
resolves #28: Implement page titles
PetoMPP Dec 19, 2023
33fda62
fixes #29: use click outside instead of focus events for force open i…
PetoMPP Dec 21, 2023
d76580e
fixes #30: truncate text in image select input
PetoMPP Dec 21, 2023
0434f9b
fix #32: add name check for new resources both ext and in cache
PetoMPP Dec 22, 2023
3f81362
fix #34: Load initial value only on first render for Text and Textare…
PetoMPP Dec 23, 2023
0f0b6c0
resolves #35: Recreate blog title display to be more visible
PetoMPP Dec 25, 2023
63deaff
fix #33: use editor state to tell if delete button should be rendered
PetoMPP Dec 26, 2023
c9a8868
#32: Fix issue with creating new blog posts, add bg to outilne button…
PetoMPP Dec 26, 2023
f2ac380
fix #38: add wrap to tag list, make texts independent from bg transforms
PetoMPP Dec 26, 2023
bd2d0f1
fix #42: Add registration validation on front end, rework how errors …
PetoMPP Dec 28, 2023
f6af3e0
update package version
PetoMPP Dec 28, 2023
398bc96
Feature/1.2.0/projects (#51) resolves #17
PetoMPP Feb 8, 2024
a4edb86
resolves #47: add favicon and logo
PetoMPP Feb 13, 2024
6934d51
resolves #41: Add robots.txt and add discoverable links to blog pages
PetoMPP Feb 13, 2024
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
491 changes: 271 additions & 220 deletions Cargo.lock

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "petompp-web-front"
version = "1.1.2"
version = "1.2.0"
edition = "2021"

[profile.release]
Expand All @@ -13,12 +13,13 @@ opt-level = "z"
async-std = "1.12"
chrono = { version = "0.4", features = ["serde"] }
deref-derive = "0.1"
futures = "0.3"
gloo = "0.10"
lazy_static = "1.4"
markdown = "1.0.0-alpha.12"
petompp-web-models = { git = "https://github.com/PetoMPP/petompp-web-models.git", branch = "0.4.5", features = [
petompp-web-models = { git = "https://github.com/PetoMPP/petompp-web-models.git", branch = "0.7.4", features = [
"timeago",
"web-sys",
"wasm",
] }
regex = "1.10"
reqwasm = "0.5"
Expand All @@ -28,13 +29,16 @@ serde_yaml = "0.9"
strum = { version = "0.25", features = ["derive"] }
timeago = "0.4"
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"
web-sys = { version = "0.3", features = [
"ClipboardEvent",
"Crypto",
"DataTransfer",
"HtmlImageElement",
"HtmlInputElement",
"HtmlDialogElement",
"Navigator",
"MediaQueryList",
] }
yew = { version = "0.20", features = ["csr"] }
yew-router = "0.17"
Expand Down
2 changes: 1 addition & 1 deletion dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ WORKDIR /front
COPY . .
RUN npm install -D
EXPOSE 8080
CMD trunk serve --release --address 0.0.0.0
CMD trunk serve --no-autoreload --release --address 0.0.0.0
Binary file added favicon.ico
Binary file not shown.
Binary file added img/logo_dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/logo_light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions img/ui/bold.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions img/ui/code-block.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions img/ui/code.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions img/ui/image.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions img/ui/italic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions img/ui/link.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions img/ui/quote.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions img/ui/strikethrough.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions img/ui/underline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<html>

<head>
<meta charset="UTF-8">
Expand All @@ -10,7 +10,8 @@
<link data-trunk rel="tailwind-css" href="./src/input.css" />
<link data-trunk rel="copy-dir" href="/img" />
<link data-trunk rel="copy-dir" href="/locales" />
<title>PetoMPP.NET</title>
<link data-trunk rel="icon" href="/favicon.ico" />
<link data-trunk rel="copy-file" href="/robots.txt" />
</head>

</html>
30 changes: 20 additions & 10 deletions locales/en.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
__version: 1.0
Home: Home
Projects: Projects
About: About
Contact: Contact
Loading: Loading
Ok: Ok
Cancel: Cancel
Insert: Insert
InsertLink: Insert Link
InsertImage: Insert Image
Url: URL
Text: Text
Gallery: Gallery
Save: Save
SaveChanges: Save Changes
SaveChangesQuestion: Do you want to save your changes?
Expand All @@ -28,7 +33,6 @@ Activate: Activate
ActivateUserQuestion: Do you want to activate user %{0}?
Delete: Delete
DeleteUserQuestion: Do you want to delete user %{0}?
ProjectsDescription: This is where I will put my projects.
Edit: Edit
Editing: Editing
Editor: Editor
Expand All @@ -50,10 +54,16 @@ NewBlogPost: New blog post
BlogPosts: Blog posts
BlogPostMetadata: Blog post metadata
BackToBlogPosts: "↩ back to posts.."
Project: Project
NewProject: New project
Projects: Projects
AllProjects: All projects
ProjectMetadata: Project metadata
Title: Title
Summary: Summary
Tags: Tags
Image: Image
Images: Images
DeleteDir: Delete directory
DeleteDirQuestion: Do you want to delete directory?
EnterDirname: Enter directory name..
Expand All @@ -66,6 +76,14 @@ Creating: Creating
Updated: Updated
NothingSelected: Nothing selected
ErrorOccured: An error has occured!
Username_InvalidLength: "Username must be between %{0} and %{1} characters long."
Username_OnlyAlphanumericOrSelectedChars: "Username can only contain letters, numbers and allowed special characters (%{0})."
Username_NameTaken: "Username %{0} is already taken."
Password_MinLength: "Password must be at least %{0} characters long."
Password_ContainsNumber: "Password must contain at least 1 number."
Password_ContainsUppercase: "Password must contain at least 1 uppercase letter."
Password_ContainsLowercase: "Password must contain at least 1 lowercase letter."
Password_ContainsSpecial: "Password must contain at least 1 special character."
# Errors
E_Auth_MissingClaim: Authentication failed. Missing claim "%{0}".
E_Auth_InvalidFormat: Authentication failed. Invalid calim format "%{0}".
Expand All @@ -77,14 +95,6 @@ E_UserNameTaken: "Username %{0} is already taken."
E_UserNotFound: "User %{0} was not found."
E_InvalidCredentials: "Invalid credentials."
E_UserNotConfirmed: "User %{0} is not confirmed."
E_Validation_Username_InvalidLength: "Username must be between %{0} and %{1} characters long."
E_Validation_Username_InvalidCharacters: "Username can only contain letters, numbers and allowed special characters (%{0})."
E_Validation_Password: "Password is invalid."
E_Validation_PasswordRequirement: "Password must be at least %{0} characters long pass at least %{1} of the following requirements: %{2}."
E_Validation_PasswordRequirement_ContainsLowercase: "at least 1 lowercase letters"
E_Validation_PasswordRequirement_ContainsUppercase: "at least 1 uppercase letters"
E_Validation_PasswordRequirement_ContainsNumber: "at least 1 number"
E_Validation_PasswordRequirement_ContainsSpecialCharacter: "at least 1 special character"
E_Validation_Country: "Country is invalid."
E_Validation_Query_InvalidColumn: "Invalid column %{0}."
E_Validation_ResourceData_KeyMismatch: "Key mismatch. Expected %{0}, got %{1}."
Expand Down
30 changes: 20 additions & 10 deletions locales/pl.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
__version: 1.0
Home: Strona główna
Projects: Projekty
About: O mnie
Contact: Kontakt
Loading: Ładowanie
Ok: Ok
Cancel: Anuluj
Insert: Wstaw
InsertLink: Wstaw link
InsertImage: Wstaw obraz
Url: URL
Text: Tekst
Gallery: Galeria
Save: Zapisz
SaveChanges: Zapisz zmiany
SaveChangesQuestion: Czy chcesz zapisać zmiany?
Expand All @@ -28,7 +33,6 @@ Activate: Aktywuj
ActivateUserQuestion: Czy chcesz aktywować użytkownika %{0}?
Delete: Usuń
DeleteUserQuestion: Czy chcesz usunąć użytkownika %{0}?
ProjectsDescription: Tutaj będę umieszczał swoje projekty.
Edit: Edytuj
Editing: Edycja
Editor: Edytor
Expand All @@ -50,10 +54,16 @@ NewBlogPost: Nowy post
BlogPosts: Posty
BlogPostMetadata: Metadane postu
BackToBlogPosts: "↩ powrót do postów.."
Project: Projekt
NewProject: Nowy projekt
Projects: Projekty
AllProjects: Wszystkie projekty
ProjectMetadata: Metadane projektu
Title: Tytuł
Summary: Podsumowanie
Tags: Tagi
Image: Obraz
Images: Obrazy
DeleteDir: Usuń katalog
DeleteDirQuestion: Czy chcesz usunąć katalog?
EnterDirname: Wpisz nazwę katalogu..
Expand All @@ -66,6 +76,14 @@ Creating: Tworzenie
Updated: Zaktualizowano
NothingSelected: Nic nie wybrano
ErrorOccured: Wystąpił błąd!
Username_InvalidLength: Nazwa użytkownika musi mieć od %{0} do %{1} znaków.
Username_OnlyAlphanumericOrSelectedChars: Nazwa użytkownika może zawierać tylko litery, cyfry oraz wybrane znaki specjalne (%{0}).
Username_NameTaken: Nazwa użytkownika %{0} jest już zajęta.
Password_MinLength: Hasło musi mieć co najmniej %{0} znaków.
Password_ContainsNumber: Hasło musi zawierać co najmniej 1 cyfrę.
Password_ContainsUppercase: Hasło musi zawierać co najmniej 1 dużą literę.
Password_ContainsLowercase: Hasło musi zawierać co najmniej 1 małą literę.
Password_ContainsSpecial: Hasło musi zawierać co najmniej 1 znak specjalny.
# Errors
E_Auth_MissingClaim: Uwierzytelnianie nie powiodło się. Brakujące roszczenie "%{0}".
E_Auth_InvalidFormat: Uwierzytelnianie nie powiodło się. Nieprawidłowy format roszczenia "%{0}".
Expand All @@ -77,14 +95,6 @@ E_UserNameTaken: "Nazwa użytkownika %{0} jest już zajęta."
E_UserNotFound: "Nie znaleziono użytkownika %{0}."
E_InvalidCredentials: "Nieprawidłowe dane logowania."
E_UserNotConfirmed: "Użytkownik %{0} nie jest potwierdzony."
E_Validation_Username_InvalidLength: "Nazwa użytkownika musi mieć od %{0} do %{1} znaków."
E_Validation_Username_InvalidCharacters: "Nazwa użytkownika może zawierać tylko litery, cyfry oraz wybrane znaki specjalne (%{0})."
E_Validation_Password: "Hasło jest nieprawidłowe."
E_Validation_PasswordRequirement: "Hasło musi mieć co najmniej %{0} znaków i spełniać co najmniej %{1} z następujących wymagań: %{2}."
E_Validation_PasswordRequirement_ContainsLowercase: "co najmniej 1 małą literę"
E_Validation_PasswordRequirement_ContainsUppercase: "co najmniej 1 dużą literę"
E_Validation_PasswordRequirement_ContainsNumber: "co najmniej 1 cyfrę"
E_Validation_PasswordRequirement_ContainsSpecialCharacter: "co najmniej 1 znak specjalny"
E_Validation_Country: "Państwo jest nieprawidłowe."
E_Validation_Query_InvalidColumn: "Nieprawidłowa kolumna %{0}."
E_Validation_ResourceData_KeyMismatch: "Niezgodność klucza. Oczekiwano %{0}, otrzymano %{1}."
Expand Down
10 changes: 5 additions & 5 deletions package-lock.json

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

2 changes: 2 additions & 0 deletions robots.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
User-agent: *
Disallow: /admin/
Loading
Loading