Skip to content
This repository has been archived by the owner on May 7, 2024. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
# Conflicts:
#	backend/app/build.gradle.kts
  • Loading branch information
daudmohamed committed Oct 28, 2023
2 parents b0b60b7 + d5ffdf7 commit 5fc4424
Show file tree
Hide file tree
Showing 12 changed files with 136 additions and 2 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
on:
push:
branches:
- main
jobs:
build-backend:
defaults:
run:
working-directory: backend
name: Build the application
runs-on: ubuntu-22.04
concurrency:
cancel-in-progress: true
group: ${{ github.workflow }}-${{ github.ref }}
steps:
- name: Checkout the code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # ratchet:actions/checkout@v4
- name: Setup java
uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # ratchet:actions/setup-java@v3
with:
distribution: temurin
java-version: 17
cache: gradle
- name: Run gradle build
run: ./gradlew build --no-daemon
8 changes: 8 additions & 0 deletions .idea/.gitignore

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

17 changes: 17 additions & 0 deletions .idea/gradle.xml

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

20 changes: 20 additions & 0 deletions .idea/jarRepositories.xml

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

6 changes: 6 additions & 0 deletions .idea/kotlinc.xml

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

10 changes: 10 additions & 0 deletions .idea/misc.xml

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

8 changes: 8 additions & 0 deletions .idea/modules.xml

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

6 changes: 6 additions & 0 deletions .idea/vcs.xml

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

9 changes: 9 additions & 0 deletions .idea/workshop-wizard.iml

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

12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
# workshop-wizard
The application for managing workshops of JavaZone. Includes registration, cancellation and all of the good stuff :):)

## Prerequisites

### Backend
JDK 17
Docker (or other container runtime)

To start the application: Go to the backend folder and `gradle app:run` or run it through your favorite editor

### Frontend
TBD
6 changes: 4 additions & 2 deletions backend/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ dependencies {
val logback_version = "1.4.11"
val slf4j_version = "2.0.9"
val kotlin_version = "1.9.0"
val logstash_version = "7.4"

// Use the Kotlin JUnit 5 integration.
testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
Expand All @@ -38,8 +39,9 @@ dependencies {
implementation("io.ktor:ktor-server-content-negotiation:$ktor_version")
testImplementation("io.ktor:ktor-server-test-host:$ktor_version")

implementation("ch.qos.logback:logback-classic:$logback_version")
implementation("org.slf4j:slf4j-api:$slf4j_version")
runtimeOnly("ch.qos.logback:logback-classic:$logback_version")
runtimeOnly("org.slf4j:slf4j-api:$slf4j_version")
runtimeOnly("net.logstash.logback:logstash-logback-encoder:$logstash_version")

// Serialization
implementation("io.ktor:ktor-server-content-negotiation:$ktor_version")
Expand Down
11 changes: 11 additions & 0 deletions backend/app/src/main/resources/logback.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<configuration>
<appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="net.logstash.logback.encoder.LogstashEncoder"/>
</appender>

<logger name="io.ktor.auth" level="TRACE" />

<root level="INFO">
<appender-ref ref="stdout_json"/>
</root>
</configuration>

0 comments on commit 5fc4424

Please sign in to comment.