diff --git a/SS14.Web/Areas/About/Pages/Contact.cshtml b/SS14.Web/Areas/About/Pages/Contact.cshtml new file mode 100644 index 0000000..c1e3620 --- /dev/null +++ b/SS14.Web/Areas/About/Pages/Contact.cshtml @@ -0,0 +1,26 @@ +@page +@using Microsoft.AspNetCore.Authorization +@using Microsoft.AspNetCore.Mvc.TagHelpers +@using SS14.Auth.Shared +@model SS14.Web.Areas.About.Pages.Contact +@inject IAuthorizationService AuthorizationService + +@{ + ViewData["Title"] = "Contact"; +} + + + +
+

If you want to contact us, you can do so via any of these methods, in order of expected fastest to slowest response:

+ +
diff --git a/SS14.Web/Areas/About/Pages/Contact.cshtml.cs b/SS14.Web/Areas/About/Pages/Contact.cshtml.cs new file mode 100644 index 0000000..ca637c5 --- /dev/null +++ b/SS14.Web/Areas/About/Pages/Contact.cshtml.cs @@ -0,0 +1,11 @@ +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace SS14.Web.Areas.About.Pages; + +public class Contact : PageModel +{ + public void OnGet() + { + + } +} diff --git a/SS14.Web/Areas/About/Pages/Index.cshtml b/SS14.Web/Areas/About/Pages/Index.cshtml new file mode 100644 index 0000000..634bf66 --- /dev/null +++ b/SS14.Web/Areas/About/Pages/Index.cshtml @@ -0,0 +1,19 @@ +@page +@using Microsoft.AspNetCore.Authorization +@using Microsoft.AspNetCore.Mvc.TagHelpers +@using SS14.Auth.Shared +@model SS14.Web.Areas.About.Pages.Index +@inject IAuthorizationService AuthorizationService + +@{ + ViewData["Title"] = "About"; +} + + + +Privacy +Contact diff --git a/SS14.Web/Areas/About/Pages/Index.cshtml.cs b/SS14.Web/Areas/About/Pages/Index.cshtml.cs new file mode 100644 index 0000000..ee2322a --- /dev/null +++ b/SS14.Web/Areas/About/Pages/Index.cshtml.cs @@ -0,0 +1,11 @@ +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace SS14.Web.Areas.About.Pages; + +public class Index : PageModel +{ + public void OnGet() + { + + } +} diff --git a/SS14.Web/Areas/About/Pages/Privacy.cshtml b/SS14.Web/Areas/About/Pages/Privacy.cshtml new file mode 100644 index 0000000..b1341a9 --- /dev/null +++ b/SS14.Web/Areas/About/Pages/Privacy.cshtml @@ -0,0 +1,71 @@ +@page +@using Microsoft.AspNetCore.Authorization +@using Microsoft.AspNetCore.Mvc.TagHelpers +@using SS14.Auth.Shared +@model SS14.Web.Areas.About.Pages.Privacy +@inject IAuthorizationService AuthorizationService + +@{ +ViewData["Title"] = "Privacy"; +} + + + +
+

Privacy Policy

+

This document will outline how we, SimpleStation, collect and handle your data. Here are the + first-party services we manage for Space Station: Beyond (SS:B), covered by this privacy policy:

+
+
SimpleStation Authentication Hub
+
Manages your SimpleStation account and is used by the official launcher whenever you play on servers.
+
Official SimpleStation servers
+
Our official game servers ("Parkstation", "Einstein Engines") ran by us. Only relevant if you connect to these servers.
+
+

Authentication Hub Privacy Policy

+

This section of the privacy policy applies if you use our official SimpleStation authentication server and/or SS:B launcher. +

+

We collect only data you enter into the website or launcher to register your account and/or change your account preferences:

+ +

We use your email address to confirm validity of your account and may send you necessary emails for + administration of the authentication server. We will not send you any form of marketing or promotional emails.

+

Your email address and/or username can be used to log you in into our services, combined with your password.

+

The following data is considered public information that may be queried for or shared to game servers you play on:

+ +

We do not share any other data such as your email address without your explicit consent.

+

Game Server Privacy Policy

+ +

This section of the privacy policy applies only if you play on our first-party SimpleStation servers.

+

Some terminology used in this section:

+ +

