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/master to staging #1070

Merged
merged 32 commits into from
Apr 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
3d37049
ci: add needed actions
sw-wayner Feb 29, 2024
dd234d1
Fixed race condition when navigating between folders too fast
Mar 4, 2024
d212009
fix: add ready-for-preview instead of preview
sw-wayner Mar 4, 2024
af9870d
feat: add spring banner
masterprog-cmd Mar 4, 2024
4090ee8
fix: remove unused import
masterprog-cmd Mar 4, 2024
da4ac46
feat: use custom hook (translations)
masterprog-cmd Mar 4, 2024
6ee23e5
fix: error in translations provider
masterprog-cmd Mar 4, 2024
2b7b19f
feat: adding space between components
masterprog-cmd Mar 4, 2024
112fca8
Merge pull request #1047 from internxt/bugfix/PB-1767-items-not-displ…
CandelR Mar 5, 2024
858ef89
[skip ci] Bump version v1.0.249
Mar 5, 2024
7cdba85
feat: create new function to get arrays from json
masterprog-cmd Mar 5, 2024
7ab019d
Merge pull request #1050 from internxt/feat/add-spring-banner
masterprog-cmd Mar 5, 2024
27673b0
[skip ci] Bump version v1.0.250
Mar 5, 2024
da490c0
Added allowance offset for tutorial upload file button
Mar 6, 2024
a98959f
feat(network): dynamic upload concurrency on Chrome depending on RAM …
sg-gs Mar 18, 2024
c7bd5f9
fix(env): add performance attribute to window global types
sg-gs Mar 18, 2024
143e09e
refactor(network): remove no longer needed inline window.performance …
sg-gs Mar 18, 2024
6e384e0
fix: center the last labels in Sign up form
masterprog-cmd Mar 18, 2024
4ba2842
fix: info labels for login
masterprog-cmd Mar 18, 2024
19c73b1
fix: center recovery link labels for mobile view
masterprog-cmd Mar 18, 2024
c22a33f
Merge pull request #1061 from internxt/fix/signup-for-mobile
masterprog-cmd Mar 18, 2024
ee77737
[skip ci] Bump version v1.0.251
Mar 18, 2024
a025a56
Merge pull request #1060 from internxt/feat/manage-concurrency-on-chrome
sg-gs Mar 19, 2024
3a151a1
[skip ci] Bump version v1.0.252
Mar 19, 2024
6f337a5
Merge pull request #1046 from internxt/ci-IN-31-github-actions
sg-gs Mar 19, 2024
467dffb
[skip ci] Bump version v1.0.253
Mar 19, 2024
ef010e9
feat: add world cloud security banner
masterprog-cmd Apr 2, 2024
5c5e334
Merge pull request #1069 from internxt/feat/add-world-cloud-security-…
masterprog-cmd Apr 3, 2024
139bf95
[skip ci] Bump version v1.0.254
Apr 3, 2024
911a0c4
Merge pull request #1051 from internxt/bugfix/PB-1644-upload-files-bu…
CandelR Apr 3, 2024
de0a1d4
[skip ci] Bump version v1.0.255
Apr 3, 2024
a6d7e93
Merge branch 'staging' into feature/master-to-staging
Apr 3, 2024
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
48 changes: 48 additions & 0 deletions .github/workflows/build-and-publish-preview.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Build & Publish Stable Preview
on:
push:
branches: ["master"]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- run: echo "registry=https://registry.yarnpkg.com/" > .npmrc
- run: echo "@internxt:registry=https://npm.pkg.github.com" >> .npmrc
# You cannot read packages from other private repos with GITHUB_TOKEN
# You have to use a PAT instead https://github.com/actions/setup-node/issues/49
- run: echo //npm.pkg.github.com/:_authToken=${{ secrets.PERSONAL_ACCESS_TOKEN }} >> .npmrc
- run: echo "always-auth=true" >> .npmrc

