Skip to content

Commit d4aa28c

Browse files
authored
Merge pull request #166 from cephie-studios/tutorial
fix(local docker & tutorial)
2 parents 46595e8 + 3532ecb commit d4aa28c

File tree

6 files changed

+19
-33
lines changed

6 files changed

+19
-33
lines changed

docker-compose.dev.yml

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ services:
1616
networks:
1717
- pfcontrol-network
1818
healthcheck:
19-
test: ["CMD-SHELL", "pg_isready -U pfcontrol"]
19+
test: [ "CMD-SHELL", "pg_isready -U pfcontrol" ]
2020
interval: 10s
2121
timeout: 5s
2222
retries: 5
@@ -32,38 +32,16 @@ services:
3232
networks:
3333
- pfcontrol-network
3434
healthcheck:
35-
test: ["CMD", "redis-cli", "ping"]
35+
test: [ "CMD", "redis-cli", "ping" ]
3636
interval: 10s
3737
timeout: 3s
3838
retries: 5
3939

40-
pfcontrol-dev:
41-
build:
42-
context: .
43-
dockerfile: Dockerfile.dev
44-
ports:
45-
- "9901:9901"
46-
- "5173:5173"
47-
environment:
48-
- NODE_ENV=development
49-
env_file:
50-
- .env.development
51-
volumes:
52-
- .:/app
53-
- /app/node_modules
54-
restart: unless-stopped
55-
networks:
56-
- pfcontrol-network
57-
depends_on:
58-
postgres:
59-
condition: service_healthy
60-
redis:
61-
condition: service_healthy
62-
6340
volumes:
6441
postgres_data:
6542
redis_data:
6643

44+
6745
networks:
6846
pfcontrol-network:
6947
driver: bridge

server/db/sessions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export async function createSession({
4444

4545
if (isTutorial) {
4646
await addFlight(sessionId, {
47-
callsign: 'EXAMPLE123',
47+
callsign: 'DLH123',
4848
aircraft: 'A320',
4949
flight_type: 'IFR',
5050
departure: airportIcao,

src/components/tables/ArrivalsTable.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ function ArrivalsTable({
446446
</th>
447447
{arrivalsColumns.callsign !== false && (
448448
<th
449-
className="py-2.5 px-4 text-left cursor-pointer select-none hover:bg-green-700"
449+
className="py-2.5 px-4 text-left column-callsign cursor-pointer select-none hover:bg-green-700"
450450
onClick={() => handleSort('callsign')}
451451
>
452452
CALLSIGN
@@ -604,7 +604,7 @@ function ArrivalsTable({
604604
</span>
605605
</td>
606606
{arrivalsColumns.callsign !== false && (
607-
<td className="py-2 px-4">
607+
<td className="py-2 px-4 column-callsign">
608608
<span
609609
className="text-white font-mono"
610610
title={

src/components/tables/DepartureTable.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ function DepartureTable({
591591
</th>
592592
{departureColumns.callsign !== false && (
593593
<th
594-
className="py-2.5 px-4 text-left w cursor-pointer select-none hover:bg-blue-700"
594+
className="py-2.5 px-4 text-left column-callsign w cursor-pointer select-none hover:bg-blue-700"
595595
onClick={() => handleSort('callsign')}
596596
>
597597
CALLSIGN
@@ -781,7 +781,7 @@ function DepartureTable({
781781
</span>
782782
</td>
783783
{departureColumns.callsign !== false && (
784-
<td className="py-2 px-4">
784+
<td className="py-2 px-4 column-callsign">
785785
<div
786786
title={
787787
!airlinesLoading

src/components/tutorial/TutorialStepsCreate.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export const steps: {
4444
target: '#pfatc-checkbox',
4545
title: 'PFATC Network',
4646
content:
47-
"Check this if you're controlling on the PFATC Network. This makes your session publicly visible.",
47+
"Check this if you're controlling on the PFATC Network. This makes your session publicly visible. (Enabled for tutorial)",
4848
placement: 'top' as Placement,
4949
disableNext: true,
5050
},

src/components/tutorial/TutorialStepsFlights.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,17 @@ export const steps: {
127127
disableNext: true,
128128
},
129129
{
130-
target: '#departure-table .w',
130+
target: '#departure-table th.column-callsign',
131131
title: 'CALLSIGN',
132-
content: "The flight's callsign (e.g., BAW123). Enter or edit as needed.",
132+
content: "The flight's callsign (e.g., DLH123). Enter or edit as needed.",
133+
placement: 'top',
134+
disableNext: true,
135+
},
136+
{
137+
target: '#departure-table td.column-callsign',
138+
title: 'Callsign Tooltip',
139+
content:
140+
'You can hover over a callsign and the spoken version will appear in a tool tip.',
133141
placement: 'top',
134142
disableNext: true,
135143
},

0 commit comments

Comments
 (0)