Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
"isRoot": true,
"tools": {
"husky": {
"version": "0.7.1",
"version": "0.7.2",
"commands": [
"husky"
],
"rollForward": false
},
"csharpier": {
"version": "0.30.5",
"version": "1.1.2",
"commands": [
"dotnet-csharpier"
"csharpier"
],
"rollForward": false
}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Check Formatting
run: |
dotnet tool restore
dotnet csharpier --check .
dotnet csharpier check .

- name: Restore Dependencies
run: dotnet restore Fracture.sln
Expand Down
1 change: 1 addition & 0 deletions .husky/task-runner.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"command": "dotnet",
"args": [
"csharpier",
"format",
"${staged}"
],
"include": [
Expand Down
12 changes: 0 additions & 12 deletions .sample.env

This file was deleted.

Binary file modified README.md
Binary file not shown.
33 changes: 16 additions & 17 deletions Server/Components/App.razor
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,26 @@
<html lang="en">

<head>
<meta charset="utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<base href="/"/>
<link rel="stylesheet" href="app.css"/>
<link rel="stylesheet" href="Fracture.Server.styles.css"/>
<link rel="icon" type="image/png" href="favicon.png"/>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<base href="/" />
<link rel="stylesheet" href="app.css" />
<link rel="stylesheet" href="Fracture.Server.styles.css" />
<link rel="icon" type="image/png" href="favicon.png" />

<HeadOutlet/>
<link rel="icon" type="image/x-icon" href="assets/favicon.ico"/>
<link rel="preconnect" href="https://fonts.googleapis.com"/>
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin/>
<link
href="https://fonts.googleapis.com/css2?family=Plus+Jakarta+Sans:wght@100;200;300;400;500;600;700;800;900&amp;display=swap"
rel="stylesheet"/>
<link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.8.1/font/bootstrap-icons.css" rel="stylesheet"/>
<HeadOutlet />
<link rel="icon" type="image/x-icon" href="assets/favicon.ico" />
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link href="https://fonts.googleapis.com/css2?family=Plus+Jakarta+Sans:wght@100;200;300;400;500;600;700;800;900&amp;display=swap"
rel="stylesheet" />
<link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.8.1/font/bootstrap-icons.css" rel="stylesheet" />
</head>

<body class="d-flex flex-column h-100">
<Routes/>
<script src="_framework/blazor.web.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js"></script>
<Routes />
<script src="_framework/blazor.web.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js"></script>
</body>

</html>
12 changes: 6 additions & 6 deletions Server/Components/Layout/BaseLayout.razor
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
@inherits LayoutComponentBase

<main class="flex-shrink-0">
<NavMenu></NavMenu>
<NavMenu></NavMenu>

@Body
@Body

<Footer></Footer>
<Footer></Footer>
</main>

<div id="blazor-error-ui">
An unhandled error has occurred.
<a href="" class="reload">Reload</a>
<a class="dismiss">🗙</a>
An unhandled error has occurred.
<a href="" class="reload">Reload</a>
<a class="dismiss">🗙</a>
</div>
52 changes: 26 additions & 26 deletions Server/Components/Layout/BaseLayout.razor.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,29 +21,29 @@ main {
align-items: center;
}

.top-row ::deep a, .top-row ::deep .btn-link {
white-space: nowrap;
margin-left: 1.5rem;
text-decoration: none;
}
.top-row ::deep a, .top-row ::deep .btn-link {
white-space: nowrap;
margin-left: 1.5rem;
text-decoration: none;
}

.top-row ::deep a:hover, .top-row ::deep .btn-link:hover {
text-decoration: underline;
}
.top-row ::deep a:hover, .top-row ::deep .btn-link:hover {
text-decoration: underline;
}

.top-row ::deep a:first-child {
overflow: hidden;
text-overflow: ellipsis;
}
.top-row ::deep a:first-child {
overflow: hidden;
text-overflow: ellipsis;
}

@media (max-width: 640.98px) {
.top-row {
justify-content: space-between;
}

.top-row ::deep a, .top-row ::deep .btn-link {
margin-left: 0;
}
.top-row ::deep a, .top-row ::deep .btn-link {
margin-left: 0;
}
}

@media (min-width: 641px) {
Expand All @@ -64,11 +64,11 @@ main {
z-index: 1;
}

.top-row.auth ::deep a:first-child {
flex: 1;
text-align: right;
width: 0;
}
.top-row.auth ::deep a:first-child {
flex: 1;
text-align: right;
width: 0;
}

.top-row, article {
padding-left: 2rem !important;
Expand All @@ -88,9 +88,9 @@ main {
z-index: 1000;
}

#blazor-error-ui .dismiss {
cursor: pointer;
position: absolute;
right: 0.75rem;
top: 0.5rem;
}
#blazor-error-ui .dismiss {
cursor: pointer;
position: absolute;
right: 0.75rem;
top: 0.5rem;
}
32 changes: 16 additions & 16 deletions Server/Components/Layout/Footer.razor
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<footer class="bg-primary py-4 mt-auto">
<div class="container px-5">
<div class="row align-items-center justify-content-between flex-column flex-sm-row">
<div class="col-auto">
<div class="small m-0">Copyright &copy; pollub.net 2023</div>
</div>
<div class="col-auto">
<NavLink class="small" href="">Privacy</NavLink>
<span class="mx-1">&middot;</span>
<NavLink class="small" href="">Terms</NavLink>
<span class="mx-1">&middot;</span>
<NavLink class="small" href="">Contact</NavLink>
<span class="mx-1">&middot;</span>
<NavLink class="small" href="https://github.com/pollubnet/fracture">GitHub</NavLink>
</div>
</div>
</div>
<div class="container px-5">
<div class="row align-items-center justify-content-between flex-column flex-sm-row">
<div class="col-auto">
<div class="small m-0">Copyright &copy; pollub.net 2023</div>
</div>
<div class="col-auto">
<NavLink class="small" href="">Privacy</NavLink>
<span class="mx-1">&middot;</span>
<NavLink class="small" href="">Terms</NavLink>
<span class="mx-1">&middot;</span>
<NavLink class="small" href="">Contact</NavLink>
<span class="mx-1">&middot;</span>
<NavLink class="small" href="https://github.com/pollubnet/fracture">GitHub</NavLink>
</div>
</div>
</div>
</footer>
20 changes: 4 additions & 16 deletions Server/Components/Layout/GameLayout.razor
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,9 @@
@inject VersionInfoProvider VersionInfoProvider

<HeadContent>
<link rel="stylesheet" href="css/game.css">
<link rel="stylesheet" href="css/items.css">
<meta name="generator" content="Fracture @VersionInfoProvider.ShortVersion">
<link rel="stylesheet" href="css/game.css">
<link rel="stylesheet" href="css/items.css">
<meta name="generator" content="Fracture @VersionInfoProvider.ShortVersion">
</HeadContent>

@Body

@* <div id="blazor-error-ui">
An unhandled error has occurred.
<a href="" class="reload">Reload</a>
<a class="dismiss">🗙</a>
</div> *@



@code {

}
@Body
10 changes: 3 additions & 7 deletions Server/Components/Layout/HomeLayout.razor
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@

<HeadContent>

<link rel="stylesheet" href="css/home.css">
<meta name="generator" content="Fracture @VersionInfoProvider.ShortVersion">
<link rel="stylesheet" href="css/home.css">
<meta name="generator" content="Fracture @VersionInfoProvider.ShortVersion">
</HeadContent>

@Body

@code {

}
@Body
20 changes: 10 additions & 10 deletions Server/Components/Layout/MainLayout.razor
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
@inherits LayoutComponentBase

<main class="flex-shrink-0">
<NavMenu></NavMenu>
<NavMenu></NavMenu>

<section class="py-5 bg-glass">
<div class="container px-5">
@Body
</div>
</section>
<section class="py-5 bg-glass">
<div class="container px-5">
@Body
</div>
</section>

<Footer></Footer>
<Footer></Footer>
</main>

<div id="blazor-error-ui">
An unhandled error has occurred.
<a href="" class="reload">Reload</a>
<a class="dismiss">🗙</a>
An unhandled error has occurred.
<a href="" class="reload">Reload</a>
<a class="dismiss">🗙</a>
</div>
52 changes: 26 additions & 26 deletions Server/Components/Layout/MainLayout.razor.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,29 +21,29 @@ main {
align-items: center;
}

.top-row ::deep a, .top-row ::deep .btn-link {
white-space: nowrap;
margin-left: 1.5rem;
text-decoration: none;
}
.top-row ::deep a, .top-row ::deep .btn-link {
white-space: nowrap;
margin-left: 1.5rem;
text-decoration: none;
}

.top-row ::deep a:hover, .top-row ::deep .btn-link:hover {
text-decoration: underline;
}
.top-row ::deep a:hover, .top-row ::deep .btn-link:hover {
text-decoration: underline;
}

.top-row ::deep a:first-child {
overflow: hidden;
text-overflow: ellipsis;
}
.top-row ::deep a:first-child {
overflow: hidden;
text-overflow: ellipsis;
}

@media (max-width: 640.98px) {
.top-row {
justify-content: space-between;
}

.top-row ::deep a, .top-row ::deep .btn-link {
margin-left: 0;
}
.top-row ::deep a, .top-row ::deep .btn-link {
margin-left: 0;
}
}

@media (min-width: 641px) {
Expand All @@ -64,11 +64,11 @@ main {
z-index: 1;
}

.top-row.auth ::deep a:first-child {
flex: 1;
text-align: right;
width: 0;
}
.top-row.auth ::deep a:first-child {
flex: 1;
text-align: right;
width: 0;
}

.top-row, article {
padding-left: 2rem !important;
Expand All @@ -88,9 +88,9 @@ main {
z-index: 1000;
}

#blazor-error-ui .dismiss {
cursor: pointer;
position: absolute;
right: 0.75rem;
top: 0.5rem;
}
#blazor-error-ui .dismiss {
cursor: pointer;
position: absolute;
right: 0.75rem;
top: 0.5rem;
}
Loading
Loading