Skip to content

Commit c9d7af4

Browse files
authored
Merge branch 'main' into newsletter
2 parents afe0f5f + 25f11d7 commit c9d7af4

File tree

9 files changed

+1692
-33835
lines changed

9 files changed

+1692
-33835
lines changed

apps/web/backend/package-lock.json

Lines changed: 872 additions & 843 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/web/backend/routes/notes.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,11 @@ router.put('/updatenote/:id', fetchuser, [
183183
router.get('/bin', fetchuser, async (req, res) => {
184184
try {
185185
const allDeletedNotes = await NoteSchema.find({ authorId: req.user.id, isDeleted: true });
186+
for (let index = 0; index < allDeletedNotes.length; index++) {
187+
const element = allDeletedNotes[index];
188+
element.title = helper.decrypt(element.title, element.secretKey);
189+
element.description = helper.decrypt(element.description, element.secretKey);
190+
}
186191
return res.status(200).json(allDeletedNotes);
187192

188193
} catch (error) {

apps/web/frontend/package-lock.json

Lines changed: 748 additions & 720 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/web/frontend/src/components/LandingPage/Components/Footer/Footer.css

Lines changed: 34 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -159,19 +159,41 @@ div.social {
159159
}
160160

161161
@media screen and (max-width: 480px) {
162-
input,button {
163-
width: auto;
164-
}
162+
input,button {
163+
width: auto;
164+
}
165165

166-
input {
167-
margin-right: .5em;
168-
}
166+
input {
167+
margin-right: .5em;
168+
}
169169

170-
div.social {
171-
width: 15rem;
172-
}
170+
div.social {
171+
width: 15rem;
172+
}
173173

174-
.copyright {
175-
padding: .3em 0;
176-
}
174+
.copyright {
175+
padding: .3em 0;
176+
}
177+
}
178+
@media screen and (max-width: 380px) {
179+
input,button {
180+
width: auto;
181+
}
182+
183+
input {
184+
margin-right: .15em;
185+
}
186+
187+
div.social {
188+
width: 16rem;
189+
}
190+
191+
.copyright {
192+
font-size: 14px;
193+
padding: .3em 0;
194+
}
195+
.footer-menu a {
196+
font-size: 13px;
197+
padding:5px;
177198
}
199+
}

apps/web/frontend/src/components/NewLandingPage/components/Navbar.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ const Navbar = () => {
1010
<li>Home</li>
1111
<li>Features</li>
1212
<li>Github</li>
13-
<li>Discord</li>
1413
<li>Contact</li>
1514
<li>Dashboard</li>
1615
<li><button className="tw-py-3 tw-px-6 tw-bg-[#3b73c6] tw-rounded-[25px] hover:tw-text-[#3b73c6] hover:tw-bg-white">Get Started</button></li>

apps/web/frontend/src/components/Sidenav/Sidenav.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ const Sidenav = () => {
9393
</Link>
9494
</li>
9595

96-
<li className="nav-link">
97-
<a href="/">
96+
<li className="nav-link pointer-events-none">
97+
<a href="#">
9898
<i className="fa-regular fa-bell icon"></i>
9999
<span className="text nav-text">Soon..</span>
100100
</a>

apps/web/frontend/src/index.css

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,32 @@
11
@tailwind base;
22
@tailwind components;
3-
@tailwind utilities;
3+
@tailwind utilities;
4+
5+
html {
6+
scroll-behavior: smooth;
7+
}
8+
9+
#light {
10+
background: var(--sidebar-color);
11+
}
12+
13+
#dark {
14+
background: rgb(29, 28, 28);
15+
}
16+
17+
.text-center {
18+
text-align: center;
19+
}
20+
21+
.text-left {
22+
text-align: left;
23+
}
24+
25+
.mt-1 {
26+
margin-top: 1rem;
27+
}
28+
29+
.mb-1 {
30+
margin-bottom: 1rem;
31+
}
32+

apps/web/frontend/tailwind.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ module.exports = {
99
"./src/**/*.{js,jsx,ts,tsx}",
1010
]
1111
}
12+

0 commit comments

Comments
 (0)