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

Feature/app 193 sync shop and user trust #184

Open
wants to merge 2,924 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2924 commits
Select commit Hold shift + click to select a range
c731c7d
Fix bottom process nav
codeho Feb 6, 2023
d7a0b7d
remove mock for local docker target
codeho Feb 6, 2023
02d7904
enable self signed https
codeho Feb 6, 2023
671e6b6
enable self signed https
codeho Feb 6, 2023
4535599
'npm run docker' now uses API_ENDPOINT='https://api-server.localhost'
jaensen Feb 6, 2023
8527fc9
fix(ci): remove 'check svelte-i18n keys' PR check workflow
almereyda Feb 6, 2023
6e426b8
Merge pull request #67 from CirclesUBI/feat/op-10
codeho Feb 6, 2023
11301ee
disabled tls in the webpack development webserver
jaensen Feb 6, 2023
ce10d92
allow frontend hot-reloading through a reverse proxy in land-local
jaensen Feb 7, 2023
b47e8a0
fix barcode scanner on macOs chrome
codeho Feb 7, 2023
e11e485
Merge pull request #68 from CirclesUBI/feature/fix-qrCodeScanner-on-m1
codeho Feb 7, 2023
e7649cd
squeeze the upsertbusiness for testing perparation
codeho Feb 8, 2023
e035a69
Merge pull request #69 from CirclesUBI/feature/orga-editor
codeho Feb 8, 2023
ba7bac1
fix(ci): remove check svelte-i18n keys dev workflow
almereyda Feb 8, 2023
957528c
Merge pull request #70 from CirclesUBI/fix/OP-10
codeho Feb 8, 2023
1ea1a71
write commit sha to the output directory
jaensen Feb 8, 2023
e179b1b
fixed button styling
ingoCollatz Feb 10, 2023
c0aaa7c
Merge pull request #73 from CirclesUBI:feature/app-58-adjust-the-butt…
ingoCollatz Feb 10, 2023
000a96f
preliminary check in
codeho Feb 13, 2023
394571b
changed route for survey
dacianavram Feb 13, 2023
509796c
local overrides
codeho Feb 14, 2023
3a25153
Merge pull request #75 from CirclesUBI/feature/move-survey-route-inde…
dacianavram Feb 14, 2023
9b8d0ac
Shop Editor and some changes for local overrides
Feb 14, 2023
f177c6a
changed font to 'Ostrich Heavy Sans' in /#/survey/2 and /#/survey/3
ingoCollatz Feb 14, 2023
f02e994
Merge pull request #76 from CirclesUBI:feature/app-54-survey-10303-al…
ingoCollatz Feb 14, 2023
fb86230
Remove fallback of 'Hmm... nothing to display here...', + some cleanup
Feb 15, 2023
a5eb62e
Merge remote-tracking branch 'origin/dev' into feature/app-47-create-…
Feb 15, 2023
3a670bb
adjust survey path
Feb 15, 2023
bcb038c
cleanup for Orga Editor
Feb 15, 2023
7ad6f1e
Merge pull request #77 from CirclesUBI/feature/app-47-create-edit-org…
codeho Feb 15, 2023
615269f
Adjust Dashboard Cards, also fix deprecated substr function
Feb 15, 2023
4b59225
Merge pull request #78 from CirclesUBI/feature/app-60-20306-make-oval…
codeho Feb 15, 2023
6c52b2c
changed redirect url for scanInvite
dacianavram Feb 15, 2023
5130ae9
preliminary commit of showing owners. so far only get safeAddresses...
Feb 15, 2023
f41dd0d
Merge remote-tracking branch 'origin/dev' into feature/move-survey-ro…
Feb 15, 2023
a68b6b0
Make location Mandatory for new users
Feb 15, 2023
ea8c994
Merge pull request #79 from CirclesUBI/feature/app-16-location-must-b…
codeho Feb 15, 2023
c8e6e0a
Remove Owners list from Store Editor as per @manu
Feb 15, 2023
9a81d75
Merge branch 'dev' into feature/app-47-create-edit-organisationshop-f…
Feb 15, 2023
817a8fe
Merge pull request #80 from CirclesUBI/feature/app-47-create-edit-org…
codeho Feb 15, 2023
a528557
remove survey/1 route
dacianavram Feb 15, 2023
de36ac7
changed onSurvey route
dacianavram Feb 15, 2023
4a4e437
preliminary commit of showing owners. so far only get safeAddresses...
Feb 15, 2023
6b32a71
Make location Mandatory for new users
Feb 15, 2023
bda2e07
Remove Owners list from Store Editor as per @manu
Feb 15, 2023
452dfd3
Fix Survey manifest routing and ScanInvite, also fixed white text in …
Feb 15, 2023
1941764
additional url fixes
Feb 15, 2023
3fff21e
remove back button from welcome screen
dacianavram Feb 15, 2023
aa64fbf
Merge pull request #81 from CirclesUBI/feature/app-37-move-homepagesu…
dacianavram Feb 15, 2023
b4e7c3c
checkFunction to conditionally show openingHours
ingoCollatz Feb 15, 2023
381cdc4
Merge pull request #82 from CirclesUBI/feature/app-82-marketplace-bus…
ingoCollatz Feb 15, 2023
730c666
Fixes App-85 - signup SessionId error
Feb 15, 2023
94474c0
Merge pull request #83 from CirclesUBI/feature/app-85-fix-sessionid-e…
codeho Feb 15, 2023
55d4313
fix margin for button on survey
Feb 15, 2023
4632145
Merge pull request #85 from CirclesUBI/feature/app-59-10101-all-conte…
codeho Feb 15, 2023
fffbaeb
fiz top margin
Feb 15, 2023
223e3f0
Merge pull request #86 from CirclesUBI/feature/app-59-10101-all-conte…
codeho Feb 15, 2023
6b55123
local env-variables now in .env-files
ingoCollatz Feb 16, 2023
0aec5c1
Merge pull request #88 from CirclesUBI:feature/op-51-parametrisation-…
ingoCollatz Feb 16, 2023
8ca470c
moved override env variables into .env file
ingoCollatz Feb 16, 2023
11749c1
Merge pull request #89 from CirclesUBI:feature/override-env-variables
ingoCollatz Feb 16, 2023
37466cc
fixed .env handling
ingoCollatz Feb 16, 2023
02b79a0
Merge pull request #90 from CirclesUBI:feature/environment-variable-fix
ingoCollatz Feb 16, 2023
b56c467
fix webpack .env stuff
Feb 17, 2023
5f16d3e
Merge pull request #91 from CirclesUBI/feature/fix_webpack
codeho Feb 17, 2023
50388d8
enable hot-reloading
ingoCollatz Feb 17, 2023
fdd4f40
Merge pull request #93 from CirclesUBI:feature/hot-reload
ingoCollatz Feb 17, 2023
28e440d
change size of invite button container. remove npm i.
Feb 17, 2023
2d5f41d
Merge pull request #94 from CirclesUBI/feature/app-4-20308-educationa…
codeho Feb 17, 2023
9acf7b5
move market sort to left.
Feb 17, 2023
e5e994c
Merge pull request #95 from CirclesUBI/feature/app-49-60107-make-the-…
codeho Feb 17, 2023
7d010be
Replace Google places api in Mystore with new Here Api.
Feb 17, 2023
5390498
Merge pull request #96 from CirclesUBI/feature/app-66-user-cannot-see…
codeho Feb 17, 2023
2ba3276
remove google places npm package
Feb 17, 2023
92dd7ea
Merge pull request #97 from CirclesUBI/feature/app-66-user-cannot-see…
codeho Feb 17, 2023
c4a2dac
change support number
dacianavram Feb 19, 2023
fc1c319
Merge pull request #98 from CirclesUBI/feature/app-44-change-support-…
dacianavram Feb 19, 2023
fceac23
redirect to survey if no invite is present. fix locationName in profile
Feb 20, 2023
ccd716a
Merge pull request #100 from CirclesUBI/feature/app-66-user-cannot-se…
codeho Feb 20, 2023
39b5394
add yet unused location helper, fix hover text color on buttons
Feb 20, 2023
a1c77ba
Merge pull request #101 from CirclesUBI/feature/app-66-user-cannot-se…
codeho Feb 20, 2023
6c96173
Fix Topnav for favorites. Fixes APP-52
Feb 20, 2023
82aa549
Merge pull request #102 from CirclesUBI/feature/app-52-604-add-title-…
codeho Feb 20, 2023
132afed
Fix the way we store location. some minor changes.
Feb 20, 2023
e784a2b
Merge pull request #103 from CirclesUBI/feature/app-47-create-edit-or…
codeho Feb 20, 2023
ac8131c
removing add owner and member from contexxt menu
Feb 20, 2023
9f2c537
Merge pull request #104 from CirclesUBI/feature/app-97-tab-label-and-…
codeho Feb 20, 2023
8528abb
The last two characters of the key were cut off. Most likely stems fr…
jaensen Feb 20, 2023
a9cc837
Merge pull request #105 from CirclesUBI/fix/truncated-last-two-chars-…
jaensen Feb 20, 2023
f6d4915
added more mock keys for the use in local environments.
jaensen Feb 20, 2023
326b1ec
Merge pull request #106 from CirclesUBI/feature/add-more-mock-accounts
jaensen Feb 20, 2023
c549200
add missing zero to time
dacianavram Feb 20, 2023
f3a0c1f
Merge pull request #107 from CirclesUBI/feature/app-84-fix-openinghou…
dacianavram Feb 20, 2023
57b7f43
update favicons
Feb 21, 2023
29ec646
Merge pull request #108 from CirclesUBI/feature/app-97-tab-label-and-…
codeho Feb 21, 2023
411b897
remove Github from login.
Feb 21, 2023
2e4872a
Merge pull request #109 from CirclesUBI/feature/app-10-10604-remove-g…
codeho Feb 21, 2023
6cdd5a2
add space on top of dashboard
codeho Feb 22, 2023
beb539d
Merge pull request #111 from CirclesUBI/feature/app-4-20308-education…
codeho Feb 22, 2023
9e2a259
use sentry + don't configure via 'dotenv' if process.env.NODE_ENV ===…
jaensen Feb 22, 2023
99472f1
Merge pull request #112 from CirclesUBI/feature/use-sentry
jaensen Feb 22, 2023
9d374e7
configure sentry replay while developing
jaensen Feb 22, 2023
1b0daeb
Merge pull request #114 from CirclesUBI/feature/use-sentry
jaensen Feb 22, 2023
197229b
Address Search format
codeho Feb 27, 2023
ea99e27
My Shop Address search
Feb 27, 2023
1a16f3d
location stuff
Feb 28, 2023
5df5a6a
refactor openinghours in marketlistingdetail
dacianavram Feb 28, 2023
83ef2b9
Merge pull request #116 from CirclesUBI/feature/app-66-address-search…
codeho Feb 28, 2023
9284f6d
fixed dotenv
codeho Feb 28, 2023
cf19ffc
fixed dotenv
codeho Feb 28, 2023
541a2b3
Merge pull request #117 from CirclesUBI/feature/fixing-dotenv
codeho Feb 28, 2023
bd87d03
Fix broken Modal Close Button & address font size on profile.
Feb 28, 2023
2a80030
Merge pull request #118 from CirclesUBI/feature/app-112-what-is-this-…
codeho Feb 28, 2023
5a911cc
format page
dacianavram Feb 28, 2023
509ef65
set isSurveyPage to false if the route is not on the survey anymore
dacianavram Feb 28, 2023
06bb0db
Merge pull request #119 from CirclesUBI/feature/app-118-sometimes-hom…
dacianavram Feb 28, 2023
9311ff3
fix navigation button and process window button states
codeho Mar 1, 2023
8ca3c89
Merge pull request #120 from CirclesUBI/feature/app-106-burger-menu-b…
codeho Mar 1, 2023
4dcccb3
fixing broken process modal close button
codeho Mar 1, 2023
adf35ed
Merge pull request #121 from CirclesUBI/feature/app-106-burger-menu-b…
codeho Mar 1, 2023
7c45073
adjust design of openinghours
dacianavram Mar 1, 2023
ae3a5c6
Merge pull request #115 from CirclesUBI/feature/app-82-marketplace-bu…
codeho Mar 1, 2023
c3e78b7
add style changes
dacianavram Mar 1, 2023
02f39da
Merge pull request #122 from CirclesUBI/feature/app-82-marketplace-bu…
dacianavram Mar 1, 2023
c283210
adjust styles
dacianavram Mar 1, 2023
1115229
Merge pull request #123 from CirclesUBI/feature/app-82-marketplace-bu…
dacianavram Mar 1, 2023
6fb751c
fix share icon that creates a shovel icon in the footer...weird
codeho Mar 1, 2023
608e4c2
Merge pull request #124 from CirclesUBI/feature/app-112-what-is-this-…
codeho Mar 1, 2023
72a7288
fix badges
dacianavram Mar 1, 2023
d80796f
Merge pull request #125 from CirclesUBI/feature/app-82-marketplace-bu…
dacianavram Mar 1, 2023
920b50e
fix icon role and remove console.log
dacianavram Mar 1, 2023
28a1786
Merge pull request #127 from CirclesUBI/feature/app-82-marketplace-bu…
dacianavram Mar 1, 2023
3ba68b8
fix menu buttons in mobile view
codeho Mar 1, 2023
5fc60f5
Merge pull request #129 from CirclesUBI/feature/app-106-burger-menu-b…
codeho Mar 1, 2023
a1ed0e6
add testpage for manu for google places
Mar 2, 2023
24f39ac
Merge pull request #131 from CirclesUBI/feature/app-127-after-additio…
codeho Mar 2, 2023
8e30502
replacing substring with slice to mimick substr. functionality
codeho Mar 2, 2023
8e211d2
Merge pull request #132 from CirclesUBI/feature/app-110-check-for-fau…
codeho Mar 2, 2023
da574cf
renamed orga.name to orga.firstName to fix data update visibility
codeho Mar 3, 2023
a934de3
renamed orga.name to orga.firstName to fix data update visibility
codeho Mar 3, 2023
68004b5
Fix Quickaction Update After UserData Change
Mar 3, 2023
e5ae408
Remove add shop if user has shop already
Mar 3, 2023
23b675e
remove add orga if user already has orga
Mar 3, 2023
dd5e028
Merge pull request #133 from CirclesUBI/feature/app-104-profile-pictu…
codeho Mar 3, 2023
6b2d5cd
remove temporary google places test
codeho Mar 3, 2023
44e6026
Merge pull request #134 from CirclesUBI/feature/removeGooglePLacesTest
codeho Mar 3, 2023
dd93e48
get location and locationName from memberships
Mar 3, 2023
87faddb
Merge pull request #135 from CirclesUBI/feature/app-135-membershipsda…
codeho Mar 3, 2023
3ffed7a
fix wrong office hour default
codeho Mar 3, 2023
84f67ad
Merge pull request #136 from CirclesUBI/feature/fix-wrong-default-off…
codeho Mar 3, 2023
b9dbd0b
remove add orga for orgas
codeho Mar 3, 2023
36aaabf
Merge pull request #137 from CirclesUBI/feature/app-130-limit-users-t…
codeho Mar 3, 2023
ce1356d
simple validation if QR code is a invite link
codeho Mar 6, 2023
0db07f4
Merge pull request #138 from CirclesUBI/feature/app-39-add-validation…
codeho Mar 6, 2023
47798ba
preliminary check in
codeho Mar 7, 2023
7ba27bd
APP-105: Notification area doesn't auto-update
jaensen Mar 8, 2023
f4aabc4
Merge pull request #139 from CirclesUBI/feature/auto-update-on-events
jaensen Mar 8, 2023
5c6e372
Preliminary check in of new Google Maps Address Search
Mar 8, 2023
f60f6c9
remove unneeded file
Mar 8, 2023
d4dda8f
create 404 page and route
dacianavram Mar 8, 2023
d684689
Merge pull request #140 from CirclesUBI/feature/app-117-create-404-pa…
dacianavram Mar 8, 2023
66e0670
Merge pull request #141 from CirclesUBI/feature/app-127-after-additio…
codeho Mar 8, 2023
b37a41d
add homepage button to notfound page
dacianavram Mar 8, 2023
09241d2
Merge pull request #142 from CirclesUBI/feature/app-117-create-404-pa…
dacianavram Mar 8, 2023
9a1294e
show Send Money button for organizations on profile page
dacianavram Mar 8, 2023
4716a0f
Merge pull request #143 from CirclesUBI/feature/app-87-add-send-circl…
dacianavram Mar 8, 2023
a915f6e
on MarketlistingDetail show button 'send money to ORGA NAME'
dacianavram Mar 8, 2023
9ebeaa7
Merge pull request #144 from CirclesUBI/feature/app-87-add-send-circl…
dacianavram Mar 8, 2023
1a7c920
New Google Address Search
Mar 9, 2023
92c54ab
Merge branch 'dev' into feature/app-127-after-additional-research-all…
codeho Mar 9, 2023
29e6383
Merge pull request #146 from CirclesUBI/feature/app-127-after-additio…
codeho Mar 9, 2023
825a2e2
update qrcode lib
Mar 9, 2023
1db58fb
Merge pull request #147 from CirclesUBI/feature/app-127-after-additio…
codeho Mar 9, 2023
5883b76
fix send money not showing
dacianavram Mar 9, 2023
180afef
Merge pull request #148 from CirclesUBI/feature/app-149-when-in-shop-…
dacianavram Mar 9, 2023
f852cdf
add Village Dropdown to Survey, remove userType
Mar 10, 2023
5517622
Merge pull request #149 from CirclesUBI/feature/app-154-add-drop-down…
codeho Mar 10, 2023
f770e43
Fix wrong SessionData Setting.
Mar 10, 2023
747db9f
Merge pull request #150 from CirclesUBI/feature/app-158-rehaul-survey…
codeho Mar 10, 2023
598c1eb
restyle error box
dacianavram Mar 13, 2023
6f26f7f
Merge pull request #151 from CirclesUBI/feature/app-68-remove-discord…
dacianavram Mar 13, 2023
2fae19a
package.json cleanup. removed unneeded packages.
Mar 13, 2023
9643e88
Merge remote-tracking branch 'origin/dev' into feature/app-95-clean-u…
Mar 13, 2023
55d6329
Merge pull request #152 from CirclesUBI/feature/app-95-clean-up-npm-i…
codeho Mar 13, 2023
f1a3dcc
fix profile link on notification list
codeho Mar 14, 2023
fc41acd
Merge pull request #153 from CirclesUBI/feature/fix-contact-profile-link
codeho Mar 14, 2023
0959b16
fix padding issues on mobile screens
dacianavram Mar 14, 2023
4585187
Merge pull request #154 from CirclesUBI/feature/app-162-survey-input-…
dacianavram Mar 14, 2023
3d9f425
added check for invite cookie to remove scan btn
codeho Mar 14, 2023
14691a8
Merge pull request #155 from CirclesUBI/feature/hide-scanInvite-if-In…
codeho Mar 14, 2023
5cd866a
add margin to survey
dacianavram Mar 14, 2023
f3fb621
Merge pull request #156 from CirclesUBI/feature/app-162-survey-input-…
dacianavram Mar 14, 2023
9572d1a
upgrade datepicker version and moved to shell package.json
dacianavram Mar 14, 2023
c10eeb7
Merge pull request #157 from CirclesUBI/feature/app-157-selecting-a-m…
dacianavram Mar 14, 2023
b011688
frontend-healthcheck
ingoCollatz Mar 15, 2023
9878e46
added a healthcheck for the frontend and only start cypress when the …
jaensen Mar 15, 2023
1c3736b
set the villageId to the first village
jaensen Mar 16, 2023
723a253
Merge pull request #158 from CirclesUBI/feature/frontend-healthcheck
jaensen Mar 16, 2023
066b0f1
New Datepicker bc. of Mobile
codeho Mar 16, 2023
3a716cf
Merge pull request #160 from CirclesUBI/feature/app-157-selecting-a-m…
codeho Mar 16, 2023
cbaa121
Only Show scan invite if no invite is present
codeho Mar 17, 2023
60b7cbc
Merge branch 'dev' into feature/app-157-selecting-a-month-in-the-cale…
codeho Mar 17, 2023
0b9ac0e
Merge pull request #161 from CirclesUBI/feature/app-157-selecting-a-m…
codeho Mar 17, 2023
7b367fc
Fix Date Input
codeho Mar 17, 2023
ab29b58
Merge pull request #162 from CirclesUBI/feature/app-157-selecting-a-m…
codeho Mar 17, 2023
4c7ccc4
Try new qr-scanner api.
codeho Mar 17, 2023
6365563
Merge pull request #163 from CirclesUBI/feature/inviteScannerTest
codeho Mar 17, 2023
ef7548f
Replace QR Code Scanner Library
codeho Mar 17, 2023
16db597
Merge pull request #164 from CirclesUBI/feature/inviteScannerTest
codeho Mar 17, 2023
ddc6e37
update ScanInvite
codeho Mar 17, 2023
36993d5
Merge pull request #165 from CirclesUBI/feature/inviteScannerTest
codeho Mar 17, 2023
0992927
set timeout after 10 seconds
codeho Mar 17, 2023
22a0643
Merge pull request #166 from CirclesUBI/feature/inviteScannerTest
codeho Mar 17, 2023
3ccc491
disable submit on locationsearch unless location is selected
codeho Mar 17, 2023
1d0791e
Merge pull request #168 from CirclesUBI/fix/disable-submit-on-locatio…
codeho Mar 17, 2023
01f0933
make ws work for the api-server
jaensen Mar 16, 2023
25a74ee
webpack hot reloading on new domain
jaensen Mar 16, 2023
812a88a
don't stop() the Qr code scanner two times
jaensen Mar 19, 2023
ab343e4
Merge pull request #169 from CirclesUBI/feature/stop-qr-code-scanner
jaensen Mar 19, 2023
278a6b7
use "window.location =" to redirect to the invitation url instead of …
jaensen Mar 19, 2023
c7a150e
Merge pull request #170 from CirclesUBI/feature/window-location-inste…
jaensen Mar 19, 2023
b0f76d5
increas fps polling rate for qr scanner
codeho Mar 20, 2023
4b5836a
Merge pull request #171 from CirclesUBI/feature/increase-qrscan-polli…
codeho Mar 20, 2023
2f053c6
preliminary submit before big bang
codeho Mar 20, 2023
dc87dee
Loading i18n from git json files.
Mar 20, 2023
f0bd2c7
add todo hint
Mar 20, 2023
5f208be
Merge pull request #172 from CirclesUBI/feature/app-167-replace-db-ba…
codeho Mar 20, 2023
a5633c0
i18n changes
codeho Mar 20, 2023
477de4a
i18n changes
codeho Mar 20, 2023
f1b8347
Merge pull request #173 from CirclesUBI/feature/app-167-replace-db-ba…
codeho Mar 20, 2023
bbe7253
add back html to strings
codeho Mar 20, 2023
10b416d
Merge pull request #174 from CirclesUBI/feature/i18nfixes
codeho Mar 20, 2023
b8d4c39
fixing color classes not showing
codeho Mar 21, 2023
8853c25
Merge pull request #175 from CirclesUBI/feature/i18nfixes
codeho Mar 21, 2023
76df68d
replace raw github translation file url with cdn
codeho Mar 21, 2023
7629dfe
Merge pull request #177 from CirclesUBI/feature/replace-raw-github-wi…
codeho Mar 21, 2023
733b3b7
changed whatsapp link
codeho Mar 21, 2023
2ac609a
Merge pull request #178 from CirclesUBI/feature/whatsapp-link
codeho Mar 21, 2023
dcf4bff
add whatsapp logo
codeho Mar 21, 2023
b6c4fb9
Merge pull request #179 from CirclesUBI/feature/whatsapp-logo
codeho Mar 21, 2023
1f68e39
fixing variables in strings
codeho Mar 23, 2023
8390284
Merge pull request #181 from CirclesUBI/feature/app-176-placeholders-…
codeho Mar 23, 2023
982ee05
truncate name if is too long
dacianavram Mar 23, 2023
b7cd1c0
Merge pull request #182 from CirclesUBI/feature/app-182-long-names-ca…
dacianavram Mar 23, 2023
cede0ea
added a 'getNonce' and 'sendSignedTransaction' mutation to the api-se…
jaensen Mar 24, 2023
719c590
APP-193: When an owner trusts a new user, trust this user with the or…
jaensen Mar 25, 2023
c9047a4
APP-193: On application startup, check which users are trusted by the…
jaensen Mar 25, 2023
a09ccbe
APP-193: Added a 'FollowTrust' class that automatically adds my own t…
jaensen Mar 25, 2023
5af234a
APP-193: don't trust twice in the setTrust flow (once for person and …
jaensen Mar 25, 2023
5615121
APP-193: run follow trust always with the primary user and not with t…
jaensen Mar 25, 2023
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
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": [["@babel/preset-env", { "targets": { "node": "current" } }]]
}
48 changes: 48 additions & 0 deletions .github/workflows/build-container-from-peerDependency.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Build application container from peerDependency
run-name: Generate o-platform build of ${{ inputs.client_ref }} for api-server peerDependency from ${{ github.ref }} by @${{ github.actor }}

