Skip to content

Commit

Permalink
Merge pull request #439 from CirclesUBI/feature/app-490-replace-banne…
Browse files Browse the repository at this point in the history
…r-on-the-home-page-only

Feature/app 490 replace banner on the home page only
  • Loading branch information
codeho authored Oct 25, 2023
2 parents 2fd280f + b784c1c commit 3bfdcce
Show file tree
Hide file tree
Showing 9 changed files with 259 additions and 249 deletions.
Binary file modified .yarn/install-state.gz
Binary file not shown.
426 changes: 213 additions & 213 deletions .yarn/releases/yarn-3.6.1.cjs → .yarn/releases/yarn-3.6.4.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.6.1.cjs
yarnPath: .yarn/releases/yarn-3.6.4.cjs
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
"xstate": "^4.33.6"
},
"version": "8.0.1",
"packageManager": "yarn@3.6.1"
"packageManager": "yarn@3.6.4"
}
2 changes: 1 addition & 1 deletion shell/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@o-platform/shell",
"version": "1.0.5-2",
"version": "1.0.5-3",
"author": "Daniel Janz, Thorsten Schau (Gnosis Service GmbH); Samuel Andert (Basic Income Lab GmbH)",
"license": "AGPL-3.0-or-later",
"description": "CirclesUBI Indonesia web app",
Expand Down
Binary file added shell/public/images/common/broadcast-oct23.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion shell/public/images/common/broadcast.svg

This file was deleted.

2 changes: 1 addition & 1 deletion shell/src/dapps/o-dashboard/pages/Home.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ onMount(init);
<DashboardColorCard color="contacts" link="/contacts" blobshape="175% 0% 92% 93% / 110% 32% 110% 81%" icon="dashfriends" title="dapps.o-dashboard.pages.home.contacts" />

<div class="w-full mx-auto">
<img src="images/common/broadcast.svg" alt="Marketplace" class="w-full" />
<img src="images/common/broadcast-oct23.png" alt="Marketplace" class="w-full" />
</div>
</div>
</div>
Expand Down
73 changes: 42 additions & 31 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2833,13 +2833,6 @@ __metadata:
languageName: node
linkType: hard

"@juggle/resize-observer@npm:^3.3.1":
version: 3.4.0
resolution: "@juggle/resize-observer@npm:3.4.0"
checksum: 2505028c05cc2e17639fcad06218b1c4b60f932a4ebb4b41ab546ef8c157031ae377e3f560903801f6d01706dbefd4943b6c4704bf19ed86dfa1c62f1473a570
languageName: node
linkType: hard

"@krowten/svelte-heroicons@npm:^0.0.6":
version: 0.0.6
resolution: "@krowten/svelte-heroicons@npm:0.0.6"
Expand Down Expand Up @@ -3331,7 +3324,7 @@ __metadata:
qr-scanner: ^1.4.2
quill: ^1.3.7
react-image-file-resizer: ^0.4.8
simplebar: ^5.3.9
simplebar: ^6.2.5
string-replace-loader: ^3.1.0
style-loader: ^3.3.1
svelecte: ^3.13.2
Expand Down Expand Up @@ -4279,6 +4272,22 @@ __metadata:
languageName: node
linkType: hard

"@types/lodash-es@npm:^4.17.6":
version: 4.17.10
resolution: "@types/lodash-es@npm:4.17.10"
dependencies:
"@types/lodash": "*"
checksum: 129e9dde830815a72f9bd17c3a7b7ffb10a9cf76d65c7bb4f14df13b38411ed3ebe9ebbc2f9059c4e61198e784d499e48d0a281e27a4defbbba748dd8a4cfd9d
languageName: node
linkType: hard

"@types/lodash@npm:*":
version: 4.14.200
resolution: "@types/lodash@npm:4.14.200"
checksum: 6471f8bb5da692a6ecf03a8da4935bfbc341e67ee9bcb4f5730bfacff0c367232548f0a01e8ac5ea18c6fe78fb085d502494e33ccb47a7ee87cbdee03b47d00d
languageName: node
linkType: hard

