diff --git a/OpenSky.Website.sln b/OpenSky.Website.sln index 908301d..72de930 100644 --- a/OpenSky.Website.sln +++ b/OpenSky.Website.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31205.134 +# Visual Studio Version 17 +VisualStudioVersion = 17.8.34330.188 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSky.Website", "OpenSky.Website\OpenSky.Website.csproj", "{1861BA62-1E04-4BE1-B88B-030247F3AF52}" EndProject diff --git a/OpenSky.Website.sln.DotSettings b/OpenSky.Website.sln.DotSettings index fe4c6a3..f1babcc 100644 --- a/OpenSky.Website.sln.DotSettings +++ b/OpenSky.Website.sln.DotSettings @@ -579,13 +579,19 @@ OpenSky project ${CurrentDate.Year} True True True + True + True True True True + True + True True True True True + True + True True True True @@ -595,4 +601,5 @@ OpenSky project ${CurrentDate.Year} True True True + True True \ No newline at end of file diff --git a/OpenSky.Website/Pages/About.razor b/OpenSky.Website/Pages/About.razor index 555658b..16ca62c 100644 --- a/OpenSky.Website/Pages/About.razor +++ b/OpenSky.Website/Pages/About.razor @@ -8,8 +8,12 @@ OpenSky is an open-source airline management simulation currently in development. We are actively seeking aviation enthusiast whom would love to be part of this upcoming project and shape it with us! If you have experience in coding, graphical or game design and feel like you could be an asset to the project, please head over to the contribute page - and do not hesitate to jump into our Discord and say hello! - We would love to hear your ideas and feedback and are actively collecting them in our forums! + and do not hesitate to jump into our Discord and say hello to our still small but growing enthusiastic community! + We would love to hear your ideas and feedback that we are actively collecting and discussing! +

+

+ If you want the best and easiest start as a new pilot on OpenSky head over to our community driven Wiki that + is written by our pilots, not the devs. Sharing the best tips and tricks, as well as answering the most common questions in the FAQ.

diff --git a/OpenSky.Website/Pages/Contribute.razor b/OpenSky.Website/Pages/Contribute.razor index c01586b..44bb2c2 100644 --- a/OpenSky.Website/Pages/Contribute.razor +++ b/OpenSky.Website/Pages/Contribute.razor @@ -5,16 +5,16 @@

CONTRIBUTE

- When choosing a name for this project we wanted the open-source nature of it's development to be immediately obvious - so we made it the first word you read. + When choosing a name for this project we wanted the open-source nature of its development to be immediately obvious - so we made it the first word you read. We believe that through involvement of the aviation simulation community we will end up with a better player experience. All code and documentation (except for maybe some future cheat detection) will be made public on Github, including the central backend API and all its functions.

- The current server codebase is written in C# using the .net-core 5.0 framework and targeted to run on Linux. The main game client and agent for - Microsoft Flight Simulator 2020 and X-Plane 11 are developed on .net 4.8 and are currently Windows only. + The current server codebase is written in C# using the .net 7.0 framework and targeted to run on Linux. The main game client and agent for + Microsoft Flight Simulator 2020 and X-Plane 11+ are developed on .net 4.8 and are currently Windows only. We will be looking to expand this to other operating systems and simulators in the future.

- opensky diagram + opensky diagram
diff --git a/OpenSky.Website/Pages/Credits.razor b/OpenSky.Website/Pages/Credits.razor new file mode 100644 index 0000000..f19cd29 --- /dev/null +++ b/OpenSky.Website/Pages/Credits.razor @@ -0,0 +1,109 @@ +@page "/credits" + +
+
+
+

VOICETALENTS

+

+ In the early stages of development we had the unique idea of using real voice over the generic AI ones. As a result we have reached out to Ash and Kelli whom both proved to be extraordinary talents in their field. Following our initial exchanges it was clear they are both passionate and professional individuals and that we were in good hands! +

+

+ As a result of our collaboration OpenSky can now deliver a truly immersive experience we can all be proud of! +

+
+
+
+
ashsteele
+

Ash Steel

+

+ Ash Steel is a pro voiceover that commands attention. +

+

+ He is hired for his emotive and engaging performance abilities, as well as his technical expertise, dedicated work ethic, and creativity. +

+

+ With a degree in performing arts and a lifelong passion for acting and recording, Ash has impressed big-name clients from Amazon to Tik Tok. He has narrated documentaries including for the WWF, brought characters to life in audiobooks and PC games and completed more than 3,000 voice over projects in the last 3 years. +

+

+ If you want to harness the power of speech for your project then talk to Ash Steel. +

+ + + + + + + + + +
Website:ashsteelvoiceover.co.uk
Email:info@ashsteel.com
+
+
+
kelliwinkler
+

Kelli Winkler

+

