Skip to content

Commit

Permalink
Dies und Das
Browse files Browse the repository at this point in the history
- PrePersist vergessen
- Design angepasst
- Korrekturen
  • Loading branch information
schipplock committed Jan 1, 2024
1 parent 977fcba commit 8e7624c
Show file tree
Hide file tree
Showing 20 changed files with 33 additions and 47 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ Meine Blogsoftware. TIL = Today I learned.

## Screenshots

![](</screenshots/screenshot1_low.jpg>)
![](</screenshots/screenshot5_low.jpg>)
![](</screenshots/screenshot1_small.png>)
![](</screenshots/screenshot2_small.png>)

## Das Image bauen

```bash
docker build --network=host --force-rm -t ghcr.io/schipplock/tilstory:v0.0.2 .
docker build --network=host --force-rm -t ghcr.io/schipplock/tilstory:v0.0.5 .
```
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ services:
- flywaydb

tilstory-app:
image: ghcr.io/schipplock/tilstory:v0.0.2
image: ghcr.io/schipplock/tilstory:v0.0.5
container_name: tilstory-app
networks:
local-net:
Expand Down
Binary file modified screenshots/screenshot1.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 removed screenshots/screenshot1_low.jpg
Binary file not shown.
Binary file added screenshots/screenshot1_small.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 modified screenshots/screenshot2.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 screenshots/screenshot2_small.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 modified screenshots/screenshot3.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 screenshots/screenshot3_small.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 modified screenshots/screenshot4.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 removed screenshots/screenshot5.png
Binary file not shown.
Binary file removed screenshots/screenshot5_low.jpg
Binary file not shown.
Binary file removed screenshots/screenshot6.png
Binary file not shown.
Binary file removed screenshots/screenshot6_low.jpg
Binary file not shown.
Binary file removed screenshots/screenshot7.png
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,6 @@ public Post(UUID uuid, String subject, String body, boolean draft) {
this.draft = draft;
}

public Post(Long id, String subject, String body, boolean draft) {
this.id = id;
this.subject = subject;
this.body = body;
this.draft = draft;
}

public Long getId() {
return id;
}
Expand Down Expand Up @@ -102,11 +95,6 @@ public void setUpdated(LocalDateTime updated) {
this.updated = updated;
}

@PrePersist
public void initializeUUID() {
guid = UUID.randomUUID();
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
Expand Down
6 changes: 5 additions & 1 deletion src/main/webapp/WEB-INF/includes/admin/header.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,12 @@
<title>${settings:name()} Admin</title>
<main>
<header>
<a href="${pageContext.request.contextPath}/admin.jsp"><h1>${settings:name()}</h1></a>
<h1># <a href="${pageContext.request.contextPath}/">${settings:name()}</a></h1>
<h2>Kurze Texte von ${settings:author()}</h2>
<h3>
<a href="https://github.com/schipplock/tilstory" target="_blank">TILStory 0.0.5</a> |
<a href="${pageContext.request.contextPath}/rss.jsp">rss</a>
</h3>
</header>
<nav id="menu">
<b id="menulabel">menü:</b>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/includes/header.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<h1># <a href="${pageContext.request.contextPath}/">${settings:name()}</a></h1>
<h2>Kurze Texte von ${settings:author()}</h2>
<h3>
<a href="https://github.com/schipplock/tilstory" target="_blank">TILStory 0.0.4</a> |
<a href="https://github.com/schipplock/tilstory" target="_blank">TILStory 0.0.5</a> |
<a href="${pageContext.request.contextPath}/rss.jsp">rss</a>
</h3>
</header>
4 changes: 4 additions & 0 deletions src/main/webapp/admin.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@
<input type="submit" value="speichern" />
</form>
</section>

<section class="container">
<h2>Vorschau</h2>
</section>

<c:if test="${not empty param.id}">
<section class="post">
Expand Down
48 changes: 19 additions & 29 deletions src/main/webapp/css/main.css.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,14 @@ main {
}

header {
box-sizing:border-box;
border: 1px solid #41c4a6;
margin-bottom: 10px;
background-color:#fff;
box-shadow: 0 0 20px rgba(0, 0, 0, 0.15);
width:50%;
margin-left: auto;
margin-right: auto;
width:100%;
text-align:center;
-webkit-border-radius: 50px 50px 0 50px;
-moz-border-radius: 50px 50px 0 50px;
border-radius: 50px 50px 0 50px;
border-radius: 5px 5px 0 0;
}

header h1 {
Expand All @@ -76,14 +73,15 @@ header h2 {
header h3 {
color: #c1c8c2;
font-size:0.6em;
padding:0;
margin: 0 0 1px 11px;
padding:3px 0 3px 0;
margin:0;
border-top-width:1px;
border-top-color: #d8fff6;
border-top-style:solid;
}

section {
box-sizing:border-box;
border: 1px solid #41c4a6;
padding: 10px 10px 10px 10px;
margin-bottom: 10px;
Expand All @@ -99,34 +97,30 @@ section h1 {
}

section.post {
box-sizing:border-box;
padding:0;
width:100%;
-webkit-border-top-right-radius: 50px;
-moz-border-radius-topright: 50px;
border-top-right-radius: 50px;
}

section.postcontentless {
width:60%;
-webkit-border-radius: 50px;
-moz-border-radius: 50px;
border-radius: 50px;
box-sizing:border-box;
width:100%;
}

section.postcontentless:nth-child(odd) {
margin-left: auto;
background-color:#fff;
}

section.postcontentless:nth-child(even) {
margin-right: auto;
background-color: #fafafa;
}

section.post:nth-child(odd) {
border: 1px solid #41c4a6;
}

section.post:nth-child(even) {
border: 1px solid #03fab9;
border: 1px solid #41c4a6;
}

section.post h1.subject {
Expand All @@ -150,9 +144,9 @@ section.post h2.error-description {
}

section.postcontentless h1.subject {
text-align:center;
text-align:left;
margin:0;
font-size: 0.8em;
font-size: 1em;
text-shadow: 0 0 0;
}

Expand Down Expand Up @@ -225,8 +219,8 @@ section.post pre code {
padding:10px;
margin:0;
background-color: #f7f7f7;
border-bottom: 1px solid #41c4a6;
border-top:0;
border-top: 1px solid #41c4a6;
border-bottom:0;
}

section.post ul, section.post.ol {
Expand All @@ -240,6 +234,7 @@ section.post ul, section.post.ol {
}

footer {
box-sizing:border-box;
font-size:0.8em;
background-color: #fff;
border-width: 1px;
Expand All @@ -248,13 +243,8 @@ footer {
padding: 10px 10px 10px;
margin-bottom: 10px;
box-shadow: 0 0 20px rgba(0, 0, 0, 0.15);
width:50%;
margin-left: auto;
margin-right: auto;
text-align:center;
-webkit-border-radius: 50px 0 50px 50px;
-moz-border-radius: 50px 0 50px 50px;
border-radius: 50px 0 50px 50px;
width:100%;
border-radius: 0 0 5px 5px;
}

.email {
Expand Down

0 comments on commit 8e7624c

Please sign in to comment.