Skip to content

Commit 4e43130

Browse files
committed
Manje izmjene
1 parent d1c776a commit 4e43130

5 files changed

Lines changed: 4 additions & 16 deletions

File tree

backend/auth.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ passport.use(
2828
async (accessToken, refreshToken, profile, done) => {
2929
try {
3030
const email = profile.emails[0].value;
31-
const adminEmails = ["tadija75@gmail.com", "lorenaivanisevic@gmail.com", "pavle.ergovic@kset.org"];
31+
const adminEmails = ["tadija75@gmail.com", "lorenaivanisevic@gmail.com", "pavle.ergovic@kset.org","doria.herceg@kset.org"];
3232
const isAdmin = adminEmails.includes(email);
3333

3434
console.log("Login attempt:", email, "| Is Admin List:", isAdmin);

backend/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ app.get("/oauth/callback", (req, res, next) => {
105105
if (err) {
106106
return res.redirect(`${frontend}/?error=login_error`);
107107
}
108-
res.redirect(`${frontend}/home`);
108+
res.redirect(`${frontend}/prodaja`);
109109
});
110110
})(req, res, next);
111111
});

frontend/src/App.jsx

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { BrowserRouter, Routes, Route } from "react-router-dom";
22
import Login from "./pages/Login";
3-
import Home from "./pages/Home";
43
import ProtectedRoute from "./ProtectedRoute";
54
import PublicRoute from "./PublicRoute";
65
import MainLayout from "./layouts/MainLayout";
@@ -25,17 +24,6 @@ export default function App() {
2524
</PublicRoute>
2625
}
2726
/>
28-
<Route
29-
path="/home"
30-
element={
31-
<ProtectedRoute>
32-
<MainLayout>
33-
<Home />
34-
</MainLayout>
35-
</ProtectedRoute>
36-
}
37-
/>
38-
3927
{/* Main Application Routes */}
4028
<Route
4129
path="/prodaja"

frontend/src/PublicRoute.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export default function PublicRoute({ children }) {
1313

1414
if (user === undefined) return null;
1515

16-
if (user) return <Navigate to="/home" />;
16+
if (user) return <Navigate to="/prodaja" />;
1717

1818
return children;
1919
}

frontend/src/pages/Izvjestaj.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ return (
234234
<thead>
235235
<tr style={{background: '#f2f2f2'}}>
236236
<th style={{padding: '8px 15px', textAlign: 'left'}}>Način plaćanja</th>
237-
<th style={{padding: '8px 15px', textAlign: 'center'}}>Br. računa</th>
237+
<th style={{padding: '8px 15px', textAlign: 'center'}}>Kol. računa</th>
238238
<th style={{padding: '8px 15px', textAlign: 'right'}}>Iznos</th>
239239
</tr>
240240
</thead>

0 commit comments

Comments
 (0)