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