@gnar-engine/cli 1.0.3 → 1.0.5

package/bootstrap/services/portal/src/ui/collapsible/collapsible.less

@@ -1,23 +0,0 @@
-.collapsible-header {
-    display: flex;
-    justify-content: space-between;
-
-    h3 {
-        margin: 0px;
-    }
-
-    &:hover {
-        cursor: pointer;
-    }
-}
-
-.collapsible-content {
-    overflow: hidden;
-    transition-duration: 0.5s;
-}
-.collapsible-content-open {
-    margin-top: 30px;
-}
-.collapsible-content-inner ul {
-    margin: 0px;
-}

package/bootstrap/services/portal/src/ui/customCheckbox/CustomCheckbox.jsx

@@ -1,17 +0,0 @@
-import React from "react";
-
-
-const CustomCheckbox = ({name, label, checked, setChecked}) => {
-    
-    return (
-        <div
-            className={`custom-checkbox ${checked && 'checked'}`}
-            onClick={(e) => e.stopPropagation()} 
-        >
-            <input type="checkbox" id={name} name={name} checked={checked} onChange={() => setChecked(!checked)} />
-            <label htmlFor={name}>{label}</label>
-        </div>
-    )
-}
-
-export default CustomCheckbox;

package/bootstrap/services/portal/src/ui/customCheckbox/customCheckbox.less

@@ -1,42 +0,0 @@
-.custom-checkbox {
-    position: relative;
-    margin-top: 15px;
-    margin-bottom: 10px;
-    
-    input {
-        opacity: 0;
-        position: absolute;
-        left: 0px;
-        min-width: 18px;
-        min-height: 18px;
-
-        &:hover {
-            cursor: pointer;
-        }
-    }
-    label {
-        padding-left: 20px;
-        transition-duration: 0.1s;
-        box-sizing: border-box;
-        
-        &:hover {
-            cursor: pointer;
-            opacity: 0.8;
-        }
-    }
-    
-    &:before {
-        content: '';
-        min-width: 18px;
-        min-height: 18px;
-        background: #F6F8F9;
-        border: 1px solid #E4E4E4;
-        border-radius: 6px;
-        position: absolute;
-        left: 0px;
-    }
-    &.checked:before {
-        content: '';
-        background: #F6F8F9 url('../assets/check.svg') no-repeat center center;
-    }
-}

package/bootstrap/services/portal/src/ui/customMultiSelect/CustomMultiSelect.jsx

@@ -1,63 +0,0 @@
-import React, { useState } from "react";
-
-const CustomMultiSelect = ({placeholder, name, options, labelKey, icon = null, setSelectedOption, selectedOptions}) => {
-
-    const [isOpen, setIsOpen] = useState(false);
-    const [isClosing, setIsClosing] = useState(false);
-
-    // Close dropdown 
-    const closeDropdown = () => {
-        setIsClosing(true);
-        setIsOpen(false);  
-        setTimeout(() => {
-            setIsClosing(false); 
-        }, 300); 
-    };
-
-    // Open dropdown
-    const openDropdown = () => {
-        setIsOpen(true);
-        setIsClosing(false);
-    };
-
-    // Handle click for opening and closing
-    const handleClick = () => {
-        if (!isOpen) {
-            openDropdown();
-        } else {
-            closeDropdown();
-        }
-    };
-
-    return (
-        <>
-        {placeholder && name && setSelectedOption && 
-            <div className={`custom-select ${isOpen && "open"} ${isClosing ? "closing" : ""}`}>
-                <div className="custom-select-input" id={name} name={name} onClick={handleClick}>
-                    {icon && <img src={icon} alt="icon" />}
-                    {selectedOptions && selectedOptions.length >= 1 && selectedOptions[0] && selectedOptions[0][labelKey] ? (
-                        selectedOptions.map((selectedOption, index) => (
-                            <span>{selectedOption[labelKey]} {index + 1 !== selectedOptions.length && ', '}</span>
-                        ))
-                    ) : (
-                        <span>{placeholder}</span>
-                    )}
-                </div>
-                {isOpen && (
-                    <div className="custom-select-options" onMouseLeave={closeDropdown}>
-                        <div className="custom-select-options-inner">
-                            {options && options.map((option, index) => (
-                                <div key={index} className="custom-select-option" onClick={() => {setSelectedOption(option)}}> 
-                                    <span>{option[labelKey]}</span>
-                                </div>
-                            ))}
-                        </div>
-                    </div>
-                )}
-            </div>
-        }
-        </>
-    )
-}
-
-export default CustomMultiSelect;