"@types/lodash@npm:^4.14.175":
version: 4.14.186
resolution: "@types/lodash@npm:4.14.186"
Expand Down Expand Up @@ -6992,13 +7001,6 @@ __metadata:
languageName: node
linkType: hard

"core-js@npm:^3.0.1":
version: 3.25.5
resolution: "core-js@npm:3.25.5"
checksum: 208b308c49bc022f90d4349d4c99802a73c9d55053976b3c529f10014c1e37845926defad8c519f2c7f71ea0acf18d2b323ab6aaee34dc85b4c4b3ced0623f3f
languageName: node
linkType: hard

"core-util-is@npm:1.0.2":
version: 1.0.2
resolution: "core-util-is@npm:1.0.2"
Expand Down Expand Up @@ -7454,6 +7456,13 @@ __metadata:
languageName: node
linkType: hard

"dayjs@npm:^1.11.9":
version: 1.11.10
resolution: "dayjs@npm:1.11.10"
checksum: a6b5a3813b8884f5cd557e2e6b7fa569f4c5d0c97aca9558e38534af4f2d60daafd3ff8c2000fed3435cfcec9e805bcebd99f90130c6d1c5ef524084ced588c4
languageName: node
linkType: hard

"debounce@npm:^1.2.0":
version: 1.2.1
resolution: "debounce@npm:1.2.1"
Expand Down Expand Up @@ -11273,13 +11282,6 @@ __metadata:
languageName: node
linkType: hard

"lodash.throttle@npm:^4.1.1":
version: 4.1.1
resolution: "lodash.throttle@npm:4.1.1"
checksum: 129c0a28cee48b348aef146f638ef8a8b197944d4e9ec26c1890c19d9bf5a5690fe11b655c77a4551268819b32d27f4206343e30c78961f60b561b8608c8c805
languageName: node
linkType: hard

"lodash.uniq@npm:^4.5.0":
version: 4.5.0
resolution: "lodash.uniq@npm:4.5.0"
Expand Down Expand Up @@ -12504,6 +12506,7 @@ __metadata:
"@metamask/jazzicon": ^2.0.0
"@prisma/client": ^2.18.0
core-util-is: ^1.0.2
dayjs: ^1.11.9
prettier: ^2.5.1
prisma: 2.18.0
rxjs: ^6.6.3
Expand Down Expand Up @@ -15407,17 +15410,25 @@ __metadata:
languageName: node
linkType: hard

"simplebar@npm:^5.3.9":
version: 5.3.9
resolution: "simplebar@npm:5.3.9"
"simplebar-core@npm:^1.2.4":
version: 1.2.4
resolution: "simplebar-core@npm:1.2.4"
dependencies:
"@juggle/resize-observer": ^3.3.1
"@types/lodash-es": ^4.17.6
can-use-dom: ^0.1.0
core-js: ^3.0.1
lodash.debounce: ^4.0.8
lodash.memoize: ^4.1.2
lodash.throttle: ^4.1.1
checksum: 11918d02c946b4925068852b4fb2dcc5008e2fb91b7eeba6c27aed810f23b985de043b12fef674fbffbbfa6201904e09d8fbc29e9959562fa6a5cfb9935751d1
lodash: ^4.17.21
lodash-es: ^4.17.21
checksum: 9bef0a29cc2ddba488776bc05eac6cbf3daa6e72fbcb54ff288cbbb2e64cadf22cc378ac3627f86c32c29ddf9f63d7accf8772e4013318aaba353625869ae866
languageName: node
linkType: hard

"simplebar@npm:^6.2.5":
version: 6.2.5
resolution: "simplebar@npm:6.2.5"
dependencies:
can-use-dom: ^0.1.0
simplebar-core: ^1.2.4
checksum: 351b3757af18d4d49928fbd44793307ca7384e363c73a740a0e542307f6af75f4803ddbb9e0e595126a487a4ba6b5d98cd397880d7217c6b1b442eb5a6c509c5
languageName: node
linkType: hard

Expand Down

0 comments on commit 3bfdcce

Please sign in to comment.