Forced merge: merge ai-dev into master

backend/src/routes/courses.js

@@ -10,7 +10,6 @@ const { parse } = require('json2csv');
 
 const { checkCrudPermissions } = require('../middlewares/check-permissions');
 
-router.use(checkCrudPermissions('courses'));
 
 /**
  *  @swagger

backend/src/routes/courses.js.temp

@@ -0,0 +1,439 @@
+const express = require('express');
+
+const CoursesService = require('../services/courses');
+const CoursesDBApi = require('../db/api/courses');
+const wrapAsync = require('../helpers').wrapAsync;
+
+const router = express.Router();
+
+const { parse } = require('json2csv');
+
+const { checkCrudPermissions } = require('../middlewares/check-permissions');
+
+
+ *  @swagger
+ *  components:
+ *    schemas:
+ *      Courses:
+ *        type: object
+ *        properties:
+
+ *          title:
+ *            type: string
+ *            default: title
+ *          description:
+ *            type: string
+ *            default: description
+
+ */
+
+/**
+ *  @swagger
+ * tags:
+ *   name: Courses
+ *   description: The Courses managing API
+ */
+
+/**
+ *  @swagger
+ *  /api/courses:
+ *    post:
+ *      security:
+ *        - bearerAuth: []
+ *      tags: [Courses]
+ *      summary: Add new item
+ *      description: Add new item
+ *      requestBody:
+ *        required: true
+ *        content:
+ *          application/json:
+ *            schema:
+ *              properties:
+ *                data:
+ *                  description: Data of the updated item
+ *                  type: object
+ *                  $ref: "#/components/schemas/Courses"
+ *      responses:
+ *        200:
+ *          description: The item was successfully added
+ *          content:
+ *            application/json:
+ *              schema:
+ *                $ref: "#/components/schemas/Courses"
+ *        401:
+ *          $ref: "#/components/responses/UnauthorizedError"
+ *        405:
+ *          description: Invalid input data
+ *        500:
+ *          description: Some server error
+ */
+router.post(
+  '/',
+  wrapAsync(async (req, res) => {
+    const referer =
+      req.headers.referer ||
+      `${req.protocol}://${req.hostname}${req.originalUrl}`;
+    const link = new URL(referer);
+    await CoursesService.create(
+      req.body.data,
+      req.currentUser,
+      true,
+      link.host,
+    );
+    const payload = true;
+    res.status(200).send(payload);
+  }),
+);
+
+/**
+ * @swagger
+ * /api/budgets/bulk-import:
+ *  post:
+ *    security:
+ *      - bearerAuth: []
+ *    tags: [Courses]
+ *    summary: Bulk import items
+ *    description: Bulk import items
+ *    requestBody:
+ *      required: true
+ *      content:
+ *        application/json:
+ *         schema:
+ *          properties:
+ *            data:
+ *              description: Data of the updated items
+ *              type: array
+ *              items:
+ *                $ref: "#/components/schemas/Courses"
+ *    responses:
+ *      200:
+ *        description: The items were successfully imported
+ *    content:
+ *      application/json:
+ *        schema:
+ *          $ref: "#/components/schemas/Courses"
+ *      401:
+ *        $ref: "#/components/responses/UnauthorizedError"
+ *      405:
+ *        description: Invalid input data
+ *      500:
+ *        description: Some server error
+ *
+ */
+router.post(
+  '/bulk-import',
+  wrapAsync(async (req, res) => {
+    const referer =
+      req.headers.referer ||
+      `${req.protocol}://${req.hostname}${req.originalUrl}`;
+    const link = new URL(referer);
+    await CoursesService.bulkImport(req, res, true, link.host);
+    const payload = true;
+    res.status(200).send(payload);
+  }),
+);
+
+/**
+ *  @swagger
+ *  /api/courses/{id}:
+ *    put:
+ *      security:
+ *        - bearerAuth: []
+ *      tags: [Courses]
+ *      summary: Update the data of the selected item
+ *      description: Update the data of the selected item
+ *      parameters:
+ *        - in: path
+ *          name: id
+ *          description: Item ID to update
+ *          required: true
+ *          schema:
+ *            type: string
+ *      requestBody:
+ *        description: Set new item data
+ *        required: true
+ *        content:
+ *          application/json:
+ *            schema:
+ *              properties:
+ *                id:
+ *                  description: ID of the updated item
+ *                  type: string
+ *                data:
+ *                  description: Data of the updated item
+ *                  type: object
+ *                  $ref: "#/components/schemas/Courses"
+ *              required:
+ *                - id
+ *      responses:
+ *        200:
+ *          description: The item data was successfully updated
+ *          content:
+ *            application/json:
+ *              schema:
+ *                $ref: "#/components/schemas/Courses"
+ *        400:
+ *          description: Invalid ID supplied
+ *        401:
+ *          $ref: "#/components/responses/UnauthorizedError"
+ *        404:
+ *          description: Item not found
+ *        500:
+ *          description: Some server error
+ */
+router.put(
+  '/:id',
+  wrapAsync(async (req, res) => {
+    await CoursesService.update(req.body.data, req.body.id, req.currentUser);
+    const payload = true;
+    res.status(200).send(payload);
+  }),
+);
+
+/**
+ * @swagger
+ *  /api/courses/{id}:
+ *    delete:
+ *      security:
+ *        - bearerAuth: []
+ *      tags: [Courses]
+ *      summary: Delete the selected item
+ *      description: Delete the selected item
+ *      parameters:
+ *        - in: path
+ *          name: id
+ *          description: Item ID to delete
+ *          required: true
+ *          schema:
+ *            type: string
+ *      responses:
+ *        200:
+ *          description: The item was successfully deleted
+ *          content:
+ *            application/json:
+ *              schema:
+ *                $ref: "#/components/schemas/Courses"
+ *        400:
+ *          description: Invalid ID supplied
+ *        401:
+ *          $ref: "#/components/responses/UnauthorizedError"
+ *        404:
+ *          description: Item not found
+ *        500:
+ *          description: Some server error
+ */
+router.delete(
+  '/:id',
+  wrapAsync(async (req, res) => {
+    await CoursesService.remove(req.params.id, req.currentUser);
+    const payload = true;
+    res.status(200).send(payload);
+  }),
+);
+
+/**
+ *  @swagger
+ *  /api/courses/deleteByIds:
+ *    post:
+ *      security:
+ *        - bearerAuth: []
+ *      tags: [Courses]
+ *      summary: Delete the selected item list
+ *      description: Delete the selected item list
+ *      requestBody:
+ *        required: true
+ *        content:
+ *          application/json:
+ *            schema:
+ *              properties:
+ *                ids:
+ *                  description: IDs of the updated items
+ *                  type: array
+ *      responses:
+ *        200:
+ *          description: The items was successfully deleted
+ *          content:
+ *            application/json:
+ *              schema:
+ *                $ref: "#/components/schemas/Courses"
+ *        401:
+ *          $ref: "#/components/responses/UnauthorizedError"
+ *        404:
+ *          description: Items not found
+ *        500:
+ *          description: Some server error
+ */
+router.post(
+  '/deleteByIds',
+  wrapAsync(async (req, res) => {
+    await CoursesService.deleteByIds(req.body.data, req.currentUser);
+    const payload = true;
+    res.status(200).send(payload);
+  }),
+);
+
+/**
+ *  @swagger
+ *  /api/courses:
+ *    get:
+ *      security:
+ *        - bearerAuth: []
+ *      tags: [Courses]
+ *      summary: Get all courses
+ *      description: Get all courses
+ *      responses:
+ *        200:
+ *          description: Courses list successfully received
+ *          content:
+ *            application/json:
+ *              schema:
+ *                type: array
+ *                items:
+ *                  $ref: "#/components/schemas/Courses"
+ *        401:
+ *          $ref: "#/components/responses/UnauthorizedError"
+ *        404:
+ *          description: Data not found
+ *        500:
+ *          description: Some server error
+ */
+router.get(
+  '/',
+  wrapAsync(async (req, res) => {
+    const filetype = req.query.filetype;
+
+    const currentUser = req.currentUser;
+    const payload = await CoursesDBApi.findAll(req.query, { currentUser });
+    if (filetype && filetype === 'csv') {
+      const fields = ['id', 'title', 'description'];
+      const opts = { fields };
+      try {
+        const csv = parse(payload.rows, opts);
+        res.status(200).attachment(csv);
+        res.send(csv);
+      } catch (err) {
+        console.error(err);
+      }
+    } else {
+      res.status(200).send(payload);
+    }
+  }),
+);
+
+/**
+ *  @swagger
+ *  /api/courses/count:
+ *    get:
+ *      security:
+ *        - bearerAuth: []
+ *      tags: [Courses]
+ *      summary: Count all courses
+ *      description: Count all courses
+ *      responses:
+ *        200:
+ *          description: Courses count successfully received
+ *          content:
+ *            application/json:
+ *              schema:
+ *                type: array
+ *                items:
+ *                  $ref: "#/components/schemas/Courses"
+ *        401:
+ *          $ref: "#/components/responses/UnauthorizedError"
+ *        404:
+ *          description: Data not found
+ *        500:
+ *          description: Some server error
+ */
+router.get(
+  '/count',
+  wrapAsync(async (req, res) => {
+    const currentUser = req.currentUser;
+    const payload = await CoursesDBApi.findAll(req.query, null, {
+      countOnly: true,
+      currentUser,
+    });
+
+    res.status(200).send(payload);
+  }),
+);
+
+/**
+ *  @swagger
+ *  /api/courses/autocomplete:
+ *    get:
+ *      security:
+ *        - bearerAuth: []
+ *      tags: [Courses]
+ *      summary: Find all courses that match search criteria
+ *      description: Find all courses that match search criteria
+ *      responses:
+ *        200:
+ *          description: Courses list successfully received
+ *          content:
+ *            application/json:
+ *              schema:
+ *                type: array
+ *                items:
+ *                  $ref: "#/components/schemas/Courses"
+ *        401:
+ *          $ref: "#/components/responses/UnauthorizedError"
+ *        404:
+ *          description: Data not found
+ *        500:
+ *          description: Some server error
+ */
+router.get('/autocomplete', async (req, res) => {
+  const payload = await CoursesDBApi.findAllAutocomplete(
+    req.query.query,
+    req.query.limit,
+    req.query.offset,
+  );
+
+  res.status(200).send(payload);
+});
+
+/**
+ * @swagger
+ *  /api/courses/{id}:
+ *    get:
+ *      security:
+ *        - bearerAuth: []
+ *      tags: [Courses]
+ *      summary: Get selected item
+ *      description: Get selected item
+ *      parameters:
+ *        - in: path
+ *          name: id
+ *          description: ID of item to get
+ *          required: true
+ *          schema:
+ *            type: string
+ *      responses:
+ *        200:
+ *          description: Selected item successfully received
+ *          content:
+ *            application/json:
+ *              schema:
+ *                $ref: "#/components/schemas/Courses"
+ *        400:
+ *          description: Invalid ID supplied
+ *        401:
+ *          $ref: "#/components/responses/UnauthorizedError"
+ *        404:
+ *          description: Item not found
+ *        500:
+ *          description: Some server error
+ */
+router.get(
+  '/:id',
+  wrapAsync(async (req, res) => {
+    const payload = await CoursesDBApi.findBy({ id: req.params.id });
+
+    res.status(200).send(payload);
+  }),
+);
+
+router.use('/', require('../helpers').commonErrorHandler);
+
+module.exports = router;

