Skip to content

Commit

Permalink
FIX: spelling...Privet => Private
Browse files Browse the repository at this point in the history
FIX:
-  Display airport name within character limit [71a5717]

------------------------------------------------------------------------

	modified:   CHANGELOG.md
	modified:   admin/conn.php
	modified:   admin/fba.php
	modified:   admin/mobile.html
	modified:   database/admin.sql
	modified:   database/bookings.sql
	modified:   database/drivers.sql
	modified:   drivers/conn.php
	modified:   user/about.html
	modified:   user/conn.php
	modified:   user/nav.php
	modified:   user/ticket.php
  • Loading branch information
siMobin committed Oct 23, 2023
1 parent 2d40bc4 commit ee95325
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 16 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [First Patch]

```powershell
npx nativefier --name "Admin-Privet Jet" -i "./icon.ico" --inject "./admin-context.js" --disable-dev-tools --build-version "0.0.073-beta" --app-version "0.07" --show-menu-bar --bookmarks-menu "./admin_menu-Action.json" --min-width "1360" --min-height "768" --ignore-certificate --portable "http://localhost/admin/"
npx nativefier --name "Admin-Private Jet" -i "./icon.ico" --inject "./admin-context.js" --disable-dev-tools --build-version "0.0.073-beta" --app-version "0.07" --show-menu-bar --bookmarks-menu "./admin_menu-Action.json" --min-width "1360" --min-height "768" --ignore-certificate --portable "http://localhost/admin/"
```
2 changes: 1 addition & 1 deletion admin/conn.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$serverName = "127.0.0.1"; // localhost ip-----OR----enable any existing ip from SQL Server (2022) Configuration manager\SQL Server Network Configuration\protocols For SQLEXPRESS(instance name)\TCP/IP\properties\protocol(enabled)\IP Address
$port = "51609"; // The port, configured in SQL Server Configuration Manager
$connectionOptions = array(
"Database" => "PrivetJet" //database name
"Database" => "PrivateJet" //database name
);

$conn = sqlsrv_connect("$serverName, $port", $connectionOptions);
Expand Down
4 changes: 3 additions & 1 deletion admin/fba.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@

// Process all airports
foreach ($allAirports as $airport) {
$airportNames[] = htmlspecialchars($airport);
$nameSize = 16;
$shortenedAirportName = strlen($airport) > $nameSize ? substr($airport, 0, $nameSize) . '...' : $airport; // show airport name under $limit...
$airportNames[] = htmlspecialchars($shortenedAirportName);
$flightCountsStart[] = isset($flightDataStart[$airport]) ? $flightDataStart[$airport] : 0;
$flightCountsDestination[] = isset($flightDataDestination[$airport]) ? $flightDataDestination[$airport] : 0;
}
Expand Down
4 changes: 2 additions & 2 deletions admin/mobile.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css" />
<link rel="stylesheet" href="./style/mobile.css" />
<title>PrivetJet/Admin</title>
<title>PrivateJet/Admin</title>
</head>
<body>
<!-- The logo -->
Expand All @@ -18,7 +18,7 @@
<p>This website is designed for <strong>Desktop</strong> only and may not provide an optimal experience on mobile devices or screens with low resolutions.</p>
<p>If you are on a <strong>Mobile</strong> device, we recommend using a <strong>Desktop</strong> or larger screen for the best viewing experience.</p>
<p>
If you'd like to refresh the page press the refresh button
If you'd like to refresh the page press the refresh button
<button>
<a href="./schedule.php"><i class="fa-solid fa-arrows-rotate"></i> Refresh</a>
</button>
Expand Down
5 changes: 3 additions & 2 deletions database/admin.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
create database PrivetJet;
use PrivetJet;
create database PrivateJet;
use PrivateJet;
use PrivateJet;

-- admin login
-- Create the admin_login table
Expand Down
2 changes: 1 addition & 1 deletion database/bookings.sql
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use PrivetJet;
use PrivateJet;

-- user login info
create table users(
Expand Down
2 changes: 1 addition & 1 deletion database/drivers.sql
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use PrivetJet
use PrivateJet


CREATE TABLE driver_info (
Expand Down
2 changes: 1 addition & 1 deletion drivers/conn.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$serverName = "127.0.0.1"; // localhost ip-----OR----enable any existing ip from SQL Server (2022) Configuration manager\SQL Server Network Configuration\protocols For SQLEXPRESS(instance name)\TCP/IP\properties\protocol(enabled)\IP Address
$port = "51609"; // The port, configured in SQL Server Configuration Manager
$connectionOptions = array(
"Database" => "PrivetJet" //database name
"Database" => "PrivateJet" //database name
);

$conn = sqlsrv_connect("$serverName, $port", $connectionOptions);
Expand Down
2 changes: 1 addition & 1 deletion user/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>About/Privet Jet</title>
<title>About/Private Jet</title>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/2.9.359/pdf.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/2.9.359/pdf.worker.min.js"></script>
<link rel="stylesheet" href="./style/about.css" />
Expand Down
2 changes: 1 addition & 1 deletion user/conn.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$serverName = "127.0.0.1"; // localhost ip-----OR----enable any existing ip from SQL Server (2022) Configuration manager\SQL Server Network Configuration\protocols For SQLEXPRESS(instance name)\TCP/IP\properties\protocol(enabled)\IP Address
$port = "51609"; // The port, configured in SQL Server Configuration Manager
$connectionOptions = array(
"Database" => "PrivetJet" //database name
"Database" => "PrivateJet" //database name
);

$conn = sqlsrv_connect("$serverName, $port", $connectionOptions);
Expand Down
2 changes: 1 addition & 1 deletion user/nav.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function logout()
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="icon" type="image/x-icon" href="./icon.ico">
<title>Privet Jet</title>
<title>Private Jet</title>
<style>

</style>
Expand Down
6 changes: 3 additions & 3 deletions user/ticket.php
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ function calculateDistance($lat1, $lon1, $lat2, $lon2)
$pdf->Image('./image/ticket.png', -10, -5, 230);
$pdf->SetFont('Arial', 'BU', 24);
$pdf->Cell(71, 10, '', 0, 0);
$pdf->Cell(59, 5, 'Privet Jet!', 0, 0);
$pdf->Cell(59, 5, 'Private Jet!', 0, 0);
$pdf->Cell(59, 10, '', 0, 0);
$pdf->SetFont('Arial', 'B', 12);

Expand Down Expand Up @@ -278,7 +278,7 @@ function calculateDistance($lat1, $lon1, $lat2, $lon2)
$pdf->Image('./image/ticket.png', -10, -5, 230);
$pdf->SetFont('Arial', 'BU', 24);
$pdf->Cell(71, 10, '', 0, 0);
$pdf->Cell(59, 5, 'Privet Jet!', 0, 0);
$pdf->Cell(59, 5, 'Private Jet!', 0, 0);
$pdf->Cell(59, 10, '', 0, 0);
$pdf->Ln();
$pdf->SetFont('Arial', 'B', 12);
Expand Down Expand Up @@ -409,7 +409,7 @@ function calculateDistance($lat1, $lon1, $lat2, $lon2)
<body>
<header>
<div>
<h1>YOUR PRIVATE AIRLINE!</h1>
<h1>YOUR PRIVATE AIRLINE!</h1>
<p>Your trusted source for premium airline tickets at an affordable price! Our goal is to ensure you get the most comfortable flying expeirence all around the globe all while at the convenience of your own home devices. We also provide the service of rescheduling your flight to ensure your experience is the most optimal that we can provide.</p>
</div>
</header>
Expand Down

0 comments on commit ee95325

Please sign in to comment.