Skip to content

Commit d4942ba

Browse files
Merge pull request #39 from okta/vm-update-ui-class
Renames directories and updates class for UI text container
2 parents fed4063 + dd923df commit d4942ba

File tree

401 files changed

+17
-241
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

401 files changed

+17
-241
lines changed

ASP.NET Core 2.x/okta-hosted-login/okta-aspnetcore-mvc-example/Properties/launchSettings.json

-27
This file was deleted.

ASP.NET Core 2.x/resource-server/okta-aspnetcore-webapi-example/Properties/launchSettings.json

-30
This file was deleted.

ASP.NET Core 2.x/self-hosted-login/okta-aspnetcore-mvc-example/Properties/launchSettings.json

-27
This file was deleted.

ASP.NET Core 2.x/social-login/okta-aspnetcore-mvc-example/Properties/launchSettings.json

-27
This file was deleted.

ASP.NET Core 3.x/okta-hosted-login/okta-aspnetcore-mvc-example/Properties/launchSettings.json

-27
This file was deleted.

ASP.NET Core 3.x/resource-server/okta-aspnetcore-webapi-example/Properties/launchSettings.json

-30
This file was deleted.

ASP.NET Core 3.x/self-hosted-login/okta-aspnetcore-mvc-example/Properties/launchSettings.json

-27
This file was deleted.

ASP.NET Core 3.x/social-login/okta-aspnetcore-mvc-example/Properties/launchSettings.json

-27
This file was deleted.

README.md

+9-9

ASP.NET Core 2.x/e2e-tests/package.json samples-aspnetcore-2x/e2e-tests/package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,15 @@
33
"version": "0.1.0",
44
"description": "E2E tests for aspnet core Sample Applications for Okta",
55
"scripts": {
6-
"test": "npm run test:e2e",
76
"build-okta-hosted-login-server": "cd ../okta-hosted-login && @powershell -Command ./build.ps1",
87
"okta-hosted-login-server": "cd ../okta-hosted-login/dist/okta-aspnetcore-mvc-example && @powershell -Command \"iisexpress /path:$pwd\"",
98
"build-self-hosted-login-server": "cd ../self-hosted-login && @powershell -Command ./build.ps1",
109
"custom-login-server": "cd ../self-hosted-login/dist/okta-aspnetcore-mvc-example && @powershell -Command \"iisexpress /path:$pwd\"",
1110
"test:okta-hosted-login": "protractor okta-oidc-tck/e2e-tests/okta-hosted-login/conf.js",
1211
"test:custom-login": "protractor okta-oidc-tck/e2e-tests/custom-login/conf.js",
13-
"test:e2e": "npm run test:okta-hosted-login && npm run test:custom-login",
1412
"build": "npm run build-okta-hosted-login-server && npm run build-self-hosted-login-server",
15-
"pretest": "npm run build && webdriver-manager update --gecko false && node scripts/update-webconfig.js"
13+
"pretest": "npm run build && npm run update-webdriver && node scripts/update-webconfig.js",
14+
"update-webdriver": "webdriver-manager update --versions.chrome 79.0.3945.36 --gecko false --versions.standalone 3.141.59"
1615
},
1716
"license": "Apache-2.0",
1817
"repository": {
@@ -27,7 +26,7 @@
2726
"forever-monitor": "^1.7.1",
2827
"jasmine-reporters": "^2.2.0",
2928
"platform": "^1.3.5",
30-
"protractor": "^5.1.0",
29+
"protractor": "^5.4",
3130
"wait-on": "^2.0.2"
3231
},
3332
"bin": {},

ASP.NET Core 2.x/okta-hosted-login/okta-aspnetcore-mvc-example/Views/Shared/_Layout.cshtml samples-aspnetcore-2x/okta-hosted-login/okta-aspnetcore-mvc-example/Views/Shared/_Layout.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
@if (User.Identity.IsAuthenticated)
3131
{
3232
<ul class="nav navbar-nav navbar-right">
33-
<li><p class="navbar-text">Hello, @User.Identity.Name</p></li>
33+
<li><p class="navbar-text text container">Welcome, @User.Identity.Name</p></li>
3434
<li><a class="nav-link" asp-controller="Home" asp-action="Profile" id="profile-button">Profile</a></li>
3535
<li>
3636
<form class="form-inline" asp-controller="Account" asp-action="SignOut" method="post">

ASP.NET Core 2.x/self-hosted-login/okta-aspnetcore-mvc-example/Views/Shared/_Layout.cshtml samples-aspnetcore-2x/self-hosted-login/okta-aspnetcore-mvc-example/Views/Shared/_Layout.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
{
3333
<ul class="nav navbar-nav navbar-right">
3434
<li>
35-
<p class="navbar-text">Hello, @User.Identity.Name</p>
35+
<p class="navbar-text text container">Welcome, @User.Identity.Name</p>
3636
</li>
3737
<li><a class="nav-link" asp-controller="Home" asp-action="Profile" id="profile-button">Profile</a></li>
3838
<li>

ASP.NET Core 3.x/e2e-tests/package.json samples-aspnetcore-3x/e2e-tests/package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,15 @@
33
"version": "0.1.0",
44
"description": "E2E tests for aspnet core Sample Applications for Okta",
55
"scripts": {
6-
"test": "npm run test:e2e",
76
"build-okta-hosted-login-server": "cd ../okta-hosted-login && @powershell -Command ./build.ps1",
87
"okta-hosted-login-server": "cd ../okta-hosted-login/dist/okta-aspnetcore-mvc-example && @powershell -Command \"iisexpress /path:$pwd\"",
98
"build-self-hosted-login-server": "cd ../self-hosted-login && @powershell -Command ./build.ps1",
109
"custom-login-server": "cd ../self-hosted-login/dist/okta-aspnetcore-mvc-example && @powershell -Command \"iisexpress /path:$pwd\"",
1110
"test:okta-hosted-login": "protractor okta-oidc-tck/e2e-tests/okta-hosted-login/conf.js",
1211
"test:custom-login": "protractor okta-oidc-tck/e2e-tests/custom-login/conf.js",
13-
"test:e2e": "npm run test:okta-hosted-login && npm run test:custom-login",
1412
"build": "npm run build-okta-hosted-login-server && npm run build-self-hosted-login-server",
15-
"pretest": "npm run build && webdriver-manager update --gecko false && node scripts/update-webconfig.js"
13+
"pretest": "npm run build && npm run update-webdriver && node scripts/update-webconfig.js",
14+
"update-webdriver": "webdriver-manager update --versions.chrome 79.0.3945.36 --gecko false --versions.standalone 3.141.59"
1615
},
1716
"license": "Apache-2.0",
1817
"repository": {
@@ -27,7 +26,7 @@
2726
"forever-monitor": "^1.7.1",
2827
"jasmine-reporters": "^2.2.0",
2928
"platform": "^1.3.5",
30-
"protractor": "^5.1.0",
29+
"protractor": "^5.4",
3130
"wait-on": "^2.0.2"
3231
},
3332
"bin": {},

0 commit comments

Comments
 (0)