- name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Build and push to ${{ github.event.repository.name }}-dev
uses: docker/build-push-action@v2
with:
context: ./
file: ./infrastructure/preview.Dockerfile
push: true
tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}-dev:${{ github.sha }}
dispatch_update_preview_image:
needs: build
runs-on: ubuntu-latest
steps:
- name: Dispatch Update Preview Image Command
uses: myrotvorets/[email protected]
with:
token: ${{ secrets.PAT }}
repo: internxt/environments
type: update-preview-image-command
payload: |
{
"image": {
"name": "${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}",
"newName": "${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}-dev",
"newTag": "${{ github.sha }}"
}
}
27 changes: 27 additions & 0 deletions .github/workflows/clean-up-pr-preview.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Clean Up PR Preview
on:
pull_request:
types: [closed]
jobs:
dispatch_cleanup_deployment:
runs-on: ubuntu-latest
steps:
- name: Dispatch Cleanup Preview Repository Command
uses: myrotvorets/[email protected]
with:
token: ${{ secrets.PAT }}
repo: internxt/environments
type: cleanup-preview-command
payload: |
{
"github": {
"payload": {
"repository": {
"name": "${{ github.event.repository.name }}"
},
"issue": {
"number": ${{ github.event.number }}
}
}
}
}
111 changes: 111 additions & 0 deletions .github/workflows/deploy-pr-preview.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
name: Deploy PR Preview
on:
pull_request:
types: [opened, reopened, synchronize, ready_for_review]
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Check Out Repo
uses: actions/checkout@v2
- run: echo "registry=https://registry.yarnpkg.com/" > .npmrc
- run: echo "@internxt:registry=https://npm.pkg.github.com" >> .npmrc
# You cannot read packages from other private repos with GITHUB_TOKEN
# You have to use a PAT instead https://github.com/actions/setup-node/issues/49
- run: echo //npm.pkg.github.com/:_authToken=${{ secrets.PERSONAL_ACCESS_TOKEN }} >> .npmrc
- run: echo "always-auth=true" >> .npmrc
- name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Build and push to ${{ github.event.repository.name }}-dev
uses: docker/build-push-action@v2
with:
context: ./
file: ./infrastructure/preview.Dockerfile
push: true
tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}-dev:preview-${{ github.event.number }}-${{ github.event.pull_request.head.sha }}
add_ready_for_preview_label:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions-ecosystem/action-add-labels@v1
with:
labels: |
ready-for-preview
dispatch_update_deployment:
needs: add_ready_for_preview_label
runs-on: ubuntu-latest
if: ${{ contains(github.event.pull_request.labels.*.name, 'deployed') }}
steps:
- name: Dispatch Update Preview Repository Command
uses: myrotvorets/[email protected]
with:
token: ${{ secrets.PAT }}
repo: internxt/environments
type: update-preview-command
payload: |
{
"github": {
"payload": {
"repository": {
"name": "${{ github.event.repository.name }}",
"full_name": "${{ github.event.repository.full_name }}"
},
"issue": {
"number": ${{ github.event.number }},
"labels": ${{ toJSON(github.event.pull_request.labels) }}
}
}
},
"slash_command": {
"args": {
"named": {
"deployment": "${{ github.event.repository.name }}",
"tag": "preview-${{ github.event.number }}-${{ github.event.pull_request.head.sha }}",
"imageSuffix": "-dev"
}
}
}
}
dispatch_check_deployment:
needs: add_ready_for_preview_label
runs-on: ubuntu-latest
if: ${{ contains(github.event.pull_request.labels.*.name, 'preview') }}
steps:
- name: Dispatch Check Preview Repository Command
uses: myrotvorets/[email protected]
with:
token: ${{ secrets.PAT }}
repo: internxt/environments
type: check-preview-command
payload: |
{
"github": {
"payload": {
"repository": {
"name": "${{ github.event.repository.name }}",
"full_name": "${{ github.event.repository.full_name }}",
"html_url": "${{ github.event.repository.html_url }}"
},
"issue": {
"number": ${{ github.event.number }},
"labels": ${{ toJSON(github.event.pull_request.labels) }},
"pull_request": {
"html_url": "${{ github.event.pull_request.html_url }}"
}
}
}
},
"slash_command": {
"args": {
"named": {
"notify": "true"
}
}
}
}
30 changes: 30 additions & 0 deletions .github/workflows/slash-command-dispatcher.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Slash Command Dispatch
on:
issue_comment:
types: [created]
jobs:
slash_command_dispatch:
runs-on: ubuntu-latest
if: ${{ contains(github.event.issue.labels.*.name, 'deployed') || contains(github.event.issue.labels.*.name, 'preview') }}
steps:
- name: Slash Command Dispatch
id: scd
uses: peter-evans/slash-command-dispatch@v4
with:
token: ${{ secrets.PAT }}
commands: update-preview,check-preview
permission: write
repository: internxt/environments
issue-type: pull-request
allow-edits: false
reactions: false
- name: Edit comment with error message
if: steps.scd.outputs.error-message
uses: peter-evans/create-or-update-comment@v4
with:
comment-id: ${{ github.event.comment.id }}
body: |