We log all connections you make to our game servers, storing IP address, HWID, account UUID and name, and which authentication server you connected with. All in-game actions you take may also be logged, only directly associated with your account UUID/name. We also store all data you explicitly enter such as your character preferences in-game.

+

Connection logs (including IP/HWID) are shared with trusted server administrators for enforcement of server rules. Connection logs are not shared publically.

+

Logs of in-game actions may be made public for anybody to view for the purposes of rule enforcement. This includes private conversations had with server administrators in-game.

+ +

Some interactions (talking in OOC chat, conversations with server staff via AHelp) may be sent to our Discord community and will therefore be logged there.

+

Contact

+

See our contact page for any questions you may have.

+
diff --git a/SS14.Web/Areas/About/Pages/Privacy.cshtml.cs b/SS14.Web/Areas/About/Pages/Privacy.cshtml.cs new file mode 100644 index 0000000..79f9d02 --- /dev/null +++ b/SS14.Web/Areas/About/Pages/Privacy.cshtml.cs @@ -0,0 +1,11 @@ +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace SS14.Web.Areas.About.Pages; + +public class Privacy : PageModel +{ + public void OnGet() + { + + } +} diff --git a/SS14.Web/Areas/About/Pages/_StatusMessage.cshtml b/SS14.Web/Areas/About/Pages/_StatusMessage.cshtml new file mode 100644 index 0000000..e996841 --- /dev/null +++ b/SS14.Web/Areas/About/Pages/_StatusMessage.cshtml @@ -0,0 +1,10 @@ +@model string + +@if (!String.IsNullOrEmpty(Model)) +{ + var statusMessageClass = Model.StartsWith("Error") ? "danger" : "success"; + +} diff --git a/SS14.Web/Areas/About/Pages/_ViewImports.cshtml b/SS14.Web/Areas/About/Pages/_ViewImports.cshtml new file mode 100644 index 0000000..001a6ab --- /dev/null +++ b/SS14.Web/Areas/About/Pages/_ViewImports.cshtml @@ -0,0 +1,3 @@ +@using Microsoft.AspNetCore.Identity +@using SS14.Web.Areas.Identity +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/SS14.Web/Areas/About/Pages/_ViewStart.cshtml b/SS14.Web/Areas/About/Pages/_ViewStart.cshtml new file mode 100644 index 0000000..ab23e9a --- /dev/null +++ b/SS14.Web/Areas/About/Pages/_ViewStart.cshtml @@ -0,0 +1,3 @@ +@{ + Layout = "/Views/Shared/_Layout.cshtml"; +} \ No newline at end of file diff --git a/SS14.Web/Areas/Identity/Pages/Account/Register.cshtml b/SS14.Web/Areas/Identity/Pages/Account/Register.cshtml index 505b48c..bbda81c 100644 --- a/SS14.Web/Areas/Identity/Pages/Account/Register.cshtml +++ b/SS14.Web/Areas/Identity/Pages/Account/Register.cshtml @@ -21,7 +21,8 @@
- Do not sign up with "temporary" or "burner" email addresses. Your account may be banned if you do. + Do not sign up with "temporary" or "burner" email addresses. Your account may be banned if you do. + If you do not want to use an email (set it to something random) or don't ever receive the verification email, we are able to manually approve your account if you contact us with your chosen username within 24 hours of account creation.
diff --git a/SS14.Web/Controllers/HomeController.cs b/SS14.Web/Controllers/HomeController.cs index 6265a9d..3d75cf9 100644 --- a/SS14.Web/Controllers/HomeController.cs +++ b/SS14.Web/Controllers/HomeController.cs @@ -21,12 +21,12 @@ public IActionResult Index() public IActionResult Privacy() { - return Redirect("https://spacestation14.com/about/privacy/"); + return Redirect("https://account.simplestation.org/About/Privacy/"); } public IActionResult Contact() { - return Redirect("https://spacestation14.com/about/contact/"); + return Redirect("https://account.simplestation.org/About/Contact/"); } [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] diff --git a/SS14.Web/Views/Shared/_Layout.cshtml b/SS14.Web/Views/Shared/_Layout.cshtml index a3c7e14..88dc78a 100644 --- a/SS14.Web/Views/Shared/_Layout.cshtml +++ b/SS14.Web/Views/Shared/_Layout.cshtml @@ -48,7 +48,7 @@