web: many improvements for 2.0 #2671
+4,250
−23,079
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,7 +18,6 @@ _* | |
| .shake | ||
| .stack* | ||
| .tmp | ||
| tags | ||
| TAGS | ||
| .obsidian | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| { | ||
| "version": "0.2.0", | ||
| "configurations": [ | ||
| { | ||
| "name": "Build hledger-web", | ||
| "type": "node", | ||
| "request": "launch", | ||
| "runtimeExecutable": "stack", | ||
| "runtimeArgs": ["install", "hledger-web"], | ||
| "console": "integratedTerminal", | ||
| "skipFiles": ["<node_internals>/**"], | ||
| "internalConsoleOptions": "neverOpen" | ||
| }, | ||
| { | ||
| "name": "Run hledger-web", | ||
| "type": "node", | ||
| "request": "launch", | ||
| "runtimeExecutable": "hledger-web", | ||
| "console": "integratedTerminal", | ||
| "skipFiles": ["<node_internals>/**"], | ||
| "internalConsoleOptions": "neverOpen" | ||
| } | ||
| ] | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| { | ||
| "terminal.integrated.enableansi": true, | ||
| "haskell.debug.auto": false | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| { | ||
| "version": "2.0.0", | ||
| "tasks": [ | ||
| { | ||
| "label": "Build hledger-web", | ||
| "type": "shell", | ||
| "command": "stack", | ||
| "args": ["install", "hledger-web"], | ||
| "group": "build", | ||
| "problemMatcher": [] | ||
| }, | ||
| { | ||
| "label": "Run hledger-web", | ||
| "type": "shell", | ||
| "command": "hledger-web", | ||
| "group": "build", | ||
| "problemMatcher": [] | ||
| }, | ||
| { | ||
| "label": "Check Stack Installation", | ||
| "type": "shell", | ||
| "command": "stack", | ||
| "args": ["--version"], | ||
| "group": "build", | ||
| "problemMatcher": [] | ||
| } | ||
| ] | ||
| } |
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| @echo off | ||
| setlocal enabledelayedexpansion | ||
| set "LOCAL_IP=" | ||
|
|
||
| REM Filter for IPv4 Address lines | ||
| for /f "tokens=2 delims=:" %%i in ('ipconfig ^| findstr "IPv4"') do ( | ||
| set "IP=%%i" | ||
| REM Trim spaces | ||
| set "IP=!IP: =!" | ||
|
|
||
| echo %IP% | ||
| REM Check if the IP starts with 192.168 | ||
| if "!IP:~0,8!"=="192.168." ( | ||
| set "LOCAL_IP=!IP!" | ||
| goto :Found | ||
| ) | ||
| ) | ||
| :Found | ||
|
|
||
| hledger-web.exe -f "C:/Users/Aiden Hu/.hledger.journal" --host %IP% --port=5000 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 2.0 | ||
|
Contributor
There was a problem hiding this comment. my assumption is that incrementing the version bump would be outside of a pull request and part of the release process, but I haven't looked into . |
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| m4_dnl Version number to show in manuals. Updated by "Shake setversion" | ||
| m4_define({{_version_}}, {{2.0}})m4_dnl |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -159,30 +159,22 @@ instance Yesod App where | |
| sideShowsm = if showSidebar then "col-sm-4" else "" :: Text | ||
| mainShowmd = if showSidebar then "col-md-8" else "col-md-12" :: Text | ||
| mainShowsm = if showSidebar then "col-sm-8" else "col-sm-12" :: Text | ||
| isJournalPage = here == JournalR | ||
|
|
||
| -- We break up the default layout into two components: | ||
| -- default-layout is the contents of the body tag, and | ||
| -- default-layout-wrapper is the entire page. Since the final | ||
| -- value passed to hamletToRepHtml cannot be a widget, this allows | ||
| -- you to use normal widget features in default-layout. | ||
| pc <- widgetToPageContent $ do | ||
| -- Bootstrap 5 CSS | ||
| addStylesheet $ StaticR css_bootstrap_min_css | ||
| addStylesheet $ StaticR css_bootstrap_icons_css | ||
| -- load these things early, in HEAD: | ||
| toWidgetHead [hamlet| | ||
| <script type="text/javascript" src="@{StaticR js_bootstrap_bundle_min_js}"> | ||
| <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/typeahead.js@0.11.1/dist/typeahead.bundle.min.js"> | ||
|
Contributor
There was a problem hiding this comment. we're in conflict here. I propose replacing typeahead with a native I welcome your feedback. |
||
| |] | ||
|
Contributor
There was a problem hiding this comment. Looks like we may be in conflict here. Could merge? In any event, I'll look into it. |
||
| addStylesheet $ StaticR hledger_css | ||
| addScript $ StaticR hledger_js | ||
| $(widgetFile "default-layout") | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you meant to delete these from the repository, but they are still here. If you now have
.vscodein your.gitignoreyou will need to turn that off, and then make a commit to delete all of this from the repo. Once that's done, you can add vscode back into your ignore.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It was accidentally removed from the gitignore for a time. For users who use Visual Studio Code, it is useful to keep. For those who don't, it's easily ignorable and poses no harm.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I disagree.
hledger is pushing twenty years old. It has 178 contributors who have opened almost 1,000 pull requests over 60 releases.
Developer tooling has changed alot in that time, and the various contributors probably use a pretty good mix of environments. If even a small percent checked in their own developer tooling, there'd be alot of it in the repo. There's no documentation or test coverage, so really no guarantee it'll even work for any one other than you.