Various visual fixes

.circleci/config.yml

@@ -4,7 +4,7 @@ jobs:
     working_directory: ~/ethlance
     docker:
       # Primary container image where all steps run.
-      - image: 487920318758.dkr.ecr.us-west-2.amazonaws.com/cljs-web3-ci:node-18.17.0
+      - image: 487920318758.dkr.ecr.us-west-2.amazonaws.com/cljs-web3-ci:node-20.18.1
         environment:
           ETHLANCE_ENV: qa
       # Secondary container images on common network.

.tool-versions

@@ -1,3 +1,3 @@
-nodejs 18.17.0
+nodejs 20.18.1
 python 3.9.1
 php 8.0.0

docker-builds/base/Dockerfile

@@ -1,5 +1,5 @@
 ARG BUILD_ENV=qa
-FROM --platform=amd64 487920318758.dkr.ecr.us-west-2.amazonaws.com/cljs-web3-ci:node-18.20.1
+FROM --platform=amd64 487920318758.dkr.ecr.us-west-2.amazonaws.com/cljs-web3-ci:node-20.18.1
 USER root
 
 RUN npm i -g [email protected]

docker-builds/server/Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=amd64 487920318758.dkr.ecr.us-west-2.amazonaws.com/cljs-web3-ci:node-18.20.1 as init
+FROM --platform=amd64 487920318758.dkr.ecr.us-west-2.amazonaws.com/cljs-web3-ci:node-20.18.1 as init
 ARG BUILD_ENV=qa
 ARG ETHLANCE_DEPLOY_SEED="sign bachelor state zoo expire boat morning situate scene unveil oven crew"
 USER root
@@ -43,7 +43,7 @@ RUN yarn && npx shadow-cljs release dev-server
 
 ARG BUILD_ENV=qa
 ARG ETHLANCE_ENV=qa
-FROM node:18
+FROM node:20
 ENV ETHLANCE_SOURCE_ROOT=/deploy
 ENV ETHLANCE_SERVER_ROOT=/deploy/server
 ENV ETHLANCE_ENV=qa
