nodefony 6.5.7 → 6.10.0

package/cli/builder/bundles/users-bundle/Resources/graphiql/graphiql.jsx

@@ -1,6 +1,7 @@
-import * as React from "react";
+import React from 'react';
 import { render } from "react-dom";
 import GraphiQL from "graphiql";
+//import { createGraphiQLFetcher } from '@graphiql/toolkit';
 import "graphiql/graphiql.min.css";
 import "./index.css";
 const NODE_ENV = process.env.NODE_ENV ;
@@ -9,7 +10,7 @@ const config = process.env.GRAPHIQL ;
 
 const URL = config.url;
 
-function graphQLFetcher(graphQLParams) {
+function fetcher(graphQLParams) {
   return fetch(URL, {
     method: 'post',
     headers: {
@@ -19,12 +20,47 @@ function graphQLFetcher(graphQLParams) {
     body: JSON.stringify(graphQLParams),
     credentials: 'same-origin',
   }).then(response => response.json().then((ele)=>{
-    console.log(ele)
+    if(ele.error){
+      return ele.error;
+    }
     return ele.data;
+  }).catch(e =>{
+    throw e;
   }));
 }
 
 const defaultQuery = `
+# Welcome to GraphiQL
+#
+# GraphiQL is an in-browser tool for writing, validating, and
+# testing GraphQL queries.
+#
+# Type queries into this side of the screen, and you will see intelligent
+# typeaheads aware of the current GraphQL type schema and live syntax and
+# validation errors highlighted within the text.
+#
+# GraphQL queries typically start with a "{" character. Lines that start
+# with a # are ignored.
+#
+# An example GraphQL query might look like:
+#
+#     {
+#       field(arg: "value") {
+#         subField
+#       }
+#     }
+#
+# Keyboard shortcuts:
+#
+#  Prettify Query:  Shift-Ctrl-P (or press the prettify button above)
+#
+#     Merge Query:  Shift-Ctrl-M (or press the merge button above)
+#
+#       Run Query:  Ctrl-Enter (or press the play button above)
+#
+#   Auto Complete:  Ctrl-Space (or just start typing)
+#
+
 {
   user(username: "admin") {
     username
@@ -55,6 +91,6 @@ const Logo = () => {
 GraphiQL.Logo = Logo;
 
 render(
-  <GraphiQL fetcher={graphQLFetcher} defaultQuery={defaultQuery} />,
+  <GraphiQL fetcher={fetcher} defaultQuery={defaultQuery} />,
   container
 );

package/cli/builder/bundles/users-bundle/Resources/scss/users.scss

@@ -1,16 +1,7 @@
 @import url(https://fonts.googleapis.com/css?family=Comfortaa);
 @import url(https://fonts.googleapis.com/css?family=Gochi+Hand);
 
-.hello {
-  text-align: center;
-}
-
-.hello h1 {
-  font-family: 'Gochi Hand', cursive;
-  color: #0167b8;
-  letter-spacing: 0;
-  font-size: 4em;
-  text-transform: none;
+body{
 }
 
 .nodefony{
@@ -25,6 +16,14 @@
   font-size: 4em;
   text-transform: none;
 }
+.nodefony h3 {
+  text-align: center;
+  font-family: 'Gochi Hand', cursive;
+  color: #0167b8;
+  letter-spacing: 0;
+  font-size: 1.2em;
+  text-transform: none;
+}
 
 pre {
   display: block;

package/cli/builder/bundles/users-bundle/Resources/swagger/swagger.js

@@ -36,14 +36,15 @@ class Swagger {
       urls: this.config.urls,
       "urls.primaryName": this.config.primaryName,
       dom_id: '#swagger',
-      //defaultModelsExpandDepth: -1,
+      validatorUrl:"none",
+      defaultModelsExpandDepth: -1,
       deepLinking: true,
       presets: [
         SwaggerUI.presets.apis,
         SwaggerUIStandalonePreset
       ],
       plugins: [
-        SwaggerUIBundle.plugins.DownloadUrl
+        //SwaggerUIBundle.plugins.DownloadUrl
       ],
       layout: "StandaloneLayout",
       requestInterceptor: function (request) {

package/cli/builder/bundles/users-bundle/Resources/translations/login.en_en.yml

@@ -2,11 +2,13 @@
 
 security          : Security
 login             : Sign In
+signin            : Sign In
 logout            : Sign Out
 submit            : Submit
 surname           : Surname
 name              : Name
 user_name         : User
 
-register          : Register
+register          : Sign Up
+signup            : Sign Up
 update            : Update

package/cli/builder/bundles/users-bundle/Resources/translations/login.fr_fr.yml

@@ -2,6 +2,7 @@
 
 security          : Securité
 login             : Se Connecter
+signin             : Se Connecter
 logout            : Se Déconnecter
 submit            : Valider
 surname           : Nom
@@ -9,4 +10,5 @@ name              : Prénom
 username          : Utilisateur
 
 register          : "S'enregistrer"
+signup            : "S'enregistrer"
 update            : Modifer

package/cli/builder/bundles/users-bundle/Resources/views/documentation/base.html.twig

@@ -12,7 +12,7 @@
       <link rel="icon" type="image/x-icon" href="/app/favicon.ico"/>
     {% endblock %}
     {% block description %}
-      <meta name="description" content="Node.js full-stack web framework Symfony Like">
+      <meta name="description" content="Node.js full-stack web framework">
     {% endblock %}
     <title>
       {% block title %}{{nodefony.name|escape}}{% endblock %}
@@ -28,7 +28,6 @@
     {% endblock %}
     {% block body %}{% endblock %}
     {% block footer %}
-      {{ render( controller("documentation:documentation:footer" )) }}
     {% endblock %}
     {% block javascripts %}
       <!-- WEBPACK BUNDLE -->

package/cli/builder/bundles/users-bundle/Resources/views/footer.html.twig

@@ -1,9 +1,7 @@
 <!-- Footer -->
-<footer class="page-footer font-small bg-light fixed-bottom">
-  <!-- Copyright -->
-  <div class="text-center py-3">
+<footer class="footer mt-auto py-3 bg-light fixed-bottom">
+  <div class="container">
     <a href="https://github.com/nodefony">{{year|escape}} powered by: nodefony@{{nodefony.version}}</a>
   </div>
-  <!-- Copyright -->
 </footer>
 <!-- Footer -->

package/cli/builder/bundles/users-bundle/Resources/views/graphiql/index.html.twig

@@ -1,12 +1,11 @@
-{% extends '../base.html.twig' %}
-
+{% extends '../documentation/base.html.twig' %}
 
 {% block title %}{{title|escape}}{% endblock %}
 
 {% block stylesheets %}
   <!-- WEBPACK BUNDLE -->
-  <link rel="stylesheet" href="/documentation-bundle/assets/css/documentation.css"/>
   <link rel='stylesheet' href='{{CDN("stylesheet")}}/users-bundle/assets/css/graphiql.css'/>
+  {{ parent() }}
   <style>
       body {
         padding: 0;
@@ -21,14 +20,10 @@
 
 {% block body %}
 
-{% block header %}
-  {{ render( controller("users:users:header" )) }}
-{% endblock %}
-
 <div class="container-fluid">
   <div class="row flex-xl-nowrap">
     {% include '../documentation/navbar.html.twig' %}
-    <main class="col-12 col-md-9 col-xl-8" style="top: 4rem;">
+    <main class="col-12 col-md-9 col-xl-10" style="top: 2px;">
       <div id="graphiql"></div>
     </main>
   </div>
@@ -40,6 +35,6 @@
 
   <!-- WEBPACK BUNDLE -->
   <script src='{{CDN("javascript")}}/users-bundle/assets/js/graphiql.js'></script>
-  <script type="text/javascript" src="/documentation-bundle/assets/js/documentation.js"></script>
+  {{ parent() }}
 
 {% endblock %}

package/cli/builder/bundles/users-bundle/Resources/views/header.html.twig

@@ -1,29 +1,22 @@
 {% set user = getUser() %}
 
-<nav class="navbar navbar-expand-lg navbar-light bg-light">
-  <div class="container-fluid">
-    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#header_nodefony" aria-controls="header_nodefony" aria-expanded="false" aria-label="Toggle navigation">
-      <span class="navbar-toggler-icon"></span>
-    </button>
-    <a class="navbar-brand mr-5" href="/">
+<div class="container-fluid">
+  <header class="d-flex flex-wrap align-items-center justify-content-center justify-content-md-between py-3 mb-4 border-bottom">
+    <a href="/" class="d-flex align-items-center col-md-3 mb-2 mb-md-0 text-dark text-decoration-none">
       <img src="/app/images/app-logo.png" width="30" height="30" class="d-inline-block align-top" alt="">
-      <span class="navbar-text pt-0 pb-0">{{nodefony.name|escape}}</span>
+      <span style="color:#0167b8" class="fs-4 nodefony"><h3>{{nodefony.name|escape}}</h3></span>
     </a>
-    <div class="collapse navbar-collapse" id="header_nodefony">
-      <ul class="navbar-nav me-auto ">
-        {% if  urlDoc %}
-          <li class="nav-item">
-            <form class="form-inline" action="{{urlDoc}}">
-              <button class="btn btn-sm btn-outline-secondary" type="submit">Documentation</button>
-            </form>
-          </li>
-        {% endif %}
-      </ul>
 
-      <ul class="navbar-nav">
+    <ul class="nav col-12 col-lg-auto me-lg-auto mb-2 justify-content-center mb-md-0">
+      {% if  urlDoc %}
+        <li><a href="{{urlDoc}}" class="btn btn-outline-secondary px-2">Documentation</a></li>
+      {% endif %}
+    </ul>
+
+    <form action="{{url('lang')}}" name="formLang" id="formLang" class="col-12 col-lg-auto mb-3 mb-lg-0 me-lg-3">
+      <ul class="nav col-12 col-lg-auto me-lg-auto mb-2 justify-content-center mb-md-0">
         <li class="nav-item">
-          <form action="{{url('lang')}}" name="formLang" id="formLang" class="d-flex ml-5">
-            <div class="input-group input-group-sm" style="top:5px;margin-right:5px">
+            <div class="input-group input-group-sm">
               <label class="input-group-text">{{"lang"| trans("messages") }} : </label>
               <select class="form-select form-select-sm " name="language"  id="language">
                 {% for opt in langs %}
@@ -38,56 +31,60 @@
                   {% endfor %}
                 </select>
               </div>
-          </form>
         </li>
-      {% if  user %}
-        <li class="nav-link fa fa-user pr-3" style="font-size:x-large">
+      </ul>
+    </form>
+
+    {% if  user %}
+    <div class="dropdown text-end">
+      <a href="#" class="d-block link-dark text-decoration-none dropdown-toggle" id="dropdownUser1" data-bs-toggle="dropdown" aria-expanded="false">
         {% if user.image %}
-          <img width="32px" height= "32px" class="rounded-circle" src="{{user.image}}" alt="image">
+          <img src="https://github.com/mdo.png" alt="mdo" width="32" height="32" class="rounded-circle">
+        {% else %}
+            <i class="text-large fa fa-user"></i>
         {% endif %}
-          </li>
-        <li class="nav-item dropdown dropstart">
-          <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-bs-toggle="dropdown" aria-expanded="true">
-           {{user.username}}</a>
-          <!--a href="" class="nav-link dropdown-toggle" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-expanded="true">
-                {{user.username}}
-          </a-->
-          <div class="dropdown-menu p-0 mt-5 " aria-labelledby="navbarDropdownMenuLink" style="width: 18rem;">
-
-            <div class="card" style="width: 18rem;">
-              <div class="card-header">
-                  <h5 class="card-title">Profile</h5>
-              </div>
-              <div class="card-body text-center" >
-                {% if user.image %}
-                  <img width="100px" height="100px"src="{{ user.image|escape }}" alt=""></img>
-                {% else %}
-                  <img width="100px" height="100px" src="/framework-bundle/images/nodefony-logo.png" alt="nodefony-logo"></img>
-                {% endif %}
-                <div class="user-info">
-                  <p>{{"username"|trans("login")}} : {{ user.username|escape }}</p>
-                  <p>{{"surname"|trans("login")}} : <i> {{ user.surname|escape }} </i> </p>
-                  <p>{{"name"|trans("login")}} : <i> {{ user.name|escape }} </i> </p>
-                </div>
-              </div>
-              <div class="card-footer text-muted">
-                <a href ="{{url("logout")}}" class="card-link">{{"logout"|trans("login")}}</a>
-                <a href ="{{url("nodefony-user-update",{username:user.username})}}" class="card-link">{{"update"|trans("login")}}</a>
-              </div>
+      </a>
+      <ul class="dropdown-menu text-small border-0" aria-labelledby="dropdownUser1">
+        <div class="card " style="width: 18rem;height:100%">
+          <div class="card-header">
+              <h5 class="card-title">Profile</h5>
+          </div>
+          <div class="card-body text-center" >
+            {% if user.image %}
+              <img width="100px" height="100px"src="{{ user.image|escape }}" alt=""></img>
+            {% else %}
+              <img width="100px" height="100px" src="/framework-bundle/images/nodefony-logo.png" alt="nodefony-logo"></img>
+            {% endif %}
+            <div class="user-info">
+              <p>{{"username"|trans("login")}} : {{ user.username|escape }}</p>
+              <p>{{"surname"|trans("login")}} : <i> {{ user.surname|escape }} </i> </p>
+              <p>{{"name"|trans("login")}} : <i> {{ user.name|escape }} </i> </p>
             </div>
           </div>
-        </li>
-      {% else %}
-        <li class="nav-link fa fa-user pr-3" style="font-size:x-large"></li>
-        <li class="nav-link">
-        <a href="{{url("login",{type:"secure"})}}"
-            class="btn btn-sm btn-outline-secondary"
-            role="button"
-            aria-pressed="false">
-            {{"login"|trans("login")}}
-        </a>
-      {% endif %}
+          <div class="card-footer text-muted">
+            <a href ="{{url("logout")}}" class="card-link">{{"logout"|trans("login")}}</a>
+            <a href ="{{url("nodefony-user-update",{username:user.username})}}" class="card-link">{{"update"|trans("login")}}</a>
+          </div>
+        </div>
       </ul>
     </div>
-  </div>
-</nav>
+    {% else %}
+
+    <div class=" text-end">
+      <a href="{{url("login",{type:"secure"})}}"
+          class="btn btn-sm btn-outline-secondary"
+          role="button"
+          aria-pressed="false">
+          {{trans("signin")}}
+      </a>
+      <a href="{{url("nodefony-user-create")}}"
+          class="btn btn-sm btn-outline-primary"
+          role="button"
+          aria-pressed="false">
+          {{trans("signup")}}
+      </a>
+
+    </div>
+    {% endif %}
+  </header>
+</div>

package/cli/builder/bundles/users-bundle/Resources/views/swagger/index.html.twig

@@ -1,36 +1,28 @@
-{% extends '../base.html.twig' %}
+{% extends '../documentation/base.html.twig' %}
 
 {% block title %}{{title|escape}}{% endblock %}
 
 {% block stylesheets %}
   <!-- WEBPACK BUNDLE -->
   <link rel='stylesheet' href='{{CDN("stylesheet")}}/users-bundle/assets/css/swagger.css'/>
-  <link rel="stylesheet" href="/documentation-bundle/assets/css/documentation.css"/>
+   {{ parent() }}
 {% endblock %}
 
 {% block body %}
 
-{% block header %}
-  {{ render( controller("users:users:header" )) }}
-{% endblock %}
-
 <div class="container-fluid">
   <div class="row flex-xl-nowrap">
     {% include '../documentation/navbar.html.twig' %}
-    <main class="col-12 col-md-9 col-xl-8" style="top: 4rem;">
+    <main class="col-12 col-md-9 col-xl-10" style="top:2px">
       <div id="swagger"></div>
     </main>
   </div>
 </div>
 
-{% block footer %}
-  {{ render( controller("users:users:footer" )) }}
 {% endblock %}
 
 {% block javascripts %}
   <!-- WEBPACK BUNDLE -->
   <script src='{{CDN("javascript")}}/users-bundle/assets/js/swagger.js'></script>
-  <script type="text/javascript" src="/documentation-bundle/assets/js/documentation.js"></script>
-{% endblock %}
-
+   {{ parent() }}
 {% endblock %}

package/cli/builder/bundles/users-bundle/controller/api/graphql/graphqlController.js

@@ -39,6 +39,8 @@ class graphqlController extends nodefony.Controller {
     }
   }
 
+  //  provides all functions for each API endpoint
+
   async user(field) {
     return await this.usersService.findOne(field.username);
   }

package/cli/builder/bundles/users-bundle/controller/usersController.js

@@ -56,7 +56,7 @@ class usersController extends nodefony.Controller {
 
   /**
    *    @see Route by Annotaion
-   *    @Method ({ "GET"})
+   *    @Method ({ "GET", "POST"})
    *    @Route ("/lang", name="lang")
    */
   langAction() {

package/cli/builder/bundles/users-bundle/package.json

@@ -16,45 +16,45 @@
   ],
   "repository": {},
   "dependencies": {
-    "@babel/core": "^7.14.8",
-    "@babel/plugin-proposal-class-properties": "^7.14.5",
+    "@babel/core": "^7.16.7",
+    "@babel/plugin-proposal-class-properties": "^7.16.7",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/preset-env": "^7.14.8",
-    "@babel/preset-react": "^7.14.5",
-    "@popperjs/core": "^2.9.2",
-    "babel-loader": "^8.2.2",
+    "@babel/preset-env": "^7.16.7",
+    "@babel/preset-react": "^7.16.7",
+    "@popperjs/core": "^2.11.0",
+    "babel-loader": "^8.2.3",
     "babel-register": "^6.26.0",
-    "bootstrap": "^5.0.2",
-    "clean-webpack-plugin": "^4.0.0-alpha.0",
+    "bootstrap": "^5.1.3",
+    "clean-webpack-plugin": "^4.0.0",
     "css-hot-loader": "^1.4.4",
-    "css-loader": "^6.2.0",
-    "expose-loader": "^3.0.0",
+    "css-loader": "^6.5.1",
+    "expose-loader": "^3.1.0",
     "faker": "^5.5.3",
     "font-awesome": "^4.7.0",
-    "graphiql": "^1.4.2",
-    "graphql": "^15.5.1",
-    "html-webpack-plugin": "^5.3.2",
-    "imports-loader": "^3.0.0",
+    "graphiql": "^1.5.16",
+    "graphql": "^16.2.0",
+    "graphql-ws": "^5.5.5",
+    "html-webpack-plugin": "^5.5.0",
+    "imports-loader": "^3.1.1",
     "jquery": "^3.6.0",
-    "mini-css-extract-plugin": "^2.1.0",
-    "mongoose-paginate-v2": "^1.4.1",
-    "node-sass": "^6.0.1",
-    "optimize-css-assets-webpack-plugin": "^6.0.1",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
-    "sass-loader": "^12.1.0",
-    "style-loader": "^3.2.1",
+    "mini-css-extract-plugin": "^2.4.5",
+    "mongoose-paginate-v2": "^1.4.2",
+    "node-sass": "^7.0.1",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "sass-loader": "^12.4.0",
+    "style-loader": "^3.3.1",
     "svg-inline-loader": "^0.8.2",
-    "swagger-ui": "^3.51.1",
-    "swagger-ui-dist": "^3.51.1",
-    "terser-webpack-plugin": "^5.1.4",
-    "webpack": "^5.44.0",
+    "swagger-ui": "^4.1.3",
+    "swagger-ui-dist": "^4.1.3",
+    "terser-webpack-plugin": "^5.3.0",
+    "webpack": "^5.65.0",
     "webpack-merge": "^5.8.0"
   },
   "devDependencies": {
-    "@mapbox/node-pre-gyp": "^1.0.5",
-    "node-gyp": "^8.1.0",
-    "sequelize-cli": "^6.2.0"
+    "@mapbox/node-pre-gyp": "^1.0.8",
+    "node-gyp": "^8.4.1",
+    "sequelize-cli": "^6.3.0"
   },
   "license": "CECILL-B",
   "readmeFilename": "README.md",

package/cli/builder/bundles/users-bundle/src/providers/mongoose/userProvider.js

@@ -24,8 +24,8 @@ module.exports = nodefony.registerProvider("userProvider", () => {
         });
     }
 
-    refreshUser(user) {
-      let serialize = user.populate();
+    async refreshUser(user) {
+      const serialize = await user.populate();
       return new nodefony.User(
         serialize.username,
         serialize.password,
@@ -46,4 +46,4 @@ module.exports = nodefony.registerProvider("userProvider", () => {
 
   };
   return Provider;
-});
+});

package/cli/builder/microService/skeletons/config/pm2.config.js

@@ -3,7 +3,7 @@ const package = require(path.resolve("package.json"));
 const env = process.env.NODE_ENV;
 const logName = `${package.name}.log`;
 
-let cpu = require('os').cpus().length;
+let cpu = 2 // require('os').cpus().length;
 let exec_mode = "cluster";
 let watch = false;
 let autorestart =true ;

package/cli/builder/microService/skeletons/config/webpack/webpack.config.dev.js

@@ -1,13 +1,8 @@
-const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 
 module.exports = {
   mode: 'development',
   devtool: 'source-map',
   plugins: [
-    new MiniCssExtractPlugin({
-      fallback: "style-loader",
-      filename: "./css/[name].css",
-      allChunks: true
-    })
+    
   ]
 };

package/cli/builder/microService/skeletons/config/webpack/webpack.config.prod.js

@@ -1,5 +1,4 @@
 const TerserPlugin = require('terser-webpack-plugin');
-const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 
 module.exports = {
   mode: 'production',
@@ -19,11 +18,7 @@ module.exports = {
     ]
   },
   plugins: [
-    new MiniCssExtractPlugin({
-      fallback: "style-loader",
-      filename: "./css/[name].min.css",
-      allChunks: true
-    })
+
   ]