Skip to content

Commit 2a06372

Browse files
nikohoffrennikohoffren
committed
update Privacy Policy
1 parent fa40a3e commit 2a06372

3 files changed

Lines changed: 145 additions & 83 deletions

File tree

‎PrivacyPolicy.md‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,53 @@
22

33
### Introduction
44

5-
Welcome to Fork, Commit, Merge (forkcommitmerge.io). This Privacy Policy governs your use of our website. This SERVICE is provided by Fork, Commit, Merge at no cost and is intended for use as is.
5+
Welcome to Fork, Commit, Merge (forkcommitmerge.dev). This Privacy Policy
6+
governs your use of our website. This SERVICE is provided by Fork, Commit, Merge
7+
at no cost and is intended for use as is.
68

79
### Data Collection
810

9-
We collect the following data if you choose to login with your Github credentials to our platform:
11+
We collect the following data if you choose to login with your GitHub
12+
credentials to our platform:
1013

11-
- Username
12-
- Email
13-
- Name
14+
- Username
15+
- Email
16+
- Name
1417

1518
### How We Use Your Data
1619

1720
We use your data to:
1821

19-
- Facilitate your learning experience about contributing to open-source.
20-
- Search for the number of issues you have made in our repository by looking at all the closed (merged) pull requests.
22+
- Facilitate your learning experience about contributing to open-source.
23+
- Search for the number of issues you have made in our repository by looking at
24+
all the closed (merged) pull requests.
2125

2226
### Data Storage
2327

24-
Your data is securely stored in MongoDB Atlas database. We do not store your password in our database. We use the OAuth2 protocol to authenticate you with Github.
28+
We use GitHub's OAuth2 protocol to authenticate you. We do not store your
29+
password or sensitive information. We only store basic information about your
30+
contributions to our repository to track your progress.
2531

2632
### Data Sharing
2733

28-
We do not share your data with third parties. We do not sell your data to third parties. We do not use your data for marketing purposes.
34+
We do not share your data with third parties. We do not sell your data to third
35+
parties. We do not use your data for marketing purposes.
2936

3037
### Cookie Policy
3138

3239
We do not use cookies on our website.
3340

3441
### Changes To This Privacy Policy
3542

36-
We may update this Privacy Policy in the future. You are advised to review this page periodically for any changes. We will notify you of any changes by posting the new Privacy Policy on this page. These changes are effective immediately after they are posted on this page.
43+
We may update this Privacy Policy in the future. You are advised to review this
44+
page periodically for any changes. We will notify you of any changes by posting
45+
the new Privacy Policy on this page. These changes are effective immediately
46+
after they are posted on this page.
3747

3848
### Contact Us
3949

40-
If you have any questions or suggestions about our Privacy Policy, do not hesitate to contact us.
50+
If you have any questions or suggestions about our Privacy Policy, do not
51+
hesitate to contact us.
4152

4253
#### Contact Information:
4354

