Scipaper/front-end
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Manually merge

Browse Source
This commit is contained in:
Daniel Weissmall 2022-10-19 17:30:50 +03:00
parent 24652d0908
commit 9c79f449c5
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/SearchResultsSection.tsx
View File

@ -36,7 +36,7 @@ export const SearchResultSection = () => {
{t("searchResults.title")}
</Typography>
<Typography className="text-gray-300 text-sm">
{t("searchResults.totalResults")}: {searchResults?.meta.total}
{t("searchResults.totalResults")}: {searchResults?.meta.total}
</Typography>
</div>
<hr className="w-full border-gray-100" />

66
src/components/parts/Header.tsx
View File

@ -5,7 +5,6 @@ import { useState, useTransition } from "react";
/* -------------------------------------------------------------------------- */
import ContextMenuAction from "../drop-down-menu/ContextMenuAction";
import ContextMenu from "../drop-down-menu/ContextMenu";
import Logofreeland from "../Logofreeland";
import { Button } from "../Button/Button";
import Avatar from "../Avatar";
import Navbar from "../Navbar";
@ -25,8 +24,9 @@ import {
} from "components/icons";
import i18n from "localization/i18n";
import { useTranslation } from "react-i18next";
import LocalizationButton from "components/LocalizationButton";
import Link from "components/typography/Link";
import LocalizationButton from "components/LocalizationButton";
import LogoScipaper from "components/LogoScipaper";
const Header = () => {
const [authenticated, setAuthenticated] = useState(false);
@ -55,7 +55,7 @@ const Header = () => {
<Logo
className={classNames(authenticated ? "w-10" : "w-7 sm:w-10")}
/>
<Logofreeland
<LogoScipaper
className={classNames(authenticated ? "w-28" : "w-20 sm:w-28")}
/>
</Link>
@ -137,41 +137,41 @@ const Header = () => {
<div className="flex items-center font-bold text-sm gap-1 md:gap-2 ">
{!authenticated
? [
<>
<LocalizationButton className="hidden md:flex" />
<Button
emphasis="low"
onClick={onClick}
className="text-xs sm:px-4 sm:text-sm "
>
{t("navbar.auth.signIn")}
</Button>
</>,
<>
<LocalizationButton className="hidden md:flex" />
<Button
emphasis="medium"
className="hidden md:flex"
emphasis="low"
onClick={onClick}
className="text-xs sm:px-4 sm:text-sm "
>
{t("navbar.auth.signUp")}
</Button>,
]
{t("navbar.auth.signIn")}
</Button>
</>,
<Button
emphasis="medium"
className="hidden md:flex"
onClick={onClick}
>
{t("navbar.auth.signUp")}
</Button>,
]
: [
<Button emphasis="low">
<Button.Icon>
{!notification ? (
<SVGBell className="h-6 w-6 fill-gray-900 stroke-gray-900" />
) : (
<SVGBellNotification className="h-6 w-6 fill-gray-900 stroke-gray-900" />
)}
</Button.Icon>
</Button>,
<Button emphasis="low">
<Button.Icon>
{!notification ? (
<SVGBell className="h-6 w-6 fill-gray-900 stroke-gray-900" />
) : (
<SVGBellNotification className="h-6 w-6 fill-gray-900 stroke-gray-900" />
)}
</Button.Icon>
</Button>,
<Button emphasis="low" className="hidden lg:flex">
<Button.Icon>
<Avatar className="bg-[rgb(255,122,69)] text-white">K</Avatar>
</Button.Icon>
</Button>,
]}
<Button emphasis="low" className="hidden lg:flex">
<Button.Icon>
<Avatar className="bg-[rgb(255,122,69)] text-white">K</Avatar>
</Button.Icon>
</Button>,
]}
{/* Burger component will be shown for the small screens */}
<Navbar className="block lg:hidden" />
</div>