Compare commits

..

No commits in common. "9ee827c106792d0f4670d306b5d1aa19cc020b30" and "86d48e415cf98f12a4101b885c4af219a0bdb543" have entirely different histories.

9 changed files with 13 additions and 36 deletions

View file

@ -62,12 +62,3 @@ jobs:
sshpass -p "$PASSWORD" rsync -az --delete -O \
-e 'ssh -p 2244 -o StrictHostKeyChecking=no' \
assets/ $USERNAME@$HOST:$PREPROD_PATH/assets/
echo "Deploying .user.ini"
sshpass -p "$PASSWORD" rsync -az -O \
-e 'ssh -p 2244 -o StrictHostKeyChecking=no' \
.user.ini $USERNAME@$HOST:$PREPROD_PATH/.user.ini
echo "Fix ACL mask on writable directories"
sshpass -p "$PASSWORD" ssh -p 2244 -o StrictHostKeyChecking=no $USERNAME@$HOST \
"setfacl -m mask::rwx $PREPROD_PATH/site/accounts $PREPROD_PATH/site/cache $PREPROD_PATH/site/sessions $PREPROD_PATH/content $PREPROD_PATH/media"

View file

@ -62,12 +62,3 @@ jobs:
sshpass -p "$PASSWORD" rsync -az --delete -O \
-e 'ssh -p 2244 -o StrictHostKeyChecking=no' \
assets/ $USERNAME@$HOST:$PROD_PATH/assets/
echo "Deploying .user.ini"
sshpass -p "$PASSWORD" rsync -az -O \
-e 'ssh -p 2244 -o StrictHostKeyChecking=no' \
.user.ini $USERNAME@$HOST:$PROD_PATH/.user.ini
echo "Fix ACL mask on writable directories"
sshpass -p "$PASSWORD" ssh -p 2244 -o StrictHostKeyChecking=no $USERNAME@$HOST \
"setfacl -m mask::rwx $PROD_PATH/site/accounts $PROD_PATH/site/cache $PROD_PATH/site/sessions $PROD_PATH/content $PROD_PATH/media"

View file

@ -56,7 +56,7 @@ deploy_preprod:
build_prod:
stage: build
only:
- main
- prod
image: composer:2
script:
- apk add --no-cache nodejs npm

View file

@ -30,12 +30,12 @@ sections:
fr: Ouvrir la plateforme
en: Open platform
value: Design to Pack
link: https://designtopack.groupe-pochet.fr/
link: https://designtopack.morphozbygroupepochet.com/
icon: open
- label:
fr: Projet(s) en cours
en: Current project(s)
link: https://designtopack.groupe-pochet.fr/
link: https://designtopack.morphozbygroupepochet.com/
value: "{{ user.currentProjects.count }}"
icon: folder
content:

View file

@ -16,7 +16,6 @@ return [
'pattern' => 'migrate-user-projects.json',
'method' => 'POST',
'action' => function () {
ini_set('memory_limit', '512M');
$user = kirby()->user();
if (!$user || $user->role()->id() !== 'admin') {

View file

@ -34,7 +34,7 @@
<script>
if (location.href.includes('goguely')) {
location.href = 'https://designtopack.groupe-pochet.fr' + location.pathname
location.href = 'https://designtopack.morphozbygroupepochet.com' + location.pathname
}
</script>
</head>

View file

@ -11,12 +11,11 @@ function getProjectData($project, $user)
{
// Utiliser getNotificationsLight() avec cache pour optimiser les performances
$notifications = [];
if ($project instanceof ProjectPage) {
try {
$notifications = $project->getNotificationsLight($user);
} catch (\Throwable $e) {
error_log("Error getting notifications for project {$project->uri()}: " . $e->getMessage());
}
try {
$notifications = $project->getNotificationsLight($user);
} catch (\Throwable $e) {
error_log("Error getting notifications for project {$project->uri()}: " . $e->getMessage());
$notifications = [];
}
$data = [

View file

@ -25,7 +25,7 @@ const images = computed(() => {
},
];
}
return allVariations.value.map((variation) => getFrontView(variation)).filter(Boolean) ?? [];
return allVariations.value.map((variation) => getFrontView(variation)) ?? [];
});
const uri = addLocalePrefix(step.uri);
@ -35,13 +35,10 @@ function getFrontView(variation) {
const xMax = parseInt(
variation.files[variation.files.length - 1].name.split('_')[1].split('.')[0]
);
const xFrontView = Math.round((xMax + 1) / 2);
const xFrontView = (xMax + 1) / 2;
const extension = variation.files[0].name.split('.')[1];
const frontViewName = '0_' + xFrontView + '.' + extension;
const frontView = variation.files.find((file) => file.name === frontViewName);
if (!frontView) {
console.warn(`[VirtualSample] Front view "${frontViewName}" not found in variation "${variation.title}", falling back to first file.`);
}
return frontView ?? variation.files[0];
return frontView;
}
</script>

View file

@ -14,7 +14,7 @@ export default defineConfig(({ mode }) => {
},
},
sourcemap: mode === 'staging',
minify: mode === 'production',
minify: mode === 'production' ? 'esbuild' : false,
},
server: {
cors: true,