> [!CAUTION]
> Couldn't dispatch your command due to error:
> **${{ steps.scd.outputs.error-message }}**
16 changes: 16 additions & 0 deletions infrastructure/preview.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
FROM node:18-alpine3.19

RUN apk update
RUN apk add nginx git yarn

WORKDIR /app
COPY package.json yarn.lock ./
COPY .npmrc ./.npmrc
COPY ./scripts ./scripts/

RUN yarn
COPY . /app

EXPOSE 3000

CMD ["yarn", "dev"]
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "drive-web",
"version": "v1.0.248",
"version": "v1.0.255",
"private": true,
"dependencies": {
"@headlessui/react": "1.7.5",
Expand Down
2 changes: 1 addition & 1 deletion src/app/auth/views/RecoveryLinkView/RecoveryLinkView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function RecoveryLinkView(): JSX.Element {
<RecoveryLink />
</div>

<div className="flex shrink-0 flex-col justify-center space-y-3 py-8 sm:flex-row sm:space-x-8 sm:space-y-0">
<div className="flex shrink-0 flex-col items-center justify-center space-x-0 space-y-3 py-8 sm:flex-row sm:space-x-8 sm:space-y-0">
<a href="https://internxt.com/legal" target="_blank" className="text-gray-80 no-underline hover:text-gray-100">
{translate('general.terms')}
</a>
Expand Down
2 changes: 1 addition & 1 deletion src/app/auth/views/SignInView/SignInView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default function SignInView(props: SignInProps): JSX.Element {
</div>

{!props.displayIframe && (
<div className="flex shrink-0 flex-col justify-center space-y-3 py-8 sm:flex-row sm:space-x-8 sm:space-y-0">
<div className="flex shrink-0 flex-col items-center justify-center space-x-0 space-y-3 py-8 sm:flex-row sm:space-x-8 sm:space-y-0">
<a
href="https://internxt.com/legal"
target="_blank"
Expand Down
2 changes: 1 addition & 1 deletion src/app/auth/views/SignUpView/SignUpView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default function SignUpView(props: SignUpViewProps): JSX.Element {
</div>

{isRegularSignup && (
<div className="flex shrink-0 flex-col justify-center space-y-3 py-8 sm:flex-row sm:space-x-8 sm:space-y-0">
<div className="flex shrink-0 flex-col items-center justify-center space-x-0 space-y-3 py-8 sm:flex-row sm:space-x-8 sm:space-y-0">
<a
href="https://internxt.com/legal"
target="_blank"
Expand Down
8 changes: 4 additions & 4 deletions src/app/banners/BannerWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import { useEffect, useState } from 'react';
import { useSelector } from 'react-redux';

import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
import Banner from './Banner';
import FeaturesBanner from './FeaturesBanner';

const SHOW_BANNER_COOKIE_NAME = 'show_lifetime_soft_banner';
const OFFER_OFF_DAY = new Date('2024-03-04');
const SHOW_BANNER_COOKIE_NAME = 'show_world_security_banner';
const OFFER_OFF_DAY = new Date('2024-04-18');

const BannerWrapper = (): JSX.Element => {
const [showBanner, setShowBanner] = useState(false);
Expand Down Expand Up @@ -41,7 +41,7 @@ const BannerWrapper = (): JSX.Element => {
}
}

return <Banner showBanner={showBanner} onClose={onCloseBanner} />;
return <FeaturesBanner showBanner={showBanner} onClose={onCloseBanner} />;
};

export default BannerWrapper;
Loading
Loading