Skip to content
This repository was archived by the owner on Jan 2, 2025. It is now read-only.

Commit 7b51018

Browse files
Login changes (#1069)
* use 2-step onboarding, some refactoring * show login page any time there is no user_login field in config (meaning user is not authorized) * Update github copy --------- Co-authored-by: Louis Knight-Webb <[email protected]>
1 parent 1ba867b commit 7b51018

File tree

23 files changed

+620
-566
lines changed

23 files changed

+620
-566
lines changed

client/src/components/AddStudioContext/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import React, {
88
import { Trans, useTranslation } from 'react-i18next';
99
import { CloseSign, PlusSignInCircle } from '../../icons';
1010
import SeparateOnboardingStep from '../SeparateOnboardingStep';
11-
import DialogText from '../../pages/Onboarding/DialogText';
11+
import DialogText from '../SeparateOnboardingStep/DialogText';
1212
import SearchableRepoList from '../RepoList/SearchableRepoList';
1313
import Button from '../Button';
1414
import {

client/src/locales/en.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
"Something went wrong": "Something went wrong",
201201
"chats in bloop": "chats in bloop",
202202
"Setup bloop": "Setup bloop",
203-
"Please log into your GitHub account to complete setup": "Please log into your GitHub account to complete setup",
203+
"Please log into your GitHub account to complete setup, this helps us us combat misuse.": "Please log into your GitHub account to complete setup, this helps us us combat misuse.",
204204
"Select color theme:": "Select color theme:",
205205
"Connect account": "Connect account",
206206
"Continue": "Continue",
@@ -416,5 +416,6 @@
416416
"Search pages": "Search pages",
417417
"This page is currently unavailable. Ability to generate will be resumed as soon as this issue is resolved.": "This page is currently unavailable. Ability to generate will be resumed as soon as this issue is resolved.",
418418
"Hold <1></1> to add multiple files": "Hold <1></1> to add multiple files",
419-
"Clear section": "Clear section"
420-
}
419+
"Clear section": "Clear section",
420+
"Let’s get you started with bloop!": "Let’s get you started with bloop!"
421+
}

client/src/locales/es.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
"Something went wrong": "Algo salió mal",
201201
"chats in bloop": "Chats en bloop",
202202
"Setup bloop": "Configuración de bloop",
203-
"Please log into your GitHub account to complete setup": "Inicie sesión con su cuenta de GitHub para completar la configuración",
203+
"Please log into your GitHub account to complete setup, this helps us us combat misuse.": "Inicie sesión con su cuenta de GitHub para completar la configuración",
204204
"Select color theme:": "Seleccione el tema:",
205205
"Connect account": "Conectar cuenta",
206206
"Continue": "Continuar",
@@ -417,5 +417,6 @@
417417
"Search pages": "Páginas de búsqueda",
418418
"This page is currently unavailable. Ability to generate will be resumed as soon as this issue is resolved.": "Esta página no está disponible. La capacidad de generar se reanudará tan pronto como se resuelva este problema.",
419419
"Hold <1></1> to add multiple files": "Mantenga presionada <1> </1> para agregar múltiples archivos",
420-
"Clear section": "Borrar sección"
420+
"Clear section": "Borrar sección",
421+
"Let’s get you started with bloop!": "¡Vamos a comenzar con Bloop!"
421422
}

client/src/locales/it.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
"Something went wrong": "Qualcosa è andato storto",
201201
"chats in bloop": "chat in bloop",
202202
"Setup bloop": "Configura bloop",
203-
"Please log into your GitHub account to complete setup": "Accedi al tuo account GitHub per completare la configurazione",
203+
"Please log into your GitHub account to complete setup, this helps us us combat misuse.": "Accedi al tuo account GitHub per completare la configurazione",
204204
"Select color theme:": "Seleziona tema colori:",
205205
"Connect account": "Collega account",
206206
"Continue": "Continua",

client/src/locales/ja.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
"Something went wrong": "何かがうまくいかなかった",
201201
"chats in bloop": "bloopでチャット",
202202
"Setup bloop": "bloopをセットアップする",
203-
"Please log into your GitHub account to complete setup": "セットアップを完了するため、GitHubアカウントにログインしてください",
203+
"Please log into your GitHub account to complete setup, this helps us us combat misuse.": "セットアップを完了するため、GitHubアカウントにログインしてください",
204204
"Select color theme:": "カラーテーマを選択する",
205205
"Connect account": "アカウントを接続する",
206206
"Continue": "次へ",
@@ -414,5 +414,6 @@
414414
"Search pages": "検索ページ",
415415
"This page is currently unavailable. Ability to generate will be resumed as soon as this issue is resolved.": "このページは現在利用できません。 生成能力は、この問題が解決されるとすぐに再開されます。",
416416
"Hold <1></1> to add multiple files": "<1> </1>を保持して複数のファイルを追加する",
417-
"Clear section": "クリアセクション"
418-
}
417+
"Clear section": "クリアセクション",
418+
"Let’s get you started with bloop!": "Bloopを始めましょう!"
419+
}

