diff --git a/RubberduckServices/SyntaxHighlighterService.cs b/RubberduckServices/SyntaxHighlighterService.cs index 44c259d..7f6a9e8 100644 --- a/RubberduckServices/SyntaxHighlighterService.cs +++ b/RubberduckServices/SyntaxHighlighterService.cs @@ -1,10 +1,10 @@ -using System.Text; -using Antlr4.Runtime; +using Antlr4.Runtime; using Antlr4.Runtime.Atn; using Rubberduck.Parsing.Grammar; using Rubberduck.SmartIndenter; using RubberduckServices.Internal; using RubberduckServices.Parsing; +using System.Text; namespace RubberduckServices; @@ -35,7 +35,7 @@ public class SyntaxHighlighterService : ISyntaxHighlighterService private readonly string _attributeValueClass; public SyntaxHighlighterService( - string cssKeywords = DefaultKeywordClass, + string cssKeywords = DefaultKeywordClass, string cssStringLiterals = DefaultStringLiteralClass, string cssComments = CommentIntervalsListener.DefaultCommentClass, string cssAnnotations = AnnotationIntervalsListener.DefaultAnnotationClass, @@ -93,7 +93,7 @@ public async Task FormatAsync(string code) var tree = parser.startRule(); FormatTokens(builder, tokens, listeners); - var lines = builder.ToString().Split(Environment.NewLine).ToArray(); + var lines = builder.ToString().Split("\n").ToArray(); var indent = lines.LastOrDefault()?.TakeWhile(char.IsWhiteSpace)?.Count() ?? 0; var formattedLines = from line in lines let trimmed = line.Substring(indent) diff --git a/rubberduckvba.Server/Api/Auth/AuthController.cs b/rubberduckvba.Server/Api/Auth/AuthController.cs index 7c07e5a..92ef276 100644 --- a/rubberduckvba.Server/Api/Auth/AuthController.cs +++ b/rubberduckvba.Server/Api/Auth/AuthController.cs @@ -51,7 +51,7 @@ public ActionResult Index() } } - [HttpPost("signin")] + [HttpPost("auth/signin")] [AllowAnonymous] public async Task SignIn() { @@ -81,7 +81,7 @@ public async Task SignIn() return RedirectToAction("Index", "Home"); } - [HttpGet("github")] + [HttpGet("auth/github")] [AllowAnonymous] public async Task GitHubCallback(string code, string state) { diff --git a/rubberduckvba.client/angular.json b/rubberduckvba.client/angular.json index 1aea203..09e7533 100644 --- a/rubberduckvba.client/angular.json +++ b/rubberduckvba.client/angular.json @@ -27,7 +27,8 @@ ], "styles": [ "node_modules/bootstrap/dist/css/bootstrap.min.css", - "src/styles.css" + "src/styles.css", + "src/vbe.css" ], "scripts": [], "browser": "src/main.ts" @@ -97,7 +98,8 @@ "src/assets" ], "styles": [ - "src/styles.css" + "src/styles.css", + "src/vbe.css" ], "scripts": [], "karmaConfig": "karma.conf.js" diff --git a/rubberduckvba.client/src/app/components/nav-menu/nav-menu.component.html b/rubberduckvba.client/src/app/components/nav-menu/nav-menu.component.html index 4765251..616dc96 100644 --- a/rubberduckvba.client/src/app/components/nav-menu/nav-menu.component.html +++ b/rubberduckvba.client/src/app/components/nav-menu/nav-menu.component.html @@ -3,7 +3,7 @@
- Rubberduck logo + Rubberduck logo Rubberduck diff --git a/rubberduckvba.client/src/environments/environment.prod.ts b/rubberduckvba.client/src/environments/environment.prod.ts index 26d101a..e95e3c7 100644 --- a/rubberduckvba.client/src/environments/environment.prod.ts +++ b/rubberduckvba.client/src/environments/environment.prod.ts @@ -1,4 +1,4 @@ export const environment = { production: true, - apiBaseUrl: 'https://test.api.rubberduckvba.com/' + apiBaseUrl: 'https://localhost:44314/' }; diff --git a/rubberduckvba.client/src/environments/environment.ts b/rubberduckvba.client/src/environments/environment.ts index ddc0b2d..0fd806b 100644 --- a/rubberduckvba.client/src/environments/environment.ts +++ b/rubberduckvba.client/src/environments/environment.ts @@ -4,7 +4,7 @@ export const environment = { production: false, - apiBaseUrl: 'https://test.api.rubberduckvba.com/' + apiBaseUrl: 'https://localhost:44314/' }; /*