@ozdao/prometheus-framework 0.2.251 → 0.2.253

package/dist/prometheus-framework/src/modules/wallet/views/components/pages/Wallet.vue.cjs

@@ -5,10 +5,10 @@ const vueI18n = require("vue-i18n");
 const Web3 = require("web3");
 const wallet_store = require("../../store/wallet.store.cjs");
 const wallet = require("../../localization/wallet.json.cjs");
-const Popup = require("../../../../../components/Popup/Popup.vue.cjs");
-const Button = require("../../../../../components/Button/Button.vue.cjs");
+const Popup = require("../../../../../components/Popup/Popup.vue2.cjs");
+const Button = require("../../../../../components/Button/Button.vue2.cjs");
 require("vue-router");
-;/* empty css                                             */
+;/* empty css                                            */
 require("../../../../reports/store/reports.cjs");
 ;/* empty css                                              */
 ;/* empty css                                                 */

package/dist/prometheus-framework/src/modules/wallet/views/components/pages/Wallet.vue.js

@@ -3,10 +3,10 @@ import { useI18n } from "vue-i18n";
 import Web3 from "web3";
 import { state, actions } from "../../store/wallet.store.js";
 import text from "../../localization/wallet.json.js";
-import _sfc_main$3 from "../../../../../components/Popup/Popup.vue.js";
-import _sfc_main$1 from "../../../../../components/Button/Button.vue.js";
+import _sfc_main$3 from "../../../../../components/Popup/Popup.vue2.js";
+import _sfc_main$1 from "../../../../../components/Button/Button.vue2.js";
 import "vue-router";
-/* empty css                                           */
+/* empty css                                          */
 import "../../../../reports/store/reports.js";
 /* empty css                                            */
 /* empty css                                               */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/prometheus-framework",
-  "version": "0.2.251",
+  "version": "0.2.253",
   "description": "Web3 Framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",

package/src/builder/webpack/webpack.config.client.js

