Merge branch 'auto-develop' into develop-G7

Author: TheoLandemaine

back-end/src/base/users/dto/users.dto.ts

@@ -57,13 +57,13 @@ class UserProfileDTO {
 
 	@IsOptional()
 	@IsString({ message: 'Invalid type format' })
-	@Length(0, 80, { message: 'Profile picture link must be between 0 and 80 characters' })
+	@Length(0, 120, { message: 'Profile picture link must be between 0 and 120 characters' })
 	@Matches(STRICT_API_URL, { message: 'Your profile picture must be a valid url' })
 	picture: string;
 
 	@IsOptional()
 	@IsString({ message: 'Invalid type format' })
-	@Length(0, 80, { message: 'Profile background link be between 0 and 80 characters' })
+	@Length(0, 120, { message: 'Profile background link be between 0 and 120 characters' })
 	@Matches(STRICT_API_URL, { message: 'Your profile background must be a valid url' })
 	background: string;
 
@@ -118,7 +118,7 @@ class UserBusinessProfileDTO {
 	@IsOptional()
 	@IsString({ message: 'Invalid type format' })
 	@Matches(STRICT_API_URL, { message: 'Your company logo must be a valid url' })
-	@Length(0, 80, { message: 'Company logo link be between 0 and 80 characters' })
+	@Length(0, 120, { message: 'Company logo link be between 0 and 120 characters' })
 	companyLogo: string;
 
 	@IsOptional()

front-end/public/elevator_pitch.webp

@@ -6,6 +6,7 @@ import { AgilityTemplateMeta } from '@/store/interfaces/agility.interface';
 import { Status } from '@/store/interfaces/axios.interface';
 import { AxiosResponse } from 'axios';
 import { UserCanvasList } from '@/store/interfaces/user.interface';
+import { BlueprintKey } from '@/lib/pixi-tools-v2/types/pixi-enums';
 
 export const apiTryGetTemplatesMeta = () => {
 	// Call
@@ -15,40 +16,40 @@ export const apiTryGetTemplatesMeta = () => {
 			status: 'ok',
 			metaTemplates: [
 				{
-					key: 'something',
-					url: 'https://bluemelondesign.com/wp-content/uploads/2020/11/Body-Image-1-1024x597.png',
-					name: 'empathy map',
-					isNew: false,
-					type: 'empathymap',
-				},
-				{
-					key: 'something',
-					url: 'https://slidemodel.com/wp-content/uploads/01-preparing-an-elevator-pitch-cover.png',
-					name: 'elevator pitch',
+					key: BlueprintKey.IMPACT_MAPPING,
+					url: '/impact_mapping.webp',
+					name: 'impact mapping',
 					isNew: true,
-					type: 'elevatorpitch',
+					type: 'impactmapping',
 				},
 				{
-					key: 'something',
-					url: 'https://draft.io/assets/site/examples/light/en/1200/example-impact-mapping-3e12e17fb4ab1cdd63cd08c3561c3cda.webp',
-					name: 'impact mapping',
+					key: BlueprintKey.EMPATHY_MAP,
+					url: '/empathy_map.webp',
+					name: 'empathy map',
 					isNew: true,
-					type: 'impactmapping',
+					type: 'empathymap',
 				},
 				{
-					key: 'something',
-					url: 'https://www.imagescreations.fr/wp-content/uploads/persona_emma-1200x800.jpg',
+					key: BlueprintKey.PERSONA,
+					url: '/persona.webp',
 					name: 'personas',
 					isNew: true,
 					type: 'personas',
 				},
 				{
-					key: 'something',
-					url: 'https://www.imagescreations.fr/wp-content/uploads/persona_emma-1200x800.jpg',
+					key: BlueprintKey.PRUNE_THE_PROJECT_TREE,
+					url: '/prune_the_project_tree.webp',
 					name: 'prune the project tree',
 					isNew: true,
 					type: 'prunetheprojecttree',
 				},
+				{
+					key: BlueprintKey.ELEVATOR_PITCH,
+					url: '/elevator_pitch.webp',
+					name: 'elevator pitch',
+					isNew: true,
+					type: 'elevatorpitch',
+				},
 			],
 		},
 	});

front-end/public/empathy_map.webp

@@ -36,8 +36,8 @@ const projectLoading = computed(() => agilityStore.projectLoading);
 const project = computed(() => agilityStore.currentProject);
 
 const canvas = ref<HTMLCanvasElement>();
-const roomId = ref(route.path.match(/[^/]+$/)[0]);
-const loading = ref(projectLoading.value || project.value.length > 0);
+const roomId = ref(route.path.match(/[^/]+(?=\?)|[^/]+$/)[0]);
+const loading = computed(() => projectLoading.value || projectStore.internalLoading);
 let timeout: NodeJS.Timeout = null;
 let rawScene: Scene = null;
 
@@ -98,7 +98,7 @@ const autoFillProject = async () => {
 
 		await processBatchesWithDelay();
 		linkLines();
-		loading.value = false;
+		projectStore.internalLoading = false;
 	}
 }
 
@@ -128,6 +128,7 @@ const linkLines = () => {
 
 watch(projectLoading, val => {
 	if(!val) {
+		projectStore.internalLoading = true;
 		autoFillProject();
 	}
 }, { immediate: true })

front-end/public/impact_mapping.webp

@@ -5,7 +5,7 @@
 		>
 			<h3 class="text-sm text-[#5c5f73] dark:text-dark-font font-bold">Available blueprints</h3>
 			<div class="w-full h-fit flex gap-4 overflow-x-scroll pt-3">
-				<AgilityTemplateCard name="New project" @click="startNewProject('default')" />
+				<AgilityTemplateCard name="New project" @click="startNewProject(BlueprintKey.DEFAULT)" />
 				<AgilityTemplateCard
 					v-for="(template, key) in metaTemplates"
 					:name="`+ ${template.name}`"
@@ -25,15 +25,20 @@ import { useRouter } from 'vue-router';
 
 import { useAgilityStore } from '@/store/modules/agility.store';
 import AgilityTemplateCard from '@/components/agility/cards/AgilityTemplateCard.vue';
+import { BlueprintKey } from '@/lib/pixi-tools-v2/types/pixi-enums';
+import { useProjectStore } from '@/store/modules/project.store';
 
 const router = useRouter();
 const agilityStore = useAgilityStore();
+const projectStore = useProjectStore();
 const metaTemplates = computed(() => agilityStore.metaTemplates);
 
-const startNewProject = async (key: string) => {
+const startNewProject = async (key: BlueprintKey) => {
 	const roomId = await agilityStore.tryCreateNewProject();
 	if(!roomId) return;
 
+	if(key !== BlueprintKey.DEFAULT)
+		projectStore.baseTemplate = key;
 	router.push(`/app/agility/project/${roomId}`);
 };
 </script>

front-end/public/persona.webp

@@ -34,7 +34,7 @@ import AccessUser from '@/components/agility/cards/AccessUser.vue';
 
 const route = useRoute();
 const accessUsers = ref<Array<UserCanvasList>>([]);
-const roomId = ref(route.path.match(/[^/]+$/)[0]);
+const roomId = ref(route.path.match(/[^/]+(?=\?)|[^/]+$/)[0]);
 
 const emit = defineEmits(['close']);