3 Commits
4 changed files with 5 additions and 4 deletions
+2 -1
View File
@@ -13,7 +13,8 @@ COPY . .
RUN composer install --no-dev --optimize-autoloader RUN composer install --no-dev --optimize-autoloader
ARG APP_VERSION=Dev ARG APP_VERSION=Dev
ENV VITE_APP_VERSION=$APP_VERSION ENV VITE_APP_VERSION=$APP_VE
LABEL org.opencontainers.image.version=$APP_VERSION
RUN npm install && npm run build && rm -f public/hot RUN npm install && npm run build && rm -f public/hot
+1 -1
View File
@@ -8,7 +8,7 @@
"dev": "vite", "dev": "vite",
"dev:all": "concurrently -s all \"php artisan serve\" \"php artisan reverb:start\" \"php artisan queue:work\" \"npm run dev\" > /dev/null 2>&1", "dev:all": "concurrently -s all \"php artisan serve\" \"php artisan reverb:start\" \"php artisan queue:work\" \"npm run dev\" > /dev/null 2>&1",
"serve:all": "concurrently -s all \"php artisan serve\" \"php artisan reverb:start\" \"php artisan queue:work\" > /dev/null 2>&1", "serve:all": "concurrently -s all \"php artisan serve\" \"php artisan reverb:start\" \"php artisan queue:work\" > /dev/null 2>&1",
"updateVersion": "cross-var docker build -t dredgy/flights-api:$npm_config_tag -t dredgy/flights-api:latest . && cross-var docker push dredgy/flights-api:$npm_config_tag && docker push dredgy/flights-api:latest" "updateVersion": "cross-var docker build --build-arg APP_VERSION=$npm_config_tag -t dredgy/flights-api:$npm_config_tag -t dredgy/flights-api:latest . && cross-var docker push dredgy/flights-api:$npm_config_tag && docker push dredgy/flights-api:latest"
}, },
"devDependencies": { "devDependencies": {
"@inertiajs/vue3": "^2.0.0", "@inertiajs/vue3": "^2.0.0",
@@ -160,7 +160,7 @@ const showColumn = (column: string) => props.columnsToShow.includes(column)
<td v-if="showColumn('class_seat_combined')" class="v-data-table__td class-badges-cell"> <td v-if="showColumn('class_seat_combined')" class="v-data-table__td class-badges-cell">
<span class="class-cell"> <span class="class-cell">
<CrewTooltip v-if="flight.flight_reason?.name == 'Crew'" :crew-type="flight.crew_type!"> <CrewTooltip v-if="flight.flight_reason?.name == 'Crew' && flight.crew_type" :crew-type="flight.crew_type!">
<FlightClassBadge v-if="flight.flight_class?.internal_name === 'crew'" :flight="flight" /> <FlightClassBadge v-if="flight.flight_class?.internal_name === 'crew'" :flight="flight" />
<InlineBadge v-else variant="crew">Crew</InlineBadge> <InlineBadge v-else variant="crew">Crew</InlineBadge>
</CrewTooltip> </CrewTooltip>
+1 -1
View File
@@ -303,7 +303,7 @@ export interface Flight {
airline: Airline | null airline: Airline | null
aircraft: Aircraft | null aircraft: Aircraft | null
seat_type: SeatType | null seat_type: SeatType | null
crew_type: CrewType | null crew_type?: CrewType | null
flight_reason: FlightReason | null flight_reason: FlightReason | null
flight_class: FlightClass | null flight_class: FlightClass | null
duration_display: string duration_display: string