@@ -19,8 +19,8 @@ module.exports = (projectRoot) => {
     devtool: !isProd ? "inline-source-map" : "source-map",
     entry: {
       main: !isProd
-        ? [path.resolve("../utils/hot-reload.js"), path.resolve(projectRoot, "src/index.js")]
-        : path.resolve(projectRoot, "src/index.js"),
+        ? [path.resolve("../utils/hot-reload.js"), path.resolve(projectRoot, "src/client.js")]
+        : path.resolve(projectRoot, "src/client.js"),
     },
     module: {
       rules: [],

package/src/builder/webpack/webpack.config.server.js

@@ -8,7 +8,7 @@ module.exports = (projectRoot) => {
     mode: "development",
     entry: [
       'webpack/hot/poll?1000', 
-      path.resolve(projectRoot, 'server/server.js')
+      path.resolve(projectRoot, 'src/server.js')
     ],
     output: {
       filename: "server.[fullhash].js",

package/src/builder/webpack/webpack.config.spa.js

@@ -20,7 +20,7 @@ module.exports = (projectRoot) => {
     mode: !isProd ? "development" : "production",
     devtool: "source-map",
     entry: {
-      main: path.resolve(projectRoot, "src/index.js"),
+      main: path.resolve(projectRoot, "src/client.js"),
     },
     output: {
       filename: "main.js",

package/src/builder/webpack/webpack.config.ssr.js

@@ -13,7 +13,7 @@ module.exports = (projectRoot) => {
     target: "node",
     mode: !isProd ? "development" : "production",
     entry: {
-      main: path.resolve(projectRoot, "src/index.js"),
+      main: path.resolve(projectRoot, "src/client.js"),
     },
     output: {
       filename: "main.[fullhash].js",

package/src/modules/auth/auth.client.js

@@ -1,9 +1,11 @@
 // Store
 import * as storeAuth from './views/store/auth.js';
 import * as storeTwofa from './views/store/twofa.js';
+import * as storeUsers from './views/store/users.js';
 
 // Router
 import routerAuth from './views/router/auth.js';
+import routerUsers from './views/router/users.js';
 
 // Middlewares
 import * as validationAuth from '@pf/src/modules/auth/views/middlewares/auth.validation';
@@ -16,18 +18,24 @@ import EnterPassword from './views/components/pages/EnterPassword.vue';
 import ResetPassword from './views/components/pages/ResetPassword.vue';
 import SignUp from './views/components/pages/SignUp.vue';
 import SignIn from './views/components/pages/SignIn.vue';
+import Profile from './views/components/pages/Profile.vue';
+import ProfileEdit from './views/components/pages/ProfileEdit.vue'
 
 // Importing sections components
 import SliderFeatures from './views/components/sections/SliderFeatures.vue';
+import FeaturedUsers from './views/components/sections/FeaturedUsers.vue';
 
 // Пример функции инициализации для модуля аутентификации
 function initializeAuth(app, store, router, options = {}) {
   const route = options.route || 'Home';
   
   router.addRoute(route, routerAuth);
+  router.addRoute(route, routerUsers);
   
   store.addStore('auth', storeAuth);
   store.addStore('twofa', storeTwofa);
+  store.addStore('users', storeUsers);
+  
 }
 
 const ModuleAuth = {
@@ -35,10 +43,12 @@ const ModuleAuth = {
   views: {
     store: {
       storeAuth,
-      storeTwofa
+      storeTwofa,
+      storeUsers
     },
     router: {
-      routerAuth
+      routerAuth,
+      routerUsers
     },
     middlewares: {
       validationAuth
@@ -53,8 +63,11 @@ const ModuleAuth = {
       ResetPassword,
       SignUp,
       SignIn,
+      Profile,
+      ProfileEdit,
       // Sections
-      SliderFeatures
+      SliderFeatures,
+      FeaturedUsers
     }
   }
 }

package/src/modules/auth/auth.server.js

@@ -1,22 +1,39 @@
 // Импортируем модели
+const UserModel = require('./models/user.model.js');
 const RoleModel = require('./models/role.model.js');
+const VisitorModel = require("./models/visitor.model")
+const RequestModel = require("./models/request.model");
 
 // Импортируем роуты
 const authRoutes = require('./controllers/routes/auth.routes.js');
 const twofaRoutes = require('./controllers/routes/twofa.routes.js');
+const usersRoutes = require('./controllers/routes/users.routes.js');
 
 // Импортируем контроллеры
 const AuthController = require('./controllers/services/auth.service.js');
 const TwoFaController = require('./controllers/services/twofa.service.js');
+const UsersController = require('./controllers/services/users.service.js');
+
+// Middlewares
+const visitors = require('@pf/src/modules/auth/controllers/middlewares/visitor.logger');
+  
 
 function initializeAuth(app, db, origins, publicPath) {
   // Настраиваем модели в объекте базы данных
   db.role = RoleModel(db);
+  db.user = UserModel(db);
+  db.visitor = VisitorModel(db);
+  db.request = RequestModel(db);
 
   // Настраиваем маршруты, если объект приложения передан
   if (app) {
     authRoutes(app, db, origins, publicPath);
     twofaRoutes(app, db, origins, publicPath);
+    usersRoutes(app, db, origins, publicPath);
+
+    const visitorModule = visitors(db);
+
+    app.use(visitorModule.visitorLogger);
   }
 }
 
@@ -25,13 +42,17 @@ module.exports = {
   initialize: initializeAuth,
   models: {
     RoleModel,
+    UserModel,
+    VisitorModel
   },
   routes: {
     authRoutes,
     twofaRoutes,
+    usersRoutes
   },
   controllers: {
     AuthController,
     TwoFaController,
+    UsersController,
   }
-};
+};

package/src/modules/{users → auth/controllers}/routes/users.routes.js

@@ -1,5 +1,5 @@
 // Factories
-const controllerFactory = require("../controllers/users.controller");
+const controllerFactory = require("../services/users.service");
 // Routes
 module.exports = function(app, db, origins) {
   const controller = controllerFactory(db);

package/src/modules/auth/controllers/services/auth.service.js

@@ -222,7 +222,6 @@ const controllerFactory = (db) => {
 
   const checkAccesses = async (req, res) => {
     try {
-      // console.log('x-access-token:', req.headers['x-access-token']);
       const uid = new db.mongoose.Types.ObjectId(req.userId);
       const depts = await Department.find({ 'members.user': uid });
       const ownedOrgs = await Organization.find({ owner: uid });

package/src/modules/{users → auth/views}/components/pages/Profile.vue

@@ -265,7 +265,7 @@ import { computed, watch, onMounted, ref, onBeforeMount } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 // Import state
 import * as auth from '@pf/src/modules/auth/views/store/auth'
-import * as users from '@pf/src/modules/users/store/users'
+import * as users from '@pf/src/modules/auth/views/store/users'
 import * as memberships from '@pf/src/modules/organizations/store/memberships'
 // Accessing router
 const route = useRoute()

package/src/modules/{users → auth/views}/components/pages/ProfileEdit.vue

@@ -140,13 +140,13 @@
   import Button        from '@pf/src/components/Button/Button.vue'
   import UploadImage   from '@pf/src/components/UploadImage/UploadImage.vue';
 
-  import ProfileCompletion from '@pf/src/modules/users/components/sections/ProfileCompletion.vue'
+  import ProfileCompletion from '@pf/src/modules/auth/views/components/sections/ProfileCompletion.vue'
   // Import libs
   import { computed, onMounted, ref, onBeforeMount } from 'vue'
   import { useRoute, useRouter } from 'vue-router'
   // Import state
   import * as auth from '@pf/src/modules/auth/views/store/auth'
-  import * as users from '@pf/src/modules/users/store/users'
+  import * as users from '@pf/src/modules/auth/views/store/users'
   import * as globals from '@pf/src/modules/globals/views/store/globals'
   // Import validation
   import * as inputsValidation from '@pf/src/modules/auth/views/validations/inputs.validation'

package/src/modules/{users → auth/views}/components/sections/FeaturedUsers.vue

@@ -80,11 +80,11 @@
 <script setup>
 import { ref, onMounted } from 'vue';
 
-import * as users from '@pf/src/modules/users/store/users'
+import * as users from '@pf/src/modules/auth/views/store/users'
 
 import Marquee from '@pf/src/components/Marquee/Marquee.vue'
 
-import CardUser from '@pf/src/modules/users/components/blocks/CardUser.vue'
+import CardUser from '@pf/src/modules/auth/views/components/blocks/CardUser.vue'
 
 const usersList = ref([])
 

package/src/modules/auth/views/router/users.js

@@ -0,0 +1,79 @@
+import * as validationAuth from '@pf/src/modules/auth/views/middlewares/auth.validation';
+
+const users = {
+  path: 'users',
+  name: 'Users',
+  meta: {
+    title: {
+      en: 'Users',
+      ru: 'Пользователи'
+    },
+  },
+  children: [{
+    path: ':_id',
+    name: 'User Profile',
+     meta: {
+        title: {
+          en: 'Profile',
+          ru: 'Профиль'
+        }
+      },
+    component: () => import(/* webpackChunkName: "profile" */ '../components/pages/Profile.vue'),
+  },{
+    path: ':_id/edit',
+    name: 'User Edit Profile',
+    beforeEnter: [
+      validationAuth.requiresAuth,
+    ],
+    meta: {
+      title: {
+        en: 'Edit Profile',
+        ru: 'Редактировать Профиль'
+      }
+    },
+    component: () => import(/* webpackChunkName: "profile" */ '../components/pages/ProfileEdit.vue'),
+  },{
+    path: ':_id/blogposts',
+    name: 'User Blogposts',
+    meta: {
+      title: {
+        en: 'Posts',
+        ru: 'Посты'
+      }
+    },
+    component: () => import(/* webpackChunkName: "profile" */ '../components/pages/ProfileBlogposts.vue'),
+  },{
+    path: ':user/events',
+    name: 'User Events',
+    meta: {
+      title: {
+        en: 'Events',
+        ru: 'События'
+      }
+    },
+    component: () => import(/* webpackChunkName: "profile" */ '@pf/src/modules/events/components/pages/EventsBackoffice.vue'),
+  },{
+    path: ':_id/organizations',
+    name: 'User Organizations',
+     meta: {
+        title: {
+          en: 'Groups',
+          ru: 'Группы'
+        }
+      },
+    component: () => import(/* webpackChunkName: "profile" */ '@pf/src/modules/organizations/components/pages/Organizations.vue'),
+  },{
+    path: ':_id/wallet',
+    name: 'User Wallet',
+     meta: {
+        title: {
+          en: 'Wallet',
+          ru: 'Кошелек'
+        }
+      },
+    component: () => import(/* webpackChunkName: "profile" */ '@pf/src/modules/wallet/views/components/pages/Wallet.vue'),
+  }]
+}
+
+
+export default users;

package/src/modules/backoffice/backoffice.client.js

@@ -1,15 +1,57 @@
+// Router
+import routerBackoffice from './router/backoffice';
 
-// Importing Vue components from the components directory
-// import Profile from './components/pages/Profile.vue';
-// import ProfileEdit from './components/pages/ProfileEdit.vue';
+// Views
+// Layouts
+import BackofficeLayout from './components/layouts/Backoffice.vue';
 
-// Importing Vuex store modules from the store directory
-// import * as filesStore from './store/files.store.js';
+// Pages
+import Dashboard from './components/pages/Dashboard.vue';
 
-// Importing Vue Router routes from the router directory
-import backofficeRoutes from './router/backoffice.js';
+// Admin components
+// import AdminDashboard from './components/admin/Dashboard.vue';
+// import FastOrders from './components/admin/FastOrders.vue';
+// import UserEdit from './components/admin/UserEdit.vue';
+// import Users from './components/admin/Users.vue';
+// import ProductEdit from './components/admin/ProductEdit.vue';
+// import Backcalls from './components/admin/Backcalls.vue';
 
-// Exporting components, store modules, and routes
-export {
-  backofficeRoutes
-};
+// Partials
+import Sidebar from './components/partials/Sidebar.vue';
+
+// Пример функции инициализации для модуля бэкофиса
+function initializeBackoffice(app, store, router, options = {}) {
+  const route = options.route || 'Home';
+
+  // const routesBackoffice = createBackofficeRoutes();
+  // const routesAdmin = createAdminRoutes();
+  
+  router.addRoute(route, routerBackoffice);
+  // router.addRoute(`${route}.admin`, routerBackoffice);
+}
+
+const ModuleBackoffice = {
+  initialize: initializeBackoffice,
+  views: {
+    router: {
+      routerBackoffice
+    },
+    components: {
+      // Layouts
+      BackofficeLayout,
+      // Pages
+      Dashboard,
+      // Admin components
+      // AdminDashboard,
+      // FastOrders,
+      // UserEdit,
+      // Users,
+      // ProductEdit,
+      // Backcalls,
+      // Partials
+      Sidebar
+    }
+  }
+}
+
+export default ModuleBackoffice;

package/src/modules/backoffice/router/backoffice.js

@@ -5,7 +5,34 @@ import layoutEmpty from '@pf/src/modules/globals/views/components/layouts/Empty.
 
 import * as validationAuth from '@pf/src/modules/auth/views/middlewares/auth.validation';
 
-const backofficeRoutes = [{
+// const admin = [
+//   {
+//     path: 'admin',
+//     component: layoutAdmin,
+//     meta: { authorize: ["ROLE_MODERATOR"] }, 
+//     children: [{
+//       path: 'backcalls',
+//       name: 'Backcalls',
+//       // meta: { authorize: ["ROLE_MODERATOR"] }, 
+//       component: () => import(/* webpackChunkName: 'Backcalls' */ '@/components/pages/admin/Backcalls.vue')
+//     },{
+//       path: 'fastorder',
+//       name: 'FastOrders',
+//       // meta: { authorize: ["ROLE_MODERATOR"] }, 
+//       component: () => import(/* webpackChunkName: 'FastOrders' */ '@/components/pages/admin/FastOrders.vue')
+//     },{
+//       path: 'users',
+//       name: 'Users',
+//       component: () => import(/* webpackChunkName: 'Users' */ '@/components/pages/admin/Users.vue')
+//     },{
+//       path: 'users/:phone',
+//       name: 'User',
+//       component: () => import(/* webpackChunkName: 'User' */ '@/components/pages/admin/User.vue')
+//     }]
+//   } 
+// ];
+
+const backofficeRoutes = {
   path: 'backoffice',
   name: 'Backoffice Root',
 
@@ -77,6 +104,6 @@ const backofficeRoutes = [{
     },
     component: () => import(/* webpackChunkName: 'BackofficeCommunity' */ '@pf/src/modules/community/components/pages/Community.vue'),
   }]
-}];
+};
 
 export default backofficeRoutes;

package/src/modules/community/community.client.js

@@ -1,24 +1,68 @@
-// Importing Vue components
+// Store
+import * as storeBlogposts from './store/blogposts.js';
+import * as storeReactions from './store/reactions.js';
+
+// Router
+import routerCommunity from './router/blogposts';
+
+// Views
+// Layouts
 import Community from './components/layouts/Community.vue';
+
+// Pages
 import CreateBlogPost from './components/pages/CreateBlogPost.vue';
 import BlogPost from './components/pages/BlogPost.vue';
 import Blog from './components/pages/Blog.vue';
+
+// Blocks
 import FooterBlogpost from './components/blocks/FooterBlogpost.vue';
 import Activity from './components/blocks/Activity.vue';
 import CardBlogpost from './components/blocks/CardBlogpost.vue';
+
+// Sections
 import JoinUs from './components/sections/JoinUs.vue';
 import Comments from './components/sections/Comments.vue';
 import HotPosts from './components/sections/HotPosts.vue';
 
+// Пример функции инициализации для модуля сообщества
+function initializeCommunity(app, store, router, options = {}) {
+  const route = options.route || 'Home';
 
-// Importing Vuex store modules
-import * as blogpostsStore from './store/blogposts.js';
-import * as reactionsStore from './store/reactions.js';
+  router.addRoute(route, routerCommunity);
+  
+  store.addStore('blogposts', storeBlogposts);
+  store.addStore('reactions', storeReactions);
+}
 
-// Importing Vue Router routes
-import blogpostsRoutes from './router/blogposts.js';
+const ModuleCommunity = {
+  initialize: initializeCommunity,
+  views: {
+    store: {
+      storeBlogposts,
+      storeReactions
+    },
+    router: {
+      routerCommunity
+    },
+    components: {
+      // Layouts
+      Community,
+      // Pages
+      CreateBlogPost,
+      BlogPost,
+      Blog,
+      // Blocks
+      FooterBlogpost,
+      Activity,
+      CardBlogpost,
+      // Sections
+      JoinUs,
+      Comments,
+      HotPosts
+    }
+  }
+}
 
-// Exporting components, store modules, and routes
 export {
   Community,
   CreateBlogPost,
@@ -30,7 +74,9 @@ export {
   JoinUs,
   Comments,
   HotPosts,
-  blogpostsStore,
-  reactionsStore,
-  blogpostsRoutes
+  storeBlogposts,
+  storeReactions,
+  routerCommunity
 };
+
+export default ModuleCommunity;

package/src/modules/community/community.server.js

@@ -1,27 +1,48 @@
-// Importing controllers
+// Импортируем контроллеры
 const BlogController = require('./controllers/blog.controller.js');
 const CommentsController = require('./controllers/comments.controller.js');
 const ReactionsController = require('./controllers/reactions.controller.js');
 
-// Importing routes
+// Импортируем роуты
 const blogRoutes = require('./routes/blog.routes.js');
 const commentsRoutes = require('./routes/comments.routes.js');
 const reactionsRoutes = require('./routes/reactions.routes.js');
 
-// Importing models
+// Импортируем модели
 const BlogpostModel = require('./models/blogpost.model.js');
 const CommentModel = require('./models/comment.model.js');
 const ReactionModel = require('./models/reaction.model.js');
 
-// Exporting
+function initializeCommunity(app, db, origins, publicPath) {
+  // Настраиваем модели в объекте базы данных
+  db.blogpost = BlogpostModel(db);
+  db.comment = CommentModel(db);
+  db.reaction = ReactionModel(db);
+
+  // Настраиваем маршруты, если объект приложения передан
+  if (app) {
+    blogRoutes(app, db, origins, publicPath);
+    commentsRoutes(app, db, origins, publicPath);
+    reactionsRoutes(app, db, origins, publicPath);
+  }
+}
+
+// Экспортируем функцию инициализации, контроллеры, роуты и модели
 module.exports = {
-  BlogController,
-  CommentsController,
-  ReactionsController,
-  blogRoutes,
-  commentsRoutes,
-  reactionsRoutes,
-  BlogpostModel,
-  CommentModel,
-  ReactionModel
-};
+  initialize: initializeCommunity,
+  models: {
+    BlogpostModel,
+    CommentModel,
+    ReactionModel,
+  },
+  routes: {
+    blogRoutes,
+    commentsRoutes,
+    reactionsRoutes,
+  },
+  controllers: {
+    BlogController,
+    CommentsController,
+    ReactionsController,
+  }
+};

package/src/modules/community/models/comment.model.js

@@ -1,7 +1,7 @@
-module.exports = (mongoose) => {
-    const CommentSchema = new mongoose.Schema({
+module.exports = (db) => {
+    const CommentSchema = new db.mongoose.Schema({
         user: {
-            type: mongoose.Schema.Types.ObjectId,
+            type: db.mongoose.Schema.Types.ObjectId,
             ref: 'User',
             required: true,
         },
@@ -12,7 +12,7 @@ module.exports = (mongoose) => {
             required: true,
         },
         target: {  // заменяем 'organization' на 'target', так как это может быть или User, или Organization
-            type: mongoose.Schema.Types.ObjectId,
+            type: db.mongoose.Schema.Types.ObjectId,
             ref: function (value) {
               if (this.type === 'blogpost') return 'Blogpost';
               if (this.type === 'comment')  return 'Comment';
@@ -22,12 +22,12 @@ module.exports = (mongoose) => {
             required: true,
         },
         parent: { 
-            type: mongoose.Schema.Types.ObjectId, 
+            type: db.mongoose.Schema.Types.ObjectId, 
             ref: 'Comment', 
             default: null 
         },
         children:[{
-            type: mongoose.Schema.Types.ObjectId,
+            type: db.mongoose.Schema.Types.ObjectId,
             ref: "Comment"
         }],
         depth: { 
@@ -45,7 +45,7 @@ module.exports = (mongoose) => {
 
     CommentSchema.index({ target: 1, parent: 1, depth: 1 });
 
-    const Comment = mongoose.model("Comment", CommentSchema);
+    const Comment = db.mongoose.model("Comment", CommentSchema);
 
     return Comment;
 }