client/src/locales/zh-CN.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203
"Something went wrong": "出错了",
204204
"chats in bloop": "在bloop中对话",
205205
"Setup bloop": "设置bloop",
206-
"Please log into your GitHub account to complete setup": "请登录您的GitHub账户以完成设置",
206+
"Please log into your GitHub account to complete setup, this helps us us combat misuse.": "请登录您的GitHub账户以完成设置",
207207
"Select color theme:": "选择颜色主题:",
208208
"Connect account": "连接账户",
209209
"Continue": "继续",
@@ -423,5 +423,6 @@
423423
"Search pages": "搜索页",
424424
"This page is currently unavailable. Ability to generate will be resumed as soon as this issue is resolved.": "此页面当前不可用。 一旦解决此问题,就会恢复产生的能力。",
425425
"Hold <1></1> to add multiple files": "保持<1> </1>添加多个文件",
426-
"Clear section": "清除部分"
427-
}
426+
"Clear section": "清除部分",
427+
"Let’s get you started with bloop!": "让我们开始开始Bloop!"
428+
}

client/src/pages/HomeTab/AddRepos/AddCodeStudio.tsx renamed to client/src/pages/HomeTab/AddRepos/AddCodeStudio/index.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import React, {
77
useState,
88
} from 'react';
99
import { Trans, useTranslation } from 'react-i18next';
10-
import TextInput from '../../../components/TextInput';
11-
import DialogText from '../../Onboarding/DialogText';
12-
import { CodeStudioIcon } from '../../../icons';
13-
import Button from '../../../components/Button';
10+
import TextInput from '../../../../components/TextInput';
11+
import DialogText from '../../../../components/SeparateOnboardingStep/DialogText';
12+
import { CodeStudioIcon } from '../../../../icons';
13+
import Button from '../../../../components/Button';
1414

1515
type Props = {
1616
handleSubmit: (name: string) => void;

client/src/pages/Onboarding/GithubReposStep/index.tsx renamed to client/src/pages/HomeTab/AddRepos/GithubReposStep/index.tsx

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
11
import React, { useCallback, useContext, useEffect, useState } from 'react';
22
import { Trans, useTranslation } from 'react-i18next';
3-
import DialogText from '../DialogText';
4-
import Button from '../../../components/Button';
5-
import { ArrowRight } from '../../../icons';
6-
import SearchableRepoList from '../../../components/RepoList/SearchableRepoList';
3+
import DialogText from '../../../../components/SeparateOnboardingStep/DialogText';
4+
import Button from '../../../../components/Button';
5+
import { ArrowRight } from '../../../../icons';
6+
import SearchableRepoList from '../../../../components/RepoList/SearchableRepoList';
77
import {
88
RepoProvider,
99
RepoType,
1010
RepoUi,
1111
SyncStatus,
12-
} from '../../../types/general';
12+
} from '../../../../types/general';
1313
import GoBackButton from '../GoBackButton';
14-
import { UIContext } from '../../../context/uiContext';
15-
import { splitPath } from '../../../utils';
16-
import { RepositoriesContext } from '../../../context/repositoriesContext';
14+
import { splitPath } from '../../../../utils';
15+
import { RepositoriesContext } from '../../../../context/repositoriesContext';
1716

1817
type Props = {
1918
handleNext: (e?: any) => void;
2019
handleBack?: (e: any) => void;
2120
disableSkip?: boolean;
2221
};
2322

24-
export const STEP_KEY = 'STEP_GITHUB_REPOS';
2523
let intervalId: number;
2624

2725
const GithubReposStep = ({ handleNext, handleBack, disableSkip }: Props) => {

client/src/pages/Onboarding/GoBackButton/index.tsx renamed to client/src/pages/HomeTab/AddRepos/GoBackButton/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import Button from '../../../components/Button';
2-
import { ArrowLeft } from '../../../icons';
1+
import Button from '../../../../components/Button';
2+
import { ArrowLeft } from '../../../../icons';
33

44
type Props = {
55
handleBack: (e: any) => void;

0 commit comments

Comments
 (0)