Skip to content

Commit

Permalink
Merge pull request #32 from dig-dao/issue/5
Browse files Browse the repository at this point in the history
#5 UIでいらないものを隠す、翻訳忘れの微修正
  • Loading branch information
tkgshn authored May 12, 2024
2 parents c88ef5f + e3dae74 commit 7adc020
Show file tree
Hide file tree
Showing 14 changed files with 75 additions and 43 deletions.
6 changes: 3 additions & 3 deletions frontend/components/grant/GrantCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ const GrantCard = ({
removeFromCart(grant.id);
}}
>
Remove from cart
カートから削除
</Button>
) : (
<Button
Expand All @@ -108,8 +108,8 @@ const GrantCard = ({
disabled={
"team" in grant
? grant.team.some(
(team) => team.email === session?.user?.email
)
(team) => team.email === session?.user?.email
)
: false
}
>
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/grant/GrantList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const GrantList = ({ grant, onClick }: IGrantListProps) => {
removeFromCart(grant.id);
}}
>
Remove from cart
カートから削除 cart
</Button>
) : (
<Button
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/pool/PoolList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ const PoolList = ({ pool, onClick }: IPoolListProps) => {
removeFromCart(pool.id);
}}
>
Remove from cart
カートから削除 cart
</Button>
) : (
<Button
Expand Down
2 changes: 1 addition & 1 deletion frontend/layouts/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export default function Navbar({
{session ? (
children
) : (
<Button onClick={() => signIn()}>サインイン</Button>
<Button onClick={() => signIn()}>ログイン</Button>
)}
</div>
{session && (
Expand Down
10 changes: 5 additions & 5 deletions frontend/layouts/landing/LandingNavbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ export default function LandingNavbar({ className }: ILandingNavbarProps) {
</div>
<div className="navbar-end flex-grow">
<div className="flex-none gap-x-7 hidden lg:flex">
<Button style="ghost" onClick={() => signIn()}>
{/* <Button style="ghost" onClick={() => signIn()}>
サインイン
</Button>
</Button> */}
<Button className="bg-white border-none" onClick={() => signIn()}>
ログイン
</Button>
Expand All @@ -55,11 +55,11 @@ export default function LandingNavbar({ className }: ILandingNavbarProps) {
className="menu menu-compact dropdown-content mt-3 p-2 shadow bg-base-100 rounded-box w-52"
>
<li>
<Link href="/sign-in">サインイン</Link>
<Link href="/sign-in">ログイン</Link>
</li>
<li>
{/* <li>
<Link href="/sign-in">サインアップ</Link>
</li>
</li> */}
</ul>
</div>
</div>
Expand Down
18 changes: 9 additions & 9 deletions frontend/pages/api/auth/[...nextauth].ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ import prisma from "../../../lib/prismadb";
export const authOptions = {
adapter: PrismaAdapter(prisma),
providers: [
TwitterProvider({
clientId: process.env.TWITTER_CLIENT_ID || "",
clientSecret: process.env.TWITTER_CLIENT_SECRET || "",
version: "2.0", // opt-in to Twitter OAuth 2.0
}),
// TwitterProvider({
// clientId: process.env.TWITTER_CLIENT_ID || "",
// clientSecret: process.env.TWITTER_CLIENT_SECRET || "",
// version: "2.0", // opt-in to Twitter OAuth 2.0
// }),
GoogleProvider({
clientId: process.env.GOOGLE_CLIENT_ID || "",
clientSecret: process.env.GOOGLE_CLIENT_SECRET || "",
}),
FacebookProvider({
clientId: process.env.FACEBOOK_CLIENT_ID || "",
clientSecret: process.env.FACEBOOK_CLIENT_SECRET || "",
}),
// FacebookProvider({
// clientId: process.env.FACEBOOK_CLIENT_ID || "",
// clientSecret: process.env.FACEBOOK_CLIENT_SECRET || "",
// }),
],
callbacks: {
async session({ session, token, user }: any) {
Expand Down
5 changes: 4 additions & 1 deletion frontend/pages/grants/[id]/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,10 @@ export default function GrantDetails() {

<MainLayout>
<Navbar className="p-0" location="grants">
<Link href="/grants/create">
{/* <Link href="/grants/create">
<Button>プロジェクト登録</Button>
</Link> */}
<Link href="https://scrapbox.io/public-goods-funding/%E5%85%AC%E7%9B%8A%E3%83%97%E3%83%AD%E3%82%B8%E3%82%A7%E3%82%AF%E3%83%88%E3%81%A8%E3%81%97%E3%81%A6%E6%8E%B2%E8%BC%89%E3%81%97%E3%81%9F%E3%81%84%E4%BA%BA%E3%81%B8" target="_blank">
<Button>プロジェクト登録</Button>
</Link>
</Navbar>
Expand Down
5 changes: 4 additions & 1 deletion frontend/pages/grants/[id]/review.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,10 @@ export default function ReviewGrant() {

<MainLayout>
<Navbar className="p-0" location="grants">
<Link href="/grants/create">
{/* <Link href="/grants/create">
<Button>プロジェクト登録</Button>
</Link> */}
<Link href="https://scrapbox.io/public-goods-funding/%E5%85%AC%E7%9B%8A%E3%83%97%E3%83%AD%E3%82%B8%E3%82%A7%E3%82%AF%E3%83%88%E3%81%A8%E3%81%97%E3%81%A6%E6%8E%B2%E8%BC%89%E3%81%97%E3%81%9F%E3%81%84%E4%BA%BA%E3%81%B8" target="_blank">
<Button>プロジェクト登録</Button>
</Link>
</Navbar>
Expand Down
5 changes: 4 additions & 1 deletion frontend/pages/grants/checkout/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,10 @@ export default function GrantsCheckout() {

<MainLayout>
<Navbar className="p-0" location="grants">
<Link href="/grants/create">
{/* <Link href="/grants/create">
<Button>プロジェクト登録</Button>
</Link> */}
<Link href="https://scrapbox.io/public-goods-funding/%E5%85%AC%E7%9B%8A%E3%83%97%E3%83%AD%E3%82%B8%E3%82%A7%E3%82%AF%E3%83%88%E3%81%A8%E3%81%97%E3%81%A6%E6%8E%B2%E8%BC%89%E3%81%97%E3%81%9F%E3%81%84%E4%BA%BA%E3%81%B8" target="_blank">
<Button>プロジェクト登録</Button>
</Link>
</Navbar>
Expand Down
3 changes: 2 additions & 1 deletion frontend/pages/grants/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ export default function Grants() {

<MainLayout>
<Navbar className="p-0" location="grants">
<Link href="/grants/create">
{/* <Link href="/grants/create"> */}
<Link href="https://scrapbox.io/public-goods-funding/%E5%85%AC%E7%9B%8A%E3%83%97%E3%83%AD%E3%82%B8%E3%82%A7%E3%82%AF%E3%83%88%E3%81%A8%E3%81%97%E3%81%A6%E6%8E%B2%E8%BC%89%E3%81%97%E3%81%9F%E3%81%84%E4%BA%BA%E3%81%B8" target="_blank">
<Button>プロジェクト登録</Button>
</Link>
</Navbar>
Expand Down
49 changes: 34 additions & 15 deletions frontend/pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import axios from "../utils/axios";
import { toast } from "react-toastify";
import Fade from "react-reveal/Fade";
import Github from "../components/icons/Github";
import Twitter from "../components/icons/Twitter";
import Link from "next/link";

export default function Home() {
Expand Down Expand Up @@ -130,8 +131,9 @@ export default function Home() {
</div>
</div>
<div className="flex w-full items-center justify-center mt-16 mb-28">
<Button onClick={() => router.push("/get-started")}>
公益プロジェクトを見る
{/* <Button onClick={() => router.push("/get-started")}> */}
<Button onClick={() => router.push("/grants")}>
プロジェクト一覧を見る
</Button>
</div>
</section>
Expand Down Expand Up @@ -206,7 +208,7 @@ export default function Home() {
<div className="flex w-full justify-end mt-14 mb-28">
<Button
style="ghost"
onClick={() => router.push("https://mirror.xyz/0xFEd3A62567FCEDfD10f56467EA6Db8c39c313606/sI97HdGBKr0ROPouXT5iKMJZHlrDm2TB45Ti4VkmLo8")}
onClick={() => window.open("https://mirror.xyz/0xFEd3A62567FCEDfD10f56467EA6Db8c39c313606/sI97HdGBKr0ROPouXT5iKMJZHlrDm2TB45Ti4VkmLo8", "_blank")}
>
Quadratic Fundingについてより詳しく <ArrowTopRightIcon className="ml-2" />
</Button>
Expand Down Expand Up @@ -248,7 +250,8 @@ export default function Home() {
<p className="mt-3 mb-10 text-lg md:text-xl">
100円からでもプロジェクトに資金を提供できます。
</p>
<Button onClick={() => router.push("/get-started")}>
{/* <Button onClick={() => router.push("/get-started")}> */}
<Button onClick={() => router.push("/grants")}>
プロジェクト一覧を見る
</Button>
</section>
Expand All @@ -270,28 +273,44 @@ export default function Home() {
height={50}
className="mb-8"
/>
<Link
href={"https://github.com/dig-dao/simplegrants"}
target="_blank"
>
<Github className="w-8 fill-sg-secondary cursor-pointer" />
</Link>
<div className="flex space-x-4">
<Link
href={"https://github.com/dig-dao/simplegrants"}
target="_blank"
>
<Github className="w-8 fill-sg-secondary cursor-pointer" />
</Link>
<Link
href={"https://twitter.com/digdaox"}
target="_blank"
>
<Twitter className="w-8 fill-sg-secondary cursor-pointer" />
</Link>
</div>
</div>
<div className="flex flex-row flex-wrap lg:flex-nowrap gap-x-8 w-full justify-between">
<div className="flex flex-col gap-y-3 mb-6">
<p className="font-bold text-xl">プロジェクトについて</p>
<Link href="https://scrapbox.io/public-goods-funding/DigDAO_%E3%83%9E%E3%83%83%E3%83%81%E3%83%B3%E3%82%B0%E3%83%89%E3%83%8D%E3%83%BC%E3%82%B7%E3%83%A7%E3%83%B3%E3%83%97%E3%83%AD%E3%82%B8%E3%82%A7%E3%82%AF%E3%83%88%E3%81%AB%E3%81%A4%E3%81%84%E3%81%A6" target="_blank">
<p className="font-bold text-xl cursor-pointer">プロジェクトについて</p>
</Link>
<p className="font-sm">プレスリリース</p>
<p className="font-sm">DigDAOとは</p>
<Link href="https://www.digdao.jp/" target="_blank">
<p className="font-sm cursor-pointer">DigDAOとは</p>
</Link>
</div>
<div className="flex flex-col gap-y-3 mb-6">
<p className="font-bold text-xl">連絡先</p>
<p className="font-sm">プロジェクトを掲載したい</p>
<p className="font-sm">資金を提供したい</p>
<Link href="https://scrapbox.io/public-goods-funding/%E5%85%AC%E7%9B%8A%E3%83%97%E3%83%AD%E3%82%B8%E3%82%A7%E3%82%AF%E3%83%88%E3%81%A8%E3%81%97%E3%81%A6%E6%8E%B2%E8%BC%89%E3%81%97%E3%81%9F%E3%81%84%E4%BA%BA%E3%81%B8" target="_blank">
<p className="font-sm cursor-pointer">プロジェクトを掲載したい</p>
</Link>
<Link href="https://scrapbox.io/public-goods-funding/%E3%83%9E%E3%83%83%E3%83%81%E3%83%B3%E3%82%B0%E3%83%89%E3%83%8D%E3%83%BC%E3%82%B7%E3%83%A7%E3%83%B3%E3%82%92%E4%BC%81%E7%94%BB%E3%81%97%E3%81%A6%E3%80%81%E3%82%A8%E3%82%B3%E3%82%B7%E3%82%B9%E3%83%86%E3%83%A0%E3%82%92%E8%82%B2%E3%81%A6%E3%81%9F%E3%81%84%E4%BA%BA%E3%81%B8" target="_blank">
<p className="font-sm cursor-pointer">資金を提供したい</p>
</Link>
</div>
<div className="flex flex-col gap-y-3 mb-6">
<p className="font-bold text-xl">法に関すること</p>
<p className="font-sm">利用規約</p>
<p className="font-sm">プライバシー</p>
<p className="font-sm">プライバシーポリシー</p>
</div>
</div>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion frontend/pages/pools/[id]/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ export default function PoolDetails() {
className="btn-error col-span-2"
onClick={() => removeFromCart(id as string)}
>
Remove from cart
カートから削除 cart
</Button>
) : (
<div
Expand Down
5 changes: 4 additions & 1 deletion frontend/pages/profile/[id].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,10 @@ export default function Home() {

<main className="flex flex-col min-w-screen min-h-screen w-full h-full overflow-x-hidden text-sg-secondary">
<Navbar className="p-4 absolute" location="grants">
<Link href="/grants/create">
{/* <Link href="/grants/create">
<Button>プロジェクト登録</Button>
</Link> */}
<Link href="https://scrapbox.io/public-goods-funding/%E5%85%AC%E7%9B%8A%E3%83%97%E3%83%AD%E3%82%B8%E3%82%A7%E3%82%AF%E3%83%88%E3%81%A8%E3%81%97%E3%81%A6%E6%8E%B2%E8%BC%89%E3%81%97%E3%81%9F%E3%81%84%E4%BA%BA%E3%81%B8" target="_blank">
<Button>プロジェクト登録</Button>
</Link>
</Navbar>
Expand Down
4 changes: 2 additions & 2 deletions frontend/pages/sign-in.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ export default function SignIn({
return (
<div>
<Head>
<title>SimpleGrants</title>
<title>DigDAO マッチングドネーション</title>
<meta
name="description"
content="Join us in making an impact through quadratic funding."
content="私たちと一緒に、Quadratic Fundingを通じてインパクトを与えましょう。"
/>
<link rel="icon" href="/favicon.ico" />
</Head>
Expand Down

0 comments on commit 7adc020

Please sign in to comment.