on:
workflow_dispatch:
inputs:
client_ref:
description: "A ref from this repository, CirclesUBI/o-platform."
required: true
type: string

jobs:
read-packageJson:
runs-on: ubuntu-latest
permissions:
contents: read
steps:
-
name: Checkout repository
uses: actions/checkout@v3
with:
ref: ${{ inputs.client_ref }}

- name: Read package.json, get server_ref
id: readPackageJson
run: |
server_ref=$(jq -r '.peerDependencies."api-server"' ./package.json)
echo "server_ref=$server_ref"
echo "server_ref=$server_ref" >> "${GITHUB_OUTPUT}"
outputs:
server_ref: ${{ steps.readPackageJson.outputs.server_ref }}

echo-server_ref:
name: echo server_ref
runs-on: ubuntu-latest
needs: read-packageJson
steps:
-
run: echo ${{needs.read-packageJson.outputs.server_ref}}

call-build-workflow:
name: Trigger container build
uses: CirclesUBI/o-platform/.github/workflows/build-container.yml@main
needs: [read-packageJson, echo-server_ref]
with:
server_ref: ${{needs.read-packageJson.outputs.server_ref}}
client_ref: ${{inputs.client_ref}}
secrets: inherit
77 changes: 77 additions & 0 deletions .github/workflows/build-container.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
name: Build application container
run-name: Generate o-platform ${{ inputs.client_ref }} for api-server ${{ inputs.server_ref }} by @${{ github.actor }}

