Develop

.env

@@ -9,4 +9,11 @@ DEV_DB_HOST=localhost
 DEV_DB_PORT=5432
 
 # JWT Secret Key
-JWT_SECRET="NKrbO2lpCsOpVAlqAPsjZ0tZXzIoKru7gAmYZ7XlHn0="
+JWT_SECRET="NKrbO2lpCsOpVAlqAPsjZ0tZXzIoKru7gAmYZ7XlHn0=qqwqeq"
+
+[email protected]
+EMAIL_PASSWORD=passwor
+EMAIL_HOST=smtp.gmail.com
+EMAIL_PORT=465
+APP_PASSWORD=password
+EMAIL_ENABLE=false

.github/workflows/deploy.yml

@@ -0,0 +1,41 @@
+name: Deploy to Staging
+
+on:
+  push:
+    branches:
+      - staging
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [22.x]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Set up SSH
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+          SSH_PASSPHRASE: ${{ secrets.SSH_PASSPHRASE }}
+        run: |
+          mkdir -p ~/.ssh
+          echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+          eval $(ssh-agent -s)
+          echo "$SSH_PASSPHRASE" | ssh-add ~/.ssh/id_rsa
+
+      - name: Deploy to DigitalOcean Droplet
+        env:
+          DO_USERNAME: ${{ secrets.DO_USERNAME }}
+        run: |
+          ssh -o StrictHostKeyChecking=no $DO_USERNAME@your_droplet_ip << EOF
+          cd ~/bluewave-onboarding && git pull && docker compose down && docker compose build && docker compose up -d
+          EOF

.github/workflows/node.js.yml

@@ -20,7 +20,38 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
-          cache: 'npm'
+
+      # Clear npm cache
+      - name: Clear npm cache
+        run: npm cache clean --force
+
+      # Remove node_modules and package-lock.json for backend
+      - name: Remove backend node_modules and package-lock.json
+        run: |
+          rm -rf ./backend/node_modules ./backend/package-lock.json
+
+      # Remove node_modules and package-lock.json for frontend
+      - name: Remove frontend node_modules and package-lock.json
+        run: |
+          rm -rf ./frontend/node_modules ./frontend/package-lock.json
+
+      # Cache backend dependencies
+      - name: Cache backend dependencies
+        uses: actions/cache@v3
+        with:
+          path: ./backend/node_modules
+          key: backend-node-modules-${{ matrix.node-version }}-${{ hashFiles('backend/package-lock.json') }}
+          restore-keys: |
+            backend-node-modules-${{ matrix.node-version }}-
+
+      # Cache frontend dependencies
+      - name: Cache frontend dependencies
+        uses: actions/cache@v3
+        with:
+          path: ./frontend/node_modules
+          key: frontend-node-modules-${{ matrix.node-version }}-${{ hashFiles('frontend/package-lock.json') }}
+          restore-keys: |
+            frontend-node-modules-${{ matrix.node-version }}-
 
       - name: Install dependencies for backend
         working-directory: ./backend
@@ -58,4 +89,4 @@ jobs:
         run: npm test
 
       - name: Run Docker container
-        run: docker-compose up --build -d
+        run: docker compose up --build -d

backend/.env

@@ -0,0 +1,11 @@
+# Node environment
+NODE_ENV=development
+
+# Development environment
+DEV_DB_USERNAME=user123
+DEV_DB_PASSWORD=password123
+DEV_DB_NAME=onboarding_db
+DEV_DB_HOST=localhost
+DEV_DB_PORT=5432
+
+EMAIL_ENABLE=false

backend/index.js

@@ -12,7 +12,8 @@ const authRoutes = require('./src/routes/auth.routes');
 const userRoutes = require('./src/routes/user.routes');
 const mocks = require('./src/routes/mocks.routes');
 const popup = require('./src/routes/popup.routes');
-const popup_log = require('./src/routes/popup_log.routes');
+const popup_log = require('./src/routes/popuplog.routes');
+const banner = require('./src/routes/banner.routes');
 // const tourRoutes = require('./src/routes/tour.routes');
 
 const app = express();
@@ -35,12 +36,13 @@ sequelize
   .then(() => console.log("Models synced with the database..."))
   .catch((err) => console.log("Error syncing models: " + err));
 