‎components/layout/Footer.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ const Footer = () => {
115115
<ul className='mt-4 space-y-2'>
116116
<li>
117117
<Link
118-
href='/privacy-policy'
118+
href='/legal/privacy-policy'
119119
className='text-sm text-gray-600 hover:text-modern-purple'
120120
>
121121
Privacy Policy

‎pages/legal/privacy-policy.tsx‎

Lines changed: 122 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,136 @@
1-
import React from "react";
1+
import { motion } from 'framer-motion'
2+
3+
const container = {
4+
hidden: { opacity: 0 },
5+
show: {
6+
opacity: 1,
7+
transition: {
8+
staggerChildren: 0.1
9+
}
10+
}
11+
}
12+
13+
const item = {
14+
hidden: { opacity: 0, y: 20 },
15+
show: { opacity: 1, y: 0 }
16+
}
217

318
const PrivacyPolicy: React.FC = () => {
419
return (
5-
<div className="bg-primary flex flex-col">
6-
<div className="min-h-screen mx-auto max-w-4xl">
7-
<div className="flex-grow text-center flex items-center justify-center">
8-
<div className="pb-6">
9-
<h1 className="text-3xl py-10">Privacy Policy</h1>
10-
<div className="text-left px-20">
11-
<h2 className="pb-2 text-2xl">1. Introduction</h2>
12-
<p className="pb-3">
13-
Welcome to Fork, Commit, Merge (forkcommitmerge.io). This
14-
Privacy Policy governs your use of our website. This SERVICE is
15-
provided by Fork, Commit, Merge at no cost and is intended for
16-
use as is.
17-
</p>
20+
<div className='bg-white'>
21+
<div className='modern-container'>
22+
<div className='py-16 sm:py-24'>
23+
<motion.div
24+
initial={{ opacity: 0, y: 20 }}
25+
animate={{ opacity: 1, y: 0 }}
26+
className='text-center'
27+
>
28+
<h1 className='text-4xl font-bold tracking-tight text-gray-900 sm:text-5xl'>
29+
Privacy <span className='text-modern-purple'>Policy</span>
30+
</h1>
31+
<p className='mx-auto mt-6 max-w-2xl text-lg text-gray-600'>
32+
Learn about how we handle your data and protect your privacy.
33+
</p>
34+
</motion.div>
35+
36+
<motion.div
37+
variants={container}
38+
initial='hidden'
39+
animate='show'
40+
className='mt-16 flex justify-center'
41+
>
42+
<motion.div variants={item} className='w-full max-w-4xl'>
43+
<div className='rounded-lg bg-gray-50 p-8 shadow-sm'>
44+
<h2 className='mb-6 text-2xl font-bold text-gray-900'>
45+
1. Introduction
46+
</h2>
47+
<p className='mb-6 text-gray-600'>
48+
Welcome to Fork, Commit, Merge (forkcommitmerge.dev). This
49+
Privacy Policy governs your use of our website. This SERVICE
50+
is provided by Fork, Commit, Merge at no cost and is intended
51+
for use as is.
52+
</p>
1853

19-
<h2 className="pb-2 text-2xl">2. Data Collection</h2>
20-
<p className="pb-1">
21-
We collect the following data if you choose to login with your
22-
Github credentials to our platform:
23-
</p>
24-
<ul>
25-
<li className="pl-4">- Username</li>
26-
<li className="pl-4">- Email</li>
27-
<li className="pl-4">- Name</li>
28-
</ul>
54+
<h2 className='mb-6 text-2xl font-bold text-gray-900'>
55+
2. Data Collection
56+
</h2>
57+
<p className='mb-4 text-gray-600'>
58+
We collect the following data if you choose to login with your
59+
GitHub credentials to our platform:
60+
</p>
61+
<ul className='mb-6 list-disc pl-5 text-gray-600'>
62+
<li>Username</li>
63+
<li>Email</li>
64+
<li>Name</li>
65+
</ul>
2966

30-
<h2 className="pb-2 text-2xl">3. How We Use Your Data</h2>
31-
<p className="pb-1">We use your data to:</p>
32-
<ul className="pb-2">
33-
<li className="pl-4">
34-
- Facilitate your learning experience about contributing to
35-
open-source.
36-
</li>
37-
<li className="pl-4">
38-
- Search for the number of issues you have made in our
39-
repository by looking at all the closed (merged) pull
40-
requests.
41-
</li>
42-
</ul>
67+
<h2 className='mb-6 text-2xl font-bold text-gray-900'>
68+
3. How We Use Your Data
69+
</h2>
70+
<p className='mb-4 text-gray-600'>We use your data to:</p>
71+
<ul className='mb-6 list-disc pl-5 text-gray-600'>
72+
<li>
73+
Facilitate your learning experience about contributing to
74+
open-source.
75+
</li>
76+
<li>
77+
Search for the number of issues you have made in our
78+
repository by looking at all the closed (merged) pull
79+
requests.
80+
</li>
81+
</ul>
4382

44-
<h2 className="pb-2 text-2xl">4. Data Storage</h2>
45-
<p className="pb-3">
46-
Your data is securely stored in MongoDB Atlas database. We do
47-
not store your password in our database. We use the OAuth2
48-
protocol to authenticate you with Github.
49-
</p>
83+
<h2 className='mb-6 text-2xl font-bold text-gray-900'>
84+
4. Data Storage
85+
</h2>
86+
<p className='mb-6 text-gray-600'>
87+
We use GitHub's OAuth2 protocol to authenticate you. We do not
88+
store your password or sensitive information. We only store
89+
basic information about your contributions to our repository
90+
to track your progress.
91+
</p>
5092

51-
<h2 className="pb-2 text-2xl">5. Data Sharing</h2>
52-
<p className="pb-3">
53-
We do not share your data with third parties. We do not sell
54-
your data to third parties. We do not use your data for
55-
marketing purposes.
56-
</p>
93+
<h2 className='mb-6 text-2xl font-bold text-gray-900'>
94+
5. Data Sharing
95+
</h2>
96+
<p className='mb-6 text-gray-600'>
97+
We do not share your data with third parties. We do not sell
98+
your data to third parties. We do not use your data for
99+
marketing purposes.
100+
</p>
57101

58-
<h2 className="pb-2 text-2xl">6. Cookie Policy</h2>
59-
<p className="pb-3">We do not use cookies on our website.</p>
102+
<h2 className='mb-6 text-2xl font-bold text-gray-900'>
103+
6. Cookie Policy
104+
</h2>
105+
<p className='mb-6 text-gray-600'>
106+
We do not use cookies on our website.
107+
</p>
60108

61-
<h2 className="pb-2 text-2xl">
62-
7. Changes To This Privacy Policy
63-
</h2>
64-
<p className="pb-3">
65-
We may update this Privacy Policy in the future. You are advised
66-
to review this page periodically for any changes. We will notify
67-
you of any changes by posting the new Privacy Policy on this
68-
page. These changes are effective immediately after they are
69-
posted on this page.
70-
</p>
109+
<h2 className='mb-6 text-2xl font-bold text-gray-900'>
110+
7. Changes To This Privacy Policy
111+
</h2>
112+
<p className='mb-6 text-gray-600'>
113+
We may update this Privacy Policy in the future. You are
114+
advised to review this page periodically for any changes. We
115+
will notify you of any changes by posting the new Privacy
116+
Policy on this page. These changes are effective immediately
117+
after they are posted on this page.
118+
</p>
71119

72-
<h2 className="pb-2 text-2xl">8. Contact Us</h2>
73-
<p className="pb-3">
74-
If you have any questions about this Privacy Policy, please
75-
contact us by email: niko.hoffren@gmail.com
76-
</p>
77-
</div>
78-
</div>
120+
<h2 className='mb-6 text-2xl font-bold text-gray-900'>
121+
8. Contact Us
122+
</h2>
123+
<p className='mb-6 text-gray-600'>
124+
If you have any questions about this Privacy Policy, please
125+
contact us by email: niko.hoffren@gmail.com
126+
</p>
127+
</div>
128+
</motion.div>
129+
</motion.div>
79130
</div>
80131
</div>
81132
</div>
82-
);
83-
};
133+
)
134+
}
84135

85-
export default PrivacyPolicy;
136+
export default PrivacyPolicy

0 commit comments

Comments
 (0)