package/bootstrap/services/portal/src/ui/customMultiSelect/CustomMultiSelectPeriod.jsx

@@ -1,63 +0,0 @@
-import React, {useState, useEffect, useRef} from "react";
-
-const CustomMultiSelectPeriod = ({placeholder, name, options, icon = null, setSelectedOption, selectedOptions}) => {
-
-    const [isOpen, setIsOpen] = useState(false);
-    const [isClosing, setIsClosing] = useState(false);
-
-    // Close dropdown 
-    const closeDropdown = () => {
-        setIsClosing(true);
-        setIsOpen(false);  
-        setTimeout(() => {
-            setIsClosing(false); 
-        }, 300); 
-    };
-
-    // Open dropdown
-    const openDropdown = () => {
-        setIsOpen(true);
-        setIsClosing(false);
-    };
-
-    // Handle click for opening and closing
-    const handleClick = () => {
-        if (!isOpen) {
-            openDropdown();
-        } else {
-            closeDropdown();
-        }
-    };
-
-    return (
-        <>
-        {placeholder && name && options && setSelectedOption && selectedOptions &&
-            <div className={`custom-select ${isOpen && "open"} ${isClosing ? "closing" : ""}`}>
-                <div className="custom-select-input" id={name} name={name} onClick={handleClick}>
-                    {icon && <img src={icon} alt="icon" />}
-                    {selectedOptions.length >= 1 && selectedOptions[0] && selectedOptions[0].period_name ? (
-                        selectedOptions.map((selectedPeriod, index) => (
-                            <span>{selectedPeriod.period_name} {selectedPeriod.calendar_year} {index + 1 !== selectedOptions.length && ', '}</span>
-                        ))
-                    ) : (
-                        <span>{placeholder}</span>
-                    )}
-                </div>
-                {isOpen && (
-                    <div className="custom-select-options" onMouseLeave={closeDropdown}>
-                        <div className="custom-select-options-inner">
-                            {options.map((period, index) => (
-                                <div key={index} className="custom-select-option" onClick={() => {setSelectedOption(period)}}> 
-                                    <span>{period.period_name} {period.calendar_year}</span>
-                                </div>
-                            ))}
-                        </div>
-                    </div>
-                )}
-            </div>
-        }
-        </>
-    )
-}
-
-export default CustomMultiSelectPeriod;

package/bootstrap/services/portal/src/ui/goBack/GoBack.jsx

@@ -1,19 +0,0 @@
-import React from "react";
-import { Link, useNavigate } from "react-router-dom";
-
-
-export default function GoBack({text}) {
-
-    const navigate = useNavigate();
-
-    function handleGoBack() {
-        navigate(-1);
-    }
-
-    return (
-        <a onClick={handleGoBack}>
-            <img className="cross" src={require('../../assets/x.svg').default} alt="back" />
-            {text}
-        </a>
-    )
-}

package/bootstrap/services/portal/src/ui/loader/Loader.jsx

@@ -1,12 +0,0 @@
-import React from 'react';
-
-function Loader() {
-
-    return (
-        <div className="loader">
-            <div className="loader__spinner">Loading...</div>
-        </div>
-    );
-}
-
-export default Loader;

package/bootstrap/services/portal/src/ui/pagination/Pagination.jsx

@@ -1,23 +0,0 @@
-import React from 'react';
-
-const Pagination = ({ numPages, currentPage, setCurrentPage }) => {
-    const handlePageChange = (page) => {
-        setCurrentPage(page);
-    };
-
-    return (
-        <div className="pagination">
-            {Array.from({ length: numPages }, (_, i) => (
-                <button
-                    key={i}
-                    onClick={() => handlePageChange(i + 1)}
-                    disabled={currentPage === i + 1}
-                >
-                    {i + 1}
-                </button>
-            ))}
-        </div>
-    );
-};
-
-export default Pagination;

package/bootstrap/services/portal/src/ui/repeater/Repeater.jsx

@@ -1,29 +0,0 @@
-import React from "react";
-
-const Repeater = ({ items = [], setItems, defaultItem, renderRow, buttonText }) => {
-
-    const addItem = () => {
-        setItems([...items, defaultItem]);
-    }
-
-    const updateItem = (index, newItem) => {
-        const newItems = [...items];
-        newItems[index] = newItem;
-        setItems(newItems);
-    };
-  
-    const removeItem = (index) => setItems(items.filter((_, i) => i !== index));
-
-    return (
-        <div>
-            {items.length > 0 && items.map((item, index) =>
-                renderRow(item, index, (newItem) => updateItem(index, newItem), () => removeItem(index))
-            )}
-            <div className="button-cont right">
-                <button className="mainButton wide" onClick={addItem}>{buttonText}</button>
-            </div>
-        </div>
-    );
-};
-
-export default Repeater;

