Skip to content

Commit 1d2de4c

Browse files
MistiumMistium
committed
new changes
1 parent bc0393b commit 1d2de4c

19 files changed

Lines changed: 2290 additions & 1668 deletions

‎.vscode/settings.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"C_Cpp.errorSquiggles": "disabled"
3+
}

‎auth.html‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,8 @@
1717
</head>
1818

1919
<body>
20-
<div
21-
id="g_id_onload"
22-
data-client_id="228445846106-ttt7glup5n94jfhlj7idmsj4r0vo6bs4.apps.googleusercontent.com"
23-
data-callback="handleCredential"
24-
data-auto_prompt="false">
20+
<div id="g_id_onload" data-client_id="228445846106-ttt7glup5n94jfhlj7idmsj4r0vo6bs4.apps.googleusercontent.com"
21+
data-callback="handleCredential" data-auto_prompt="false">
2522
</div>
2623
<div id="navbar-placeholder"></div>
2724
<div class="modal">
@@ -139,14 +136,8 @@ <h1>Welcome to Rotur</h1>
139136
<i class="fas fa-sign-in-alt"></i>
140137
Sign In
141138
</button>
142-
<div
143-
class="g_id_signin"
144-
data-type="standard"
145-
data-size="large"
146-
data-text="continue_with"
147-
data-theme="outline"
148-
data-shape="rectangular"
149-
data-logo_alignment="left">
139+
<div class="g_id_signin" data-type="standard" data-size="large" data-text="continue_with" data-theme="outline"
140+
data-shape="rectangular" data-logo_alignment="left">
150141
</div>
151142
<button class="btn-welcome btn-welcome-secondary" id="welcome-signup-btn">
152143
<i class="fas fa-user-plus"></i>
@@ -723,6 +714,7 @@ <h2 style="margin:0 0 4px; font-size:22px; font-weight:500;">Link This Account</
723714
if (password !== confirmPassword) {
724715
submitButton.innerHTML = 'Passwords do not match';
725716
submitButton.style.background = '#ea4335';
717+
hcaptcha.reset();
726718
setTimeout(() => {
727719
submitButton.innerHTML = originalText;
728720
submitButton.style.background = '';
@@ -733,6 +725,7 @@ <h2 style="margin:0 0 4px; font-size:22px; font-weight:500;">Link This Account</
733725
if (password.length < 8) {
734726
submitButton.innerHTML = 'Password must be at least 8 characters';
735727
submitButton.style.background = '#ea4335';
728+
hcaptcha.reset();
736729
setTimeout(() => {
737730
submitButton.innerHTML = originalText;
738731
submitButton.style.background = '';
@@ -763,6 +756,8 @@ <h2 style="margin:0 0 4px; font-size:22px; font-weight:500;">Link This Account</
763756
const result = await response.json();
764757

765758
if (result.error) {
759+
hcaptcha.reset();
760+
766761
// Show error message below the form
767762
let errorDiv = document.getElementById('signup-error-message');
768763
if (!errorDiv) {
@@ -789,7 +784,6 @@ <h2 style="margin:0 0 4px; font-size:22px; font-weight:500;">Link This Account</
789784
updateModalForLoggedInUser();
790785
} else {
791786
if (account_data.requiresTOSAcceptance) {
792-
// Redirect to TOS acceptance page with token and return_to
793787
const tosUrl = new URL('./terms-of-service.html', window.location.href);
794788
tosUrl.searchParams.set('token', account_data.key);
795789
if (return_to) {
@@ -798,7 +792,6 @@ <h2 style="margin:0 0 4px; font-size:22px; font-weight:500;">Link This Account</
798792
window.location.href = tosUrl.toString();
799793
return;
800794
}
801-
// Fallback to signin form if auto-login fails
802795
submitButton.innerHTML = 'Account created! Please sign in';
803796
submitButton.style.background = '#34a853';
804797
setTimeout(() => {
@@ -810,6 +803,7 @@ <h2 style="margin:0 0 4px; font-size:22px; font-weight:500;">Link This Account</
810803
}
811804
} catch (error) {
812805
console.error('Signup error:', error);
806+
hcaptcha.reset();
813807
submitButton.innerHTML = 'Error occurred';
814808
submitButton.style.background = '#ea4335';
815809

‎claw.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ <h3 class="title">GET /rate</h3>
125125
</a>
126126
</div>
127127
<p class="body">
128-
&copy; 2025 Rotur. All rights reserved.
128+
&copy; 2026 Rotur. All rights reserved.
129129
</p>
130130
</div>
131131
</div>

‎config/contributors.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
},
2222
{
2323
"name": "IzKuipers",
24-
"pfp": "https://avatars.rotur.dev/izkuipers",
24+
"pfp": "https://avatars.githubusercontent.com/u/76709090?v=4",
2525
"link": "https://github.com/IzKuipers"
2626
},
2727
{

‎index.html‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -99,20 +99,7 @@
9999
<body>
100100
<div id="header-wrapper">
101101
<div id="header" class="row">
102-
<img src="assets/branding/rotur-logo.svg" id="logo">
103-
<div class="vrule"></div>
104-
<a href="https://github.com/roturTW" class="tab">
105-
<p>Github</p>
106-
</a>
107-
<a href="https://rotur.dev/systems" class="tab">
108-
<p>Systems</p>
109-
</a>
110-
<a href="https://rotur.dev/status" class="tab">
111-
<p>Status</p>
112-
</a>
113-
<a href="https://docs.rotur.dev/" class="tab">
114-
<p>Docs</p>
115-
</a>
102+
<div id="navbar-placeholder"></div>
116103
</div>
117104
</div>
118105

@@ -191,11 +178,12 @@
191178
</a>
192179
</div>
193180
<p class="body">
194-
© 2025 Rotur. All rights reserved.
181+
© 2026 Rotur. All rights reserved.
195182
</p>
196183
</div>
197184
</div>
198185
<script src="index.js" async defer></script>
186+
<script src="nav.js"></script>
199187
</body>
200188

201189
</html>

‎inventory-manager.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,7 @@ <h2 class="title">Create New Item</h2>
945945
</a>
946946
</div>
947947
<p class="body">
948-
© 2025 Rotur. All rights reserved.
948+
© 2026 Rotur. All rights reserved.
949949
</p>
950950
</div>
951951

‎key-manager.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ <h4 class="subtitle">Subscription Settings</h4>
622622
</a>
623623
</div>
624624
<p class="body">
625-
© 2025 Rotur. All rights reserved.
625+
© 2026 Rotur. All rights reserved.
626626
</p>
627627
</div>
628628

‎mobile-nav.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
const hamburgerMenu = document.getElementById('hamburger-menu');
2+
const navLinks = document.getElementById('nav-links');
3+
4+
hamburgerMenu.addEventListener('click', () => {
5+
navLinks.classList.toggle('show');
6+
hamburgerMenu.classList.toggle('active');
7+
});

‎nav.html‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
<div class="nav">
2-
<div class="left">
2+
<div class="left" id="nav-left">
33
<img src="/Rotur Logo.png" alt="Rotur Logo" id="roturIMG" style="width: 40px; height: 40px; border-radius: 50%;">
44
<a href="/" id="roturTXT">Rotur.dev</a>
55
</div>
6-
<div class="right">
7-
<a href="/">Home</a>
8-
<a href="https://github.com/roturTW">Github</a>
9-
<a href="/systems">Systems</a>
10-
<a href="/status">Status</a>
11-
<a href="https://docs.rotur.dev">Docs</a>
12-
<a href="/auth">Auth</a>
13-
</div>
6+
<button id="hamburger-menu">
7+
<span></span>
8+
<span></span>
9+
<span></span>
10+
</button>
1411
</div>
12+
<div class="right" id="nav-links">
13+
<a href="https://github.com/roturTW" target="_blank">Github</a>
14+
<a href="/systems">Systems</a>
15+
<a href="/services">Services</a>
16+
<a href="/status">Status</a>
17+
<a href="https://docs.rotur.dev">Docs</a>
18+
<a href="/auth">Auth</a>
19+
<a href="/premium">Upgrade</a>
20+
</div>

‎nav.js‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
1-
// Load the navbar content from navbar.html into the placeholder
21
fetch('/nav.html')
3-
.then(response => response.text())
4-
.then(data => {
5-
document.getElementById('navbar-placeholder').innerHTML = data;
2+
.then(res => res.text())
3+
.then(html => {
4+
const placeholder = document.getElementById('navbar-placeholder');
5+
placeholder.outerHTML = html;
6+
7+
// Mobile navigation logic
8+
const hamburgerMenu = document.getElementById('hamburger-menu');
9+
const navLinks = document.getElementById('nav-links');
10+
11+
if (hamburgerMenu && navLinks) {
12+
hamburgerMenu.addEventListener('click', () => {
13+
navLinks.classList.toggle('show');
14+
hamburgerMenu.classList.toggle('active');
15+
});
16+
}
617
})
7-
.catch(error => console.error('Error loading navbar:', error));
18+
.catch(err => console.error('Error loading navbar:', err));

0 commit comments

Comments
 (0)