Skip to content

Commit

Permalink
Merge pull request #5 from Paulsenik/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
Paulsenik authored Apr 19, 2024
2 parents 5bf7e6d + 3086b26 commit 7897184
Show file tree
Hide file tree
Showing 89 changed files with 3,018 additions and 906 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
kdv-data
.data

.idea

Expand Down
19 changes: 12 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
# KdV
# PRoST

(*Kasse des Vertrauens*)
(***P**raktisches **R**echnungssystem für **o**ptimale **S**pesen- und **T**rinkkultur*)

Ein digitales Kaffeekassen-System
der [Fachschaft für Informatik und Mathematik der Universität Passau](https://fsinfo.fim.uni-passau.de/).

## Deployment
## Deploy

Docker-Compose-Environment:

- VITE_API_URL: URL für die Backend-API
- MASTER_PASSWORD: Master Password for every user
- /data : Ordner für Datenbank und Item-Bilder

**Build & Run Compose**:
Expand All @@ -30,11 +29,17 @@ docker compose up
- ESLint addon

```bash
cd frontend && npm install && npm run dev
cd frontend
npm install
npm run dev
```

**Backend**:

- [Google-Java-Codestyle](https://github.com/google/styleguide/blob/gh-pages/intellij-java-google-style.xml)
- Intellij: Settings > Editor > Codestyle > Scheme
- Run backend mit Maven...
- Intellij: Settings > Editor > Codestyle > Scheme

Run backend mit LDAP-Container:
```bash
docker compose up ldap backend --build
```
2 changes: 2 additions & 0 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ WORKDIR /app
COPY --from=backend /app/backend/target/*.jar ./backend.jar
EXPOSE 8081
ENV DATA_LOCATION /data
ARG LDAP_URI
ENV LDAP_URI $LDAP_URI
CMD ["java", "-jar", "backend.jar"]
6 changes: 3 additions & 3 deletions backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
</parent>

<groupId>de.unipassau.fim.fsinfo</groupId>
<artifactId>KdV</artifactId>
<artifactId>PRoST</artifactId>
<version>1.0.0</version>
<name>KdV</name>
<description>KdV</description>
<name>PRoST</name>
<description>PRoST</description>

<properties>
<java.version>17</java.version>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 7897184

Please sign in to comment.