Reorganized with solution file, added Dockerfile

dswersky · Aug 12, 2018 · 0d6a271 · 0d6a271
1 parent 7280b50
commit 0d6a271
Show file tree

Hide file tree

Showing 51 changed files with 67 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,19 +1,18 @@
 FROM microsoft/dotnet:2.1-sdk AS build
 WORKDIR /app
-
-# copy csproj and restore as distinct layers
 COPY *.sln .
-COPY *.csproj ./aspnetapp/
+COPY angularapp/*.csproj ./angularapp/
 RUN dotnet restore
 
-# copy everything else and build app
-COPY ./ ./aspnetapp/
-WORKDIR /app/aspnetapp
+COPY angularapp/ ./angularapp/
+WORKDIR /app/angularapp
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - && apt-get install -y nodejs
 RUN dotnet publish -c Release -o out
 
 
 FROM microsoft/dotnet:2.1-aspnetcore-runtime AS runtime
 WORKDIR /app
-COPY --from=build /app/aspnetapp/out ./
+COPY --from=build /app/angularapp/out ./
 ENTRYPOINT ["dotnet", "dotnet-angular.dll"]
 
+
diff --git a/ClientApp/.angular-cli.json → angularapp/ClientApp/.angular-cli.json b/ClientApp/.angular-cli.json → angularapp/ClientApp/.angular-cli.json
diff --git a/ClientApp/.editorconfig → angularapp/ClientApp/.editorconfig b/ClientApp/.editorconfig → angularapp/ClientApp/.editorconfig
diff --git a/ClientApp/.gitignore → angularapp/ClientApp/.gitignore b/ClientApp/.gitignore → angularapp/ClientApp/.gitignore
diff --git a/ClientApp/README.md → angularapp/ClientApp/README.md b/ClientApp/README.md → angularapp/ClientApp/README.md
diff --git a/ClientApp/e2e/app.e2e-spec.ts → angularapp/ClientApp/e2e/app.e2e-spec.ts b/ClientApp/e2e/app.e2e-spec.ts → angularapp/ClientApp/e2e/app.e2e-spec.ts
diff --git a/ClientApp/e2e/app.po.ts → angularapp/ClientApp/e2e/app.po.ts b/ClientApp/e2e/app.po.ts → angularapp/ClientApp/e2e/app.po.ts
diff --git a/ClientApp/e2e/tsconfig.e2e.json → angularapp/ClientApp/e2e/tsconfig.e2e.json b/ClientApp/e2e/tsconfig.e2e.json → angularapp/ClientApp/e2e/tsconfig.e2e.json
diff --git a/ClientApp/karma.conf.js → angularapp/ClientApp/karma.conf.js b/ClientApp/karma.conf.js → angularapp/ClientApp/karma.conf.js
diff --git a/ClientApp/package-lock.json → angularapp/ClientApp/package-lock.json b/ClientApp/package-lock.json → angularapp/ClientApp/package-lock.json
diff --git a/ClientApp/package.json → angularapp/ClientApp/package.json b/ClientApp/package.json → angularapp/ClientApp/package.json
diff --git a/ClientApp/protractor.conf.js → angularapp/ClientApp/protractor.conf.js b/ClientApp/protractor.conf.js → angularapp/ClientApp/protractor.conf.js
diff --git a/ClientApp/src/app/app.component.css → ...arapp/ClientApp/src/app/app.component.css b/ClientApp/src/app/app.component.css → ...arapp/ClientApp/src/app/app.component.css
diff --git a/ClientApp/src/app/app.component.html → ...rapp/ClientApp/src/app/app.component.html b/ClientApp/src/app/app.component.html → ...rapp/ClientApp/src/app/app.component.html
diff --git a/ClientApp/src/app/app.component.ts → ...larapp/ClientApp/src/app/app.component.ts b/ClientApp/src/app/app.component.ts → ...larapp/ClientApp/src/app/app.component.ts
diff --git a/ClientApp/src/app/app.module.ts → angularapp/ClientApp/src/app/app.module.ts b/ClientApp/src/app/app.module.ts → angularapp/ClientApp/src/app/app.module.ts
diff --git a/...pp/src/app/counter/counter.component.html → ...pp/src/app/counter/counter.component.html b/...pp/src/app/counter/counter.component.html → ...pp/src/app/counter/counter.component.html
diff --git a/...src/app/counter/counter.component.spec.ts → ...src/app/counter/counter.component.spec.ts b/...src/app/counter/counter.component.spec.ts → ...src/app/counter/counter.component.spec.ts
diff --git a/...tApp/src/app/counter/counter.component.ts → ...tApp/src/app/counter/counter.component.ts b/...tApp/src/app/counter/counter.component.ts → ...tApp/src/app/counter/counter.component.ts
diff --git a/.../app/fetch-data/fetch-data.component.html → .../app/fetch-data/fetch-data.component.html b/.../app/fetch-data/fetch-data.component.html → .../app/fetch-data/fetch-data.component.html
diff --git a/...rc/app/fetch-data/fetch-data.component.ts → ...rc/app/fetch-data/fetch-data.component.ts b/...rc/app/fetch-data/fetch-data.component.ts → ...rc/app/fetch-data/fetch-data.component.ts
diff --git a/ClientApp/src/app/home/home.component.html → ...lientApp/src/app/home/home.component.html b/ClientApp/src/app/home/home.component.html → ...lientApp/src/app/home/home.component.html
diff --git a/ClientApp/src/app/home/home.component.ts → .../ClientApp/src/app/home/home.component.ts b/ClientApp/src/app/home/home.component.ts → .../ClientApp/src/app/home/home.component.ts
diff --git a/...p/src/app/nav-menu/nav-menu.component.css → ...p/src/app/nav-menu/nav-menu.component.css b/...p/src/app/nav-menu/nav-menu.component.css → ...p/src/app/nav-menu/nav-menu.component.css
diff --git a/.../src/app/nav-menu/nav-menu.component.html → .../src/app/nav-menu/nav-menu.component.html b/.../src/app/nav-menu/nav-menu.component.html → .../src/app/nav-menu/nav-menu.component.html
diff --git a/...pp/src/app/nav-menu/nav-menu.component.ts → ...pp/src/app/nav-menu/nav-menu.component.ts b/...pp/src/app/nav-menu/nav-menu.component.ts → ...pp/src/app/nav-menu/nav-menu.component.ts
diff --git a/ClientApp/src/assets/.gitkeep → angularapp/ClientApp/src/assets/.gitkeep b/ClientApp/src/assets/.gitkeep → angularapp/ClientApp/src/assets/.gitkeep
diff --git a/...tApp/src/environments/environment.prod.ts → ...tApp/src/environments/environment.prod.ts b/...tApp/src/environments/environment.prod.ts → ...tApp/src/environments/environment.prod.ts
diff --git a/ClientApp/src/environments/environment.ts → ...ClientApp/src/environments/environment.ts b/ClientApp/src/environments/environment.ts → ...ClientApp/src/environments/environment.ts
diff --git a/ClientApp/src/index.html → angularapp/ClientApp/src/index.html b/ClientApp/src/index.html → angularapp/ClientApp/src/index.html
diff --git a/ClientApp/src/main.ts → angularapp/ClientApp/src/main.ts b/ClientApp/src/main.ts → angularapp/ClientApp/src/main.ts
diff --git a/ClientApp/src/polyfills.ts → angularapp/ClientApp/src/polyfills.ts b/ClientApp/src/polyfills.ts → angularapp/ClientApp/src/polyfills.ts
diff --git a/ClientApp/src/styles.css → angularapp/ClientApp/src/styles.css b/ClientApp/src/styles.css → angularapp/ClientApp/src/styles.css
diff --git a/ClientApp/src/test.ts → angularapp/ClientApp/src/test.ts b/ClientApp/src/test.ts → angularapp/ClientApp/src/test.ts
diff --git a/ClientApp/src/tsconfig.app.json → angularapp/ClientApp/src/tsconfig.app.json b/ClientApp/src/tsconfig.app.json → angularapp/ClientApp/src/tsconfig.app.json
diff --git a/ClientApp/src/tsconfig.spec.json → angularapp/ClientApp/src/tsconfig.spec.json b/ClientApp/src/tsconfig.spec.json → angularapp/ClientApp/src/tsconfig.spec.json
diff --git a/ClientApp/src/typings.d.ts → angularapp/ClientApp/src/typings.d.ts b/ClientApp/src/typings.d.ts → angularapp/ClientApp/src/typings.d.ts
diff --git a/ClientApp/tsconfig.json → angularapp/ClientApp/tsconfig.json b/ClientApp/tsconfig.json → angularapp/ClientApp/tsconfig.json
diff --git a/ClientApp/tslint.json → angularapp/ClientApp/tslint.json b/ClientApp/tslint.json → angularapp/ClientApp/tslint.json
diff --git a/Controllers/SampleDataController.cs → ...arapp/Controllers/SampleDataController.cs b/Controllers/SampleDataController.cs → ...arapp/Controllers/SampleDataController.cs
diff --git a/Pages/Error.cshtml → angularapp/Pages/Error.cshtml b/Pages/Error.cshtml → angularapp/Pages/Error.cshtml
diff --git a/Pages/Error.cshtml.cs → angularapp/Pages/Error.cshtml.cs b/Pages/Error.cshtml.cs → angularapp/Pages/Error.cshtml.cs
diff --git a/Pages/_ViewImports.cshtml → angularapp/Pages/_ViewImports.cshtml b/Pages/_ViewImports.cshtml → angularapp/Pages/_ViewImports.cshtml
diff --git a/Program.cs → angularapp/Program.cs b/Program.cs → angularapp/Program.cs
diff --git a/angularapp/Properties/launchSettings.json b/angularapp/Properties/launchSettings.json
@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:2958",
+      "sslPort": 44372
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "dotnet_angular": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "applicationUrl": "https://localhost:5001;http://localhost:5000",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
diff --git a/Startup.cs → angularapp/Startup.cs b/Startup.cs → angularapp/Startup.cs
diff --git a/appsettings.Development.json → angularapp/appsettings.Development.json b/appsettings.Development.json → angularapp/appsettings.Development.json
diff --git a/appsettings.json → angularapp/appsettings.json b/appsettings.json → angularapp/appsettings.json
diff --git a/dotnet-angular.csproj → angularapp/dotnet-angular.csproj b/dotnet-angular.csproj → angularapp/dotnet-angular.csproj
diff --git a/wwwroot/favicon.ico → angularapp/wwwroot/favicon.ico b/wwwroot/favicon.ico → angularapp/wwwroot/favicon.ico
diff --git a/dotnet-angular.sln b/dotnet-angular.sln
@@ -0,0 +1,34 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26124.0
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-angular", "angularapp\dotnet-angular.csproj", "{D6A28F39-6D71-4A39-B711-0DE4F6E42827}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D6A28F39-6D71-4A39-B711-0DE4F6E42827}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6A28F39-6D71-4A39-B711-0DE4F6E42827}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6A28F39-6D71-4A39-B711-0DE4F6E42827}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D6A28F39-6D71-4A39-B711-0DE4F6E42827}.Debug|x64.Build.0 = Debug|Any CPU
+		{D6A28F39-6D71-4A39-B711-0DE4F6E42827}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D6A28F39-6D71-4A39-B711-0DE4F6E42827}.Debug|x86.Build.0 = Debug|Any CPU
+		{D6A28F39-6D71-4A39-B711-0DE4F6E42827}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D6A28F39-6D71-4A39-B711-0DE4F6E42827}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6A28F39-6D71-4A39-B711-0DE4F6E42827}.Release|x64.ActiveCfg = Release|Any CPU
+		{D6A28F39-6D71-4A39-B711-0DE4F6E42827}.Release|x64.Build.0 = Release|Any CPU
+		{D6A28F39-6D71-4A39-B711-0DE4F6E42827}.Release|x86.ActiveCfg = Release|Any CPU
+		{D6A28F39-6D71-4A39-B711-0DE4F6E42827}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal