@ozdao/prometheus-framework 0.2.308 → 0.2.310

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/prometheus-framework",
-  "version": "0.2.308",
+  "version": "0.2.310",
   "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/components/Block/Block.vue

@@ -1,6 +1,6 @@
 <template>
 	<div 
-    class="bg-light pd-medium radius-big"
+    class="bg-light pd-medium radius-medium"
   >
   	<div v-if="title || actions" class="mn-b-small flex-v-center flex-nowrap flex">
   		<h4 v-if="title" class="mn-r-thin t-medium">{{title}}</h4>

package/src/components/Completion/Completion.vue

@@ -11,6 +11,7 @@
       </h4>
 
       <router-link 
+        v-if="cta"
         class="h4 mn-l-auto"
          :to="{
           name: 'User Edit Profile',

package/src/components/EditImages/EditImages.vue

@@ -32,7 +32,7 @@
       :uploadPath="props.uploadPath"
       :text="props.text"
       :options="props.options"
-      class="w-100 pd-extra"
+      class="w-100 pd-medium"
     />
 	</div>	
 </template>

package/src/components/Feed/Feed.vue

@@ -88,7 +88,7 @@
       v-if="isLoading"
       v-for="i in currentLimit" 
       :key="'skeleton-' + i"
-      class="mn-b-small radius-big o-hidden d-block"
+      class="mn-b-small radius-medium o-hidden d-block"
     />
   </TransitionGroup>
 

package/src/components/Field/Field.vue

@@ -54,7 +54,7 @@
       v-if="label" 
       class="t-transp mn-r-small"
     >
-      <span>
+      <span class="t-nowrap">
         {{label}}
       </span>
     </div>

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

@@ -35,6 +35,8 @@ function initializeAuth(app, store, router, options = {}) {
   store.addStore('auth', storeAuth);
   store.addStore('twofa', storeTwofa);
   store.addStore('users', storeUsers);
+
+  app.provide('store', store)
   
 }
 

package/src/modules/auth/views/components/pages/Profile.vue

@@ -15,15 +15,15 @@
 			_id="dash" 
 			class="pd-thin w-100"
 		>
-			<Completion 
+			<!-- <Completion 
 				v-if="route.params._id === auth.state.user._id && show" 
 		    :user="auth.state.user._id"
 		    :target="users.state.current"
-		    :cta="true" 
+		    :cta="false" 
 		    text_cta="Fill"
 		    text="Profile completed at"
 		    class="mn-b-medium mn-b-regular pd-medium radius-semi t-white bg-second"
-			/>
+			/> -->
 
 			<section 
 				class="flex-center pos-relative flex flex-column t-center w-100 mn-b-regular radius-medium pd-medium bg-light"
@@ -157,37 +157,27 @@
 			
 			
 
-			<Menu class="mn-b-regular bg-light">
-
-			  <MenuItem @click="router.push({name: 'User Events', params: {user: route.params._id}})" class="cursor-pointer">
-			    <IconEvents class="i-semi" :icon="true" :fill="'rgb(var(--white))'"/> 
-			    <span>Events</span>
-			  </MenuItem> 
-
-			  <MenuItem @click="router.push({name: 'User Organizations', params: {_id: route.params._id}})" class="cursor-pointer">
-			    <IconGroups class="i-semi" :icon="true"/>
-			    <span>Groups</span>
-			  </MenuItem>
-
-			 	<MenuItem @click="router.push({name: 'User Blogposts', params: {_id: route.params._id}})" class="cursor-pointer">
-			 		<IconCommunity class="i-semi" :icon="true"/>
-			    <span>Posts</span>
-			  </MenuItem>
-			</Menu>
-
-			<Menu v-if="APP_NAME === 'Weeder'"class="mn-b-regular bg-light">
-				<MenuItem @click="router.push({name: 'User Wallet', params: {_id: route.params._id}})" class="cursor-pointer">
-			    <IconGroups class="i-semi" :icon="true"/>
-			    <span>Wallet</span>
-			  </MenuItem>
-			</Menu>
-			  
-			  <!-- <MenuItem @click="router.push({name: 'User Comments', params: {_id: route.params._id}})" class="cursor-pointer">
-			    <span>Comments</span>
-			  </MenuItem>
-			  <MenuItem @click="router.push({name: 'User Likes', params: {_id: route.params._id}})" class="cursor-pointer">
-			    <span>Likes</span>
-			  </MenuItem> -->
+			<Menu v-if="filteredModules.length > 0" class="mn-b-regular bg-light">
+	      <MenuItem 
+	        v-for="module in filteredModules" 
+	        :key="module.name"
+	        @click="router.push({
+	          name: `${module.route}`, 
+	          params: {
+	            _id: route.params._id
+	          }
+	        })" 
+	        class="cursor-pointer"
+	      >
+	        <component 
+	          :is="module.icon" 
+	          v-if="module.icon"
+	          class="i-semi" 
+	          :icon="true"
+	        />
+	        <span>{{ module.displayName }}</span>
+      	</MenuItem>
+   		</Menu>
 			  
 			<Menu 
 				v-if="auth.state.user._id === route.params._id"