frontend/next.config.mjs

@@ -50,6 +50,10 @@ const nextConfig = {
         source: '/about',
         destination: '/web_pages/about',
       },
+      {
+        source: '/courses',
+        destination: '/web_pages/courses',
+      },
     ];
   },
 };

frontend/src/components/AsideMenuItem.tsx

@@ -1,6 +1,8 @@
 import React from 'react';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
+import BaseIcon from './BaseIcon';
+
 import { useAppSelector } from '../stores/hooks';
 import { MenuAsideItem } from '../interfaces';
 
@@ -17,14 +19,16 @@ const AsideMenuItem = ({ item }: Props) => {
   const activeClass = isActive ? 'border-b-2 border-blue-600' : '';
 
   return (
-    <li>
+    <li title={item.label}>
       {item.withDevider && <hr className={`${borders} my-2`} />}
       {item.href ? (
-        <Link href={item.href} target={item.target} className={`${baseClass} ${activeClass}`}> 
+        <Link href={item.href} target={item.target} title={item.label} className={`${baseClass} ${activeClass}`}>
-          {item.label}
+          <BaseIcon path={item.icon} size="20" />
         </Link>
       ) : (
-        <span className={`${baseClass} ${activeClass}`}>{item.label}</span>
+        <span title={item.label} className={`${baseClass} ${activeClass}`}>
+          <BaseIcon path={item.icon} size="20" />
+        </span>
       )}
     </li>
   );

frontend/src/components/Logo/index.tsx

@@ -6,10 +6,6 @@ type Props = {
 
 export default function Logo({ className = '' }: Props) {
   return (
-    <img
+  <div className={className}>App</div>
-      src={'https://flatlogic.com/logo.svg'}
-      className={className}
-      alt={'Flatlogic logo'}
-    ></img>
   );
 }

frontend/src/css/_app.css

@@ -1,3 +1,10 @@
+@layer base {
+  /* Global reset */
+  * { @apply m-0 p-0; }
+  /* System font and smaller text */
+  body { @apply font-sans text-sm; }
+}
+
 html {
   @apply h-full;
 }

frontend/src/css/_table.css

@@ -8,8 +8,7 @@
   }
 
   tr {
-    @apply max-w-full block relative border-b-4 border-gray-100
+    @apply max-w-full block relative lg:table-row;
-      lg:table-row lg:border-b-0 dark:border-slate-800;
   }
 
   tr:last-child {

frontend/src/layouts/Authenticated.tsx

@@ -8,9 +8,7 @@ import BaseIcon from '../components/BaseIcon';
 import NavBar from '../components/NavBar';
 import NavBarItemPlain from '../components/NavBarItemPlain';
 import AsideMenu from '../components/AsideMenu';
-import FooterBar from '../components/FooterBar';
 import { useAppDispatch, useAppSelector } from '../stores/hooks';
-import Search from '../components/Search';
 import { useRouter } from 'next/router';
 import { findMe, logoutUser } from '../stores/authSlice';
 
@@ -114,9 +112,6 @@ export default function LayoutAuthenticated({
           >
             <BaseIcon path={mdiMenu} size='24' />
           </NavBarItemPlain>
-          <NavBarItemPlain useMargin>
-            <Search />
-          </NavBarItemPlain>
         </NavBar>
         <AsideMenu
           isAsideMobileExpanded={isAsideMobileExpanded}
@@ -125,7 +120,6 @@ export default function LayoutAuthenticated({
           onAsideLgClose={() => setIsAsideLgActive(false)}
         />
         {children}
-        <FooterBar>Hand-crafted & Made with ❤️</FooterBar>
       </div>
     </div>
   );

frontend/src/menuNavBar.ts

@@ -51,6 +51,10 @@ export const webPagesNavBar = [
     href: '/faq',
     label: 'FAQ',
   },
+  {
+    href: '/courses',
+    label: 'courses',
+  },
   {
     href: '/services',
     label: 'services',

frontend/src/pages/web_pages/courses.tsx

@@ -0,0 +1,68 @@
+import React, { useEffect, useState } from 'react';
+import axios from 'axios';
+import type { ReactElement } from 'react';
+import Head from 'next/head';
+import LayoutGuest from '../../layouts/Guest';
+import WebSiteHeader from '../../components/WebPageComponents/Header';
+import WebSiteFooter from '../../components/WebPageComponents/Footer';
+
+export default function CoursesPage() {
+  const projectName = 'test i18';
+  const [courses, setCourses] = useState([]);
+
+  useEffect(() => {
+    const darkElement = document.querySelector('body .dark');
+    if (darkElement) {
+      darkElement.classList.remove('dark');
+    }
+    // Fetch public courses list
+    axios.get('/courses')
+      .then(response => {
+        const list = Array.isArray(response.data.rows) ? response.data.rows : [];
+        setCourses(list);
+      })
+      .catch(error => console.error(error));
+  }, []);
+
+
+  return (
+    <div className="flex flex-col min-h-screen">
+      <Head>
+        <title>{`Courses - ${projectName}`}</title>
+        <meta
+          name="description"
+          content={`Access our list of courses on ${projectName}.`}
+        />
+      </Head>
+      <WebSiteHeader projectName={projectName} />
+      <main className="flex-grow bg-white rounded-none p-4">
+        <div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-4">
+          {courses.map((course) => (
+            <div key={course.id} className="bg-gray-100 p-4 rounded shadow">
+              <h3 className="text-lg font-semibold">{course.title}</h3>
+              {course.instructors && course.instructors.length > 0 && (
+                <div className="mt-2">
+                  <h4 className="text-sm font-semibold">Instructors:</h4>
+                  <p className="text-gray-600">{course.instructors.map(i => i.first_name + ' ' + i.last_name).join(', ')}</p>
+                </div>
+              )}
+              {course.students && course.students.length > 0 && (
+                <div className="mt-2">
+                  <h4 className="text-sm font-semibold">Students:</h4>
+                  <p className="text-gray-600">{course.students.length} students</p>
+                </div>
+              )}
+
+              <p className="text-gray-700">{course.description}</p>
+            </div>
+          ))}
+        </div>
+      </main>
+      <WebSiteFooter projectName={projectName} />
+    </div>
+  );
+}
+
+CoursesPage.getLayout = function getLayout(page: ReactElement) {
+  return <LayoutGuest>{page}</LayoutGuest>;
+};

frontend/src/styles.ts

@@ -41,7 +41,7 @@ export const white: StyleObject = {
   cardsColor: 'bg-white',
   focusRingColor: 'focus:ring focus:ring-blue-300 focus:outline-none',
   corners: '',
-  cardsStyle: 'bg-white border border-gray-200',
+  cardsStyle: 'bg-white',
   linkColor: 'text-blue-600',
   websiteHeder: 'border-b border-gray-200',
   borders: 'border-gray-200',