package/bootstrap/services/portal/src/ui/saveButton/SaveButton.jsx

@@ -1,69 +0,0 @@
-import React, { useState, useEffect } from 'react';
-
-const SaveButton = ({ save, loading, textCreate, textCreateLoading, textCreateSuccess, textCreateError, textUpdate, textUpdateLoading, textUpdateSuccess, textUpdateError, isUpdating}) => {
-    
-    const [buttonText, setButtonText] = useState(textCreate || 'Save');
-
-    // Determine the button class name based on the loading state
-    const getButtonClassName = () => {
-        if (loading === 'loading') {
-            return 'btn-loading';
-        }
-    
-        if (loading === 'success') {
-            return 'success';
-        }
-    
-        if (loading === 'error') {
-            return 'error';
-        }
-    
-        if (isUpdating) {
-            return 'update';
-        } else {
-            return 'create';
-        }
-    };
-
-    useEffect(() => {
-        if (isUpdating) {
-            // If updating
-            switch (loading) {
-                case 'loading':
-                    setButtonText(textUpdateLoading || 'Updating...');
-                    break;
-                case 'success':
-                    setButtonText(textUpdateSuccess || 'Updated');
-                    break;
-                case 'error':
-                    setButtonText(textUpdateError || 'Error');
-                    break;
-                default:
-                    setButtonText(textUpdate || 'Update');
-                    break;
-            }
-        } else {
-            // If creating
-            switch (loading) {
-                case 'loading':
-                    setButtonText(textCreateLoading || 'Creating...');
-                    break;
-                case 'success':
-                    setButtonText(textCreateSuccess || 'Saved');
-                    break;
-                case 'error':
-                    setButtonText(textCreateError || 'Error');
-                    break;
-                default:
-                    setButtonText(textCreate || 'Save');
-                    break;
-            }
-        }
-    }, [loading, isUpdating, textCreate, textCreateLoading, textCreateSuccess, textCreateError, textUpdate, textUpdateLoading, textUpdateSuccess, textUpdateError]);
-
-    return (
-        <button className={getButtonClassName()} onClick={save}>{buttonText}</button>
-    );
-};
-
-export default SaveButton;

package/bootstrap/services/user/src/db/seeders/development/02-portal-admin-user.js

@@ -1,27 +0,0 @@
-import { logger } from '@gnar-engine/core';
-import { user } from '../../../services/user.service.js';
-
-/**
- * Up seeder
- */
-export const up = async () => {
-
-    // create root users using user service
-    const users = [];
-
-    users.push(await user.create({
-        email: 'alex@gnar.co.uk',
-        username: 'alexgnar',
-        password: 'gnarlybulkwash',
-        role: 'admin'
-    })); 
-
-    logger.info('Completed seeding root user data ' + JSON.stringify(users));
-}
-
-/**
- * Down seeder
- */
-export const down = async () => {
-    logger.info('Down seeder not implemented');
-}

package/bootstrap/services/user/src/tests/user.test.js

