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.

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

refactor(web): convert terms and privacy policy styling from SCSS to CSS-in-JS #681

Merged
merged 1 commit into from
Feb 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion service/vspo-schedule/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
"react-dom": "^18.3.1",
"react-i18next": "^14.1.2",
"react-tweet": "^3.2.1",
"sass": "^1.77.6",
"sharp": "^0.33.4",
"swr": "^2.2.5",
"typescript": "^5.5.2"
Expand Down
17 changes: 11 additions & 6 deletions service/vspo-schedule/web/pnpm-lock.yaml

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

Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.container {
import { styled } from "@mui/material/styles";

export const AgreementDocument = styled("div")(`
h1 {
font-size: 2.5rem;
margin-top: 0;
Expand Down Expand Up @@ -35,4 +37,4 @@
text-decoration: underline;
}
}
}
`);
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export * from "./AgreementDocument";
export * from "./ClipList";
export * from "./ClipTabs";
export * from "./Livestreams";
Expand Down
6 changes: 3 additions & 3 deletions service/vspo-schedule/web/src/pages/privacy-policy.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import styles from "@/styles/Terms.module.scss";
import { NextPageWithLayout } from "./_app";
import { ContentLayout } from "@/components/Layout/ContentLayout";
import { AgreementDocument } from "@/components/Templates";
import { DEFAULT_LOCALE, QA_LINK } from "@/lib/Const";
import { GetStaticProps } from "next";
import { serverSideTranslations } from "next-i18next/serverSideTranslations";
Expand Down Expand Up @@ -36,7 +36,7 @@ export const getStaticProps: GetStaticProps<Props> = async ({

const PrivacyPolicy: NextPageWithLayout<Props> = () => {
return (
<div className={styles.container}>
<AgreementDocument>
<h1>プライバシーポリシー</h1>
<p>
このプライバシーポリシーは,サービス提供者がこのウェブサイト上で提供するサービス(以下,「本サービス」といいます。)のプライバシーポリシー(以下,「本ポリシー」といいます。)を定めます。
Expand Down Expand Up @@ -123,7 +123,7 @@ const PrivacyPolicy: NextPageWithLayout<Props> = () => {
</a>
までお願いいたします。
</p>
</div>
</AgreementDocument>
);
};

Expand Down
6 changes: 3 additions & 3 deletions service/vspo-schedule/web/src/pages/terms.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import styles from "@/styles/Terms.module.scss";
import { NextPageWithLayout } from "./_app";
import { ContentLayout } from "@/components/Layout/ContentLayout";
import { AgreementDocument } from "@/components/Templates";
import { GetStaticProps } from "next";
import { DEFAULT_LOCALE } from "@/lib/Const";
import { serverSideTranslations } from "next-i18next/serverSideTranslations";
Expand Down Expand Up @@ -36,7 +36,7 @@ export const getStaticProps: GetStaticProps<Props> = async ({

const Terms: NextPageWithLayout<Props> = () => {
return (
<div className={styles.container}>
<AgreementDocument>
<h1>利用規約</h1>
<p>
この利用規約(以下,「本規約」といいます。)は,サービス提供者がこのウェブサイト上で提供するサービス(以下,「本サービス」といいます。)の利用条件を定めます。
Expand Down Expand Up @@ -202,7 +202,7 @@ const Terms: NextPageWithLayout<Props> = () => {
<p>
本サービスに関して紛争が生じた場合には,サービス提供者の本店所在地を管轄する裁判所を専属的合意管轄とします。
</p>
</div>
</AgreementDocument>
);
};

Expand Down
69 changes: 0 additions & 69 deletions service/vspo-schedule/web/src/styles/Home.module.scss

This file was deleted.