Skip to content

Vite-ify homepage #321

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Apr 30, 2024
Merged

Vite-ify homepage #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
895d939
app store home button
0x70b1a5 Apr 29, 2024
7bee956
homepage vite-ified, valet button for hosted nodes
0x70b1a5 Apr 30, 2024
a8a882f
merge conflicts
0x70b1a5 Apr 30, 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
Binary file removed kinode/packages/app_store/pkg/ui/assets/fonts/BarlowCondensed-Black.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed kinode/packages/app_store/pkg/ui/assets/fonts/Futura-Heavy.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed kinode/packages/app_store/pkg/ui/assets/fonts/OpenSans-CondBold.ttf
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions kinode/packages/app_store/pkg/ui/assets/index-P4oc20OK.css
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions ...app_store/pkg/ui/assets/index-Lb8jbJl3.js → ...app_store/pkg/ui/assets/index-oEHGQ8XY.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion kinode/packages/app_store/pkg/ui/assets/index-szfTR2t7.css
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions kinode/packages/app_store/pkg/ui/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<meta name="viewport"
content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1.00001, viewport-fit=cover" />
<link href='https://fonts.googleapis.com/css?family=Montserrat' rel='stylesheet'>
<script type="module" crossorigin src="/main:app_store:sys/assets/index-Lb8jbJl3.js"></script>
<link rel="stylesheet" crossorigin href="/main:app_store:sys/assets/index-szfTR2t7.css">
<script type="module" crossorigin src="/main:app_store:sys/assets/index-oEHGQ8XY.js"></script>
<link rel="stylesheet" crossorigin href="/main:app_store:sys/assets/index-P4oc20OK.css">
</head>

<body>
Expand Down
Binary file removed kinode/packages/app_store/ui/public/assets/fonts/BarlowCondensed-Black.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed kinode/packages/app_store/ui/public/assets/fonts/Futura-Heavy.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed kinode/packages/app_store/ui/public/assets/fonts/OpenSans-CondBold.ttf
View file
Open in desktop
Binary file not shown.
10 changes: 4 additions & 6 deletions kinode/packages/app_store/ui/src/components/AppHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { AppInfo } from "../types/Apps";
import { appId } from "../utils/app";
import { useNavigate } from "react-router-dom";
import classNames from "classnames";
import { FaCircleQuestion } from "react-icons/fa6";

interface AppHeaderProps extends React.HTMLAttributes<HTMLDivElement> {
app: AppInfo;
Expand All @@ -22,14 +23,11 @@ export default function AppHeader({
className={classNames('flex w-full justify-content-start', size, props.className, { 'cursor-pointer': size !== 'large' })}
onClick={() => navigate(`/app-details/${appId(app)}`)}
>
<img
src={
app.metadata?.image ||
"https://png.pngtree.com/png-vector/20190215/ourmid/pngtree-vector-question-mark-icon-png-image_515448.jpg"
}
{app.metadata?.image && <img
src={app.metadata.image}
alt="app icon"
className={classNames('mr-2', { 'h-32 rounded-md': size === 'large', 'h-12 rounded': size !== 'large' })}
/>
/>}
<div className="flex flex-col w-full">
<div
className={classNames("whitespace-nowrap overflow-hidden text-ellipsis", { 'text-3xl': size === 'large', })}
Expand Down
31 changes: 20 additions & 11 deletions kinode/packages/app_store/ui/src/components/SearchHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,23 @@ import {

import { MY_APPS_PATH } from "../constants/path";
import classNames from "classnames";
import { FaHome } from "react-icons/fa";

interface SearchHeaderProps {
value?: string;
onChange?: (value: string) => void;
onBack?: () => void;
onlyMyApps?: boolean;
hideSearch?: boolean;
hidePublish?: boolean;
}

export default function SearchHeader({
value = "",
onChange = () => null,
onBack,
hideSearch = false,
hidePublish = false,
}: SearchHeaderProps) {
const navigate = useNavigate();
const location = useLocation();
Expand All @@ -35,7 +38,7 @@ export default function SearchHeader({
return (
<div className="flex justify-between">
{location.pathname !== '/' ? (
<button className="flex flex-col c mr-1 icon" onClick={() => {
<button className="flex flex-col c mr-2 icon" onClick={() => {
if (onBack) {
onBack()
} else {
Expand All @@ -46,16 +49,22 @@ export default function SearchHeader({
</button>
) : (
<button
className="flex flex-col c mr-1 alt"
onClick={() => navigate("/publish")}
className="flex flex-col c mr-2 icon"
onClick={() => window.location.href = '/'}
>
<FaUpload />
<FaHome />
</button>
)}
{!hidePublish && <button
className="flex flex-col c mr-2 icon"
onClick={() => navigate("/publish")}
>
<FaUpload />
</button>}
{!hideSearch && (
<div className="flex mx-2 flex-1 rounded-md">
<div className="flex mr-2 flex-1 rounded-md">
<button
className="icon"
className="icon mr-2"
type="button"
onClick={() => inputRef.current?.focus()}
>
Expand All @@ -67,10 +76,10 @@ export default function SearchHeader({
onChange={(event) => onChange(event.target.value)}
value={value}
placeholder="Search for apps..."
className="w-full ml-2"
className="w-full mr-2"
/>
{value.length > 0 && <button
className="icon ml-2"
className="icon"
onClick={() => onChange("")}
>
<FaX />
Expand All @@ -79,11 +88,11 @@ export default function SearchHeader({
)}
<div className="flex">
<button
className={classNames("flex ml-1 alt")}
className={classNames("flex alt")}
onClick={() => (isMyAppsPage ? navigate(-1) : navigate(MY_APPS_PATH))}
>
<FaDownload className="mr-1" />
My Apps
<FaDownload className="mr-2" />
<span>My Apps</span>
</button>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions kinode/packages/app_store/ui/src/index.css
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion kinode/packages/app_store/ui/src/pages/PublishPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,11 @@ export default function PublishPage({

return (
<div className="max-w-[900px] w-full">
<SearchHeader hideSearch onBack={showMetadataForm ? () => setShowMetadataForm(false) : undefined} />
<SearchHeader
hideSearch
hidePublish
onBack={showMetadataForm ? () => setShowMetadataForm(false) : undefined}
/>
<div className="flex justify-between items-center my-2">
<h4>Publish Package</h4>
{Boolean(account) && <div className="card flex items-center">
Expand Down
12 changes: 0 additions & 12 deletions kinode/packages/homepage/homepage/src/favicon.svg
View file
Open in desktop

This file was deleted.

Loading