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

Fix Merge Conflict #2746

Open
wants to merge 26 commits into
base: dev
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e9cb269
CW-prod-privacy-policy Added privacy policy page
MeyerPV Apr 3, 2024
dbaf198
Merge pull request #2670 from daostack/CW-prod-privacy-policy-page
MeyerPV Apr 3, 2024
9ecf7cd
CW-prod-policy fix privacy-policy path
MeyerPV Apr 9, 2024
c74f7c4
Merge pull request #2678 from daostack/CW-prod-policy
MeyerPV Apr 9, 2024
7f744d5
Merge branch 'staging'
andreymikhadyuk Apr 9, 2024
b295c5f
CW-staging-privacy-policy Fixed privacy policy url
MeyerPV Apr 10, 2024
0eb7195
Merge pull request #2681 from daostack/CW-staging-privacy-policy
MeyerPV Apr 10, 2024
157e4c7
add experimentalForceLongPolling to firestore settings
andreymikhadyuk Apr 16, 2024
400d050
CW-Webview-fix-backbutton Fixed back-button redirect
MeyerPV Apr 21, 2024
4543182
Merge pull request #2688 from daostack/CW-Webview-fix-backbutton
MeyerPV Apr 21, 2024
10f0acb
Merge branch 'dev' into staging
andreymikhadyuk Apr 25, 2024
1ecbd61
Merge branch 'staging'
andreymikhadyuk May 9, 2024
98d5fcb
Merge pull request #2693 from daostack/dev
elatif2020 May 21, 2024
836e6fb
Merge pull request #2695 from daostack/dev
MeyerPV May 27, 2024
fa455b0
Merge pull request #2698 from daostack/dev
MeyerPV Jun 10, 2024
6e54820
Merge pull request #2699 from daostack/staging
MeyerPV Jun 11, 2024
fd6b3ba
Merge pull request #2710 from daostack/dev
MeyerPV Jul 2, 2024
98aab31
Merge pull request #2713 from daostack/dev
MeyerPV Jul 8, 2024
335286b
Merge pull request #2714 from daostack/staging
MeyerPV Jul 10, 2024
567554a
Merge pull request #2725 from daostack/dev
MeyerPV Aug 27, 2024
3e2ea1f
Merge pull request #2728 from daostack/dev
MeyerPV Aug 28, 2024
417883f
Merge pull request #2726 from daostack/staging
MeyerPV Aug 28, 2024
4f0d7cc
CW-hotfix-app-crash
MeyerPV Sep 2, 2024
f5d9c71
CW-hotfix-app-crash
MeyerPV Sep 2, 2024
f572fee
Merge pull request #2731 from daostack/CW-hotfix-app-crash
MeyerPV Sep 3, 2024
6ed41ac
Merge branch 'dev' into CW-fix-confliсе
MeyerPV Oct 14, 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
Next Next commit
CW-prod-privacy-policy Added privacy policy page
  • Loading branch information
MeyerPV committed Apr 3, 2024
commit e9cb269c21265135dc4b44f043f0bcdfe5781bac
6 changes: 6 additions & 0 deletions src/pages/App/router/configuration/emptyLayout.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { PrivacyPolicy } from "@/pages/PrivacyPolicy";
import { EmptyPage } from "@/pages/empty";
import { ROUTE_PATHS } from "@/shared/constants";
import { EmptyLayout } from "@/shared/layouts";
@@ -11,5 +12,10 @@ export const EMPTY_LAYOUT_CONFIGURATION: LayoutConfiguration = {
exact: true,
component: EmptyPage,
},
{
path: ROUTE_PATHS.PRIVACY_POLICY,
exact: true,
component: PrivacyPolicy,
},
],
};
38 changes: 38 additions & 0 deletions src/pages/PrivacyPolicy/PrivacyPolicy.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
@import "../../styles/sizes";

.container-pdf {
width: 100%;
height: 100%;
background-color: #525659;
display: flex;
}

.preview-pdf {
margin: auto;
border-radius: 0.625rem;
max-height: 70%;
max-width: 80%;

@include phone {
max-width: unset;
width: unset !important;
max-height: unset !important;
height: unset !important;
}

.react-pdf__Page canvas {
max-width: 100%;
width: fit-content !important;
max-height: 90vh !important;
height: fit-content !important;
margin-bottom: 0.25rem;


@include phone {
max-width: unset;
width: unset !important;
max-height: unset !important;
height: unset !important;
}
}
}
20 changes: 20 additions & 0 deletions src/pages/PrivacyPolicy/PrivacyPolicy.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import React from "react";
import { Document, Page } from "react-pdf/dist/esm/entry.webpack5";
import "./PrivacyPolicy.scss";

export function PrivacyPolicy() {
return (
<div className="container-pdf">
<Document
className="preview-pdf"
file="http://localhost:3000/privacy_policy.pdf"
>
<Page pageNumber={1} />
<Page pageNumber={2} />
<Page pageNumber={3} />
<Page pageNumber={4} />
<Page pageNumber={5} />
</Document>
</div>
);
}
1 change: 1 addition & 0 deletions src/pages/PrivacyPolicy/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "./PrivacyPolicy"
1 change: 1 addition & 0 deletions src/shared/constants/routePaths.tsx
Original file line number Diff line number Diff line change
@@ -44,4 +44,5 @@ export enum ROUTE_PATHS {
SAVE_SAADIA = "/save-saadia",
V04_INBOX = "/inbox-v04",
INBOX = "/inbox",
PRIVACY_POLICY = "/privacy-policy",
}
Loading