+ I'm a professional female voiceover talent with 5+ years experience in the industry. My main objective is to offer you excellent customer service and provide you with a quality voiceover product that you can be proud of having associated with your business! I've been told by my clients that I'm very responsive and have great follow through. +

+

+ With professional equipment and an in-home studio, I've been able to provide quick voice deliveries to my clients in a crunch as well as provide that voiceover that welcomes customers to your company with a warm smile. +

+
 
+ + + + + + + + + +
Website:kelliwinklervoice.com
Email:kelli@kelliwinklervoice.com
+
+
+
+

TECHNOLOGY

+

+ We are a small team and rely on technology and creative partners for our work to ensure we can bring our pilots the best possible experience. + If you are developing your own open-source project be sure to keep them in mind and from all of us a big thank you for supporting the open-source community! +

+
+
+
+
syncfusion
+

syncfusion

+

+ Syncfusion provides an ecosystem of compatible developer control suites, embeddable BI platforms, and business software. Our 1,800+ components and frameworks for mobile, web, and desktop development get your products to market faster, and our Bold line delivers a diverse set of enterprise solutions, ranging from data analysis and visualization, to help desk software, to an electronic signature platform. +

+

+ This project uses several controls from Syncfusion's WPF libraries, especially their excellent Docking manager. Syncfusion was kind enough to support our open-source project with a special community license. You can check out their WPF demos over on Github. +

+ + + + + + +
Website:syncfusion.com
+
+
+
vecteezy
+

vecteezy

+

+ Vecteezy is an online marketplace where users can license stock photos, vector graphics, and stock footage from artists. +

+

+ At Vecteezy we understand that the creative path is never straight. We aim to provide designers with the resources they need to do their best work, wherever they are in the creative process. With fresh photography and vector illustrations by our fantastic creative community and worry-free licensing, we want to help you create with confidence. +

+
 
+ + + + + +
Website:vecteezy.com
+
+
+
+
+ + \ No newline at end of file diff --git a/OpenSky.Website/Pages/Index.razor b/OpenSky.Website/Pages/Index.razor index d66b682..8cde7e5 100644 --- a/OpenSky.Website/Pages/Index.razor +++ b/OpenSky.Website/Pages/Index.razor @@ -6,7 +6,7 @@

OpenSKY,

-

A brand new airline manager experience!

+

a brand-new airline manager experience!

@bannerMessage

