diff --git a/README.md b/README.md
index 31466b54c..82a0f134c 100644
--- a/README.md
+++ b/README.md
@@ -10,4 +10,6 @@ Describe how you approached to problem, and what tools and techniques you used t
## View it live
-Every project should be deployed somewhere. Be sure to include the link to the deployed project so that the viewer can click around and see what it's all about.
\ No newline at end of file
+Every project should be deployed somewhere. Be sure to include the link to the deployed project so that the viewer can click around and see what it's all about.
+
+https://stoppa-proppen.netlify.app/
\ No newline at end of file
diff --git a/backend/models/User.js b/backend/models/User.js
new file mode 100644
index 000000000..2ee12dbc2
--- /dev/null
+++ b/backend/models/User.js
@@ -0,0 +1,25 @@
+import mongoose from "mongoose";
+import crypto from "crypto";
+
+const userSchema = new mongoose.Schema({
+
+ email: {
+ type: String,
+ required: true,
+ unique: true,
+ lowercase: true,
+ },
+ password: {
+ type: String,
+ required: true
+ },
+ accessToken: {
+ type: String,
+ default: () => crypto.randomUUID()
+ }
+}, { timestamps: true });
+//creates a user modell based on schema
+const User = mongoose.model("User", userSchema)
+
+
+export default User
diff --git a/backend/package.json b/backend/package.json
index 08f29f244..266fe19c2 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -12,9 +12,12 @@
"@babel/core": "^7.17.9",
"@babel/node": "^7.16.8",
"@babel/preset-env": "^7.16.11",
+ "bcrypt": "^6.0.0",
"cors": "^2.8.5",
+ "dotenv": "^17.3.1",
"express": "^4.17.3",
+ "express-session": "^1.19.0",
"mongoose": "^8.4.0",
"nodemon": "^3.0.1"
}
-}
\ No newline at end of file
+}
diff --git a/backend/routes/auth.js b/backend/routes/auth.js
new file mode 100644
index 000000000..c0ad2927f
--- /dev/null
+++ b/backend/routes/auth.js
@@ -0,0 +1,90 @@
+import express from "express";
+import User from "../models/User.js";
+import bcrypt from "bcrypt";
+
+const router = express.Router();
+
+// Middleware to protect routes — checks the Authorization header for a valid token
+export const authenticateUser = async (req, res, next) => {
+ const token = req.headers.authorization?.replace("Bearer ", "");
+ if (!token) {
+ return res.status(401).json({ message: "Ingen token angiven" });
+ }
+ const user = await User.findOne({ accessToken: token });
+ if (!user) {
+ return res.status(401).json({ message: "Ogiltig token" });
+ }
+ req.user = user;
+ next();
+};
+
+// async - means the route contains code that takes time (talking to the database)
+// without async/await we cannot wait for a response from MongoDB
+router.post("/register", async (req, res) => {
+
+ // body contains the data the user submitted from the form
+ // destructuring = we extract email and password directly instead of req.body.email
+ const { email, password } = req.body;
+
+ // Checks if the user has actually filled in the fields
+ // ! means "not" - so if email is missing
+ if (!email || !password) {
+
+ // stop the router here so the rest of the code does not run
+ // status 400
+ return res.status(400).json({ message: "Email och lösenord krävs"});
+ }
+
+// checks if the email already exists in the database, findOne looks for a matching document, returns null if nothing found
+const existingUser = await User.findOne({ email });
+
+if (existingUser) {
+ return res.status(400).json({ message: "Email redan registrerad"});
+}
+// 10 means the password is hashed 10 times
+// await wait until encryption is complete before proceeding
+const hashedPassword = await bcrypt.hash(password, 10);
+
+// newUser creates a new user object with our schema
+// we pass in email and the hashed password
+const newUser = new User({
+ email: email,
+ password: hashedPassword,
+});
+// saves the user to MongoDB
+// await - wait until saving is complete
+await newUser.save();
+
+res.status(201).json({ message: "Konto skapat!" });
+});
+
+router.post("/login", async (req, res) => {
+
+ const { email, password } = req.body;
+
+ if (!email || !password) {
+ return res.status(400).json({ message: 'Email och lösenord krävs' });
+ }
+
+ // looks for the user's email in the database
+ const user = await User.findOne({ email });
+ // if null is returned the login is denied
+ if (!user) {
+ return res.status(401).json({ message: "Fel email eller lösenord"});
+ }
+
+ // compare compares the password with the hashed one, await wait until compared, returns true if they match false otherwise
+ const isMatch = await bcrypt.compare(password, user.password);
+ // if the password does not match login is denied
+ if(!isMatch){
+ return res.status(401).json({ message: "Fel email eller lösenord"})
+ }
+ res.status(200).json({
+ message: 'Inloggad!',
+ email: user.email,
+ id: user._id,
+ accessToken: user.accessToken
+ });
+})
+
+export default router;
diff --git a/backend/server.js b/backend/server.js
index 070c87518..50d4b3380 100644
--- a/backend/server.js
+++ b/backend/server.js
@@ -1,22 +1,32 @@
import express from "express";
import cors from "cors";
import mongoose from "mongoose";
+import dotenv from 'dotenv';
+import authRoutes from "./routes/auth";
-const mongoUrl = process.env.MONGO_URL || "mongodb://localhost/final-project";
-mongoose.connect(mongoUrl);
-mongoose.Promise = Promise;
+dotenv.config();
-const port = process.env.PORT || 8080;
+const mongoUrl = process.env.MONGO_URL || "mongodb://localhost/final-project";
+/* mongoose.Promise = Promise; */
+const port = process.env.PORT || 8081;
const app = express();
+/* Middleware */
app.use(cors());
app.use(express.json());
-app.get("/", (req, res) => {
- res.send("Hello Technigo!");
-});
+// tells express that all routes in auth.js should start with /api
+// register becomes /api/register
+app.use("/api", authRoutes);
// Start the server
-app.listen(port, () => {
- console.log(`Server running on http://localhost:${port}`);
+mongoose.connect(mongoUrl)
+ .then(() => {
+ console.log("✅ Succéss! We are conected to MongoDB Atlas.");
+ app.listen(port, () => {
+ console.log(`Server running on http://localhost:${port}`);
});
+ })
+ .catch((err) => {
+ console.error("❌ Could not connect to the database:", err);
+ });
diff --git a/frontend/index.html b/frontend/index.html
index 664410b5b..d4e87152f 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -4,7 +4,10 @@
- Technigo React Vite Boiler Plate
+ Stoppa Proppen
+
+
+
diff --git a/frontend/package.json b/frontend/package.json
index 7b2747e94..e593e22f5 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -10,8 +10,15 @@
"preview": "vite preview"
},
"dependencies": {
+ "date-fns": "^4.1.0",
+ "framer-motion": "^12.34.0",
"react": "^18.2.0",
- "react-dom": "^18.2.0"
+ "react-dom": "^18.2.0",
+ "react-router-dom": "^7.13.0",
+ "react-toastify": "^11.0.5",
+ "styled-components": "^6.3.9",
+ "usehooks-ts": "^3.1.1",
+ "zustand": "^5.0.11"
},
"devDependencies": {
"@types/react": "^18.2.15",
diff --git a/frontend/public/_redirects b/frontend/public/_redirects
new file mode 100644
index 000000000..50a463356
--- /dev/null
+++ b/frontend/public/_redirects
@@ -0,0 +1 @@
+/* /index.html 200
\ No newline at end of file
diff --git a/frontend/public/vite.svg b/frontend/public/vite.svg
deleted file mode 100644
index e7b8dfb1b..000000000
--- a/frontend/public/vite.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
index 0a24275e6..bdafdb9e9 100644
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -1,8 +1,36 @@
+import LandingPage from "./pages/LandingPage";
+import { ThemeProvider } from "styled-components";
+import GlobalStyles from "./styles/Globalstyles";
+import { theme } from "./styles/theme";
+import { BrowserRouter, Routes, Route, Navigate } from "react-router-dom";
+import LoginPage from "./pages/LoginPage";
+import MedicinPage from "./pages/MedicinPage";
+import FaqPage from "./pages/FaqPage";
+import OmOssPage from "./pages/OmossPage";
+import HurdetFungerar from "./pages/Hurdetfungerarpage"
+import ProtectedRoute from "./components/ProtectedRoute";
+import ProfilPage from "./pages/ProfilPage";
+
export const App = () => {
return (
- <>
-
+
+ Här hittar du svar på de vanligaste frågorna om appen,
+ symtomkollen och medicinpåminnelser. Hittar du inte svar?
+ Hör gärna av dig till oss.
+
+
+
+ {/* Accordion per category */}
+ {FAQ_DATA.map((cat, ci) => (
+