@@ -260,8 +250,9 @@ import IconEdit from '@pf/src/modules/icons/navigation/IconEdit.vue'
 
 import PlaceholderUserpic from '@pf/src/modules/icons/placeholders/PlaceholderUserpic.vue'
 // Import libs
-import { computed, watch, onMounted, ref, onBeforeMount } from 'vue'
+import { computed, watch, onMounted, ref, onBeforeMount, inject } 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/auth/views/store/users'
@@ -272,6 +263,37 @@ const router = useRouter()
 // Get organization _id from cookie
 const show = ref(false)
 
+const store = inject('store')
+
+const moduleMapping = {
+  events: {
+    displayName: 'Events',
+    route: 'User Events',
+    icon: IconEvents
+  },
+  organizations: {
+    displayName: 'Groups',
+    route: 'User Organizations',
+    icon: IconGroups
+  },
+  blogposts: {
+    displayName: 'Posts',
+    route: 'User Posts',
+    icon: IconCommunity
+  }
+}
+
+const filteredModules = computed(() => {
+  return store.modules
+    .map(moduleName => {
+      return {
+        name: moduleName,
+        ...moduleMapping[moduleName]
+      }
+    })
+    .filter(module => moduleMapping[module.name]) // Only show modules that have mapping
+})
+
 onMounted(async () => {
  	await users.actions.read({ _id: route.params._id, user: auth.state.user._id });
  	show.value = true

package/src/modules/auth/views/components/pages/ProfileEdit.vue

@@ -1,56 +1,52 @@
 <template>
-	<div  v-if="show" class="pd-medium for-transition w-100">
+	<div  v-if="show" class="for-transition w-100">
    
-    <ProfileCompletion 
+    <!-- <ProfileCompletion 
       v-if="route.params._id === auth.state.user._id" 
       :user="auth.state.user._id"
       :target="users.state.current"
       :cta="false"
-    />
-    <!--  -->
-    <h3 class="mn-b-small">Username</h3>
-
-    <Field 
-      v-model:field="users.state.current.username"     
-      label="@"  
-      placeholder="Not specified" 
-      class="mn-b-thin w-100 bg-light pd-medium radius-small" 
-      :validation="organizationName" 
-    />
-
-    <p class="mn-b-semi">Your username will be used for URL of profile like {{API_URL}}/users/username</p>
-
+    /> -->
 
-    <ProfileEditCredentials/>
-    
-    <!--  -->
-    <h3 class="mn-b-small">Profile</h3>
-
-    <div class="mn-b-thin radius-small w-100 h-10r bg-light flex-center flex-column flex">
-       <UploadImage 
-          v-model:photo="users.state.current.profile.photo"
-          :uploadPath="'users/' + users.state.current._id + '/avatars'"
-          class="h-4r w-4r aspect-1x1 o-hidden bg-white mn-b-thin radius-extra" 
-        />
-        <h4>Upload userpic</h4>
+    <div class="bg-white mn-b-thin pd-medium">
+      <h4 class="mn-b-small">Profile</h4>
+
+      <div class="mn-b-thin radius-small w-100 h-10r bg-light flex-center flex-column flex">
+         <UploadImage 
+            v-model:photo="users.state.current.profile.photo"
+            :uploadPath="'users/' + users.state.current._id + '/avatars'"
+            class="h-4r w-4r aspect-1x1 o-hidden bg-white mn-b-thin radius-extra" 
+          />
+          <h4>Upload userpic</h4>
+      </div>
+
+      <Field 
+        v-model:field="users.state.current.username"     
+        label="@"  
+        placeholder="Not specified" 
+        class="mn-b-thin w-100 bg-light pd-medium radius-small" 
+        :validation="organizationName" 
+      />
+
+      <p class="mn-b-semi">Your username will be used for URL of profile like {{API_URL}}/users/username</p>
+
+      <Field 
+        v-model:field="users.state.current.profile.name"     
+        label="Name"  
+        placeholder="Not specified" 
+        class="mn-b-thin bg-light pd-medium radius-small" 
+        :validation="organizationName" 
+      />
+
+      <Field 
+        v-model:field="users.state.current.profile.description"     
+        label="Description"  
+        placeholder="Not specified" 
+        class="mn-b-semi bg-light pd-medium radius-small" 
+        :validation="organizationName" 
+      />
     </div>
 
-    <Field 
-      v-model:field="users.state.current.profile.name"     
-      label="Name"  
-      placeholder="Not specified" 
-      class="mn-b-thin bg-light pd-medium radius-small" 
-      :validation="organizationName" 
-    />
-
-    <Field 
-      v-model:field="users.state.current.profile.description"     
-      label="Description"  
-      placeholder="Not specified" 
-      class="mn-b-semi bg-light pd-medium radius-small" 
-      :validation="organizationName" 
-    />
-
     <!-- <p class="mn-b-thin">Select your birthday if you want to receive your birthday gift.</p>
     
     <Field 
@@ -61,41 +57,47 @@
       class="mn-b-semi bg-light pd-medium radius-small" 
       :validation="organizationName" 
     /> -->
-    <h3 class="mn-b-small">Socials</h3>
-    <p class="mn-b-thin">Please provide only the username for social media profiles, without full links.</p>
+    <div class="bg-white mn-b-thin pd-medium">
+      <h3 class="mn-b-small">Socials</h3>
+      <p class="mn-b-thin">Please provide only the username for social media profiles, without full links.</p>
+
+      <Field 
+        v-model:field="users.state.current.socials.instagram"
+        label="Instagram"   
+        placeholder="" 
+        class="mn-b-thin bg-light pd-medium radius-small" 
+      />
+      <Field 
+        v-model:field="users.state.current.socials.twitter"
+        label="Twitter"   
+        placeholder="" 
+        class="mn-b-thin bg-light pd-medium radius-small" 
+      />
+      <Field 
+        v-model:field="users.state.current.socials.facebook"
+        label="Facebook"   
+        placeholder="" 
+        class="mn-b-thin bg-light pd-medium radius-small" 
+      />
+      <Field 
+        v-model:field="users.state.current.socials.telegram"
+        label="Telegram"   
+        placeholder="" 
+        class="mn-b-semi bg-light pd-medium radius-small" 
+      />
+    </div>
 
-    <Field 
-      v-model:field="users.state.current.socials.instagram"
-      label="Instagram"   
-      placeholder="" 
-      class="mn-b-thin bg-light pd-medium radius-small" 
-    />
-    <Field 
-      v-model:field="users.state.current.socials.twitter"
-      label="Twitter"   
-      placeholder="" 
-      class="mn-b-thin bg-light pd-medium radius-small" 
-    />
-    <Field 
-      v-model:field="users.state.current.socials.facebook"
-      label="Facebook"   
-      placeholder="" 
-      class="mn-b-thin bg-light pd-medium radius-small" 
-    />
-    <Field 
-      v-model:field="users.state.current.socials.telegram"
-      label="Telegram"   
-      placeholder="" 
-      class="mn-b-semi bg-light pd-medium radius-small" 
-    />
-    <h3 class="mn-b-small">Settings</h3>
-    <Checkbox 
-      :label="'Darkmode'"
-      :radio="globals.state.theme.darkmode"
-      @update:radio="event => globals.actions.toggleTheme()"
-      class="mn-b-semi w-100 bg-light t-black pd-medium radius-small"
-    />
+    <ProfileEditCredentials class="bg-white mn-b-thin pd-medium"/>
 
+    <div class="bg-white mn-b-thin pd-medium">
+      <h3 class="mn-b-small">Settings</h3>
+      <Checkbox 
+        :label="'Darkmode'"
+        :radio="globals.state.theme.darkmode"
+        @update:radio="event => globals.actions.toggleTheme()"
+        class="w-100 bg-light t-black pd-medium radius-small"
+      />
+    </div>
 
     <Button 
       :submit="onSubmit" 
@@ -148,10 +150,17 @@
     show.value = true
   })
   // Methods