@@ -60,4 +60,4 @@ COPY --from=build_server /build/ethlance/server/package.json /build/ethlance/ser
 COPY --from=build_server /build/ethlance/resources/public/contracts /deploy/ui/contracts/
 COPY --from=build_server /build/ethlance/ui/resources/public/* /deploy/ui/
 RUN echo -n "{:last-processed-block 9622279}" > ethlance-events.log
-CMD [ "node", "ethlance_server.js" ]
+CMD [ "node", "ethlance_server.js" ]

docker-builds/ui/Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=amd64 487920318758.dkr.ecr.us-west-2.amazonaws.com/cljs-web3-ci:node-18.20.1 as init
+FROM --platform=amd64 487920318758.dkr.ecr.us-west-2.amazonaws.com/cljs-web3-ci:node-20.18.1 as init
 ARG BUILD_ENV=qa
 ARG ETHLANCE_DEPLOY_SEED="sign bachelor state zoo expire boat morning situate scene unveil oven crew"
 USER root
@@ -49,4 +49,4 @@ COPY --from=build_stage /build/ethlance/resources /deploy/resources
 COPY --from=build_stage /build/ethlance/resources/public/contracts /deploy/ui/contracts/
 COPY --from=build_stage /build/ethlance/ui/resources/public /deploy/ui/
 
-EXPOSE 80
+EXPOSE 80

package.json

@@ -20,6 +20,6 @@
     "solc": "0.8.19"
   },
   "engines": {
-    "node": "^18.17.0"
+    "node": "^20.18.1"
   }
 }

server/.tool-versions

@@ -1,2 +1,2 @@
-nodejs 18.17.0
+nodejs 20.18.1
 python 2.7.13

server/package.json

@@ -9,7 +9,7 @@
     "@opentelemetry/semantic-conventions": "^1.22.0",
     "apollo-server-express": "2.12.0",
     "axios": "1.3.3",
-    "better-sqlite3": "7.6.2",
+    "better-sqlite3": "11.7.0",
     "bignumber.js": "9.0.1",
     "body-parser": "1.19.0",
     "buffer": "6.0.3",

server/yarn.lock

@@ -1751,13 +1751,13 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-better-sqlite3@7.6.2:
-  version "7.6.2"
-  resolved "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-7.6.2.tgz"
-  integrity sha512-S5zIU1Hink2AH4xPsN0W43T1/AJ5jrPh7Oy07ocuW/AKYYY02GWzz9NH0nbSMn/gw6fDZ5jZ1QsHt1BXAwJ6Lg==
+better-sqlite3@11.7.0:
+  version "11.7.0"
+  resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-11.7.0.tgz#3eaa0f54f9e57d0a100d980e42320f8b9a4cd676"
+  integrity sha512-mXpa5jnIKKHeoGzBrUJrc65cXFKcILGZpU3FXR0pradUEm9MA7UZz02qfEejaMcm9iXrSOCenwwYMJ/tZ1y5Ig==
   dependencies:
     bindings "^1.5.0"
-    prebuild-install "^7.1.0"
+    prebuild-install "^7.1.1"
 
 [email protected]:
   version "9.0.1"
@@ -4877,10 +4877,10 @@ postgres-interval@^1.1.0:
   dependencies:
     xtend "^4.0.0"
 
-prebuild-install@^7.1.0:
-  version "7.1.1"
-  resolved "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz"
-  integrity sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==
+prebuild-install@^7.1.1:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.2.tgz#a5fd9986f5a6251fbc47e1e5c65de71e68c0a056"
+  integrity sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==
   dependencies:
     detect-libc "^2.0.0"
     expand-template "^2.0.3"

ui/.tool-versions

@@ -1,2 +1,2 @@
-nodejs 18.17.0
+nodejs 20.18.1
 python 2.7.13

ui/resources/public/less/component/select-input.less

@@ -16,7 +16,7 @@
     justify-content: space-between;
     height: @input-height;
     cursor: pointer;
-    white-space: nowrap; 
+    white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
     padding-left: 0.5em;
@@ -40,7 +40,7 @@
       width: 32px;
       height: 32px;
       flex-basis: 32px;
-      flex-shrink: 0; 
+      flex-shrink: 0;
     }
 
     &:hover {
@@ -97,6 +97,7 @@
         height: @input-height;
         padding-left: 1em;
         cursor: pointer;
+        text-align: left;
 
         &:hover {
 	  background-color: #d6e1fd;
@@ -146,7 +147,7 @@
           background-color: desaturate(#color[light-purple], 5%);
         }
       }
-      
+
       > .selection-listing {
         > .selection {
           background-color: #color[light-purple];

ui/resources/public/less/page/job-detail.less

@@ -83,8 +83,8 @@
         }
 
         > .ethlance-tag {
-          margin: 1em 0;
-          margin-right: 1em;
+          margin-right: 0.4rem;
+          margin-bottom: 0.4rem;
         }
       }
 
@@ -215,6 +215,12 @@
         text-align: center;
         margin: 0.5em 0;
       }
+
+      .button {
+        margin: 1em 0;
+        align-self: flex-end;
+      }
+
     }
   }
 

ui/resources/public/less/page/jobs.less

@@ -61,7 +61,7 @@
       > .ethlance-chip-search-input {
         margin: 2em;
         max-width: 100vw;
-        
+
         @media #media[tablet-query] {
           margin: 1.5em;
         }
@@ -181,6 +181,7 @@
           > .name {
             grid-area: name;
             display: flex;
+            margin: 1em 0;
             align-items: center;
             font-weight: 700;
           }
@@ -205,11 +206,13 @@
           }
 
           > .location {
+            margin: 1em 0;
             grid-area: location;
           }
 
           > .ethlance-inline-svg {
             position: absolute;
+            margin: 1em 0;
             top: 0em;
             left: -1.5em;
             width: 16px;
@@ -227,12 +230,12 @@
         align-items: flex-start;
         padding-top: 1em;
         grid-area: details;
-        
+
         @media #media[mobile-query] {
           align-items: center;
           margin-bottom: 2em;
         }
-        
+
         > .job-detail-table {
           #mixin.detail-table();
           width: 90%;

ui/src/ethlance/ui/page/job_contract.cljs

@@ -65,10 +65,11 @@
 
 
 (defn c-information
-  [text]
+  [& text-or-children]
   [:div.feedback-input-container {:style {:opacity "50%"}}
-   [:div {:style {:height "10em" :display "flex" :align-items "center" :justify-content "center"}}
-    text]])
+   (into
+     [:div {:style {:height "10em" :display "flex" :align-items "center" :justify-content "center"}}]
+     text-or-children)])
 
 
 (defn common-chat-fields
@@ -499,7 +500,9 @@
      (when job-active? {:label "Create Invoice"})
      (when job-active?
        [:div.message-input-container
-        [:div.info-message "Click here to create new invoice for this job"]
+        [:div {:style {:height "10em" :display "flex" :align-items "center" :justify-content "center"}}
+         [:div.message "Click here to create new invoice for this job"]]
+        [:div {:style {:flex-basis "100%" :height 0}}]
         [c-button {:color :primary
                    :on-click (util.navigation/create-handler {:route :route.invoice/new})}
          [c-button-label "Go to create invoice"]]])

ui/src/ethlance/ui/page/job_detail.cljs

@@ -252,12 +252,14 @@
       [c-text-input
        {:placeholder ""
         :disabled true
+        :style {:cursor "not-allowed"}
         :value (get-in arbitration-to-accept [:arbiter :user :user/name])}]]
      [:div.amount-input
       [:div.label {:style {:margin-right "1em"}} "Amount: "]
       [c-text-input
        {:placeholder ""
         :disabled true
+        :style {:cursor "not-allowed"}
         :value (token-utils/human-amount (get arbitration-to-accept :arbitration/fee) :eth)}]
       [:label "ETH"]]
 

ui/src/ethlance/ui/page/new_invoice.cljs

@@ -10,6 +10,19 @@
     [re-frame.core :as re]))
 
 
+(defn truncate [length ending string]
+  (cond
+    (nil? string)
+    ""
+
+    (< (count string) (+ length 3))
+    string
+
+    :else
+    (str
+      (subs string 0 (min (count string) length))
+      ending)))
+
 (defmethod page :route.invoice/new []
   (let [active-user (:user/id @(re/subscribe [:ethlance.ui.subscriptions/active-session]))
         query [:candidate {:user/id active-user}
@@ -66,7 +79,9 @@
            [c-select-input
             {:selections *job-listing
              :value-fn (fn [job-story] (str (:job/id job-story) "-" (:job-story/id job-story)))
-             :label-fn (comp :job/title :job)
+             :label-fn (comp #(truncate 50 "..." %)
+                             :job/title
+                             :job)
              :selection @*invoiced-job
              :on-select #(re/dispatch [:page.new-invoice/set-invoiced-job %])}]]
           [:div.input-stripe {:on-click (partial focus-on-element "invoice-hours-input")}