Adjust projections and CI config
Some checks failed
Deploy to Production / deploy (push) Failing after 4s

This commit is contained in:
2026-02-22 19:19:03 +00:00
parent 6eb60e1cb3
commit d536290e5d
2 changed files with 200 additions and 5 deletions

View File

@@ -1,5 +1,4 @@
name: Deploy to Production
run-name: Deploy to Production by @${{ github.actor }}
on:
push:
@@ -15,9 +14,6 @@ jobs:
- name: Build and deploy with Docker Compose
run: |
# Próba zatrzymania i usunięcia starego kontenera (ignoruje błąd jeśli nie istnieje)
# Sprzątaj TYLKO swój projekt
docker compose down --remove-orphans || true
docker rm -f rubic-cube || true
# Start nowej wersji
docker compose up -d --build

View File

@@ -1,8 +1,11 @@
<script setup>
import { ref, computed, onMounted, onUnmounted } from 'vue'
import { useCube } from '../../composables/useCube'
import { useSettings } from '../../composables/useSettings'
import Line3D from '../common/Line3D.vue'
const { cubies, initCube, rotateLayer, FACES } = useCube()
const { showProjections } = useSettings()
// --- Visual State ---
const rx = ref(-25) // Initial View Rotation X
@@ -89,6 +92,95 @@ const project = (v) => {
return { x: x3, y: y3 }
}
const projectedCubies = computed(() => {
// Filter cubies for each face based on logical coordinates
// x: -1 (Left), 1 (Right)
// y: -1 (Down/Bottom), 1 (Up/Top)
// z: -1 (Back), 1 (Front)
const left = cubies.value.filter(c => Math.round(c.x) === -1)
const back = cubies.value.filter(c => Math.round(c.z) === -1)
const down = cubies.value.filter(c => Math.round(c.y) === -1)
return { left, back, down }
})
const projectionTransforms = {
left: { tx: -350, ty: 0, tz: 0, ry: -90 },
back: { tx: 0, ty: -200, tz: -350, ry: 0 },
down: { tx: 0, ty: 350, tz: 0, rx: 90 }
}
const projectionLines = computed(() => {
const lines = []
// Helper to transform point
const transformPoint = (p, transform) => {
let x = p.x, y = p.y, z = p.z
// Rotate
if (transform.ry) {
const rad = transform.ry * Math.PI / 180
const x0 = x, z0 = z
x = x0 * Math.cos(rad) + z0 * Math.sin(rad)
z = -x0 * Math.sin(rad) + z0 * Math.cos(rad)
}
if (transform.rx) {
const rad = transform.rx * Math.PI / 180
const y0 = y, z0 = z
y = y0 * Math.cos(rad) - z0 * Math.sin(rad)
z = y0 * Math.sin(rad) + z0 * Math.cos(rad)
}
// Translate
x += transform.tx || 0
y += transform.ty || 0
z += transform.tz || 0
return { x, y, z }
}
const S = 150 // Half size
// 1. Left Projection
{
const t = projectionTransforms.left
// Start: Left Face corners (x = -S)
const start = [
{ x: -S, y: -S, z: -S }, { x: -S, y: -S, z: S },
{ x: -S, y: S, z: -S }, { x: -S, y: S, z: S }
]
const end = start.map(p => transformPoint(p, t))
start.forEach((p, i) => lines.push({ start: p, end: end[i] }))
}
// 2. Back Projection
{
const t = projectionTransforms.back
// Start: Back Face corners (z = -S)
const start = [
{ x: -S, y: -S, z: -S }, { x: S, y: -S, z: -S },
{ x: -S, y: S, z: -S }, { x: S, y: S, z: -S }
]
const end = start.map(p => transformPoint(p, t))
start.forEach((p, i) => lines.push({ start: p, end: end[i] }))
}
// 3. Down Projection (Down Face)
{
const t = projectionTransforms.down
// Start: Down Face corners (y = -S)
const start = [
{ x: -S, y: -S, z: -S }, { x: S, y: -S, z: -S },
{ x: -S, y: -S, z: S }, { x: S, y: -S, z: S }
]
const end = start.map(p => transformPoint(p, t))
start.forEach((p, i) => lines.push({ start: p, end: end[i] }))
}
return lines
})
// --- Interaction Logic ---
const onMouseDown = (e) => {
@@ -313,6 +405,27 @@ const getCubieStyle = (c) => {
return { transform }
}
const getProjectionStyle = (c, face) => {
let col = 0
let row = 0
if (face === FACES.LEFT) {
col = 1 - c.z
row = 1 - c.y
} else if (face === FACES.BACK) {
col = 1 - c.x
row = 1 - c.y
} else if (face === FACES.DOWN) {
col = c.x + 1
row = 1 - c.z
}
const x = (col - 1) * SCALE
const y = (row - 1) * SCALE
return { transform: `translate3d(${x}px, ${y}px, 0px)` }
}
onMounted(() => {
initCube()
window.addEventListener('mousemove', onMouseMove)
@@ -345,6 +458,42 @@ onUnmounted(() => {
</div>
</div>
<!-- Projections of Hidden Faces -->
<div v-if="showProjections" class="projections">
<!-- Guide Lines -->
<Line3D v-for="(line, i) in projectionLines" :key="'line-'+i"
:start="line.start" :end="line.end"
:color="'var(--text-strong)'"
:thickness="1" />
<!-- Left Face Projection -->
<div class="projection-group left-projection">
<div v-for="c in projectedCubies.left" :key="c.id"
class="cubie-placeholder"
:style="getProjectionStyle(c, FACES.LEFT)">
<div class="sticker" :class="c.faces.left"></div>
</div>
</div>
<!-- Back Face Projection -->
<div class="projection-group back-projection">
<div v-for="c in projectedCubies.back" :key="c.id"
class="cubie-placeholder"
:style="getProjectionStyle(c, FACES.BACK)">
<div class="sticker" :class="c.faces.back"></div>
</div>
</div>
<!-- Down Face Projection (Exploded View) -->
<div class="projection-group down-projection">
<div v-for="c in projectedCubies.down" :key="c.id"
class="cubie-placeholder"
:style="getProjectionStyle(c, FACES.DOWN)">
<div class="sticker" :class="c.faces.down"></div>
</div>
</div>
</div>
</div>
</div>
</template>
@@ -382,6 +531,56 @@ onUnmounted(() => {
transform-style: preserve-3d;
}
/* Projection Styles */
.projections {
position: absolute;
top: 0; left: 0;
width: 0; height: 0;
pointer-events: none; /* Let clicks pass through to the cube */
transform-style: preserve-3d;
}
/*
Positioning relative to center (0,0,0).
Cube size is approx 300px (3 * 100px).
Projections are "exploded" views floating around the cube.
*/
/* Projection Groups - Exploded View Containers */
.projection-group {
position: absolute;
top: 50%;
left: 50%;
width: 0;
height: 0;
transform-style: preserve-3d;
pointer-events: none;
}
.cubie-placeholder {
position: absolute;
width: 100px;
height: 100px;
top: 0;
left: 0;
margin-top: -50px;
margin-left: -50px;
transform-style: preserve-3d;
}
.left-projection {
transform: translateX(-350px) translateY(0) translateZ(0) rotateY(-90deg);
}
.back-projection {
transform: translateX(0) translateY(-200px) translateZ(-350px) rotateY(0deg);
}
.down-projection {
transform: translateX(0) translateY(350px) translateZ(0) rotateX(90deg);
}
.sticker {
position: absolute;
width: 100px;