Skip to content

Commit

Permalink
Upgrade to v36
Browse files Browse the repository at this point in the history
  • Loading branch information
mythz committed Jun 1, 2021
1 parent 6d22a22 commit b1915ab
Show file tree
Hide file tree
Showing 94 changed files with 32,908 additions and 23,349 deletions.
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*/node_modules
*/npm-debug.log
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ jobs:
echo TESTS FAILED
exit 1
fi
working-directory: ./VuetifySpaTemplate.Tests
working-directory: ./VuetifySpa.Tests

6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
LETSENCRYPT_EMAIL: ${{ env.letsencrypt_email }}
with:
input: deploy/docker-compose-template.yml
output: deploy/VuetifySpaTemplate-docker-compose.yml
output: deploy/VuetifySpa-docker-compose.yml

- name: copy compose file via scp
uses: appleboy/[email protected]
Expand All @@ -58,7 +58,7 @@ jobs:
username: ${{ secrets.DEPLOY_USERNAME }}
port: ${{ secrets.DEPLOY_PORT }}
key: ${{ secrets.DEPLOY_KEY }}
source: "deploy/VuetifySpaTemplate-docker-compose.yml"
source: "deploy/VuetifySpa-docker-compose.yml"
target: "~/"

- name: Set the value
Expand All @@ -79,4 +79,4 @@ jobs:
envs: APPTOKEN,USERNAME
script: |
echo $APPTOKEN | docker login ghcr.io -u $USERNAME --password-stdin
docker-compose -f ~/deploy/VuetifySpaTemplate-docker-compose.yml up -d
docker-compose -f ~/deploy/VuetifySpa-docker-compose.yml up -d
8 changes: 4 additions & 4 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/VuetifySpaTemplate/bin/Debug/net5/VuetifySpaTemplate.dll",
"program": "${workspaceFolder}/VuetifySpa/bin/Debug/net5/VuetifySpa.dll",
"args": [],
"cwd": "${workspaceFolder}/VuetifySpaTemplate",
"cwd": "${workspaceFolder}/VuetifySpa",
"console": "internalConsole",
"stopAtEntry": false,
"internalConsoleOptions": "openOnSessionStart",
Expand All @@ -25,9 +25,9 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/VuetifySpaTemplate/bin/Debug/net5/VuetifySpaTemplate.dll",
"program": "${workspaceFolder}/VuetifySpa/bin/Debug/net5/VuetifySpa.dll",
"args": [],
"cwd": "${workspaceFolder}/VuetifySpaTemplate",
"cwd": "${workspaceFolder}/VuetifySpa",
"stopAtEntry": false,
"internalConsoleOptions": "openOnSessionStart",
"launchBrowser": {
Expand Down
15 changes: 5 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
WORKDIR /source
WORKDIR /app

RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
&& apt-get install -y --no-install-recommends nodejs \
&& echo "node version: $(node --version)" \
&& echo "npm version: $(npm --version)" \
&& rm -rf /var/lib/apt/lists/*

COPY VuetifySpaTemplate/package.json .
COPY VuetifySpaTemplate/npm-shrinkwrap.json .

RUN npm --prefix VuetifySpaTemplate install

COPY . .
RUN dotnet restore

WORKDIR /source/VuetifySpaTemplate
RUN dotnet publish -c release -o /app --no-restore
WORKDIR /app/VuetifySpa
RUN dotnet publish -c release -o /out --no-restore

FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS runtime
WORKDIR /app
COPY --from=build /app ./
ENTRYPOINT ["dotnet", "VuetifySpaTemplate.dll"]
COPY --from=build /out ./
ENTRYPOINT ["dotnet", "VuetifySpa.dll"]
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@

$ x new vuetify-spa ProjectName

Alternatively write new project files directly into an empty repository, using the Directory Name as the ProjectName:

$ git clone https://github.com/<User>/<ProjectName>.git
$ cd <ProjectName>
$ x new vuetify-spa

## Development workflow

Our recommendation during development is to run the `dev` npm script or Gulp task and leave it running in the background:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System;
using ServiceStack;
using VuetifySpaTemplate.ServiceModel;
using VuetifySpa.ServiceModel;

namespace VuetifySpaTemplate.ServiceInterface
namespace VuetifySpa.ServiceInterface
{
public class MyServices : Service
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\VuetifySpaTemplate.ServiceModel\VuetifySpaTemplate.ServiceModel.csproj" />
<ProjectReference Include="..\VuetifySpa.ServiceModel\VuetifySpa.ServiceModel.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using ServiceStack;

namespace VuetifySpaTemplate.ServiceModel
namespace VuetifySpa.ServiceModel
{
[Route("/hello")]
[Route("/hello/{Name}")]
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using Funq;
using ServiceStack;
using NUnit.Framework;
using VuetifySpaTemplate.ServiceInterface;
using VuetifySpaTemplate.ServiceModel;
using VuetifySpa.ServiceInterface;
using VuetifySpa.ServiceModel;

namespace VuetifySpaTemplate.Tests
namespace VuetifySpa.Tests
{
public class IntegrationTest
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using NUnit.Framework;
using ServiceStack;
using ServiceStack.Testing;
using VuetifySpaTemplate.ServiceInterface;
using VuetifySpaTemplate.ServiceModel;
using VuetifySpa.ServiceInterface;
using VuetifySpa.ServiceModel;

namespace VuetifySpaTemplate.Tests
namespace VuetifySpa.Tests
{
public class UnitTest
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\VuetifySpaTemplate.ServiceInterface\VuetifySpaTemplate.ServiceInterface.csproj" />
<ProjectReference Include="..\VuetifySpaTemplate.ServiceModel\VuetifySpaTemplate.ServiceModel.csproj" />
<ProjectReference Include="..\VuetifySpa.ServiceInterface\VuetifySpa.ServiceInterface.csproj" />
<ProjectReference Include="..\VuetifySpa.ServiceModel\VuetifySpa.ServiceModel.csproj" />

<PackageReference Include="NUnit" Version="3.12.*" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.*" />
Expand Down
8 changes: 4 additions & 4 deletions VuetifySpaTemplate.sln → VuetifySpa.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.3
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VuetifySpaTemplate", "VuetifySpaTemplate\VuetifySpaTemplate.csproj", "{5F817400-1A3A-48DF-98A6-E7E5A3DC762F}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VuetifySpa", "VuetifySpa\VuetifySpa.csproj", "{5F817400-1A3A-48DF-98A6-E7E5A3DC762F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VuetifySpaTemplate.ServiceInterface", "VuetifySpaTemplate.ServiceInterface\VuetifySpaTemplate.ServiceInterface.csproj", "{5B8FFF01-1E0B-477D-9D7F-93016C128B23}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VuetifySpa.ServiceInterface", "VuetifySpa.ServiceInterface\VuetifySpa.ServiceInterface.csproj", "{5B8FFF01-1E0B-477D-9D7F-93016C128B23}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VuetifySpaTemplate.ServiceModel", "VuetifySpaTemplate.ServiceModel\VuetifySpaTemplate.ServiceModel.csproj", "{0127B6CA-1B79-46A6-8307-B36836D107F0}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VuetifySpa.ServiceModel", "VuetifySpa.ServiceModel\VuetifySpa.ServiceModel.csproj", "{0127B6CA-1B79-46A6-8307-B36836D107F0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VuetifySpaTemplate.Tests", "VuetifySpaTemplate.Tests\VuetifySpaTemplate.Tests.csproj", "{455EC1EF-134F-4CD4-9C78-E813E4E6D8F6}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VuetifySpa.Tests", "VuetifySpa.Tests\VuetifySpa.Tests.csproj", "{455EC1EF-134F-4CD4-9C78-E813E4E6D8F6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using ServiceStack.Auth;
using ServiceStack.FluentValidation;

namespace VuetifySpaTemplate
namespace VuetifySpa
{
// Add any additional metadata properties you want to store in the Users Typed Session
public class CustomUserSession : AuthUserSession
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using ServiceStack.Auth;
using ServiceStack.Configuration;

namespace VuetifySpaTemplate
namespace VuetifySpa
{
// Custom UserAuth Data Model with extended Metadata properties
public class AppUser : UserAuth
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Web;
using ServiceStack;

namespace VuetifySpaTemplate
namespace VuetifySpa
{
public class ConfigureUi : IConfigureAppHost
{
Expand Down
2 changes: 1 addition & 1 deletion VuetifySpaTemplate/Program.cs → VuetifySpa/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using Microsoft.Extensions.Logging;
using ServiceStack;

namespace VuetifySpaTemplate
namespace VuetifySpa
{
public class Program
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"VuetifySpaTemplate": {
"VuetifySpa": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
Expand Down
6 changes: 3 additions & 3 deletions VuetifySpaTemplate/Startup.cs → VuetifySpa/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
using Funq;
using ServiceStack;
using ServiceStack.Configuration;
using VuetifySpaTemplate.ServiceInterface;
using VuetifySpa.ServiceInterface;
using ServiceStack.Script;
using ServiceStack.Web;
using System;
using ServiceStack.Text;
using ServiceStack.Logging;

namespace VuetifySpaTemplate
namespace VuetifySpa
{
public class Startup : ModularStartup
{
Expand All @@ -42,7 +42,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)

public class AppHost : AppHostBase
{
public AppHost() : base("VuetifySpaTemplate", typeof(MyServices).Assembly) { }
public AppHost() : base("VuetifySpa", typeof(MyServices).Assembly) { }

// Configure your AppHost with the necessary configuration and dependencies your App needs
public override void Configure(Container container)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
<ItemGroup>
<Folder Include="wwwroot\" />
</ItemGroup>

<Target Name="Bundle" BeforeTargets="BeforePublish">
<Exec Command="npm install --also=dev" />
<Exec Command="npm run-script build" />
</Target>

<ItemGroup>
<PackageReference Include="ServiceStack" Version="5.*" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\VuetifySpaTemplate.ServiceInterface\VuetifySpaTemplate.ServiceInterface.csproj" />
<ProjectReference Include="..\VuetifySpaTemplate.ServiceModel\VuetifySpaTemplate.ServiceModel.csproj" />
<ProjectReference Include="..\VuetifySpa.ServiceInterface\VuetifySpa.ServiceInterface.csproj" />
<ProjectReference Include="..\VuetifySpa.ServiceModel\VuetifySpa.ServiceModel.csproj" />
</ItemGroup>

<Target Name="OnFirstUse" BeforeTargets="Build" Condition=" !Exists('wwwroot\dist') ">
Expand Down
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit b1915ab

Please sign in to comment.