Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: signing templates (continued) #719

Closed
wants to merge 369 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
369 commits
Select commit Hold shift + click to select a range
e2d86e2
change healthcheck to query first user
DonKoko Feb 5, 2024
6155692
UI updates
hunar1312 Feb 2, 2024
041aeeb
fixes
hunar1312 Feb 2, 2024
142a978
update
hunar1312 Feb 2, 2024
4d15740
UI updates
hunar1312 Feb 5, 2024
d3798fd
UI updates
hunar1312 Feb 5, 2024
5f4ad4e
mend
DonKoko Feb 5, 2024
a426d18
some more minor adjustments
DonKoko Feb 5, 2024
985ed30
fix hono server, adjust some file locations
DonKoko Feb 6, 2024
4e8c411
add a comment with some optimization ideas
DonKoko Feb 6, 2024
77a2f9a
update with main and fix conflicts
DonKoko Feb 6, 2024
41ef831
Merge branch 'main' into hono-server
DonKoko Feb 6, 2024
6aacb1a
Merge pull request #727 from Shelf-nu/free-trial-webhooks
DonKoko Feb 6, 2024
c95a815
Merge pull request #728 from Shelf-nu/free-trial-webhooks
DonKoko Feb 7, 2024
7ba95b2
Merge pull request #730 from Shelf-nu/free-trial-webhooks
DonKoko Feb 7, 2024
b33b3dd
Merge branch 'main' into hono-server
DonKoko Feb 7, 2024
ff959ac
small adjustments and middleware cleanup
DonKoko Feb 7, 2024
10a5f7d
mend
DonKoko Feb 7, 2024
b7cac69
Changing some types and making minor adjustments
DonKoko Feb 7, 2024
a601bf4
fixed assets, started working on implementing auth
DonKoko Feb 7, 2024
9b3aa59
fix basic login flow, adjust logger to make it log more details
DonKoko Feb 8, 2024
33da4c5
re-enable pinno-pretty
DonKoko Feb 8, 2024
6b94a23
Merge branch 'main' into hono-server
DonKoko Feb 8, 2024
5221044
working on other routes
DonKoko Feb 8, 2024
42db930
solving some more public routes
DonKoko Feb 9, 2024
df083d5
Merge branch 'signing-templates' into signing-templates
rajdip-b Feb 9, 2024
8e43f2d
remaining auth routes + assets index
DonKoko Feb 9, 2024
6555b9a
most assets routes completed
DonKoko Feb 9, 2024
6b83f22
resolving most of the settings routes
DonKoko Feb 9, 2024
e1fecc5
admin dashboard routes + some api routes
DonKoko Feb 9, 2024
6b4cc78
bookings routes
DonKoko Feb 9, 2024
fe2e51d
Merge branch 'main' into hono-server
DonKoko Feb 12, 2024
b801cb6
categories
DonKoko Feb 12, 2024
7805677
tags
DonKoko Feb 12, 2024
2dc680a
Merge pull request #739 from Shelf-nu/standalone-docker
DonKoko Feb 13, 2024
c433488
locations update
DonKoko Feb 13, 2024
6d74104
trying to fix logger and sse issues
DonKoko Feb 13, 2024
32c9a17
Merge branch 'main' into hono-server
DonKoko Feb 13, 2024
743646a
customized logger
DonKoko Feb 13, 2024
fe52a5a
Merge branch 'main' into hono-server
DonKoko Feb 14, 2024
b0ab58e
version updates
DonKoko Feb 14, 2024
4e7b2a1
massive package update
DonKoko Feb 14, 2024
67656ac
fixing remaining routes
DonKoko Feb 14, 2024
62b9a46
updating package
DonKoko Feb 14, 2024
0ba8a4b
many fixes
DonKoko Feb 15, 2024
1c73df4
change ts version to 5.1.0
DonKoko Feb 15, 2024
e85ef81
fixed authSession to always return or throw an error
DonKoko Feb 15, 2024
7bfbe86
small cleanup and fixing navLink for settings
DonKoko Feb 15, 2024
aed2a0c
@TODO fixes
DonKoko Feb 15, 2024
3b7dd83
further cleanup
DonKoko Feb 15, 2024
3b79000
finish cleanup and solving of @todos
DonKoko Feb 15, 2024
0d15baf
Merge pull request #746 from Shelf-nu/hono-server
DonKoko Feb 15, 2024
05ca8aa
improving process of inviting teamMembers
DonKoko Feb 16, 2024
023d9c3
Merge branch 'main' into refactor/dropdowns
DonKoko Feb 16, 2024
a6928eb
fix broken code
DonKoko Feb 16, 2024
b20c19c
Merge branch 'signing-templates' of github.com:Shelf-nu/shelf.nu into…
rajdip-b Feb 19, 2024
021d3e4
bookings fixes
DonKoko Feb 19, 2024
c8cce34
fixing search
DonKoko Feb 19, 2024
d746d8e
Merge branch 'dev' into bookings-bugs-fixes
DonKoko Feb 19, 2024
8cafe31
Merge pull request #755 from Shelf-nu/bookings-bugs-fixes
DonKoko Feb 19, 2024
232c209
adjusting admin reservation heading
DonKoko Feb 19, 2024
a12a9c7
Merge pull request #754 from Shelf-nu/bookings-bugs-fixes
DonKoko Feb 19, 2024
9780242
adding notes
DonKoko Feb 19, 2024
3ae5a10
solving remaining cases for adding and removing asset to booking
DonKoko Feb 20, 2024
a44ddee
updates to booking related notes
DonKoko Feb 20, 2024
e4fd7aa
Merge branch 'dev' into bookings-bugs-fixes
DonKoko Feb 20, 2024
7b80bd6
Merge pull request #757 from Shelf-nu/bookings-bugs-fixes
DonKoko Feb 20, 2024
2ee7ca2
fix ts
DonKoko Feb 20, 2024
ba9447d
Merge pull request #758 from Shelf-nu/bookings-bugs-fixes
DonKoko Feb 20, 2024
5f61edc
Merge branch 'main' into bookings-notes
DonKoko Feb 20, 2024
fc928c9
nodemailer transporter singleton
DonKoko Feb 20, 2024
2ec1ff3
Merge branch 'main' into nodemailer-transporter-singleton
DonKoko Feb 20, 2024
dedc965
Merge pull request #760 from Shelf-nu/nodemailer-transporter-singleton
DonKoko Feb 20, 2024
86bd5df
small fix to text in email
DonKoko Feb 20, 2024
79f0716
Merge pull request #759 from Shelf-nu/bookings-notes
DonKoko Feb 20, 2024
625d58b
Merge branch 'main' into refactor-dropdowns-v2
DonKoko Feb 20, 2024
b8ac2dc
updated crisp
DonKoko Feb 20, 2024
03dca9c
Merge pull request #761 from Shelf-nu/crips-enhancement
DonKoko Feb 20, 2024
24ccaf1
Merge branch 'main' into hono-server
DonKoko Feb 20, 2024
edaea08
updated package version of @hono/node-server
DonKoko Feb 20, 2024
4f9f549
Merge branch 'dev' into hono-server
DonKoko Feb 20, 2024
6972177
fixing issue caused by merge mistake
DonKoko Feb 20, 2024
89c277d
automatic linting fixes
DonKoko Feb 20, 2024
389580f
Merge pull request #766 from Shelf-nu/improve-invite-process
DonKoko Feb 20, 2024
11aeb84
Merge branch 'main' into 751-bug-aks-test-of-team-plan-and-bookings
DonKoko Feb 20, 2024
8914ef6
updates to inviting users
DonKoko Feb 20, 2024
ee89eb1
Merge pull request #767 from Shelf-nu/751-bug-aks-test-of-team-plan-a…
DonKoko Feb 20, 2024
c6e9987
started updating the flow
DonKoko Feb 20, 2024
74e6219
removing assets from booking
DonKoko Feb 20, 2024
e9e1917
Bump ip from 2.0.0 to 2.0.1
dependabot[bot] Feb 20, 2024
2a75bf7
add assets now allows clicking on the whole row
DonKoko Feb 21, 2024
8ba33e9
fixing asset search in add-assets modal?
DonKoko Feb 21, 2024
791cce9
fixing some css
DonKoko Feb 21, 2024
a4f5105
Merge pull request #772 from Shelf-nu/dependabot/npm_and_yarn/ip-2.0.1
DonKoko Feb 21, 2024
6498462
updating location/add-assets to new approach and implementing a new w…
DonKoko Feb 21, 2024
6a0fdff
fixed issue with dialog size in different cases
DonKoko Feb 21, 2024
1d90f26
Merge pull request #769 from Shelf-nu/768-feature-request-improve-add…
DonKoko Feb 21, 2024
3657fcd
fixed import assets success message issue and custodian select ui
hunar1312 Feb 21, 2024
7840157
Merge branch 'main' into 751-bug-aks-test-of-team-plan-and-bookings
DonKoko Feb 21, 2024
f889185
finalizing fixes
DonKoko Feb 21, 2024
34a160a
Merge pull request #775 from Shelf-nu/751-bug-aks-test-of-team-plan-a…
DonKoko Feb 21, 2024
2358c28
merged main into hono-server and fixed conflicts
DonKoko Feb 21, 2024
beb8b18
automatic linting fixes
DonKoko Feb 21, 2024
c4f0f3e
Merge pull request #720 from Shelf-nu/hono-server
DonKoko Feb 21, 2024
df12adc
small css fixes
DonKoko Feb 21, 2024
103529c
automatic linting fixes
DonKoko Feb 21, 2024
9219a7a
Merge pull request #776 from Shelf-nu/css-fixes
DonKoko Feb 21, 2024
1d1132e
fixing wrong first and last name being passed to function that create…
DonKoko Feb 21, 2024
65231a2
mend
DonKoko Feb 21, 2024
0787c12
Merge pull request #777 from Shelf-nu/minor-fix
DonKoko Feb 21, 2024
adf8a57
reworked pagination
DonKoko Feb 22, 2024
d2e9d37
Merge pull request #780 from Shelf-nu/pagination-rework
DonKoko Feb 22, 2024
1087ce9
updated the order in which subscriptions are prioritized on settings.…
DonKoko Feb 22, 2024
74bca86
fixing bugs related to bookings reported in #770
DonKoko Feb 22, 2024
25a91f3
Merge pull request #781 from Shelf-nu/bookings-bugs-2
DonKoko Feb 22, 2024
4f81654
fixing bug with tier limit for creating workspaces
DonKoko Feb 22, 2024
6ff0000
small fixes and updates
DonKoko Feb 22, 2024
b10279a
mend
DonKoko Feb 22, 2024
f420813
Merge pull request #782 from Shelf-nu/polishing
DonKoko Feb 22, 2024
af9c02a
changing how default value of selectedAssets is set as useHydrateAtom…
DonKoko Feb 22, 2024
e15a97a
mend
DonKoko Feb 22, 2024
c09f08e
Merge pull request #783 from Shelf-nu/polishing
DonKoko Feb 22, 2024
0cf6ee3
mend
DonKoko Feb 22, 2024
cd0c858
Merge pull request #784 from Shelf-nu/polishing
DonKoko Feb 22, 2024
3efce52
fixing issues with auth caused by change of how sessions are handled
DonKoko Feb 23, 2024
7b443ff
removing console.logs
DonKoko Feb 23, 2024
2dbdd7f
Merge pull request #786 from Shelf-nu/auth-fixes
DonKoko Feb 23, 2024
45d8751
ui updates in add-assets modal
hunar1312 Feb 23, 2024
43344f8
fixed a few small bugs
DonKoko Feb 26, 2024
6e92e45
Merge pull request #789 from Shelf-nu/minor-bug-fixes
DonKoko Feb 26, 2024
6a06b8f
testing to see what causes the error when deploying with hono
DonKoko Feb 26, 2024
3729ecb
updating fly.toml for testing
DonKoko Feb 26, 2024
4385ab9
updating fly.toml for testing
DonKoko Feb 26, 2024
c0393ef
new fly.toml config + adjustments to healthcheck
DonKoko Feb 26, 2024
6ab3979
fixing wrong command for starting server
DonKoko Feb 26, 2024
2ff1407
Adding missing ports from fly.toml
DonKoko Feb 26, 2024
2cb9d0f
Merge pull request #790 from Shelf-nu/hono-deploy-fix
DonKoko Feb 26, 2024
d2e27d7
Merge branch 'main' into add-assets-modal-ui-fixes
DonKoko Feb 26, 2024
d5eb6ba
removing un-necessary @ts-expect-error
DonKoko Feb 26, 2024
aa1c55f
Merge pull request #787 from Shelf-nu/add-assets-modal-ui-fixes
DonKoko Feb 26, 2024
166192c
fix(prisma-ts): fix prisma new dynamic client types
rockingrohit9639 Feb 27, 2024
87f9077
refactor(asset): remove unused imports in asset's service.server files
rockingrohit9639 Feb 27, 2024
cab7712
refactor(asset-edit): remove unused variables in asset edit file
rockingrohit9639 Feb 27, 2024
77e8151
Merge branch 'main' of github.com:rockingrohit9639/shelf.nu into rohi…
rockingrohit9639 Feb 27, 2024
58b9bb9
Merge branch 'main' into rohit/refactor-dropdowns-v2
rockingrohit9639 Feb 27, 2024
1a1b013
added card wrapper in new and edit views for assets and locations
DonKoko Feb 27, 2024
30be64c
Merge pull request #793 from Shelf-nu/asset-form-ui-fixes
DonKoko Feb 27, 2024
ed07508
implement the new ui on workspace.new and custom-field.new
DonKoko Feb 27, 2024
55ad107
Merge pull request #794 from Shelf-nu/asset-form-ui-fixes
DonKoko Feb 27, 2024
52973c7
refactor(model-filters): filters models based on organizationId inste…
rockingrohit9639 Feb 28, 2024
a849004
refactor(dynamic-select): removed logic for saving values in query pa…
rockingrohit9639 Feb 28, 2024
7060545
Merge branch 'rohit/refactor-dropdowns-v2' of github.com:rockingrohit…
rockingrohit9639 Feb 28, 2024
3454874
refactor(dynamic-select): fix filcker of Select when it's items changes
rockingrohit9639 Feb 28, 2024
cf98eaa
merge main and fix conflicts
DonKoko Feb 28, 2024
320668d
refactor(dynamic-dropdown): Implemented Optimistic UI approach in dro…
rockingrohit9639 Feb 28, 2024
74e3b93
Merge branch 'rohit/refactor-dropdowns-v2' of github.com:rockingrohit…
rockingrohit9639 Feb 28, 2024
4b1e572
refactor(dynamic-select): fixed placeholder in new asset form
rockingrohit9639 Feb 28, 2024
214a56a
fix issue with qr endpoint not being accessible when not logged in
DonKoko Feb 28, 2024
5248646
Merge pull request #797 from Shelf-nu/791-location-capture-not-working
DonKoko Feb 28, 2024
06f6058
Merge branch 'main' into rohit/refactor-dropdowns-v2
DonKoko Feb 28, 2024
30e7e23
refactor(dynamic-select): remove reset fetcher action and create useF…
rockingrohit9639 Feb 28, 2024
037dede
refactor(dynamic-select): add location in zod validation for model-fi…
rockingrohit9639 Feb 28, 2024
0e6a816
refactor(dynamic-select): fixed focues issue on DynamicSelect
rockingrohit9639 Feb 28, 2024
39c466d
refactor(dynamic-select): remove Select and using Popover in DynamicS…
rockingrohit9639 Feb 28, 2024
1692fe0
implementing feedback from client
DonKoko Feb 28, 2024
d78b979
Merge branch 'main' into minor-improvements-user-feedback
DonKoko Feb 28, 2024
6e21d87
Merge pull request #798 from Shelf-nu/minor-improvements-user-feedback
DonKoko Feb 28, 2024
834f835
Merge branch 'main' into rohit/refactor-dropdowns-v2
DonKoko Feb 28, 2024
d7ecd8f
few styling adjustments
DonKoko Feb 28, 2024
64dd56b
Further ui improvement
DonKoko Feb 29, 2024
a472232
Merge pull request #800 from Shelf-nu/minor-improvements-user-feedback-2
DonKoko Feb 29, 2024
f68e2c1
style changes
DonKoko Feb 29, 2024
e158017
Merge branch 'main' into rohit/refactor-dropdowns-v2
DonKoko Feb 29, 2024
55c3ca7
mend
DonKoko Feb 29, 2024
bb4a1a5
Merge branch 'main' into rohit/refactor-dropdowns-v2
DonKoko Feb 29, 2024
d3f8cf0
refactor(asset-index): create search param utilities to manage clear …
rockingrohit9639 Feb 29, 2024
b821c69
fixing remaining issues from 770
DonKoko Feb 29, 2024
d0af4fe
Merge pull request #801 from Shelf-nu/770-bookings-feature-bugs
DonKoko Feb 29, 2024
b15b7b3
refactor(dynamic select and dropdown): updated styles for DynamicDrop…
rockingrohit9639 Feb 29, 2024
7ff4103
refactor(dynamic-dropdown): updated style for asset index page for mo…
rockingrohit9639 Feb 29, 2024
a1798cd
fixing the broken link and type imports
DonKoko Mar 1, 2024
1755856
Merge pull request #803 from Shelf-nu/802-broken-link
DonKoko Mar 1, 2024
322fe85
fixing remaining issues from 770
DonKoko Feb 29, 2024
54e06c8
merged and rebased to fix conflicts
DonKoko Mar 1, 2024
d39cd32
mend
DonKoko Mar 1, 2024
60b512b
update with main
DonKoko Mar 1, 2024
5b13ec1
small css change
DonKoko Mar 1, 2024
744090f
Merge pull request #792 from rockingrohit9639/rohit/refactor-dropdown…
DonKoko Mar 1, 2024
defb723
feature(filters-get-all): implement the feature to all entries in Dyn…
rockingrohit9639 Mar 1, 2024
8435ae1
fix readme
DonKoko Mar 1, 2024
b67f973
feature(filters-get-all): updated logic for getAll entries to be sepe…
rockingrohit9639 Mar 1, 2024
c68200b
feature(filters): increase number of initial entries fetched for filt…
rockingrohit9639 Mar 2, 2024
42062b8
feature(filters-get-all): add Show all button to fetch all entries fo…
rockingrohit9639 Mar 2, 2024
4524d9f
refactor(dynamic-select): update width of content to be equal to its …
rockingrohit9639 Mar 2, 2024
6895fa9
Merge branch 'main' into feature/filters-get-all
DonKoko Mar 4, 2024
0b51928
small style update
DonKoko Mar 4, 2024
c067939
Merge pull request #805 from rockingrohit9639/feature/filters-get-all
DonKoko Mar 4, 2024
bea06e1
small ui fix for custodian select spacing
DonKoko Mar 4, 2024
e5eeffd
initializing the cookie was setting the value of perPage to 20, even …
DonKoko Mar 4, 2024
a171b66
Merge pull request #808 from Shelf-nu/641-bug-items-per-page-not-reme…
DonKoko Mar 4, 2024
6203f83
polishing dynamic dropdown and select
DonKoko Mar 4, 2024
8abb223
automatic linting fix
DonKoko Mar 4, 2024
cc26e3e
Merge pull request #810 from Shelf-nu/dynamic-dropdowns-empty-state
DonKoko Mar 4, 2024
437deb0
making sure the correct user is added as the owner of the org
DonKoko Mar 4, 2024
47da1a1
Merge pull request #812 from Shelf-nu/811-bug-administrator-sees-thei…
DonKoko Mar 4, 2024
c1f19ac
decoding url before consuming token
DonKoko Mar 4, 2024
1194c2a
Merge pull request #815 from Shelf-nu/decode-invite-link
DonKoko Mar 4, 2024
9720ab1
attempting to fix the problem with import
DonKoko Mar 5, 2024
3f3616e
fixing custodian select on booking page
DonKoko Mar 5, 2024
e3e4539
Merge pull request #816 from Shelf-nu/bug-default-custodian-on-bookin…
DonKoko Mar 5, 2024
67c5d71
fixing #743
DonKoko Mar 5, 2024
83c161f
Merge pull request #817 from Shelf-nu/743-feature-request-post-scan-q…
DonKoko Mar 5, 2024
958c17a
testing replacing magic link with otp
DonKoko Mar 5, 2024
18f70d1
refactor(otp-auth): replace migic-link-auth with login-with-otp
rockingrohit9639 Mar 5, 2024
f6fce20
feature(otp): add mode in otp page and rendering title and subheading…
rockingrohit9639 Mar 6, 2024
6bdfcce
feature(otp): move otp page data to its separate util file
rockingrohit9639 Mar 6, 2024
39c4f59
feature(otp): add feature to handle resend otp
rockingrohit9639 Mar 6, 2024
bd3ae77
small adjustments
DonKoko Mar 6, 2024
1598f75
fixing small bug with link on logo on auth layout
DonKoko Mar 6, 2024
6209ce0
fix(resend-otp): update route in otp page to /send-otp to handle rese…
rockingrohit9639 Mar 6, 2024
79a44e2
fixing some bugs related to org and other modules
DonKoko Mar 6, 2024
e9080f5
Merge pull request #823 from Shelf-nu/818-bug-booking-related-bugs-im…
DonKoko Mar 6, 2024
3fa19ff
Merge branch 'main' into replace-magic-link-with-otp
DonKoko Mar 6, 2024
d6e0af0
refactor(otp-auth): replace migic-link-auth with login-with-otp
rockingrohit9639 Mar 5, 2024
27976ad
feature(otp): add mode in otp page and rendering title and subheading…
rockingrohit9639 Mar 6, 2024
7a4e964
feature(otp): move otp page data to its separate util file
rockingrohit9639 Mar 6, 2024
8d1a10f
feature(otp): add feature to handle resend otp
rockingrohit9639 Mar 6, 2024
0b9f627
small adjustments
DonKoko Mar 6, 2024
14e5952
fix(resend-otp): update route in otp page to /send-otp to handle rese…
rockingrohit9639 Mar 6, 2024
c8a74f4
fix: done all the changes requested in PR #821
rockingrohit9639 Mar 6, 2024
9cb8b4c
Merge branch 'refactor/magic-link-auth' of github.com:rockingrohit963…
rockingrohit9639 Mar 6, 2024
46fef7e
Merge pull request #821 from rockingrohit9639/refactor/magic-link-auth
DonKoko Mar 6, 2024
16860c5
fixing responsiveness of some forms
DonKoko Mar 7, 2024
34717b2
Merge pull request #826 from Shelf-nu/responsiveness-fixes
DonKoko Mar 7, 2024
246de21
Merge branch 'main' into replace-magic-link-with-otp
DonKoko Mar 7, 2024
36589fe
polishing
DonKoko Mar 7, 2024
30f70cc
Merge pull request #819 from Shelf-nu/replace-magic-link-with-otp
DonKoko Mar 7, 2024
dc46ef2
Update get-started.md
DonKoko Mar 7, 2024
63a1015
Merge pull request #827 from Shelf-nu/DonKoko-patch-2
DonKoko Mar 7, 2024
604b505
updating csv parser
DonKoko Mar 7, 2024
8aa9e9c
Merge pull request #828 from Shelf-nu/814-bug-importing-csv-with-spec…
DonKoko Mar 7, 2024
1bedf51
Merge branch 'signing-templates' into signing-templates
rajdip-b Mar 7, 2024
a8b3c4c
fixing issue with escaped quotes and wrapping quotes in csv imports
DonKoko Mar 7, 2024
4ce99da
Merge pull request #830 from Shelf-nu/813-bug-wrapping-quotes-are-not…
DonKoko Mar 7, 2024
d557fbf
Save button improvements
DonKoko Mar 7, 2024
228a2ab
Merge pull request #831 from Shelf-nu/663-feature-request-positioning…
DonKoko Mar 7, 2024
b19b1e1
Merge branch 'signing-templates' of github.com:rajdip-b/shelf.nu into…
rajdip-b Mar 9, 2024
1eb548f
Merge branch 'main' of github.com:Shelf-nu/shelf.nu into signing-temp…
rajdip-b Mar 10, 2024
d18e0fc
PR-CHANGES 3
rajdip-b Mar 10, 2024
cd5cfdb
fetching template updated in template edit
rajdip-b Mar 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 3 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ SUPABASE_ANON_PUBLIC="{ANON_PUBLIC}"
SUPABASE_SERVICE_ROLE="{SERVICE_ROLE}"
SUPABASE_URL="https://{YOUR_INSTANCE_NAME}.supabase.co"
SERVER_URL="http://localhost:3000"
APP_NAME="Shelf"


