Skip to content

Commit

Permalink
Merge pull request #162 from dymaptic/develop
Browse files Browse the repository at this point in the history
Prepare for 2.1.0 release
  • Loading branch information
TimPurdum authored Apr 16, 2023
2 parents 0499398 + 4195aa4 commit 1dd0d87
Show file tree
Hide file tree
Showing 220 changed files with 22,786 additions and 19,365 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,6 @@ MigrationBackup/
/src/.idea/**/*
/src/dymaptic.GeoBlazor.Core/wwwroot/js/**/*
/src/dymaptic.GeoBlazor.Core/wwwroot/assets/**/*
/src/dymaptic.GeoBlazor.Core/ReadMe.md

/docs/_site
/docs/.sass-cache
Expand Down
35 changes: 35 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build-env
WORKDIR /App

# Add NPM
RUN apk add --update npm

# Copy everything
COPY . ./

# Restore as distinct layers
RUN dotnet restore samples/dymaptic.GeoBlazor.Core.Sample.Wasm/dymaptic.GeoBlazor.Core.Sample.Wasm.csproj

# Build and publish a release
RUN dotnet publish samples/dymaptic.GeoBlazor.Core.Sample.Wasm/dymaptic.GeoBlazor.Core.Sample.Wasm.csproj -c Release -o out

# Build runtime image
FROM mcr.microsoft.com/dotnet/aspnet:7.0.3-alpine3.17
EXPOSE 5000
WORKDIR /App
COPY --from=build-env /App/out .
RUN ls -la

# Add Dumb-init
RUN apk upgrade -U -a \
&& apk add dumb-init \
&& rm -rf /var/cache/* \
&& mkdir /var/cache/apk \
&& mkdir /temp

# set up user
RUN addgroup -S geoblazor && adduser -S geoblazor -G geoblazor
RUN chmod -R 777 /temp
USER geoblazor

ENTRYPOINT ["dumb-init", "dotnet", "dymaptic.GeoBlazor.Core.Sample.Wasm.dll", "urls=http://0.0.0.0:5000/"]
5 changes: 5 additions & 0 deletions ReadMe.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@

[Join our Discord Server!](https://discord.gg/hcmbPzn4VW)

## Using GeoBlazor

Please read the [Getting Started](https://docs.geoblazor.com/pages/gettingStarted.html) page in the documentation on how
to get started using the GeoBlazor nuget package. The following sections are for developers who want to build the code from source.

## Build Requirements

For the Asp.NET projects, including the core library, you can run on the
Expand Down
31 changes: 16 additions & 15 deletions docs/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,24 @@
layout: default
---

<style type="text/css" media="screen">
.container {
margin: 10px auto;
max-width: 600px;
text-align: center;
}
h1 {
margin: 30px 0;
font-size: 4em;
line-height: 1;
letter-spacing: -1px;
}
<style media="screen" type="text/css">
.container {
margin: 10px auto;
max-width: 600px;
text-align: center;
}

h1 {
margin: 30px 0;
font-size: 4em;
line-height: 1;
letter-spacing: -1px;
}
</style>

<div class="container">
<h1>404</h1>
<h1>404</h1>

<p><strong>Page not found :(</strong></p>
<p>The requested page could not be found.</p>
<p><strong>Page not found :(</strong></p>
<p>The requested page could not be found.</p>
</div>
5 changes: 3 additions & 2 deletions docs/ReadMe.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# GeoBlazor Documentation

This folder creates a GitHub Pages website with Jekyll.
This folder creates a GitHub Pages website with Jekyll.

To run Jekyll locally, you need to follow the [Jekyll Installation Docs](http://jekyllrb.com/docs/installation/).
Then run `bundle exec jekyll serve --config _config_testing.yml` from this folder.

## XML Class Docs
The `pages\classes` documents are auto-generated from the XML comments in `dymaptic.GeoBlazor.Core`. To update these

The `pages\classes` documents are auto-generated from the XML comments in `dymaptic.GeoBlazor.Core`. To update these
documents, add your XML comments in the code, build the Core project, and commit the added files in `pages\classes`.
This should be kept up to date with changes in the core library at all times.
2 changes: 1 addition & 1 deletion docs/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ description: >- # this means to ignore newlines until "baseurl:"
baseurl: "" # the subpath of your site, e.g. /blog
url: "https://docs.geoblazor.com" # the base hostname & protocol for your site, e.g. http://example.com
twitter_username: TimPurdum
github_username: TimPurdum
github_username: TimPurdum

# Build settings
# theme: just-the-docs
Expand Down
2 changes: 1 addition & 1 deletion docs/_config_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ description: >- # this means to ignore newlines until "baseurl:"
baseurl: "" # the subpath of your site, e.g. /blog
url: "https://docs.geoblazor.com" # the base hostname & protocol for your site, e.g. http://example.com
twitter_username: TimPurdum
github_username: TimPurdum
github_username: TimPurdum

# Build settings
theme: just-the-docs
Expand Down
37 changes: 19 additions & 18 deletions docs/_sass/color_schemes/geoblazor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -77,28 +77,28 @@ $geoblazor-blue-100: #125a8d;
$body-background-color: $white;
.side-bar {
background-image: linear-gradient(180deg, $geoblazor-blue-100 0%, $geoblazor-purple-000 100%);
}
}

.side-bar a {
color: white;
}

$search-background-color: $white;
$table-background-color: $white;

code {
background-color: #ececec !important;
color: inherit!important;
font-size: 0.9rem!important;;
color: inherit !important;
font-size: 0.9rem !important;;
}

.highlight code {
color: white!important;
color: white !important;
background-color: unset !important;
}

.highlight .na, .highlight .nl, .highlight .p {
color: white!important;
color: white !important;
}

.highlight .n {
Expand Down Expand Up @@ -201,13 +201,14 @@ $media-queries: (
.site-header {
border-bottom: none !important;
}

.site-button:hover {
background-image: none !important;
text-decoration: underline;
}

.search {
position: absolute!important;
position: absolute !important;
left: 0;
}

Expand All @@ -217,21 +218,21 @@ body {
}

.main-header {
background-color: transparent!important;
background-color: transparent !important;
}

.site-button {
background-color: black;
color: white;
border-radius: 0.5rem;
border: 1px solid black;
padding: 0.2rem 2rem!important;
padding: 0.2rem 2rem !important;
font-size: 1.5rem;
height: unset!important;
height: unset !important;
}

.aux-nav-list-item, .search-input-wrap {
display: flex!important;
display: flex !important;
align-items: center;
}

Expand All @@ -240,17 +241,17 @@ search {
}

.search-input {
height: unset!important;
border-radius: 0.5rem!important;
padding: 0.5rem 1rem 0.5rem 2rem!important;
font-size: 1.5rem!important;
position: relative!important;
height: unset !important;
border-radius: 0.5rem !important;
padding: 0.5rem 1rem 0.5rem 2rem !important;
font-size: 1.5rem !important;
position: relative !important;
margin: 0 1.5rem;
width: 250px!important;
width: 250px !important;
}

.search-active .search-label {
padding-left: 2rem!important;
padding-left: 2rem !important;
}

.search-active .search-input {
Expand Down
51 changes: 30 additions & 21 deletions docs/assets/images/discord-logo-blue.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 1dd0d87

Please sign in to comment.