Skip to content

Commit 5fc695e

Browse files
committed
Fixes; screenshots
1 parent 38780ff commit 5fc695e

File tree

8 files changed

+37
-31
lines changed

8 files changed

+37
-31
lines changed

README.md

+6-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ The project consists of the following amper modules:
2121
| [core](core) | domain data objects, interfaces, and exceptions |
2222
| [server / common](server/common) | common server functionality |
2323
| [server / rest](server/rest) | ktor server REST implementation |
24-
| [server / htmx](server/htmx) | HTMX server implementation |
2524
| [server / admin](server/admin) | admin service for making sensitive changes |
2625
| [app / common](app/common) | shared front-end application code |
2726
| [app / android](app/android) | android front-end application |
@@ -72,4 +71,9 @@ First, publish images locally using:
7271
Now, you can run docker compose:
7372
```bash
7473
docker compose up
75-
```
74+
```
75+
76+
## Screenshots
77+
78+
![](docs/chat-desktop.png)
79+
![](docs/chat-phone.png)

client/testResources@jvm/test-server.yaml

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
ktor:
22
application:
33
modules:
4-
- io.ktor.chat.RootKt.root
5-
- io.ktor.chat.LoggingKt.logging
6-
- io.ktor.chat.SecurityKt.security
7-
- io.ktor.chat.MailKt.mail
8-
- io.ktor.chat.RestKt.rest
9-
- io.ktor.chat.HealthCheckKt.healthCheck
10-
- io.ktor.chat.DatabasesKt.database
11-
- io.ktor.chat.RepositoriesKt.repositories
12-
- io.ktor.chat.AuthenticationKt.auth
13-
- io.ktor.chat.UsersKt.users
14-
- io.ktor.chat.MessagesKt.messages
15-
- io.ktor.chat.RoomsKt.rooms
16-
- io.ktor.chat.MembershipsKt.members
4+
- io.ktor.chat.server.RootKt.root
5+
- io.ktor.chat.server.LoggingKt.logging
6+
- io.ktor.chat.server.SecurityKt.security
7+
- io.ktor.chat.server.MailKt.mail
8+
- io.ktor.chat.server.RestKt.rest
9+
- io.ktor.chat.server.HealthCheckKt.healthCheck
10+
- io.ktor.chat.server.DatabasesKt.database
11+
- io.ktor.chat.server.RepositoriesKt.repositories
12+
- io.ktor.chat.server.AuthenticationKt.auth
13+
- io.ktor.chat.server.UsersKt.users
14+
- io.ktor.chat.server.MessagesKt.messages
15+
- io.ktor.chat.server.RoomsKt.rooms
16+
- io.ktor.chat.server.MembershipsKt.members
1717

1818
jwt:
1919
audience: audience

docs/chat-desktop.png

52.8 KB
Loading

docs/chat-phone.png

56.5 KB
Loading

server/admin/module.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ test-dependencies:
3333

3434
settings:
3535
jvm:
36-
mainClass: io.ktor.chat.ApplicationKt
36+
mainClass: io.ktor.chat.server.ApplicationKt
3737
kotlin:
3838
serialization: json

server/admin/src/Admin.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package io.ktor.chat
1+
package io.ktor.chat.server
22

3+
import io.ktor.chat.*
34
import io.ktor.server.application.*
45
import io.ktor.server.auth.*
56
import io.ktor.server.routing.*

server/admin/src/Application.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package io.ktor.chat
1+
package io.ktor.chat.server
22

3+
import io.ktor.chat.Users
34
import io.ktor.http.*
45
import io.ktor.server.application.*
56
import io.ktor.server.auth.*

server/rest/resources/application.yaml

+13-13
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@ ktor:
22
development: true
33
application:
44
modules:
5-
- io.ktor.chat.RootKt.root
6-
- io.ktor.chat.LoggingKt.logging
7-
- io.ktor.chat.SecurityKt.security
8-
- io.ktor.chat.MailKt.mail
9-
- io.ktor.chat.RestKt.rest
10-
- io.ktor.chat.HealthCheckKt.healthCheck
11-
- io.ktor.chat.DatabasesKt.database
12-
- io.ktor.chat.RepositoriesKt.repositories
13-
- io.ktor.chat.AuthenticationKt.auth
14-
- io.ktor.chat.UsersKt.users
15-
- io.ktor.chat.MessagesKt.messages
16-
- io.ktor.chat.RoomsKt.rooms
17-
- io.ktor.chat.MembershipsKt.members
5+
- io.ktor.chat.server.RootKt.root
6+
- io.ktor.chat.server.LoggingKt.logging
7+
- io.ktor.chat.server.SecurityKt.security
8+
- io.ktor.chat.server.MailKt.mail
9+
- io.ktor.chat.server.RestKt.rest
10+
- io.ktor.chat.server.HealthCheckKt.healthCheck
11+
- io.ktor.chat.server.DatabasesKt.database
12+
- io.ktor.chat.server.RepositoriesKt.repositories
13+
- io.ktor.chat.server.AuthenticationKt.auth
14+
- io.ktor.chat.server.UsersKt.users
15+
- io.ktor.chat.server.MessagesKt.messages
16+
- io.ktor.chat.server.RoomsKt.rooms
17+
- io.ktor.chat.server.MembershipsKt.members
1818
deployment:
1919
port: 8080
2020

0 commit comments

Comments
 (0)