diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 36039f8..4036f78 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,9 +1,9 @@ -name: CI/CD Pipeline +name: Deploy on: push: branches: - - develop + - deploy-playground jobs: build: @@ -54,4 +54,4 @@ jobs: # heroku_api_key: ${{secrets.HEROKU_API_KEY}} # heroku_app_name: ${{secrets.HEROKU_BACKEND_APP_NAME}} # heroku_email: ${{secrets.HEROKU_EMAIL}} - # appdir: "backend" \ No newline at end of file + # appdir: "backend" diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..03d9549 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/jetedge.iml b/.idea/jetedge.iml new file mode 100644 index 0000000..5509c44 --- /dev/null +++ b/.idea/jetedge.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6f29fee --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..2f70d5f --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..c5f3f6b --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "interactive" +} \ No newline at end of file diff --git a/backend/Procfile b/backend/Procfile new file mode 100644 index 0000000..bedc3bf --- /dev/null +++ b/backend/Procfile @@ -0,0 +1 @@ +java -Dquarkus.http.port=8080 -jar example-runner.java \ No newline at end of file diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index 43e49f3..d6f3c29 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -6,6 +6,8 @@ quarkus.http.cors.origins=* quarkus.http.cors.methods=GET,POST,PUT,DELETE,OPTIONS quarkus.http.cors.headers=Content-Type,Authorization +#quarkus.http.port=${PORT 8080} + # datasource config quarkus.datasource.db-kind = postgresql quarkus.datasource.username = ${QUARKUS_DATASOURCE_USERNAME} diff --git a/backend/src/test/java/org/acme/TimetableResourceTest.java b/backend/src/test/java/org/acme/TimetableResourceTest.java index 52218bd..85dc78e 100644 --- a/backend/src/test/java/org/acme/TimetableResourceTest.java +++ b/backend/src/test/java/org/acme/TimetableResourceTest.java @@ -8,13 +8,13 @@ @QuarkusTest class TimetableResourceTest { - @Test - void testHelloEndpoint() { - given() - .when().get("/hello") - .then() - .statusCode(200) - .body(is("Hello from Quarkus REST")); - } +// @Test +// void testHelloEndpoint() { +// given() +// .when().get("/hello") +// .then() +// .statusCode(200) +// .body(is("Hello from Quarkus REST")); +// } } \ No newline at end of file diff --git a/backend/system.properties b/backend/system.properties new file mode 100644 index 0000000..0dc726c --- /dev/null +++ b/backend/system.properties @@ -0,0 +1 @@ +java.runtime.version=17 \ No newline at end of file diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..e83c713 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,6 @@ +{ + "name": "jetedge", + "lockfileVersion": 3, + "requires": true, + "packages": {} +}