on:
workflow_call:
inputs:
server_ref:
description: "A ref from CirclesUBI/api-server against which we build."
required: true
type: string
client_ref:
description: "A ref from this repository, CirclesUBI/o-platform."
required: true
type: string
workflow_dispatch:
inputs:
server_ref:
description: "A ref from CirclesUBI/api-server against which we build."
required: true
type: string
client_ref:
description: "A ref from this repository, CirclesUBI/o-platform."
required: true
type: string

env:
REGISTRY: registry.digitalocean.com
IMAGE_OWNER: circles-land
IMAGE_REPOSITORY: o-platform

jobs:
build-container-image:
runs-on: ubuntu-latest
permissions:
contents: read

steps:
-
name: Checkout repository
uses: actions/checkout@v3
with:
ref: ${{ inputs.client_ref }}

-
name: Docker meta outside of branches
id: meta
uses: docker/metadata-action@v4
with:
images: |
${{ env.REGISTRY }}/${{ env. IMAGE_OWNER }}/${{ env.IMAGE_REPOSITORY }}
tags: |
latest-${{ inputs.server_ref }}
{{sha}}-${{ inputs.server_ref }}

-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
with:
driver-opts: |
image=moby/buildkit:v0.10.6

-
name: Login to Container Registry
uses: docker/login-action@v2
with:
registry: ${{ env.REGISTRY }}
username: ${{ secrets.DIGITALOCEAN_PASSWORD }}
password: ${{ secrets.DIGITALOCEAN_PASSWORD }}