+
   async function onSubmit() {
     await users.actions.update(users.state.current)
   }
 
+  // Добавляем редирект после сохранения
+async function handleSave() {
+  await onSubmit()
+  router.replace({ name: 'User Profile', params: { _id: users.state.current._id }})
+}
+
   async function onSubmitDelete() {
     const confirmation = window.confirm("Are you sure you want to delete your account? Restoration will be possible only with the help of an administrator.");
     
@@ -166,6 +175,11 @@
   function redirectTo () {
     router.replace({ name: 'User Profile', params: { _id: users.state.current._id }});
   }
+
+  defineExpose({
+    onSubmit,
+    redirectTo
+  })
 </script>
 
 <style lang="scss">

package/src/modules/auth/views/middlewares/auth.validation.js

@@ -4,6 +4,7 @@ function resetUser(to, from, next) {
   next()
   auth.state.user.phone = ''
   auth.state.user.email = ''
+  auth.state.user.avatar = ''
   auth.state.user.password = ''
   auth.state.user.passwordRepeat = ''
 }

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

@@ -3,6 +3,7 @@ import * as validationAuth from '@pf/src/modules/auth/views/middlewares/auth.val
 import * as auth from '@pf/src/modules/auth/views/store/auth';
 
 import IconPlus from '@pf/src/modules/icons/navigation/IconPlus.vue'
+import IconCheckmark from '@pf/src/modules/icons/navigation/IconCheckmark.vue'
 
 const users = {
   path: 'users',
@@ -20,7 +21,9 @@ const users = {
         title: {
           en: 'Profile',
           ru: 'Профиль'
-        }
+        },
+        title_hide: true,
+        hideNavigationBar: true
       },
     component: () => import(/* webpackChunkName: "profile" */ '../components/pages/Profile.vue'),
   },{
@@ -33,7 +36,23 @@ const users = {
       title: {
         en: 'Edit Profile',
         ru: 'Редактировать Профиль'
-      }
+      },
+      // actions: [{
+      //   component: IconCheckmark,
+      //   props: {},
+      //   condition: () => true,
+      //   action: async (router) => {
+      //     const component = router.currentRoute.value.matched[0].instances.default
+      //     console.log('Component:', component) // Проверим, что получаем
+      //     console.log('Available methods:', Object.keys(component)) // Посмотрим доступные методы
+          
+      //     if (component && typeof component.onSubmit === 'function') {
+      //       await component.onSubmit()
+      //     } else {
+      //       console.error('onSubmit is not available:', component)
+      //     }
+      //   }
+      // }]
     },
     component: () => import(/* webpackChunkName: "profile" */ '../components/pages/ProfileEdit.vue'),
   },{

package/src/modules/auth/views/store/auth.js

@@ -19,6 +19,7 @@
   const state = reactive({
     user: {
       _id: undefined,
+      avatar: null,
       username: '',
       email: '',
       phone: '',
@@ -40,7 +41,7 @@
         const userCookie = cookie ? cookie : await getCookie('user');
 
         if (userCookie) {
-          const { _id, email, phone, roles, accessToken } = userCookie;
+          const { _id, email, phone, avatar, roles, accessToken } = userCookie;
 
           setAuthToken(accessToken);
 
@@ -50,7 +51,7 @@
           state.accesses = userAccesses;
 
           // Обновление состояния приложения с информацией о пользователе и его правах доступа
-          Object.assign(state.user, { _id, email, phone });
+          Object.assign(state.user, { _id, email, phone, avatar });
           Object.assign(state.access, { token: accessToken, roles, status: !!accessToken });
         } else {
           console.log('no cookies')
@@ -58,6 +59,7 @@
           state.accesses = [];
           state.user = {
             _id: undefined,
+            avatar: null,
             username: '',
             email: '',
             phone: '',
@@ -77,6 +79,7 @@
         state.user = {
           _id: undefined,
           username: '',
+          avatar: null,
           email: '',
           phone: '',
           password: '',
@@ -185,6 +188,7 @@
       Object.assign(state.user, {
         _id: undefined,
         username: '',
+        avatar: null,
         email: '',
         phone: '',
         password: '',

package/src/modules/backoffice/components/pages/Dashboard.vue

@@ -1,7 +1,5 @@
 <template>
-	<div class="">
-		<h1 class="pd-medium radius-medium bg-light mn-b-small">Welcome to Backoffice</h1>
-		
+	<div class="bg-white">
 		
 	</div>
 </template>

package/src/modules/community/components/blocks/CardBlogpost.vue

@@ -1,6 +1,6 @@
 <template>
 	<article 
-		class="pos-relative bg-light radius-big flex-column flex"
+		class="pos-relative flex-column flex"
 	>
 		<CardHeader 
 	    :class="{

package/src/modules/community/components/blocks/FooterBlogpost.vue

@@ -6,11 +6,11 @@
         url: blogpost.url 
       }
     }" 
-    class="font-second cursor-pointer hover-bg-white pd-l-thin pd-r-thin radius-big">
+    class="font-second cursor-pointer hover-bg-light pd-l-thin pd-r-thin radius-big">
       👁️ {{blogpost.views}}
     </router-link>
     
-    <div class="hover-bg-white pd-l-thin pd-r-thin radius-big cursor-pointer">
+    <div class="hover-bg-light pd-l-thin pd-r-thin radius-big cursor-pointer">
       <div class="cursor-pointer" @click="addReaction('like')" v-if="!isReacted">
         👍 {{reactionsCount }}
       </div>
@@ -25,7 +25,7 @@
         url: blogpost.url 
       }
     }" 
-    class="font-second cursor-pointer hover-bg-white pd-l-thin pd-r-thin radius-big">
+    class="font-second cursor-pointer hover-bg-light pd-l-thin pd-r-thin radius-big">
       💬 {{ blogpost.numberOfComments }}
     </router-link>
   </footer>

package/src/modules/community/components/layouts/Community.vue

@@ -1,7 +1,7 @@
 <template>
-	<div style="grid-template-columns: 2fr 4fr 2fr;" class="cols-3 gap-thin pd-t-zero pd-thin">
+	<div style="grid-template-columns: 2fr 4fr 2fr; grid-template-rows: auto 1fr auto;" class="cols-3 gap-thin pd-t-zero pd-thin mobile:pd-zero ">
 
-		<ul class="align-self-start pos-sticky pos-t-0 w-100 bg-light radius-big pd-medium p-medium gap-thin flex-column mobile:flex-row flex-nowrap flex z-index-2 o-scroll t-nowrap scroll-hide">
+		<ul class="align-self-start pos-sticky h-max pos-t-0 w-100 bg-white radius-medium pd-medium p-medium gap-thin flex-column mobile:flex-row mobile:radius-zero mobile:pd-thin flex-nowrap flex z-index-2 o-scroll t-nowrap scroll-hide">
 			<li  	
 				:class="{'t-black bg-white': route.params.category === 'featured' }" 					
 				@click="() => { blog.state.sort.param = 'createdAt'; router.push({name: 'Blog', params: { category: 'featured' } })}" 
@@ -49,9 +49,9 @@
 
 		<section class="pos-relative">
 
-			<header v-if="!route.params.url" class="bg-light t-black radius-big pd-medium pos-relative  mn-b-thin flex-v-center t-left flex-nowrap flex">
-	    	<h3 class="pos-relative flex-v-center flex-nowrap flex">
-	    		<span class="mn-r-thin">Topics for </span>
+			<header v-if="!route.params.url" class="bg-white pd-medium radius-medium mobile:radius-zero t-black pos-relative  mn-b-thin flex-v-center t-left flex-nowrap flex">
+	    	<h2 class="pos-relative t-nowrap flex-v-center flex-nowrap flex">
+	    		<span class="mn-r-thin">Posts for </span>
 
 	    		<Select 
 		        :options="['today','week','month','year','all time']"
@@ -64,11 +64,11 @@
 		        	bg-main t-black
 		        	pd-thin
 		        	radius-medium
-		          h3
+		          h2
 		         	t-center
 		        "
 		      />
-	    	</h3>
+	    	</h2>
 			</header>
 
 			<router-view v-slot="{ Component, route }">
@@ -79,7 +79,7 @@
 
 		</section>
 
-		<div class="desktop-only align-self-start  bg-light radius-big pd-medium">
+		<div class="desktop-only align-self-start  bg-white radius-medium pd-medium">
 			<div class="gap-thin flex-nowrap flex">
 				<p class="t-medium mn-b-small">Popular Communities</p>
 				

package/src/modules/community/components/pages/Blog.vue

@@ -30,7 +30,7 @@
         :key="item._id" 
         :blogpost="item" 
         :user="auth.state.user._id" 
-        class="h-max-40r mn-b-medium"
+        class="h-max-40r bg-white mn-b-thin radius-medium mobile:radius-zero"
       />
     </Feed>
   </section>

package/src/modules/community/components/pages/BlogPost.vue

@@ -1,6 +1,6 @@
 <template>
   <section>
-    <TransitionGroup tag="ul" name="fade" class="o-hidden bg-light radius-big">
+    <TransitionGroup tag="ul" name="fade" class="o-hidden bg-white radius-medium">
       <SkeletonBlogpost
         v-if="isLoading"
         v-for="i in 3" :key="i"
@@ -29,7 +29,7 @@
           :user="auth.state.user._id"
           :type="'blogpostPage'"
           :hideTitle="true"
-          class="mn-b-thin"
+          class="mn-b-thin bg-white radius-medium"
         >
 
   	      <Viewer
@@ -53,7 +53,7 @@
         :type="'blogpost'" 
         :target="blogpost._id" 
         :owner="auth.state.user._id"
-        class="bg-light radius-big pd-medium"
+        class="bg-white radius-medium pd-medium"
       />
       
     </TransitionGroup>  

package/src/modules/community/components/pages/Community.vue

@@ -13,7 +13,7 @@
         :key="blogpost._id" 
         :blogpost="blogpost" 
         :owner="auth.state.user._id" 
-        class="mn-b-medium"
+        class="mn-b-medium "
       >
         <div class="flex-nowrap flex pd-t-zero pd-b-zero pd-big">
           <button class="mn-r-thin button-small w-100 button" @click="$router.push({path: '/community/posts/' +  blogpost.url + '/edit'})">Edit</button>

package/src/modules/community/components/sections/Comments.vue

@@ -8,7 +8,7 @@
       </div>
 
       <div class="mn-b-small" v-if="owner">
-        <form @submit.prevent="submitComment" class="bg-white radius-medium pd-small">
+        <form @submit.prevent="submitComment" class="bg-light radius-medium pd-small">
           <textarea v-model="commentContent" placeholder="Enter your comment" class="p-big w-100 radius-small mn-r-small"></textarea>
           <button type="submit" class="mn-l-auto bg-main button">Send</button>
         </form>
@@ -24,7 +24,7 @@
         :owner="owner"
         @reply="handleReply"
         @load-more="loadMoreChildren"
-        class="comment mn-b-small radius-big bg-light"
+        class="comment mn-b-small radius-medium"
       />
   </div>
 </template>