-app.use('/auth', authRoutes);
-app.use('/users', userRoutes);
-app.use('/mock/', mocks);
-app.use('/popup', popup);
-app.use('/popup_log', popup_log);
-// app.use('/tours', tourRoutes);
+app.use('/api/auth', authRoutes);
+app.use('/api/users', userRoutes);
+app.use('/api/mock/', mocks);
+app.use('/api/popup', popup);
+app.use('/api/popup_log', popup_log);
+app.use('/api/banner', banner);
+// app.use('/api/tours', tourRoutes);
 
 app.use((err, req, res, next) => {
   console.error(err.stack);

backend/migrations/20240422214219-create_users_table.js

@@ -1,5 +1,3 @@
-"use strict";
-
 /** @type {import('sequelize-cli').Migration} */
 module.exports = {
   up: async (queryInterface, Sequelize) => {

backend/migrations/20240601230258-create-popup-table.js

@@ -1,5 +1,3 @@
-"use strict";
-
 module.exports = {
   up: async (queryInterface, Sequelize) => {
     await queryInterface.createTable("popup", {

backend/migrations/20240605215441-add-createdBy-to-popup.js

@@ -1,5 +1,3 @@
-"use strict";
-
 module.exports = {
   up: async (queryInterface, Sequelize) => {
     await queryInterface.addColumn("popup", "createdBy", {

backend/migrations/20240617070351-create_tokens_table.js

@@ -1,5 +1,3 @@
-"use strict";
-
 module.exports = {
   up: async (queryInterface, Sequelize) => {
     await queryInterface.createTable("tokens", {

backend/migrations/20240906060143-add-name-surname-to-users.js

@@ -0,0 +1,23 @@
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.addColumn("users", "name", {
+      type: Sequelize.STRING(50),
+      allowNull: false,
+    });
+    await queryInterface.addColumn("users", "surname", {
+      type: Sequelize.STRING(50),
+    });
+    await queryInterface.removeColumn("users", "username");
+  },
+
+  down: async (queryInterface, Sequelize) => {
+    await queryInterface.removeColumn("users", "name");
+    await queryInterface.removeColumn("users", "surname");
+    await queryInterface.addColumn("users", "username", {
+      type: Sequelize.STRING(50),
+      allowNull: false,
+      unique: true
+    });
+  },
+};

backend/package.json

@@ -20,9 +20,10 @@
     "dotenv": "^16.4.5",
     "express": "^4.19.2",
     "express-validator": "^7.1.0",
+    "handlebars": "^4.7.8",
     "helmet": "^7.1.0",
     "jsonwebtoken": "^9.0.2",
-    "nodemailer": "^6.9.14",
+    "nodemailer": "^6.9.15",
     "pg": "^8.11.5",
     "sequelize": "^6.37.3"
   },

backend/src/controllers/auth.controller.js

@@ -4,21 +4,23 @@ const User = db.User;
 const Token = db.Token;
 const { generateToken, verifyToken } = require("../utils/jwt");
 const crypto = require('crypto');
-const nodemailer = require('nodemailer');
 const { TOKEN_LIFESPAN } = require('../utils/constants');
+const { sendSignupEmail, sendPasswordResetEmail } = require('../service/email.service');
 
 const register = async (req, res) => {
   try {
-    const { username, email, password } = req.body;
+    const { name, surname, email, password } = req.body;
     const existingUser = await User.findOne({ where: { email } });
-    if (existingUser) return res.status(400).json({ error: "User already exists" });
+    if (existingUser) return res.status(400).json({ error: "Email already exists" });
 
     const hashedPassword = await bcrypt.hash(password, 10);
-    const newUser = await User.create({ username, email, password: hashedPassword });
+    const newUser = await User.create({ name, surname, email, password: hashedPassword });
     const token = generateToken({ id: newUser.id, email: newUser.email });
 
     await Token.create({ token, userId: newUser.id, type: 'auth' });
 
+    await sendSignupEmail(newUser.email, newUser.name);
+
     res.status(201).json({ user: newUser, token });
   } catch (error) {
     console.error("Error registering user:", error);
@@ -79,18 +81,7 @@ const forgetPassword = async (req, res) => {
     const expiresAt = new Date(Date.now() + TOKEN_LIFESPAN);
     await Token.create({ token: hash, userId: user.id, type: 'reset', expiresAt });
 
-    const transporter = nodemailer.createTransport({
-      service: 'Gmail',
-      auth: { user: process.env.EMAIL, pass: process.env.EMAIL_PASSWORD }
-    });
-
-    const mailOptions = {
-      to: user.email,
-      subject: 'Password Reset',
-      text: `Please use this token to reset your password: ${resetToken}`
-    };
-
-    await transporter.sendMail(mailOptions);
+    await sendPasswordResetEmail(user.email, user.name, resetToken);
     res.status(200).json({ message: "Password reset token sent" });
   } catch (error) {
     console.error("Error in forget password:", error);
@@ -119,4 +110,4 @@ const resetPassword = async (req, res) => {
   }
 };
 
-module.exports = { register, login, logout, forgetPassword, resetPassword };
+module.exports = { register, login, logout, forgetPassword, resetPassword };