Skip to content
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

Gallery 主题相关 #512

Merged
merged 1 commit into from
Nov 18, 2023
Merged

Gallery 主题相关 #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion apps/electron/src/renderer/src/pages/Color.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ const colorScheme = [
["night", "dark,angle"],
["coffee", "dark,angle"],
["winter", "light,angle"],
["dim", "dark,right-angle"],
["nord", "light,angle"],
["sunset", "dark,angle"],
];

const languages = {
Expand Down Expand Up @@ -126,7 +129,7 @@ const ColorPage = () => {
{tags.map((item) => (
<input
key={item.name}
className="btn-sm join-item btn"
className="btn btn-sm join-item"
type="radio"
name="options"
checked={item.name === tag}
Expand Down
2 changes: 2 additions & 0 deletions icons/create_icon.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ convert './icon_512x512@2x.png' \
\( +clone -resize x32 -write './icon_32x32.png' +delete \) \
\( +clone -resize x64 -write './icon_32x32@2x.png' +delete \) \
\( +clone -resize x128 -write './icon_128x128.png' +delete \) \
\( +clone -resize x192 -write './icon_192x192.png' +delete \) \
\( +clone -resize x256 -write './icon_128x128@2x.png' +delete \) \
\( +clone -resize x256 -write './icon_256x256.png' +delete \) \
\( +clone -resize x512 -write './icon_256x256@2x.png' +delete \) \
Expand All @@ -104,6 +105,7 @@ convert './icon_512x512@2x.png' \
\( +clone -resize x32 -write './icon_32x32.png' +delete \) \
\( +clone -resize x64 -write './icon_32x32@2x.png' +delete \) \
\( +clone -resize x128 -write './icon_128x128.png' +delete \) \
\( +clone -resize x192 -write './icon_192x192.png' +delete \) \
\( +clone -resize x256 -write './icon_128x128@2x.png' +delete \) \
\( +clone -resize x256 -write './icon_256x256.png' +delete \) \
\( +clone -resize x512 -write './icon_256x256@2x.png' +delete \) \
Expand Down
83 changes: 33 additions & 50 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added themes/gallery/public/icon_192x192.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added themes/gallery/public/icon_512x512.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion themes/gallery/src/app/_components/ChildFolderCardList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const ChildFolderCardList = ({ folderId }: { folderId: string }) => {
return (
<Card key={child.id}>
<div className="absolute left-0 top-0 flex h-full w-full items-center justify-center bg-neutral pb-14 transition-all ease-in-out">
<LightBulbIcon className="h-24 w-24 text-base-100" />
<LightBulbIcon className="h-24 w-24 text-neutral-content" />
</div>
</Card>
);
Expand Down
21 changes: 21 additions & 0 deletions themes/gallery/src/app/_components/LayoutWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
"use client";

import { RecoilRoot } from "recoil";

import { TRPCReactProvider } from "@rao-pics/trpc";

export const RecoilRootWrapper = ({
children,
}: {
children: React.ReactNode;
}) => {
return <RecoilRoot>{children}</RecoilRoot>;
};

export const TRPCReactProviderWrapper = ({
children,
}: {
children: React.ReactNode;
}) => {
return <TRPCReactProvider>{children}</TRPCReactProvider>;
};
26 changes: 14 additions & 12 deletions themes/gallery/src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
"use client";

import "~/styles/globals.css";

import { RecoilRoot } from "recoil";
import type { Metadata } from "next";

import { TRPCReactProvider } from "@rao-pics/trpc";
import {
RecoilRootWrapper,
TRPCReactProviderWrapper,
} from "./_components/LayoutWrapper";

import Setting from "./_components/Setting";
export const metadata: Metadata = {
title: "Gallery",
description: "RAO.PICS 默认主题",
manifest: "/manifest.json",
};

export default function Layout(props: { children: React.ReactNode }) {
return (
<html lang="en" data-theme="light">
<html lang="en">
<body>
<RecoilRoot>
<TRPCReactProvider>
{props.children}
<Setting />
</TRPCReactProvider>
</RecoilRoot>
<RecoilRootWrapper>
<TRPCReactProviderWrapper>{props.children}</TRPCReactProviderWrapper>
</RecoilRootWrapper>
</body>
</html>
);
Expand Down
23 changes: 23 additions & 0 deletions themes/gallery/src/app/manifest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import type { MetadataRoute } from "next";

export default function manifest(): MetadataRoute.Manifest {
return {
name: "Gallery 主题",
short_name: "Gallery",
description: "RAO.PICS 默认主题",
start_url: "/",
display: "minimal-ui",
icons: [
{
src: "/icon_192x192.png",
sizes: "192x192",
type: "image/png",
},
{
src: "/icon_512x512.png",
sizes: "512x512",
type: "image/png",
},
],
};
}
17 changes: 15 additions & 2 deletions themes/gallery/src/app/template.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,19 @@ import { trpc } from "@rao-pics/trpc";

import type { SettingType } from "~/states/setting";
import { defaultSetting, settingSelector } from "~/states/setting";
import Setting from "./_components/Setting";

export default function Page({ children }: { children: React.ReactNode }) {
export default function Template({ children }: { children: React.ReactNode }) {
const [, setSetting] = useRecoilState(settingSelector);

const { data: lib } = trpc.library.findUnique.useQuery();
const { data: config } = trpc.config.findUnique.useQuery();

useEffect(() => {
if (config) {
document.querySelector("html")?.setAttribute("data-theme", config.color);
}
}, [config]);

useEffect(() => {
const local = localStorage.getItem("setting");
Expand All @@ -24,5 +32,10 @@ export default function Page({ children }: { children: React.ReactNode }) {
});
}, [setSetting, lib]);

return children;
return (
<>
{children}
<Setting />
</>
);
}
4 changes: 4 additions & 0 deletions themes/gallery/src/styles/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
@tailwind base;
@tailwind components;
@tailwind utilities;

.pswp__img {
@apply !bg-transparent;
}
3 changes: 3 additions & 0 deletions tooling/tailwind/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ export default {
"night",
"coffee",
"winter",
"dim",
"nord",
"sunset",
],
},
plugins: [
Expand Down
2 changes: 1 addition & 1 deletion tooling/tailwind/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"dependencies": {
"autoprefixer": "^10.4.15",
"daisyui": "^3.5.1",
"daisyui": "^4.4.0",
"postcss": "8.4.26",
"postcss-nesting": "^12.0.1",
"tailwindcss": "3.3.2"
Expand Down
Loading