Read more
diff --git a/OpenSky.Website/Shared/NavMenu.razor b/OpenSky.Website/Shared/NavMenu.razor index 4d3c442..41289e5 100644 --- a/OpenSky.Website/Shared/NavMenu.razor +++ b/OpenSky.Website/Shared/NavMenu.razor @@ -31,8 +31,13 @@ + @if (!UserSession.IsUserLoggedIn) diff --git a/OpenSky.Website/Shared/PageFooter.razor b/OpenSky.Website/Shared/PageFooter.razor index b6a61f9..e1b8553 100644 --- a/OpenSky.Website/Shared/PageFooter.razor +++ b/OpenSky.Website/Shared/PageFooter.razor @@ -8,7 +8,7 @@ facebook
- instagram + gitbook
discord diff --git a/OpenSky.Website/wwwroot/appsettings.json b/OpenSky.Website/wwwroot/appsettings.json index 3ce7a24..990ef78 100644 --- a/OpenSky.Website/wwwroot/appsettings.json +++ b/OpenSky.Website/wwwroot/appsettings.json @@ -5,7 +5,7 @@ "OpenSky": { "OpenSkyAPIUrl": "https://api.opensky.to", "EmailAddress": "opensky.to@gmail.com", - "IndexBannerMessage": "Alpha4 out now!", + "IndexBannerMessage": "Alpha5 out now!", "TokenApps": [ { "ID": "755CC379-E8FE-43C5-B75F-6CD09772D7A7", diff --git a/OpenSky.Website/wwwroot/css/OpenSky.css b/OpenSky.Website/wwwroot/css/OpenSky.css index 89f623c..8948634 100644 --- a/OpenSky.Website/wwwroot/css/OpenSky.css +++ b/OpenSky.Website/wwwroot/css/OpenSky.css @@ -589,6 +589,114 @@ p { } /* End About Section */ +/* Credits Section */ + +#credits { + background: #fff; +} + + #credits .credits { + flex-direction: column; + text-align: center; + max-width: 1500px; + margin: 0 auto; + padding: 100px 0; + } + + #credits .section-title span { + color: #08c6a4; + } + + #credits .credits-top h1 { + font-size: 3.5rem; + } + + #credits .credits-top p { + margin-left: 30px; + margin-right: 30px; + font-size: 1.3rem; + } + + #credits .credits-bottom { + display: flex; + justify-content: center; + flex-wrap: wrap; + margin-top: 50px; + } + + #credits .credits-item { + flex-basis: 48%; + display: flex; + align-items: flex-start; + justify-content: center; + flex-direction: column; + padding: 30px; + border-radius: 10px; + background-size: cover; + margin: 10px 1%; + position: relative; + z-index: 1; + overflow: hidden; + } + + #credits .credits-item::after { + content: ''; + position: absolute; + left: 0; + top: 0; + height: 100%; + width: 100%; + background-image: linear-gradient(60deg, #29323c 0%, #485563 100%); + opacity: 0.9; + z-index: -1; + } + + #credits .credits-bottom .icon { + height: 200px; + width: 100%; + margin-bottom: 20px; + align-items: center; + } + + #credits .credits-bottom .icon img { + height: 200px; + width: auto; + } + + + #credits .credits-item h2 { + font-size: 2rem; + color: white; + margin-bottom: 10px; + text-transform: uppercase; + width: 100%; + } + + #credits .credits-item p { + color: white; + text-align: left; + font-size: 1.2rem; + } + + #credits table { + width: auto; + vertical-align: bottom; + } + + #credits tr { + padding: 0; + } + + #credits td { + color: white; + text-align: left; + width: auto; + padding: 0; + font-size: 1.2rem; + } + +/* End Credits Section */ + /* News Section */ #news { diff --git a/OpenSky.Website/wwwroot/img/contributediagram.svg b/OpenSky.Website/wwwroot/img/contributediagram.svg index 45c3baf..192fc86 100644 --- a/OpenSky.Website/wwwroot/img/contributediagram.svg +++ b/OpenSky.Website/wwwroot/img/contributediagram.svg @@ -1,5 +1,5 @@ - + @@ -139,12 +139,12 @@ - + - @@ -155,198 +155,140 @@ C325.3,120.2,326.3,119.9,327,119.3z"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - www - + - @@ -373,13 +315,13 @@ v-6.1h-1.9v-1.7h1.9v-2.4h2v2.4h3.2v1.7h-3.2v6c0,0.6,0.1,1.1,0.5,1.4c0.3,0.3,0.7,0.5,1.3,0.5c0.6,0,1.1-0.2,1.6-0.5L991,192.1z"/> - + - @@ -405,12 +347,12 @@ - + - @@ -435,12 +377,12 @@ - + - @@ -475,133 +417,93 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - @@ -967,13 +869,13 @@ - + - @@ -1179,4 +1081,72 @@ c-0.4-0.3-0.5-0.8-0.5-1.5v-2.8h-1v-1.1h1v-1.3h1.4v1.3h1.6v1.1h-1.6v2.8c0,0.3,0.1,0.5,0.2,0.7s0.3,0.2,0.6,0.2 c0.3,0,0.6-0.1,0.8-0.2L1211.3,384.6z"/> + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenSky.Website/wwwroot/img/credits/ash-steel.webp b/OpenSky.Website/wwwroot/img/credits/ash-steel.webp new file mode 100644 index 0000000..eb96ddc Binary files /dev/null and b/OpenSky.Website/wwwroot/img/credits/ash-steel.webp differ diff --git a/OpenSky.Website/wwwroot/img/credits/kelly-winkler.png b/OpenSky.Website/wwwroot/img/credits/kelly-winkler.png new file mode 100644 index 0000000..c147042 Binary files /dev/null and b/OpenSky.Website/wwwroot/img/credits/kelly-winkler.png differ diff --git a/OpenSky.Website/wwwroot/img/credits/syncfusion.webp b/OpenSky.Website/wwwroot/img/credits/syncfusion.webp new file mode 100644 index 0000000..0ce4218 Binary files /dev/null and b/OpenSky.Website/wwwroot/img/credits/syncfusion.webp differ diff --git a/OpenSky.Website/wwwroot/img/credits/vecteezy.png b/OpenSky.Website/wwwroot/img/credits/vecteezy.png new file mode 100644 index 0000000..1be9fc1 Binary files /dev/null and b/OpenSky.Website/wwwroot/img/credits/vecteezy.png differ diff --git a/OpenSky.Website/wwwroot/img/socials/gitbook48.png b/OpenSky.Website/wwwroot/img/socials/gitbook48.png new file mode 100644 index 0000000..0b8d05f Binary files /dev/null and b/OpenSky.Website/wwwroot/img/socials/gitbook48.png differ diff --git a/OpenSky.Website/wwwroot/img/socials/instagram48.png b/OpenSky.Website/wwwroot/img/socials/instagram48.png deleted file mode 100644 index 7eeae26..0000000 Binary files a/OpenSky.Website/wwwroot/img/socials/instagram48.png and /dev/null differ diff --git a/OpenSky.Website/wwwroot/index.html b/OpenSky.Website/wwwroot/index.html index 40f121a..85ae0c9 100644 --- a/OpenSky.Website/wwwroot/index.html +++ b/OpenSky.Website/wwwroot/index.html @@ -8,7 +8,7 @@ - +