Merge pull request #2 from infernalstudios/main

Update workflows and add recursive objectives (or/not)

Author: evanbones

.github/workflows/ci.yml

@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Use Node.js v22
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: "22.x"
           registry-url: "https://registry.npmjs.org"
@@ -20,7 +20,7 @@ jobs:
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
       - name: Get Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -38,10 +38,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Use Node.js v22
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: "22.x"
           registry-url: "https://registry.npmjs.org"
@@ -51,7 +51,7 @@ jobs:
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
       - name: Get Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -69,10 +69,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Use Node.js v22
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: "22.x"
           registry-url: "https://registry.npmjs.org"
@@ -82,7 +82,7 @@ jobs:
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
       - name: Get Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -100,10 +100,10 @@ jobs:
   #   runs-on: ubuntu-latest
   #   steps:
   #     - name: Checkout Repository
-  #       uses: actions/checkout@v2
+  #       uses: actions/checkout@v4
 
   #     - name: Use Node.js v22
-  #       uses: actions/setup-node@v2
+  #       uses: actions/setup-node@v4
   #       with:
   #         node-version: '16.x'
   #         registry-url: 'https://registry.npmjs.org'
@@ -132,7 +132,7 @@ jobs:
     needs: [build, format, lint]
     steps:
       - name: Use NodeJS v16
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: "16"
 

.github/workflows/deploy.yml

@@ -10,7 +10,7 @@ jobs:
     environment: production
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Get temporary file for SSH key
         id: mktemp

public/css/questlog.css

@@ -137,3 +137,43 @@ textarea.form-input {
   overflow-y: auto;
   overflow-x: hidden;
 }
+
+.input-group {
+  align-items: flex-start;
+}
+
+.input-group .input-group-addon {
+  height: 1.8rem;
+  display: flex;
+  align-items: center;
+  margin-top: 0;
+}
+
+.input-group > .objective-list,
+.input-group > .card {
+  flex: 1 1 auto;
+  width: 100%;
+}
+
+.objective-list {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+}
+
+.objective-list .d-flex {
+  align-items: flex-start;
+  width: 100%;
+}
+
+.objective-list .btn-action {
+  margin-top: 0.1rem;
+  margin-left: 0.5rem !important;
+}
+
+.input-group .popover {
+  margin-top: 0;
+  height: 1.8rem;
+  display: flex;
+  align-items: center;
+}

public/script/questlog.tsx

@@ -2,16 +2,8 @@
 import { _createElement, _fragment } from "simple-jsx-handler";
 declare const React: JSX.IntrinsicElements;
 
-import {
-  Objective,
-  OBJECTIVE_TYPES,
-  ObjectiveDisplay,
-  Quest,
-  Renderable,
-  Reward,
-  REWARD_TYPES,
-  RewardDisplay,
-} from "./questlog/types";
+import { Objective, ObjectiveDisplay, Quest, Renderable, Reward, RewardDisplay } from "./questlog/types";
+import { OBJECTIVE_TYPES, REWARD_TYPES } from "./questlog/definitions";
 import { createField } from "./questlog/field";
 import { removeNode } from "./util";
 import { SOUNDS } from "./questlog/data";