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

Staging #358

Open
wants to merge 126 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
adac3bd
Merge branch 'development' into staging
tomicvladan May 29, 2023
a48e978
Merge remote-tracking branch 'origin/master' into staging
tomicvladan May 29, 2023
2638f8b
[ci} build: docker image build
darkobas2 Jun 8, 2023
2eac201
[ci] buildx: use env not vars
darkobas2 Jun 8, 2023
1c6d5fb
[ci] buildx: add port var
darkobas2 Jun 8, 2023
4f69647
[ci] docker image add global vars
darkobas2 Jun 9, 2023
dd91834
Update buildx.yml
darkobas2 Jun 9, 2023
033fd08
Update Dockerfile
darkobas2 Jun 9, 2023
4fcdff7
[skip ci] buildx: add webhook
darkobas2 Jun 9, 2023
17dce1b
[ci] consolidate vars
darkobas2 Jun 20, 2023
8d26e8e
[skip ci] update ci
darkobas2 Aug 9, 2023
c907d81
feat: metamask sdk
IgorShadurin Aug 14, 2023
6e2e0df
Merge branch 'development' into feat/mobile-metamask
IgorShadurin Aug 14, 2023
bbfae0f
feat: fdp-storage 0.11
IgorShadurin Aug 14, 2023
54aeb0b
Merge pull request #444 from fairDataSociety/feat/fdp-storage-0.11
IgorShadurin Aug 15, 2023
03eb541
Merge branch 'master' into development
tomicvladan Aug 15, 2023
02f5b94
Merge pull request #446 from fairDataSociety/chore/development-conflicts
tfius Aug 15, 2023
dfb622e
Merge branch 'development' into feat/mobile-metamask
IgorShadurin Aug 17, 2023
7f1ac02
Merge pull request #443 from fairDataSociety/feat/mobile-metamask
IgorShadurin Aug 18, 2023
104c4f9
fix: login via metamask with default network
IgorShadurin Aug 16, 2023
a1c72e5
fix: added request accounts to activate metamask
IgorShadurin Aug 18, 2023
333359d
Merge pull request #448 from fairDataSociety/fix/default-localhost
IgorShadurin Aug 18, 2023
a49bbb7
fix: metamask workflow for clean installation
IgorShadurin Aug 18, 2023
2044a52
Merge pull request #452 from fairDataSociety/fix/metamask-fresh
IgorShadurin Aug 18, 2023
5cb3cc9
fix: added big bang urls
IgorShadurin Aug 21, 2023
7b88e30
Merge pull request #453 from fairDataSociety/fix/deploy-config
IgorShadurin Aug 21, 2023
1d3084b
fix: added big bang urls
IgorShadurin Aug 21, 2023
29fc485
Merge pull request #454 from fairDataSociety/fix/bigbang-url
IgorShadurin Aug 21, 2023
6adabc0
fix: invite rules url improved
IgorShadurin Aug 21, 2023
12092c6
fix: upgraded images urls
IgorShadurin Aug 23, 2023
cd77d32
Merge pull request #456 from fairDataSociety/fix/data-urls
IgorShadurin Aug 23, 2023
76e47a6
Merge branch 'development' into fix/invite-checkbox
IgorShadurin Aug 23, 2023
64901bb
fix: copyright message margin (#447)
tomicvladan Aug 23, 2023
f3f0fb2
Merge pull request #455 from fairDataSociety/fix/invite-checkbox
IgorShadurin Aug 23, 2023
44b70f9
refactor: change passphrase title
IgorShadurin Aug 23, 2023
72f65f5
Merge pull request #458 from fairDataSociety/refactor/metamask-passph…
IgorShadurin Aug 25, 2023
76dec11
Merge branch 'development' into fix/447
IgorShadurin Aug 25, 2023
23e9352
fix: hide invites for blossom users (#459)
tomicvladan Aug 25, 2023
2682f94
Merge pull request #457 from fairDataSociety/fix/447
tomicvladan Aug 25, 2023
c6a6fed
Merge branch 'development' into fix/blossom-invites
IgorShadurin Aug 28, 2023
a655c22
fix: sharing behaviour
IgorShadurin Aug 28, 2023
e1b2bc6
refactor: upgraded text for singing
IgorShadurin Aug 28, 2023
5d3abd6
feat: pod list (#467)
tomicvladan Aug 28, 2023
2ace6be
Merge pull request #461 from fairDataSociety/fix/blossom-invites
tomicvladan Aug 28, 2023
c54ddfb
Merge pull request #463 from fairDataSociety/fix/462-share-modal
IgorShadurin Aug 28, 2023
c0c5857
fix: min balance display
tomicvladan Aug 28, 2023
b289b9d
Merge branch 'development' into feat/pod-list
tomicvladan Aug 28, 2023
2ca210c
fix: error parsing (#471)
tomicvladan Aug 30, 2023
b26e258
fix: animation stuck on cancel
IgorShadurin Aug 30, 2023
0d41c39
Merge pull request #473 from fairDataSociety/fix/mm-loader-stuck
tfius Aug 30, 2023
6dedf33
chore: upgrade blossom library
tomicvladan Sep 1, 2023
0f17a72
Merge pull request #472 from fairDataSociety/fix/error-check
tomicvladan Sep 5, 2023
f545e43
Merge pull request #469 from fairDataSociety/fix/metamask-migration-m…
tomicvladan Sep 5, 2023
ece8576
Merge pull request #468 from fairDataSociety/feat/pod-list
tomicvladan Sep 5, 2023
8d408e3
fix: root directory
tomicvladan Sep 6, 2023
dbc7fcf
Merge pull request #481 from fairDataSociety/fix/root-folder-path
tfius Sep 6, 2023
a406f6b
feat: add drive back button (#482)
tomicvladan Sep 7, 2023
a381920
fix: pods layout
tomicvladan Sep 7, 2023
6872e2b
fix: move upload error
tomicvladan Sep 7, 2023
1c7614b
feat: sidebar for mobile
tomicvladan Sep 7, 2023
967f2ef
fix: sidebar
tomicvladan Sep 7, 2023
5204ddf
Merge branch 'development' into chore/blossom-library-upgrade
IgorShadurin Sep 8, 2023
f536724
ci: bee url fix
tomicvladan Sep 8, 2023
e7db812
fix: mobile side bar
tomicvladan Sep 8, 2023
2ab08e3
Merge pull request #486 from fairDataSociety/ci/bee-url
tomicvladan Sep 8, 2023
fe69d64
Merge pull request #485 from fairDataSociety/feat/mobile-sidebar
tomicvladan Sep 8, 2023
ef87032
Merge pull request #484 from fairDataSociety/fix/upload-error-position
tomicvladan Sep 8, 2023
cdcfa07
Merge pull request #483 from fairDataSociety/feat/drive-back-button
tomicvladan Sep 8, 2023
907c9b8
Merge pull request #465 from fairDataSociety/refactor/429-mm-change-text
tfius Sep 8, 2023
b1a4f04
Merge pull request #476 from fairDataSociety/chore/blossom-library-up…
tfius Sep 8, 2023
b3d4d58
fix: removed left padding for mobile
IgorShadurin Sep 8, 2023
278c947
fix: removed .bzz links, changed medium logo
IgorShadurin Sep 8, 2023
e906a3f
Merge pull request #489 from fairDataSociety/fix/mobile-left-spacing
IgorShadurin Sep 8, 2023
602521d
Merge branch 'development' into fix/blog-url
IgorShadurin Sep 8, 2023
0b97672
fix: drive dropdown z-index
tomicvladan Sep 8, 2023
8f74db4
Merge branch 'development' into fix/dropdown-z-index
tomicvladan Sep 8, 2023
91d07f5
fix: layout padding
tomicvladan Sep 8, 2023
b65b0fe
Merge pull request #490 from fairDataSociety/fix/blog-url
IgorShadurin Sep 11, 2023
ea38518
fix: sidebar (#395)
tomicvladan Sep 11, 2023
04936df
feat: new gas estimation
tomicvladan Sep 11, 2023
53a9c32
fix: spinner for pods (#494)
tomicvladan Sep 11, 2023
e7db669
Merge branch 'development' into fix/dropdown-z-index
tomicvladan Sep 11, 2023
4d320be
Merge pull request #493 from fairDataSociety/fix/layout-padding
tomicvladan Sep 11, 2023
8fcac0d
Merge branch 'development' into fix/395
tomicvladan Sep 11, 2023
13c12dd
Merge branch 'development' into fix/494
tomicvladan Sep 11, 2023
5ef4234
Merge branch 'development' into fix/dropdown-z-index
IgorShadurin Sep 13, 2023
99498ae
feat: file path redesign for mobile
tomicvladan Sep 13, 2023
9880399
fix: dropdown z-index
tomicvladan Sep 13, 2023
5719dc5
Merge remote-tracking branch 'origin/fix/dropdown-z-index' into fix/d…
tomicvladan Sep 13, 2023
4fa2938
Merge pull request #495 from fairDataSociety/fix/395
tomicvladan Sep 13, 2023
269f7d0
Merge pull request #496 from fairDataSociety/fix/494
tomicvladan Sep 13, 2023
0722955
Merge pull request #500 from fairDataSociety/feat/folder-path-mobile
tfius Sep 13, 2023
1e99825
Merge pull request #492 from fairDataSociety/fix/dropdown-z-index
tfius Sep 13, 2023
f007cca
fix: pod dropdown
tomicvladan Sep 14, 2023
a48f07c
Merge remote-tracking branch 'origin/development' into feat/new-gas-e…
tomicvladan Sep 14, 2023
024b93c
chore: new fdp-storage
tomicvladan Sep 14, 2023
4dcec8c
fix: metamask dialog layout
tomicvladan Sep 14, 2023
aaaacaf
feat: new mobile drive layout
tomicvladan Sep 15, 2023
74b7314
feat: navigation reorganization
tomicvladan Sep 15, 2023
d4a63fa
fix: caching issue (#507)
tomicvladan Sep 18, 2023
755819d
fix: pod dropdown (#502)
tomicvladan Sep 18, 2023
158ce8e
Merge pull request #511 from fairDataSociety/fix/507
tfius Sep 19, 2023
4e690db
Merge pull request #512 from fairDataSociety/feat/pod-dropdown-fix
tfius Sep 19, 2023
9ae2193
Merge branch 'development' into feat/mobile-view-improvements
tomicvladan Sep 19, 2023
b9a7eab
Merge pull request #510 from fairDataSociety/feat/mobile-view-improve…
tfius Sep 19, 2023
2c06e5f
Merge branch 'development' into feat/new-gas-estimation
tomicvladan Sep 19, 2023
d26f3f9
fix: lint error
tomicvladan Sep 19, 2023
eff1cb4
Merge pull request #513 from fairDataSociety/fix/lint-error
tfius Sep 19, 2023
170c298
fix: change login label (#509)
tomicvladan Sep 19, 2023
9040d21
feat: new file preview
tomicvladan Sep 19, 2023
9e73b0a
Merge branch 'development' into feat/new-gas-estimation
IgorShadurin Sep 19, 2023
48ff9ad
fix: file preview
tomicvladan Sep 20, 2023
232914b
Merge branch 'development' into feat/file-preview
tomicvladan Sep 20, 2023
bc3850b
Merge branch 'development' into fix/login-label
tomicvladan Sep 20, 2023
42a73c5
Merge pull request #505 from fairDataSociety/feat/new-gas-estimation
tomicvladan Sep 20, 2023
3941bcd
feat: import button removed
tomicvladan Sep 20, 2023
e86642a
fix: disable upload button when pod not selected
tomicvladan Sep 20, 2023
9e66e2d
Merge pull request #518 from fairDataSociety/feat/remove-import-button
tomicvladan Sep 20, 2023
cb8e25d
Merge pull request #515 from fairDataSociety/fix/login-label
tomicvladan Sep 20, 2023
6cef18c
fix: file preview
tomicvladan Sep 20, 2023
e590af8
Merge remote-tracking branch 'origin/feat/file-preview' into feat/fil…
tomicvladan Sep 20, 2023
b044bac
Merge branch 'development' into feat/file-preview
tomicvladan Sep 20, 2023
d1ef24e
Merge pull request #519 from fairDataSociety/fix/upload-button-disabled
tfius Sep 20, 2023
afdcfb2
Merge pull request #516 from fairDataSociety/feat/file-preview
tfius Sep 20, 2023
5465c22
Merge remote-tracking branch 'origin/development' into staging
tomicvladan Sep 21, 2023
6fa5f86
[ci] move staging back to dev bee
darkobas2 Sep 21, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/buildx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v3

- name: Set environment specific variables
uses: jnus/[email protected]
with:
Expand Down Expand Up @@ -73,7 +72,6 @@ jobs:
tags: ${{ secrets.REGISTRY_URL }}/${{ env.REPO_LC }}:${{ github.sha }},${{ secrets.REGISTRY_URL }}/${{ env.REPO_LC }}:${{ github.ref_name }}
cache-from: type=registry,ref=${{ secrets.REGISTRY_URL }}/${{ env.REPO_LC }}:buildcache
cache-to: type=registry,ref=${{ secrets.REGISTRY_URL }}/${{ env.REPO_LC }}:buildcache,mode=max

notify-servers:
needs: docker
uses: fairdatasociety/ci_utils/.github/workflows/webhook.yml@main
Expand Down
45 changes: 18 additions & 27 deletions .github/workflows/variables.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,21 @@
"Name": "DEPLOYMENT",
"Value": ".",
"Scope": {
"Environment": [
"master",
"main"
]
"Environment": ["master", "main"]
}
},
{
"Name": "DEPLOYMENT",
"Value": ".dev.",
"Scope": {
"Environment": [
"development"
]
"Environment": ["development"]
}
},
{
"Name": "DEPLOYMENT",
"Value": ".staging.",
"Scope": {
"Environment": [
"staging"
]
"Environment": ["staging"]
}
},
{
Expand Down Expand Up @@ -67,40 +60,28 @@
"Name": "NEXT_PUBLIC_FAIRDRIVEHOST",
"Value": "https://app.fairdrive#{DEPLOYMENT}fairdatasociety.org",
"Scope": {
"Environment": [
"main",
"master",
"development"
]
"Environment": ["main", "master", "development"]
}
},
{
"Name": "NEXT_PUBLIC_FAIRDRIVEHOST",
"Value": "https://fairdrive#{DEPLOYMENT}fairdatasociety.org",
"Scope": {
"Environment": [
"staging"
]
"Environment": ["staging"]
}
},
{
"Name": "NEXT_PUBLIC_BEE_URL",
"Value": "https://bee-1#{DEPLOYMENT}fairdatasociety.org",
"Value": "https://bee-1.fairdatasociety.org",
"Scope": {
"Environment": [
"main",
"master",
"development"
]
"Environment": ["main", "master", "development"]
}
},
{
"Name": "NEXT_PUBLIC_BEE_URL",
"Value": "https://bee-1.dev.fairdatasociety.org",
"Scope": {
"Environment": [
"staging"
]
"Environment": ["staging"]
}
},
{
Expand Down Expand Up @@ -142,6 +123,16 @@
"Name": "SWARM_URL",
"Value": "https://gateway#{DEPLOYMENT}fairdatasociety.org/proxy/",
"Scope": {}
},
{
"Name": "NEXT_PUBLIC_BB_API_URL",
"Value": "https://bbapi.fairdatasociety.org",
"Scope": {}
},
{
"Name": "NEXT_PUBLIC_BB_RULES_URL",
"Value": "https://create#{DEPLOYMENT}fairdatasociety.org/#/bb-rules",
"Scope": {}
}
]
}
3 changes: 1 addition & 2 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ module.exports = {
testEnvironment: 'node',
testMatch: ['**/*.test.ts'],
moduleNameMapper: {
'@utils/cache': '<rootDir>/src/utils/cache',
'@utils/object': '<rootDir>/src/utils/object',
'^@utils/(.*)$': '<rootDir>/src/utils/$1',
},
};
Loading
Loading