update README

README.md

@@ -55,11 +55,13 @@ Projects/
 * [Yarn]
 ### Setting up
 To get both Hangar and HangarAuth running locally:
-1. To start all the docker services move into Hangar's docker folder `cd Hangar/docker` the run `docker-compose up -d`. 
+1. Setup HangarAuth
-   If you are using IntelliJ, you can also add `Hangar/docker/docker-compose.yml` as a Run Configuration and use that to start up the services.
+   1. See [HangarAuth README](https://github.com/HangarMC/HangarAuth/blob/master/README.md)
+   2. Start HangarAuth's docker services
+   3. Create HangarAuth's hydra client
 2. Move to Hangar's frontend directory `Hangar/frontend`. In that directory run `yarn install` followed by `yarn dev`.
-3. Setup the hangar client in hydra (see hangar auth readme)
+3. Setup the hangar client in hydra (see [HangarAuth README](https://github.com/HangarMC/HangarAuth/blob/master/README.md))
-5. Navigate to http://localhost:3000 and login. 
+4. Navigate to http://localhost:3000 and login.
 
 
 ### Notes

docker/hangar/Dockerfile

@@ -1,20 +0,0 @@
-FROM openjdk:16-jdk-alpine
-
-LABEL maintainer="Yannick Lamprecht <yannicklamprecht@live.de>"
-
-RUN set -x && \
-    addgroup -g 1000 appuser && \
-    adduser -u 1000 -D -G appuser appuser && \
-    mkdir /uploads && \
-    chown appuser:appuser /uploads && \
-    apk add yarn
-
-ENV TERM xterm-256color
-#
-#ADD target/hangar-*.jar app.jar
-#ADD docker/hangar/application.yml application.yml
-#
-#
-#EXPOSE 8080
-## "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005" is for debug only
-#ENTRYPOINT ["java", "-XX:+ShowCodeDetailsInExceptionMessages", "-jar", "app.jar"]

docker/hangar/application.yml

@@ -1,27 +0,0 @@
-spring:
-  datasource:
-    url: jdbc:postgresql://db:5432/hangar
-    username: hangar
-    password: hangar
-
-fake-user:
-  enabled: false
-
-hangar:
-  dev: true
-  base-url: "http://localhost:3000"
-
-  discourse:
-    enabled: false
-    url: "http://localhost:80/"
-    admin-user: "admin"
-
-
-logging:
-  level:
-    #    root: TRACE
-    io:
-      papermc:
-        hangar:
-          config:
-            jackson: DEBUG

pom.xml

@@ -27,10 +27,10 @@
 
         <!-- dependency management -->
         <jdbi3-bom.version>3.20.1</jdbi3-bom.version>
+        <configurate.version>4.1.1</configurate.version>
 
         <!-- dependencies -->
         <springfox-boot-starter.version>3.0.0</springfox-boot-starter.version>
-        <freemarker-java8.version>2.0.0</freemarker-java8.version>
         <flexmark-all.version>0.62.2</flexmark-all.version>
         <jsitemapgenerator.version>4.5</jsitemapgenerator.version>
         <org-json.version>20210307</org-json.version>
@@ -55,7 +55,7 @@
                 <groupId>org.spongepowered</groupId>
                 <artifactId>configurate-bom</artifactId>
                 <type>pom</type>
-                <version>4.1.1</version>
+                <version>${configurate.version}</version>
                 <scope>import</scope>
             </dependency>
         </dependencies>