Merge pull request #387 from district0x/various-fixes-3

Various fixes
district0x · Mar 21, 2024 · 64c5aac · 64c5aac
2 parents 77749a7 + 1890d65
commit 64c5aac
Show file tree

Hide file tree

Showing 17 changed files with 20 additions and 446 deletions.
diff --git a/server/src/ethlance/server/graphql/resolvers.cljs b/server/src/ethlance/server/graphql/resolvers.cljs
@@ -732,27 +732,6 @@
                                  (<? (db/get conn (dispute-message-query job-story-id invoice-id invoice-message-column))))))
 
 
-(defn employer-search-resolver
-  [_ {:keys [:limit :offset
-             :user/id
-             :professional-title
-             :order-by :order-direction]
-      :as args} _]
-  (db/with-async-resolver-conn conn
-                               (log/debug "employer-search-resolver" args)
-                               (let [query (cond-> employer-query
-
-                                             id (sql-helpers/merge-where [:= id :Employer.user/id])
-
-                                             professional-title (sql-helpers/merge-where [:= professional-title :Employer.employer/professional-title])
-
-                                             order-by (sql-helpers/merge-order-by [[(get {:date-registered :user/date-registered
-                                                                                          :date-updated :user/date-updated}
-                                                                                         (graphql-utils/gql-name->kw order-by))
-                                                                                    (or (keyword order-direction) :asc)]]))]
-                                 (<? (paged-query conn query limit offset)))))
-
-
 (def ^:private job-query
   {:select [:Job.job/id
             :Job.job/bid-option
@@ -1296,7 +1275,6 @@
            :candidate candidate-resolver
            :candidateSearch candidate-search-resolver
            :employer employer-resolver
-           :employerSearch employer-search-resolver
            :arbiter arbiter-resolver
            :arbiterSearch arbiter-search-resolver
            :job job-resolver

diff --git a/shared/src/ethlance/shared/graphql/schema.cljs b/shared/src/ethlance/shared/graphql/schema.cljs
@@ -52,15 +52,6 @@
 
     employer(user_id : ID!): Employer
 
-    employerSearch(
-      user_id: ID,
-      professionalTitle: String,
-      orderBy: EmployerListOrderBy,
-      orderDirection: OrderDirection,
-      limit: Int,
-      offset: Int,
-    ): EmployerList
-
     arbiter(user_id : ID!): Arbiter
 
     arbiterSearch(
@@ -385,18 +376,6 @@
     jobStories: JobStoryList
   }
 
-  type EmployerList {
-    items: [Employer]
-    totalCount: Int
-    endCursor: String
-    hasNextPage: Boolean
-  }
-
-  enum EmployerListOrderBy {
-    dateUpdated
-    dateRegistered
-  }
-
   type TokenDetails {
     tokenDetail_id: ID!
     tokenDetail_type: Keyword

diff --git a/shared/src/ethlance/shared/routes.cljs b/shared/src/ethlance/shared/routes.cljs
@@ -7,7 +7,6 @@
    ;; Users
    ["/arbiters" :route.user/arbiters]
    ["/candidates" :route.user/candidates]
-   ["/employers" :route.user/employers]
    ["/user/" :route.user/profile]
    ["/user/:address" :route.user/profile]
 

diff --git a/shared/src/ethlance/shared/token_utils.cljs b/shared/src/ethlance/shared/token_utils.cljs
@@ -105,7 +105,7 @@
           token-decimals (case token-type
                            :eth 18
                            :erc721 0
-                           :erc1155 1
+                           :erc1155 0
                            :erc20 (if (has-contract-method? contract-instance "decimals")
                                     (<! (promise->chan (w3-eth/contract-call contract-instance :decimals [] {})))
                                     18))]

diff --git a/ui/resources/public/less/page/employers.less b/ui/resources/public/less/page/employers.less
diff --git a/ui/resources/public/less/pages.less b/ui/resources/public/less/pages.less
@@ -11,7 +11,6 @@
 @import "page/jobs";
 @import "page/arbiters";
 @import "page/candidates";
-@import "page/employers";
 @import "page/profile";
 
 // jobs

diff --git a/ui/src/ethlance/ui/component/search_input.cljs b/ui/src/ethlance/ui/component/search_input.cljs
@@ -12,7 +12,6 @@
 
 (defn filter-selections
   [search-text selections label-fn]
-  (println ">>> filter-selections" selections)
   (let [fuzzy-options (map (fn [sel] {::fz/string (label-fn sel)
                                       :original-val sel}) selections)]
     (when (and (seq search-text) (seq selections))

diff --git a/ui/src/ethlance/ui/events.cljs b/ui/src/ethlance/ui/events.cljs
@@ -5,7 +5,6 @@
     [district.ui.web3-accounts.events]
     [ethlance.ui.page.arbiters.events]
     [ethlance.ui.page.candidates.events]
-    [ethlance.ui.page.employers.events]
     [ethlance.ui.page.home.events]
     [ethlance.ui.page.invoices.events]
     [ethlance.ui.page.job-contract.events]
@@ -36,7 +35,6 @@
         [:page.sign-up/initialize-page]
         [:page.candidates/initialize-page]
         [:page.arbiters/initialize-page]
-        [:page.employers/initialize-page]
         [:page.profile/initialize-page]
         [:page.job-contract/initialize-page]
         [:page.job-detail/initialize-page]