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
3 changes: 3 additions & 0 deletions RoomieRosterWeb.sln
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,15 @@ Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
Develop|Any CPU = Develop|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5348BFB1-0787-4C23-99D9-632672873E47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5348BFB1-0787-4C23-99D9-632672873E47}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5348BFB1-0787-4C23-99D9-632672873E47}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5348BFB1-0787-4C23-99D9-632672873E47}.Release|Any CPU.Build.0 = Release|Any CPU
{5348BFB1-0787-4C23-99D9-632672873E47}.Develop|Any CPU.ActiveCfg = Debug|Any CPU
{5348BFB1-0787-4C23-99D9-632672873E47}.Develop|Any CPU.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
8 changes: 8 additions & 0 deletions RoomieRosterWeb/Properties/launchSettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"develop": {
"commandName": "Project",
"launchBrowser": true,
"applicationUrl": "https://localhost:45715;http://localhost:31666",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Develop"
}
}
}
}
17 changes: 17 additions & 0 deletions RoomieRosterWeb/RoomieRosterWeb.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,23 @@

<PropertyGroup Condition=" '$(RunConfiguration)' == 'https' " />
<PropertyGroup Condition=" '$(RunConfiguration)' == 'http' " />
<PropertyGroup Condition=" '$(RunConfiguration)' == 'develop' " />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<EnvironmentName>Development</EnvironmentName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<EnvironmentName>Production</EnvironmentName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Develop|AnyCPU'">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<EnvironmentName>Develop</EnvironmentName>
</PropertyGroup>
<ItemGroup>
<None Remove="Views\Favourites\" />
<None Remove="Views\Chat\" />
Expand Down
41 changes: 41 additions & 0 deletions RoomieRosterWeb/appsettings.Develop.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"TokenOption": {
"Audience": [ "www.memorengapi.com" ],
"Issuer": "www.memorengapi.com",
"AccessTokenExpiration": 1440,
"RefreshTokenExpiration": 14400,
"SecurityKey": "pZ7zEJrPbm8bRNeTtLpH7VcMLWxGKFfQOoX9qih2vAukjCSsIy0wYD5Ua1gd6*w"
},
"AllowedHosts": "*",
"MatchApi": {
"BaseUrl": "https://develop-api.roomieroster.com/api/",
"Endpoints": {
"Auth": {
"Register": "Auth/Register",
"Login": "Auth/Login",
"ForgotPassword": "Auth/ForgotPassword",
"ResetPassword": "Auth/ResetPassword",
"CreateTokenByRefreshToken": "Auth/CreateTokenByRefreshToken",
"RevokeRefreshToken": "Auth/RevokeRefreshToken",
"ConfirmEmail": "Auth/ConfirmEmail"
},
"Match": "Match",
"Preferences": "Preferences",
"User": {
"GetById": "User/",
"GetFollows": "User/GetFollows",
"Follow": "User/Follow",
"UnFollow": "User/UnFollow",
"DisableUser": "User/DisableUser",
"EnableUser": "Usser/EnableUser"
}
}
}
}

32 changes: 32 additions & 0 deletions RoomieRosterWeb/appsettings.Development.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,38 @@
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"TokenOption": {
"Audience": [ "www.memorengapi.com" ],
"Issuer": "www.memorengapi.com",
"AccessTokenExpiration": 1440,
"RefreshTokenExpiration": 14400,
"SecurityKey": "pZ7zEJrPbm8bRNeTtLpH7VcMLWxGKFfQOoX9qih2vAukjCSsIy0wYD5Ua1gd6*w"
},
"AllowedHosts": "*",
"MatchApi": {
"BaseUrl": "https://localhost:7032/api/",
"Endpoints": {
"Auth": {
"Register": "Auth/Register",
"Login": "Auth/Login",
"ForgotPassword": "Auth/ForgotPassword",
"ResetPassword": "Auth/ResetPassword",
"CreateTokenByRefreshToken": "Auth/CreateTokenByRefreshToken",
"RevokeRefreshToken": "Auth/RevokeRefreshToken",
"ConfirmEmail": "Auth/ConfirmEmail"
},
"Match": "Match",
"Preferences": "Preferences",
"User": {
"GetById": "User/",
"GetFollows": "User/GetFollows",
"Follow": "User/Follow",
"UnFollow": "User/UnFollow",
"DisableUser": "User/DisableUser",
"EnableUser": "Usser/EnableUser"
}
}
}
}

3 changes: 1 addition & 2 deletions RoomieRosterWeb/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
},
"AllowedHosts": "*",
"MatchApi": {
"BaseUrl": "https://localhost:7032/api/"
/*"BaseUrl": "https://api.roomieroster.com/api/"*/,
"BaseUrl": "https://api.roomieroster.com/api/",
"Endpoints": {
"Auth": {
"Register": "Auth/Register",
Expand Down
2 changes: 1 addition & 1 deletion RoomieRosterWeb/wwwroot/js/site.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@

window.config = {
accessToken: document.cookie.split('AccessToken=').slice(-1)[0].split(';')[0],
baseUrl: 'https://roomieroster.com/'
baseUrl: 'https://localhost:7032/'
}