Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ function App() {
isAuthenticated &&
(await logout({
logoutParams: {
returnTo: window.location.origin + "/collections",
returnTo: window.location.origin + "/",
},
}));
} else {
Expand Down
1 change: 1 addition & 0 deletions src/i18n/bo-IN.json
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@
"header.profileMenu.profile": "ངོ་སྤྲོད་སྙིང་བསྡུས།",
"header.search_bar.search_for": "འདི་འཚོལ་ཞིབ།",
"header.site_language": "དྲ་བའི་སྐད་ཡིག།",
"header.plan": "སྦྱོང་ལམ།",
"header.text": "ཡིག་མཛོད།",
"header.topic": "ཀུན་གླེང་།",
"hebrew": "བོད་ཀྱི་སྐད་ཡིག",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@
"header.profileMenu.profile": "Profile",
"header.search_bar.search_for": "Search for",
"header.site_language": "Site Language",
"header.plan": "Plans",
"header.text": "Texts",
"header.topic": "Topics",
"hebrew": "Hebrew",
Expand Down
2 changes: 1 addition & 1 deletion src/routes/navbar/NavigationBar.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ describe("NavigationBar Component", () => {
};
test("renders navigation links", () => {
setup();
expect(screen.getByText("header.plans")).toBeInTheDocument();
expect(screen.getByText("Texts")).toBeInTheDocument();
// Note: Community link was removed from navigation, only Texts (Collections) link remains
});

test("renders search input", () => {
Expand Down
1 change: 1 addition & 0 deletions src/routes/navbar/NavigationBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ const Navigation = () => {
const [searchTerm, setSearchTerm] = useState("");
const [params, setParams] = useSearchParams();
const navItems = [
{ to: "/", label: t("header.plans"), key: "plans" },
{ to: "/collections", label: t("header.text"), key: "collections" },
];

Expand Down
4 changes: 2 additions & 2 deletions src/routes/user-login/UserLogin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const UserLogin = () => {
const accessToken = data.auth.access_token;
const refreshToken = data.auth.refresh_token;
login(accessToken, refreshToken);
navigate("/collections");
navigate("/");
},
onError: (error: any) => {
const errorMsg =
Expand Down Expand Up @@ -107,7 +107,7 @@ const UserLogin = () => {
connection,
...(connection === "google-oauth2" && { prompt: "select_account" }),
},
appState: { returnTo: "/collections" },
appState: { returnTo: "/" },
});
} catch (error: any) {
const message =
Expand Down
6 changes: 3 additions & 3 deletions src/routes/user-registration/UserRegistration.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const UserRegistration = () => {

useEffect(() => {
if (isLoggedIn || isAuthenticated) {
navigate("/collections");
navigate("/");
}
}, [isLoggedIn, isAuthenticated, navigate]);

Expand All @@ -69,7 +69,7 @@ const UserRegistration = () => {
onSuccess: (data) => {
const { access_token, refresh_token } = data.auth;
login(access_token, refresh_token);
navigate("/collections");
navigate("/");
},
onError: (error: any) => {
const message =
Expand Down Expand Up @@ -147,7 +147,7 @@ const UserRegistration = () => {

const handleSocialLogin = async (connection: "google-oauth2" | "apple") => {
try {
const redirectPath = "/collections";
const redirectPath = "/";
const authParams: any = {
appState: { returnTo: redirectPath },
authorizationParams: { connection },
Expand Down
Loading