# Set this to false to disable requirement of subscription for premium features. This will make premium features available for all users
Expand All @@ -36,6 +37,6 @@ INVITE_TOKEN_SECRET="secret-test-invite"
GEOCODE_API_KEY="geocode-api-key"

# Used for Sentry error logging
SENTRY_DSN="sentry-dsn"
SENTRY_ORG="sentry-org"
SENTRY_PROJECT="sentry-project"
SENTRY_PROJECT="sentry-project"
SENTRY_DSN="sentry-dsn"
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Shelf.nu

<a href="https://www.shelf.nu/" target="_blank">
<img width="100%" src="https://cdn.discordapp.com/attachments/1143882281069592658/1143949082017153044/Frame_102.jpg" />
<img width="100%" src="./public/static/images/readme-cover.jpg" />
</a>
<h4 align="center">
✨ Open Source Asset Management Infrastructure for everyone. ✨
Expand Down Expand Up @@ -48,4 +48,4 @@ With Shelf, you can take a picture of any item you own and store it in your own

### Looking for contributing in Shelf?

- check out our [contributing guidelines](https://github.com/hrutik7/shelf.nu/blob/docs_improvement/docs/get-started.md)
- check out our [contributing guidelines](./CONTRIBUTING.md)
2 changes: 1 addition & 1 deletion app/atoms/file.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export const fileErrorAtom = atom<string | undefined>(undefined);
fileErrorAtom.onMount = (setAtom) => {
setAtom("");
};
export const MAX_SIZE = 4_000_000; // 4MB
export const MAX_SIZE = 8_000_000; // 4MB

/** Validates the file atom */
export const validateFileAtom = atom(
Expand Down
7 changes: 7 additions & 0 deletions app/atoms/selected-assets-atoms.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { atom } from "jotai";

/** Track selected assets for adding assets to booking */
export const bookingsSelectedAssetsAtom = atom<string[]>([]);

/** Track selected assets for adding assets to location */
export const locationsSelectedAssetsAtom = atom<string[]>([]);
9 changes: 0 additions & 9 deletions app/atoms/workspace.new.ts

This file was deleted.

35 changes: 24 additions & 11 deletions app/components/assets/actions-dropdown.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useState } from "react";
import { useEffect, useState } from "react";
import { useLoaderData, useSearchParams } from "@remix-run/react";
import { useHydrated } from "remix-utils/use-hydrated";
import {
Expand Down Expand Up @@ -28,16 +28,37 @@ const ConditionalActionsDropdown = () => {
const refIsQrScan = searchParams.get("ref") === "qr";
const defaultOpen = window.innerWidth <= 640 && refIsQrScan;
const [open, setOpen] = useState(defaultOpen);
const [defaultApplied, setDefaultApplied] = useState(false);
const assetIsCheckedOut = asset.status === "CHECKED_OUT";

useEffect(() => {
if (defaultOpen && !defaultApplied) {
setOpen(true);
setDefaultApplied(true);
}
}, [defaultOpen, defaultApplied]);

return (
<>
{open && (
<div
className={tw(
"fixed right-0 top-0 z-10 h-screen w-screen cursor-pointer bg-gray-700/50 transition duration-300 ease-in-out md:hidden"
)}
/>
)}
<DropdownMenu
modal={false}
onOpenChange={(open) => setOpen(open)}
onOpenChange={(open) => {
if (defaultApplied && window.innerWidth <= 640) setOpen(open);
}}
open={open}
defaultOpen={defaultOpen}
>
<DropdownMenuTrigger className="asset-actions hidden sm:flex">
<DropdownMenuTrigger
className="asset-actions hidden sm:flex"
onClick={() => setOpen(!open)}
>
<Button variant="secondary" data-test-id="assetActionsButton">
<span className="flex items-center gap-2">
Actions <ChevronRight className="chev" />
Expand Down Expand Up @@ -185,14 +206,6 @@ const ConditionalActionsDropdown = () => {
</div>
</DropdownMenuContent>
</DropdownMenu>

{/* overlay on mobile */}
<div
className={tw(
"size-screen fixed right-0 top-0 z-50 cursor-pointer bg-[#344054]/50 transition duration-300 ease-in-out md:hidden",
open ? "visible" : "invisible opacity-0"
)}
></div>
</>
);
};
Expand Down
2 changes: 1 addition & 1 deletion app/components/assets/asset-image.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const AssetImage = ({
const url =
mainImage ||
fetcher?.data?.asset?.mainImage ||
"/images/asset-placeholder.jpg";
"/static/images/asset-placeholder.jpg";

useEffect(() => {
if (mainImage && mainImageExpiration) {
Expand Down
10 changes: 5 additions & 5 deletions app/components/assets/custom-fields-inputs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
SelectValue,
SelectItem,
} from "../forms";
import { Calendar } from "../forms/calender-input";
import { Calendar } from "../forms/calendar-input";
import FormRow from "../forms/form-row";
import Input from "../forms/input";
import { Switch } from "../forms/switch";
Expand Down Expand Up @@ -151,8 +151,8 @@ export default function AssetCustomFields({
align="start"
>
<div className=" max-h-[320px] overflow-auto">
{field.options.map((value) => (
<SelectItem value={value} key={value}>
{field.options.map((value, index) => (
<SelectItem value={value} key={value + index}>
<span className="mr-4 text-[14px] text-gray-700">
{value.toLowerCase()}
</span>
Expand All @@ -178,14 +178,14 @@ export default function AssetCustomFields({
</Link>
</div>
{customFields.length > 0 ? (
customFields.map((field) => {
customFields.map((field, index) => {
const value = customFieldsValues?.find(
(cfv) => cfv.customFieldId === field.id
)?.value;
const displayVal = value ? getCustomFieldDisplayValue(value) : "";
return (
<FormRow
key={field.id}
key={field.id + index}
rowLabel={field.name}
subHeading={field.helpText ? <p>{field.helpText}</p> : undefined}
className="border-b-0"
Expand Down
Loading
Loading