- name: Build and push Docker image
uses: docker/build-push-action@v3
with:
push: true
build-args: |
SERVER_REF=${{ inputs.server_ref }}
tags: ${{ steps.meta.outputs.tags }}
file: Dockerfile.ci
70 changes: 70 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ main, dev ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ main ]
schedule:
- cron: '22 7 * * 5'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'javascript' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support

steps:
- name: Checkout repository
uses: actions/checkout@v2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
.DS_Store
localhost.cert
localhost.key
.history
node_modules
packages/o-events/dist/
packages/o-interfaces/dist/
packages/o-process/dist/
packages/o-utils/dist/
shell/public/bundle.*
shell/public/bundle.css
shell/public/bundle.js
shell/public/index.html
shell/public/bundle.js.LICENSE.txt
shell/public/bundle.1.js
yarn.lock
.env.*

shell/public/COMMITTISH
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v16.1.0
v16.17.0
15 changes: 15 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"trailingComma": "es5",
"tabWidth": 2,
"useTabs": false,
"semi": true,
"singleQuote": false,
"jsxBracketSameLine": true,
"bracketSpacing": true,
"svelteSortOrder": "options-scripts-markup-styles",
"svelteStrictMode": true,
"svelteBracketNewLine": false,
"svelteAllowShorthand": false,
"svelteIndentScriptAndStyle": false,
"printWidth": 190
}
13 changes: 13 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"version": "0.2.0",
"configurations": [
{
"type": "chrome",
"request": "launch",
"name": "Launch Chrome against dev server",
"url": "https://localhost:5000",
"webRoot": "${workspaceFolder}",
"env": {}
}
]
}
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"typescript.tsdk": "node_modules/typescript/lib"
}
48 changes: 48 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.1",
"tasks": [
{
"label": "Run O-Plaform Build for Bali",
"type": "shell",
"command": "./build_bali.sh",
"args": ["${env:API_ENDPOINT}"],
"windows": {
"command": ".\\build_bali.cmd"
},
"group": "build",
"presentation": {
"reveal": "always",
"panel": "new"
}
},
{
"label": "Run O-Plaform LIBS Build",
"type": "shell",
"command": "./build_libs.sh",
"args": ["${env:API_ENDPOINT}"],
"windows": {
"command": ".\\build_bali.cmd"
},
"group": "build",
"presentation": {
"reveal": "always",
"panel": "new"
}
},
{
"label": "Compile GraphQL",
"type": "shell",
"command": "./graphql_build.sh",
"windows": {
"command": ".\\graphql_build.sh"
},
"group": "build",
"presentation": {
"reveal": "always",
"panel": "new"
}
}
]
}
Loading