Documentation

.github/workflows/ci.yml

@@ -7,6 +7,7 @@ on:
       - closed
 jobs:
   build-for-docker:
+    if: github.event.pull_request.merged
     runs-on: ubuntu-latest
     env:
       # define Java options for both official sbt and sbt-extras
@@ -34,4 +35,7 @@ jobs:
         run:
           npm install;
           sbt docker;
-          docker push mattlangsenkamp/rocfreestands-http4s:latest
+          npm run build;
+          docker buildx build -f front.Dockerfile -t mattlangsenkamp/rocfreestands-front:latest .;
+          docker push mattlangsenkamp/rocfreestands-http4s:latest;
+          docker push mattlangsenkamp/rocfreestands-front:latest

README.md

@@ -1,17 +1,75 @@
-# crossbuilds
+# Rocfreestands
 
-Install stuff
+This repo contains the code used to develop [Rocfreestands](https://rocfreestands.com). The frontend is built using ScalaJS and the Tyrian framework. The backend is built using http4s, postgres, and the typelevel FP stack. The frontend and backend commuincate via rest endpoints defined using the Smithy IDL. The app is deployed to Digital ocean and netlify, through the help of docker and Github Actions 
 
-1 sbt "~fastLinkJS"
-2 sbt "serverJVM/run"
-3 npx tailwindcss -i ./style.css -o ./output.css; npm run dev
-4 npm run dev
 
-sbt "docker"
+## Environment setup
 
+The following tools where used to set up the development environment, if these requirements are already met this step can be skipped \
+- [nvm](https://github.com/nvm-sh/nvm) 
+- [sdkman](https://sdkman.io/)
+- [docker]()
 
-docker compose -f stack.yml up db
-docker compose -f stack.yml  up -d
-docker compose -f stack.yml down
+```
+# JS stuff
+nvm install node 20
+nvm use node 20
+npm install
 
-docker volume rm crossbuilds_server
+# Scala stuff
+sdk install java 22.3.1.r19-grl
+sdk install scala 3.3.0
+sdk install sbt 1.9.0
+```
+
+## Starting The Backend
+
+### Using Docker 
+The fastest way to start the backend is to use Docker Compose. This will automatically start a postgres service, then the server as well as create volumes to persist data
+Simply run 
+
+`docker compose -f stack.yml  up -d`
+
+To stop the services run 
+
+`docker compose -f stack.yml down` 
+
+To remove any volumes run 
+```bash
+docker volume ls
+docker volume rm <names of volumes to remove>
+```
+
+To confirm that the services started correctly navigate to http://localhost:8081/docs. The swagger documentation should be present
+
+To change ENV variables alter them in the  `stack.yml` file prior to the first time the you run `docker compose up`
+### Using SBT
+Even when the server is being run with SBT postgres is still run via Docker. To start just postgres run
+
+`docker compose -f stack.yml -p dblocal up db`
+
+Then run 
+
+`sbt "serverJVM/run"`
+
+To confirm that the services started correctly navigate to http://localhost:8081/docs. The swagger documentation should be present
+
+## Starting The Frontend
+
+First make sure the backend is running as the frontend will immediately try and pull data from the backend.
+
+To compile the frontend from scala to JS simply run
+
+`sbt "~fastLinkJS"` 
+
+Note that the `~` enables live reloading of code changes.
+
+To build the CSS styles defined using tailwind CSS, in a separate terminal run 
+
+`npx tailwindcss -i ./style.css -o ./output.css`
+
+Note that this step will need to be rerun anytime a tailwind style is added
+
+Finally, in a third terminal run
+
+`npm run dev`

front-nginx.conf

@@ -0,0 +1,9 @@
+server {
+    listen 8079;
+    server_name localhost;
+    location / {
+        root /usr/share/nginx/html;
+        index index.html;
+        try_files $uri $uri/ /index.html;
+    }
+}

front.Dockerfile

@@ -0,0 +1,9 @@
+FROM nginx:stable-alpine
+COPY dist/index.html /usr/share/nginx/html
+RUN mkdir "usr/share/nginx/html/assets"
+COPY dist/assets/* usr/share/nginx/html/assets
+COPY assets/* usr/share/nginx/html/assets
+COPY front-nginx.conf /etc/nginx/conf.d/default.conf
+
+EXPOSE 8079
+CMD ["nginx", "-g", "daemon off;"]

front/shared/src/main/scala/com/rocfreestands/front/components/AboutPage.scala

@@ -5,12 +5,18 @@ import tyrian.Html
 import tyrian.Html._
 
 def aboutPage: Model => Html[Msg] = (model: Model) =>
+
+  val images =
+    model.locations.map(p => img(cls := "rounded h-32 sm:h-56 w-auto m-1", src := p.location.image, onClick(Msg.NoOp)))
+
+  println("images")
+  println(images)
   div(
     cls := "font-mono  text-gray-500 map p-2 pb-12 m-auto max-w-m md:max-w-3xl lg:max-w-5xl xl:max-w-7xl h-full"
   )(
     div(
       cls := "flex p-4 mb-8 justify-center scrollbar-thin scrollbar-thumb-indigo-500 scrollbar-track-indigo-200 overflow-x-scroll"
-    )(img(cls := "rounded h-32 sm:h-56 w-auto m-1")),
+    )( images:_*),
     p(
       "Since the onset of covid-19 mutual aid efforts in the Rochester Area have " +
         "been on the rise. One project many have invested time into is the free " +

front/shared/src/main/scala/com/rocfreestands/front/components/locationDetailsPane.scala

@@ -5,7 +5,7 @@ import tyrian.Html
 import tyrian.Html.*
 import tyrian.syntax.*
 
-def locationDetalsPane: Model => Html[Msg] = (model: Model) =>
+def locationDetailsPane: Model => Html[Msg] = (model: Model) =>
 
   val locationPaneStyles =
     """
@@ -53,7 +53,7 @@ def locationDetalsPane: Model => Html[Msg] = (model: Model) =>
       div(cls := "p-2 sm:flex w-full")(text("Name"), nameError),
       input(
         cls         := Styles.inputFormClasses,
-        placeholder := "Enter Username",
+        placeholder := "Enter stand name",
         onInput(name => Msg.UpdateLocationForm(model.newLocationForm.copy(name = name)))
       )
     ),
@@ -72,7 +72,7 @@ def locationDetalsPane: Model => Html[Msg] = (model: Model) =>
       div(cls := "p-2 sm:flex w-full")(text("Address"), addressError),
       input(
         cls         := Styles.inputFormClasses,
-        placeholder := "Enter Address",
+        placeholder := "Enter address",
         value       := model.newLocationForm.address,
         onInput(address => Msg.UpdateLocationForm(model.newLocationForm.copy(address = address)))
       )

front/shared/src/main/scala/com/rocfreestands/front/helpers/HttpHelper.scala

@@ -22,16 +22,18 @@ object HttpHelper:
 
   private case class Address(display_name: String)
 
+  private val clientUri = uri"http://127.0.0.1:8081/"
+
   private val client = FetchClientBuilder[IO]
     .withMode(RequestMode.cors)
     .withCredentials(RequestCredentials.include)
     .create
   private val pubLocs =
-    SimpleRestJsonBuilder(PublicLocationsService).client(client).uri(uri"http://127.0.0.1:8081/").use
+    SimpleRestJsonBuilder(PublicLocationsService).client(client).uri(clientUri).use
   private val auth =
-    SimpleRestJsonBuilder(AuthService).client(client).uri(uri"http://127.0.0.1:8081/").use
+    SimpleRestJsonBuilder(AuthService).client(client).uri(clientUri).use
   private val authedLocs =
-    SimpleRestJsonBuilder(AuthedLocationsService).client(client).uri(uri"http://127.0.0.1:8081/").use
+    SimpleRestJsonBuilder(AuthedLocationsService).client(client).uri(clientUri).use
 
   def createLocation(
       nlf: LocationForm,
@@ -60,7 +62,6 @@ object HttpHelper:
       case Right(c) =>
         c.getLocations()
           .map(l =>
-            println(l)
             Msg.AddLocationsToMap(l.locations.map(LeafletHelper.locationToMapLocation))
           )
     Cmd.Run(io)

front/shared/src/main/scala/com/rocfreestands/front/helpers/LeafletHelper.scala

@@ -54,7 +54,6 @@ object LeafletHelper:
     MapLocation(location, marker)
 
   private def setContent(location: Location): String =
-    println(location.uuid)
     val url =
       f"https://www.google.com/maps/search/?api=1&query=${location.latitude},${location.longitude}"
     f"""<div class=\"inline-block break-words w-64\">

package.json

@@ -4,8 +4,8 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "dev": "vite --mode dev",
-    "build": "vite build --mode prod",
+    "dev": "vite",
+    "build": "vite build",
     "preview": "vite preview"
   },
   "devDependencies": {

server/jvm/pictures/77784853-6b6d-4a26-9acd-d31f40d88a4a.txt

@@ -0,0 +1 @@
+data:image/png;base64,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

server/jvm/src/main/scala/com/rocfreestands/server/Main.scala

@@ -23,14 +23,10 @@ import smithy4s.{ByteArray, Timestamp}
 import smithy4s.http4s.SimpleRestJsonBuilder
 import com.rocfreestands.server.database.{Flyway, SkunkSession}
 import com.rocfreestands.server.middleware.JwtAuthMiddlewear
-import com.rocfreestands.server.services.{
-  AuthServiceImpl,
-  LocationsRepository,
-  ObjectStore,
-  fromPath,
-  fromSession,
-  makePublicLocationService
-}
+import com.rocfreestands.server.services.{ObjectStore, LocationsRepository}
+import com.rocfreestands.server.services.PublicLocationServiceImpl.makePublicLocationService
+import com.rocfreestands.server.services.LocationsRepository.makeLocationRepository
+import com.rocfreestands.server.services.ObjectStore.makeObjectStore
 import com.rocfreestands.server.services.AuthServiceImpl.fromServerConfig
 import com.rocfreestands.server.services.AuthedLocationServiceImpl.makeAuthedLocationService
 import fly4s.core.*
@@ -103,8 +99,8 @@ object Main extends IOApp.Simple:
       psqlConnection <- SkunkSession.fromServerConfig(serverConfig)
       psqlSession    <- psqlConnection
       p              <- createFolderIfNotExist(Path.of(serverConfig.picturePath)).toResource
-      im             <- fromPath(p).toResource
-      db             <- fromSession(psqlSession).toResource
+      im             <- makeObjectStore(p).toResource
+      db             <- makeLocationRepository(psqlSession).toResource
       routes         <- Routes.all(serverConfig, db, im)
       srv <- EmberServerBuilder
         .default[IO]

server/jvm/src/main/scala/com/rocfreestands/server/services/AuthedLocationServiceImpl.scala

@@ -27,8 +27,8 @@ object AuthedLocationServiceImpl:
             Location(uuid, address, name, description, latitude, longitude, image, creationDateTime)
           )
           p <- os.writeImage(uuid, image)
-          l <- lr.createLocation(loc.copy(image = p.toString))
-        yield l
+          _ <- lr.createLocation(loc.copy(image = p.toString))
+        yield loc
 
       override def deleteLocation(uuid: String): IO[DeleteLocationOutput] =
         for