Skip to content

Merge master with main #706

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.

Sign up for GitHub

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

Merged
Harsh-26626 merged 28 commits into from
Aug 14, 2025
Merged

Merge master with main #706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
64472b0
Upload a sample file
Harsh-26626 Jul 30, 2025
5c6a58c
Update static.yml
Harsh-26626 Jul 30, 2025
1683ea6
Update static.yml
Harsh-26626 Jul 30, 2025
5bd6573
Removed Redundant CSS and Documented CSS for simplicity (#524)
Arsenal17x Aug 2, 2025
a25a8dc
Update script.js
Harsh-26626 Aug 2, 2025
14bd0ff
fixed some href errors which was causing functionality issues in whol…
Harsh-26626 Aug 2, 2025
8e5fb5d
Merge branch 'master' of https://github.com/Harsh-26626/notesvault
Harsh-26626 Aug 2, 2025
4641f4c
Fix href and styles linking issues (#560)
Harsh-26626 Aug 2, 2025
d35efd1
UI Improvement of browse.html (#513)
Pallavi-kr6 Aug 2, 2025
50fdb1b
Updated Pr/513 to include new header design (#587)
Harsh-26626 Aug 2, 2025
e7dc3c7
Auto-update LEADERBOARD.md [skip ci]
actions-user Aug 2, 2025
29a7b84
Modifications in Student Account Page (#569)
Disha19-09 Aug 3, 2025
4c3898e
Merge branch 'master' of https://github.com/Harsh-26626/notesvault
Harsh-26626 Aug 3, 2025
7d6e116
Created a unified header, fixed a lot of href issues everywhere and r…
Harsh-26626 Aug 3, 2025
8f251da
Rename Header.html to header.html
Harsh-26626 Aug 3, 2025
9f68667
Update header.js
Harsh-26626 Aug 3, 2025
7b88ba9
Merge branch 'main' into master
Harsh-26626 Aug 3, 2025
a5529a8
Removed Unused Assets
FrostByte-49 Aug 14, 2025
0a59b9e
Merge branch 'fix/styling-issues' of https://github.com/FrostByte-49/…
FrostByte-49 Aug 14, 2025
55116c1
Removed Unused Files
FrostByte-49 Aug 14, 2025
c25cd52
Removed Home Page
FrostByte-49 Aug 14, 2025
2128b87
Added Home Page
FrostByte-49 Aug 14, 2025
6880713
Deleted browseNotes.js
FrostByte-49 Aug 14, 2025
81b42f2
Removed browseNotes.css
FrostByte-49 Aug 14, 2025
0bb8056
Merge pull request #704 from FrostByte-49/fix/styling-issues
adityai0 Aug 14, 2025
7c13192
Update script.js
Harsh-26626 Aug 14, 2025
6e8c3c1
Fixed bugs after changes in #704 (#705)
Harsh-26626 Aug 14, 2025
15c5581
Delete index.html (moved to pages folder)
Harsh-26626 Aug 14, 2025
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
26 changes: 13 additions & 13 deletions components/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<title>NotesVault - Footer</title>

<!-- Favicon -->
<link rel="icon" href="assets/index/images/favicon.png" />
<link rel="icon" href="../assets/index/images/favicon.png" />

<!-- Font Awesome -->
<link
Expand All @@ -32,7 +32,7 @@
<div class="footer-container">
<!-- Logo -->
<div class="footer-brand">
<a href="/index.html" class="footer-logo">
<a href="index.html" class="footer-logo">
<span>NotesVault</span>
</a>
<p class="footer-description">
Expand All @@ -48,22 +48,22 @@
<h3 class="footer-heading">Quick Links</h3>
<ul class="footer-nav">
<li>
<a href="/pages/overview.html" class="footer-link">
<a href="overview.html" class="footer-link">
<i class="fas fa-eye fa-fw"></i> &nbsp; Overview
</a>
</li>
<li>
<a href="/pages/dashboard.html" class="footer-link">
<a href="dashboard.html" class="footer-link">
<i class="fas fa-user-graduate fa-fw"></i> &nbsp; Dashboard
</a>
</li>
<li>
<a href="/pages/features.html" class="footer-link">
<a href="features.html" class="footer-link">
<i class="fas fa-star fa-fw"></i> &nbsp; Features
</a>
</li>
<li>
<a href="/pages/about.html" class="footer-link">
<a href="about.html" class="footer-link">
<i class="fas fa-info-circle fa-fw"></i> &nbsp; About
</a>
</li>
Expand All @@ -75,22 +75,22 @@ <h3 class="footer-heading">Quick Links</h3>
<h3 class="footer-heading">Features</h3>
<ul class="footer-nav">
<li>
<a href="/pages/upload.html" class="footer-link">
<a href="upload.html" class="footer-link">
<i class="fas fa-upload fa-fw"></i> &nbsp; Upload Notes
</a>
</li>
<li>
<a href="/pages/notes.html" class="footer-link">
<a href="notes.html" class="footer-link">
<i class="fas fa-search fa-fw"></i> &nbsp; Browse Notes
</a>
</li>
<li>
<a href="/pages/jotpad.html" class="footer-link">
<a href="jotpad.html" class="footer-link">
<i class="fas fa-edit fa-fw"></i> &nbsp; Jotpad
</a>
</li>
<li>
<a href="/pages/todolist.html" class="footer-link">
<a href="todolist.html" class="footer-link">
<i class="fas fa-tasks fa-fw"></i> &nbsp; To-Do List
</a>
</li>
Expand Down Expand Up @@ -124,7 +124,7 @@ <h3 class="footer-heading">Community</h3>
<i class="fab fa-github"></i>
</a>
<a
href="#"
href="https://discord.gg/DmpqzkRZ"
class="social-link"
aria-label="Discord"
target="_blank"
Expand All @@ -143,9 +143,9 @@ <h3 class="footer-heading">Community</h3>
<span class="heart">❤️</span> by the Open Source Community
</p>
<div class="legal-links">
<a href="/pages/privacyPolicy" class="legal-link">Privacy Policy</a>
<a href="privacyPolicy" class="legal-link">Privacy Policy</a>
<span class="divider">•</span>
<a href="/pages/termsOfService" class="legal-link"
<a href="termsOfService" class="legal-link"
>Terms of Service</a
>
<span class="divider">•</span>
Expand Down
24 changes: 12 additions & 12 deletions components/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,17 @@

<nav class="navbar-nav">
<ul class="nav-links">
<li><a href="/index.html" class="nav-link">Home</a></li>
<li><a href="index.html" class="nav-link">Home</a></li>
<li>
<a href="/pages/overview.html" class="nav-link">Overview</a>
<a href="overview.html" class="nav-link">Overview</a>
</li>
<li>
<a href="/pages/dashboard.html" class="nav-link">Dashboard</a>
<a href="dashboard.html" class="nav-link">Dashboard</a>
</li>
<li>
<a href="/pages/features.html" class="nav-link">Features</a>
<a href="features.html" class="nav-link">Features</a>
</li>
<li><a href="/pages/about.html" class="nav-link">About</a></li>
<li><a href="about.html" class="nav-link">About</a></li>
</ul>
</nav>

Expand Down Expand Up @@ -98,13 +98,13 @@

<div class="auth-buttons">
<button
onclick="location.href='../pages/login.html'"
onclick="location.href='login.html'"
class="btn btn-secondary"
>
Login
</button>
<button
onclick="location.href='../pages/signup.html'"
onclick="location.href='signup.html'"
class="btn btn-primary"
>
Sign Up
Expand All @@ -123,25 +123,25 @@
<nav class="mobile-nav">
<ul class="mobile-nav-links">
<li>
<a href="../index.html" class="mobile-nav-link">Home</a>
<a href="index.html" class="mobile-nav-link">Home</a>
</li>
<li>
<a href="../pages/overview.html" class="mobile-nav-link"
<a href="overview.html" class="mobile-nav-link"
>Overview</a
>
</li>
<li>
<a href="../pages/dashboard.html" class="mobile-nav-link"
<a href="dashboard.html" class="mobile-nav-link"
>Dashboard</a
>
</li>
<li>
<a href="../pages/features.html" class="mobile-nav-link"
<a href="features.html" class="mobile-nav-link"
>Features</a
>
</li>
<li>
<a href="../pages/about.html" class="mobile-nav-link">About</a>
<a href="about.html" class="mobile-nav-link">About</a>
</li>
</ul>

Expand Down
148 changes: 0 additions & 148 deletions index.html
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions pages/features.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ <h2>Upload Notes</h2>
<a
href="upload.html"
class="btn btn-primary"
target="_blank"
rel="noopener noreferrer"
>
Try It Now &nbsp; <i class="fas fa-arrow-right"></i>
</a>
Expand All @@ -83,8 +81,6 @@ <h2>Browse Notes</h2>
<a
href="notes.html"
class="btn btn-primary"
target="_blank"
rel="noopener noreferrer"
>
Browse Notes &nbsp; <i class="fas fa-arrow-right"></i>
</a>
Expand All @@ -105,8 +101,6 @@ <h2>Jotpad</h2>
<a
href="jotpad.html"
class="btn btn-primary"
target="_blank"
rel="noopener noreferrer"
>
Start Writing &nbsp; <i class="fas fa-arrow-right"></i>
</a>
Expand All @@ -127,8 +121,6 @@ <h2>To-Do List</h2>
<a
href="todolist.html"
class="btn btn-primary"
target="_blank"
rel="noopener noreferrer"
>
Get Organized &nbsp; <i class="fas fa-arrow-right"></i>
</a>
Expand Down
Loading
Loading