@@ -1,126 +0,0 @@
-const request = require('supertest');
-const url = 'http://localhost';
-
-describe('User API', () => {
-
-    let adminAuthToken;
-    let customerAuthToken;
-    let userId;
-    let testCustomerEmail;
-
-    beforeAll(async () => {
-        // check we are not in production mode
-        if (process.env.NODE_ENV === 'production') {
-            throw new Error('Do not run tests in production mode!');
-        }
-
-        testCustomerEmail = 'customertest13@gnar.co.uk';
-    });
-
-    // Test authenticate with email and password
-    it('POST /authenticate (as admin)', async () => {
-        const response = await request(url).post('/authenticate')
-        .set('Content-Type', 'application/json')
-        .send({
-            username: 'root@gnar.co.uk',
-            password: 'gn4rlyR00tP0rt4lP4ss'
-        });
-        console.log(response.body);
-        expect(response.status).toBe(200);
-        expect(response.body).toHaveProperty('token');
-
-        adminAuthToken = response.body.token;
-    });
-
-    // Create new customer user (success no auth required)
-    it('POST /users (create new customer user no auth required)', async () => {
-        const response = await request(url).post('/users')
-        .set('Content-Type', 'application/json')
-        .send({
-            user: 
-                {
-                    email: testCustomerEmail,
-                    password: 'password1234'
-                }
-        })
-        console.log(response.body);
-        expect(response.status).toBe(200);
-        expect(response.body.users[0].email).toBe(testCustomerEmail);
-
-        // Save the new user id
-        userId = response.body.users[0].id;
-        console.log('New user id: ' + userId);
-    });
-
-    // Test authenticate with new user
-    it('POST /authenticate (as new customer user)', async () => {
-        const response = await request(url).post('/authenticate')
-        .set('Content-Type', 'application/json')
-        .send({
-            username: testCustomerEmail,
-            password: 'password1234'
-        });
-        console.log(response.body);
-        expect(response.status).toBe(200);
-        expect(response.body).toHaveProperty('token');
-
-        customerAuthToken = response.body.token;
-    });
-
-    // Fetch single customer user (as customer)
-    it('GET /users/{id} (as customer)', async () => {
-        const response = await request(url).get('/users/' + userId)
-        .set('Authorization', 'Bearer ' + customerAuthToken);
-        console.log(response.body);
-        expect(response.status).toBe(200);
-    });
-
-    // Fetch all users (not authorised as customer)
-    it('GET /users (not authorised as customer)', async () => {
-        const response = await request(url).get('/users')
-        .set('Authorization', 'Bearer ' + customerAuthToken);
-        console.log(response.body);
-        expect(response.status).toBe(403);
-    });
-
-    // Fetch all users (success as admin)
-    it('GET /users (as admin)', async () => {
-        const response = await request(url).get('/users')
-        .set('Authorization', 'Bearer ' + adminAuthToken);
-        console.log(response.body);
-        expect(response.status).toBe(200);
-    });
-
-    // Update customer user (as customer)
-    it('POST /users/{id} (as customer)', async () => {
-        const response = await request(url).post('/users/' + userId)
-        .set('Authorization', 'Bearer ' + customerAuthToken)
-        .set('Content-Type', 'application/json')
-        .send({
-            email: 'changedcustomeremail2@gnar.co.uk'
-        });
-        console.log(response.body);
-        expect(response.status).toBe(200);
-        expect(response.body.user.email).toBe('changedcustomeremail2@gnar.co.uk');
-    });
-
-    // Update customer user (check cannot elevate role to admin)
-    it('POST /users/{id} (as customer)', async () => {
-        const response = await request(url).post('/users/' + userId)
-        .set('Authorization', 'Bearer ' + customerAuthToken)
-        .set('Content-Type', 'application/json')
-        .send({
-            role: 'service_admin'
-        });
-        console.log(response.body);
-        expect(response.status).toBe(403);
-    });-
-
-    // Delete customer user (as admin)
-    it('DELETE /users/{id} (as admin)', async () => {
-        const response = await request(url).delete('/users/' + userId)
-        .set('Authorization', 'Bearer ' + adminAuthToken);
-        console.log(response.body);
-        expect(response.status).toBe(200);
-    });
-});

package/templates/service/app.js.hbs

@@ -1,38 +0,0 @@
-import { message, http, logger, db } from '@gnar-engine/core';
-import { config } from './config.js';
-import { messageHandlers } from './controllers/message.controller.js';
-import { httpController as {{pascalCase serviceName}}PlatformHttpController } from './controllers/http.controller.js';
-
-/**
- * Initialise service
- */
-export const initService = async () => {
-
-	// Run migrations
-	db.migrations.runMigrations({config});
-	db.seeders.runSeeders({config});
-
-	// Import command handlers after the command bus is initialised
-	await import('./commands/{{lowerCasePlural serviceName}}.handler.js');
-	// Add more handlers as needed
-
-	// Initialise and register message handlers
-	await message.init({
-		config: config.message,
-		handlers: messageHandlers
-	});
-
-	// Register http routes
-	await http.registerRoutes({
-		controllers: [
-			{{pascalCase serviceName}}PlatformHttpController,
-		]
-	});
-
-	// Start the HTTP server
-	await http.start();
-
-	logger.info('G n a r  E n g i n e | {{capitaliseFirstLetter serviceName}} Service initialised successfully.');
-}
-
-initService();

package/templates/service/schema/{{serviceName}}.schema.js.hbs

@@ -1,14 +0,0 @@
-import { schema } from '@gnar-engine/core';
-import { config } from '../config.js';
-
-export const {{serviceName}}Schema = {
-    type: 'object',
-    properties: {
-        // Add your properties here
-        
-    },
-    required: [],
-    additionalProperties: false,
-};
-
-export const validate{{pascalCase serviceName}} = schema.compile({{serviceName}}Schema);