Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1_7 #139

Merged
merged 221 commits into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
221 commits
Select commit Hold shift + click to select a range
f01973f
[Task] #6 provide fallback index.html
Type-Style Jan 12, 2024
9cc6446
Merge branch 'main' into dev
Type-Style Jan 12, 2024
c19508f
[Task] #6 production ready code (m)
Type-Style Jan 12, 2024
e09f978
[Task] #6 create github action for upload when main is updated (#21)
Type-Style Jan 12, 2024
ca85337
Merge remote-tracking branch 'origin/main' into dev
Type-Style Jan 12, 2024
9c2a2fc
[change] #6 new ftp upload action
Type-Style Jan 12, 2024
8e478d6
Merge branch 'main' into dev
Type-Style Jan 12, 2024
bae1b4e
[Fix] #6 replace host with server in ftp action
Type-Style Jan 12, 2024
de31448
Merge branch 'main' into dev
Type-Style Jan 12, 2024
861336b
[Task] #6 basic log (#26)
Type-Style Jan 12, 2024
63b3525
[CHANGE] #6 revert back to require output for production
Type-Style Jan 12, 2024
2de635c
Merge branch 'main' into dev
Type-Style Jan 12, 2024
7c5ad3c
Merge branch 'main' into dev
Type-Style Jan 12, 2024
95aec15
[Task] #6 add ability to manually upload to prod
Type-Style Jan 14, 2024
81cac92
[Task] #9 enable manual start of codechecks
Type-Style Jan 19, 2024
3e1fbbd
10 webhook for writing (#36)
Type-Style Jan 24, 2024
781d61d
[Task] #3 improve error handling, logger and added chalk
Type-Style Jan 25, 2024
6d84638
[Change] #3 nodemon to clear console when in dev mode
Type-Style Jan 25, 2024
63085ed
[!Task] #32 webhook creates folder and file based on date
Type-Style Jan 25, 2024
8873654
[Change] #35 relocated tests and refactor write, also added file check
Type-Style Jan 26, 2024
91fba3b
[Task] #18, installed helmet, configured self as CSP origin
Type-Style Jan 26, 2024
a22f970
[Fix] moved chalk out of dev dependency
Type-Style Jan 29, 2024
c779de6
[Task] #32 error logging and text output improvement, log string inst…
Type-Style Jan 29, 2024
8a5137d
[Task] #18 CSP Update to allow localhost for testing
Type-Style Jan 29, 2024
3e8dab1
[Fix] #3 debugging setup improvments
Type-Style Jan 29, 2024
ff7c287
[FIX] #10 Error Handling
Type-Style Jan 29, 2024
10391c5
[Task] #10 writing basic non calculated data to file
Type-Style Jan 29, 2024
552dc32
[Fix] #10 avoid Header Modification after sending the request
Type-Style Jan 30, 2024
7bfdced
[Task] #10 JSON Data pretty output
Type-Style Jan 30, 2024
0bee573
[Task] #32 update types to reflect subobjects of entry
Type-Style Jan 30, 2024
9e801fe
[Task] #10 write time
Type-Style Jan 30, 2024
b801af4
[Task] #32 added logging for time edgecases
Type-Style Jan 30, 2024
b7360b2
[Task] #10 output seconds
Type-Style Jan 30, 2024
4cd1c07
[Task] #10 calculate distance based on lat and lon
Type-Style Jan 30, 2024
f8799b2
[Task] #32 writing tests for time and distance
Type-Style Jan 30, 2024
e39b8a7
[Task] #32 change distance calculation to use pythagoras
Type-Style Jan 30, 2024
6393efc
[Task] #38 add favicon
Type-Style Jan 31, 2024
353817c
[Task] #32 time converted to seconds
Type-Style Jan 31, 2024
f7df2d8
[Taskk] #32 speed calculation and output and tests
Type-Style Jan 31, 2024
976096a
[Task] #32 speed tests
Type-Style Jan 31, 2024
e9d0bbe
[Task] #33 add ignore
Type-Style Jan 31, 2024
e97d965
[Task] #32 test finetuning
Type-Style Jan 31, 2024
1a89b42
[Task] #32 add angle between entries
Type-Style Jan 31, 2024
c346ffb
[Task] #32 test for angle, extracted getData function
Type-Style Jan 31, 2024
003e57d
[change] #32 test to include optional leading 0 for days
Type-Style Feb 1, 2024
dbbbb46
[!!!Task] #18 add uncaughtExeption handler as last resort
Type-Style Feb 1, 2024
50c9700
[Task] #7 enhance static options to include common filetypes; index …
Type-Style Feb 2, 2024
04e2761
[change] #32 validation to be used more explictly
Type-Style Feb 2, 2024
c0b9db6
[change] #32 add index to log while writing
Type-Style Feb 2, 2024
29cc03c
[Task] #32 test if 1000 calls can be made with randomized data
Type-Style Feb 2, 2024
1145e9e
[!!! Task] #32 limit JSON Data to be 1000 lines: replace last line wi…
Type-Style Feb 2, 2024
19aa8eb
[Change, Task] #32 if 1000 entries exceeded, only replace last if hdo…
Type-Style Feb 2, 2024
e1d6827
[Change] build action enable button to on manually
Type-Style Feb 2, 2024
df0711c
[temp] test y tests fail
Type-Style Feb 2, 2024
88413e1
Merge branch 'dev' into 32-enhance-writing-data
Type-Style Feb 2, 2024
9702002
Create node.js.yml
Type-Style Feb 5, 2024
62123b7
Merge remote-tracking branch 'origin/dev' into 32-enhance-writing-data
Type-Style Feb 5, 2024
32d5579
Create main.yml
Type-Style Feb 5, 2024
0ca2a85
[!!!Fix] Created new workflow to build / test node, commented tests b…
Type-Style Feb 5, 2024
8fb1057
[Task] #33 moved ignore to its own file since it creates data rather …
Type-Style Feb 6, 2024
5ddf951
42 output json (#44)
Type-Style Feb 6, 2024
f1a628c
41 add rate limiter (#45)
Type-Style Feb 13, 2024
ce6e636
Bump follow-redirects from 1.15.5 to 1.15.6 (#47)
dependabot[bot] Mar 19, 2024
45c3a89
43 secure output route (#46)
Type-Style Mar 21, 2024
da13c77
48 move login to seperate controller (#49)
Type-Style Mar 21, 2024
8ab8cba
50 integrate csrf protection for login form (#53)
Type-Style Mar 26, 2024
1018d2e
fix: upgrade express-rate-limit from 7.1.5 to 7.2.0 (#52)
Type-Style Mar 26, 2024
eb76667
fix: package.json & package-lock.json to reduce vulnerabilities (#54)
Type-Style Mar 26, 2024
ff66e39
[Snyk] Upgrade express from 4.18.2 to 4.18.3 (#51)
Type-Style Mar 26, 2024
2a81a2e
Merge remote-tracking branch 'origin/main' into dev
Type-Style Mar 28, 2024
5d616b4
[Task] update dev after main merge
Type-Style Mar 28, 2024
16429e6
[Task] npm upgrade
Type-Style Apr 3, 2024
d65da31
58 react setup (#59)
Type-Style Apr 5, 2024
27ebfed
[Temp] Test csp
Type-Style Apr 9, 2024
0cc9776
[FIX] Add views to be deployed to prod
Type-Style Apr 9, 2024
c05d21c
[Task] disable csp for local development
Type-Style Apr 9, 2024
7645937
[Task] #58 base css including colors, deleted color classes in favor …
Type-Style Apr 15, 2024
265ce0c
[Task] #58 typescript setup for react
Type-Style Apr 15, 2024
adfde74
[Task] #58 webpack setup for react and typescript
Type-Style Apr 15, 2024
9908b73
[Task] #58 app setup react
Type-Style Apr 15, 2024
0d72aeb
[Temp] #58 conctact module css
Type-Style Apr 15, 2024
b63bb97
[Task] #58 remove learning files
Type-Style Apr 15, 2024
2d6bab0
[Task] #61, create font
Type-Style Apr 18, 2024
12f2a6f
Revert "[Task] #58 remove learning files"
Type-Style Apr 18, 2024
887ecf5
[Task] #61, adjust for darkmode
Type-Style Apr 19, 2024
aa0b668
[Task] #61 apply base style to login
Type-Style Apr 19, 2024
5eec473
[Task] #58, dev tesing rule to disable
Type-Style Apr 19, 2024
28af1bb
[Task] #58, adjust styles for headline
Type-Style Apr 19, 2024
a38e6fe
[Task] #58, create Contacts wrapper Component
Type-Style Apr 19, 2024
062f84c
[Task] #58 apply wrapper component
Type-Style Apr 19, 2024
e68e304
[Task] #58 adjust contact component to expect object
Type-Style Apr 19, 2024
94e234c
[Task] #58, toggle state
Type-Style Apr 22, 2024
d7b57d8
[Task] #58 learn context api provider and consumer
Type-Style Apr 23, 2024
ed2fd14
[Task] #58 add delete via dispatch
Type-Style Apr 23, 2024
9b53001
[Task] #58, react-router, move contacts to new url
Type-Style Apr 30, 2024
fe49d56
[Task] #58 fetch more contacts
Type-Style May 3, 2024
272bbce
fix: package.json & package-lock.json to reduce vulnerabilities (#62)
Type-Style May 3, 2024
01c30fd
Bump tar and npm (#60)
dependabot[bot] May 3, 2024
5eb9c72
Bump ejs from 3.1.9 to 3.1.10 (#63)
dependabot[bot] May 3, 2024
4916309
Merge branch 'react-learn' into dev
Type-Style May 6, 2024
0d2bbbe
[Task] #58, webpack configuriation to allow regular css files as well…
Type-Style May 6, 2024
49c6d81
[Task] #58, clean up react learn files
Type-Style May 7, 2024
2bf0d91
[Task] #58, setup react router
Type-Style May 7, 2024
56835ea
[Task] #61 install Material UI
Type-Style May 10, 2024
d47d0a2
[Task] #61, test mui
Type-Style May 10, 2024
f058aa5
[CHANGE, MultiLine] #61 color variables levels removed, MUI Overwrite…
Type-Style May 10, 2024
f46941d
[Temp] #61 introduce darkmode to MUI
Type-Style May 10, 2024
7df4555
[Task] #61, create new start module so that App can act as root
Type-Style May 10, 2024
bbb8421
[Task] #61, naming update
Type-Style May 10, 2024
9c9a8c8
[Task] #61, move router to root App
Type-Style May 10, 2024
a5b4ee6
[Task] #61, add font to preload
Type-Style May 10, 2024
8fad5c5
[Task] #61, dim colors in dark mode
Type-Style May 14, 2024
afdc3b6
[Task] #61, introduce modeswitcher
Type-Style May 15, 2024
e8bc18c
[Change] #64, refactoring splitting pages and components
Type-Style May 15, 2024
3316aa4
[Task] #61, mobile Theme Swticher placed on top right
Type-Style May 16, 2024
e62c563
[Task] #61, mobile theme switcher icon only on mobile
Type-Style May 16, 2024
a5bf0ce
[Task] #61, button color and background improvement
Type-Style May 16, 2024
a04e2c3
[Task] #63, login page first draft
Type-Style May 16, 2024
6879f65
[Temp] #61, login controller commented out unused route, TO BE REFACT…
Type-Style May 16, 2024
2a64701
[Task] #63, login validation
Type-Style May 16, 2024
97e93ec
[Task] #63, add error icon
Type-Style May 16, 2024
a012ed9
[Task] #61, cut design update
Type-Style May 21, 2024
c505d2b
[Task] #53, apply cut, rename FormData to FormInfo to avoid confusion…
Type-Style May 21, 2024
8e0bb6b
[Task] #63, send login request
Type-Style May 21, 2024
10646b6
[Task] #61, loading icon
Type-Style May 21, 2024
59b31e0
[Task] #63, get csrfToken, fullfill login request
Type-Style May 21, 2024
5bc4e04
[Fix] #63, fail gracefully when too many tokens
Type-Style May 22, 2024
ace6b5a
[Task] #63, error Handling in login form
Type-Style May 22, 2024
ffd8183
[Task] #81, remove password log
Type-Style May 27, 2024
9e5781a
[Task] #80, cleanup todo token
Type-Style May 27, 2024
980317e
fix: upgrade multiple dependencies with Snyk (#68)
Type-Style May 27, 2024
86babe8
[Fix] #64, disable express header
Type-Style May 27, 2024
f9aa2fc
[Task] #64, protect csrf token page with custom http header
Type-Style May 27, 2024
d3e19f1
[FIx] #64, fix csrf test
Type-Style May 27, 2024
3f92443
[Task] #64, repair test cases
Type-Style May 28, 2024
1f080db
fix: upgrade express-slow-down from 2.0.1 to 2.0.2 (#69)
Type-Style May 28, 2024
ae7e36e
[fix] #64, linter fixes
Type-Style May 28, 2024
49947f8
[Task] Editor Config
Type-Style May 28, 2024
d6468b1
[Task] #61, convert background line to svg and animate
Type-Style May 28, 2024
9718083
[Task] #61, main headline style
Type-Style May 28, 2024
9e1c22d
[Task] #61, fine tune background pattern
Type-Style May 29, 2024
a2626ee
[Task] #61, font-weight reduced in darkmode
Type-Style May 29, 2024
0638f10
[Task] #64, login design improvements
Type-Style May 29, 2024
d618d46
[Task] #61, update design with minor ripples and edges
Type-Style Jun 3, 2024
59ea9c7
[Task] #70, store token after login
Type-Style Jun 3, 2024
02018ab
Bump braces from 3.0.2 to 3.0.3 (#76)
dependabot[bot] Jun 26, 2024
270b0b4
fix: upgrade @mui/icons-material from 5.15.16 to 5.15.18 (#75)
Type-Style Jun 26, 2024
809e809
fix: upgrade react-router-dom from 6.23.0 to 6.23.1 (#74)
Type-Style Jun 26, 2024
951780d
fix: upgrade express-slow-down from 2.0.2 to 2.0.3 (#73)
Type-Style Jun 26, 2024
6e520ee
fix: upgrade express-rate-limit from 7.2.0 to 7.3.0 (#82)
Type-Style Jul 4, 2024
33d6dbc
fix: upgrade express-validator from 7.0.1 to 7.1.0 (#81)
Type-Style Jul 4, 2024
740bacd
fix: upgrade axios from 1.7.1 to 1.7.2 (#80)
Type-Style Jul 4, 2024
ea7bf04
fix: upgrade @mui/icons-material from 5.15.18 to 5.15.19 (#79)
Type-Style Jul 4, 2024
3a1f9c8
fix: upgrade @mui/icons-material from 5.15.19 to 5.15.20 (#88)
Type-Style Jul 16, 2024
ef310ad
fix: upgrade react-router-dom from 6.23.1 to 6.24.0 (#91)
Type-Style Jul 16, 2024
a4c195a
77 design base layout (#85)
Type-Style Jul 16, 2024
431fc7b
[Task] #77, draft of status content
Type-Style Jul 17, 2024
d366717
[FIX] #77 change data accumulation
Type-Style Jul 17, 2024
1455199
[Task] #77 improve test example data
Type-Style Jul 17, 2024
d516382
fix: upgrade @mui/material from 5.15.16 to 5.15.20 (#92)
Type-Style Jul 19, 2024
b70c248
[Fix] #94, refactor-ignore logic (multiline) (#95)
Type-Style Jul 19, 2024
4efcbf4
[Task] #94, add logging if logical error with ignore
Type-Style Jul 19, 2024
5e26a19
[Task] #94, cleanup console.logs
Type-Style Jul 19, 2024
7a55e4d
[Fix] #93, offline message improvement (#96)
Type-Style Jul 19, 2024
9e01a1c
fix: package.json & package-lock.json to reduce vulnerabilities (#101)
Type-Style Aug 15, 2024
50d8c1d
fix: upgrade @mui/material from 5.15.20 to 5.16.5 (#102)
Type-Style Aug 15, 2024
0de8b24
93 fix error message when server not available (#103)
Type-Style Aug 15, 2024
6e87449
[Fix] #94, repair overwriting the last data point
Type-Style Aug 19, 2024
008e24b
fix: upgrade @emotion/react from 11.11.4 to 11.13.0 (#104)
Type-Style Aug 21, 2024
b232179
fix: upgrade @emotion/styled from 11.11.5 to 11.13.0 (#105)
Type-Style Aug 21, 2024
ee33d4b
fix: upgrade react-router-dom from 6.25.0 to 6.25.1 (#106)
Type-Style Aug 21, 2024
87afbd3
fix: upgrade @mui/icons-material from 5.16.4 to 5.16.5 (#107)
Type-Style Aug 21, 2024
f14c9e3
fix: upgrade express-rate-limit from 7.3.1 to 7.4.0 (#108)
Type-Style Aug 21, 2024
842d0c8
109 marker and line design (#110)
Type-Style Aug 21, 2024
5775d84
fix: upgrade react-router-dom from 6.25.1 to 6.26.0 (#113)
Type-Style Aug 26, 2024
6773f8d
fix: upgrade @mui/material from 5.16.5 to 5.16.6 (#112)
Type-Style Aug 26, 2024
e2df714
Switch polyline (#114)
Type-Style Aug 26, 2024
7fb42c0
[Task] #77, change timing to round up, so it "feels" more accurate
Type-Style Aug 26, 2024
bfc3440
[Task] #115, remove SVG Animation on startup based on media Query
Type-Style Aug 26, 2024
f76fe8e
[Task] #77 improve test example data
Type-Style Aug 26, 2024
2d57a38
[Task] #77, calculate more Status data
Type-Style Aug 26, 2024
11d760a
[Task] #77, improve example test data
Type-Style Aug 26, 2024
14573d6
[Task] #109, line dashed when diff is high, marker start icon when di…
Type-Style Aug 27, 2024
70ff0d9
[Task] #77, status design
Type-Style Aug 27, 2024
5368424
[Task] #83, forced scheme for map
Type-Style Sep 1, 2024
1292b35
[Task] #83, change context, mode globally available
Type-Style Sep 1, 2024
b699807
[Task] #83, react update, cluster install
Type-Style Sep 1, 2024
c852365
[Task, multiline] #83, map tilelayer
Type-Style Sep 1, 2024
76e54a2
[Task] #77 improve responsive design, hide images, status overlays map
Type-Style Sep 1, 2024
35055b3
[Task] #77, adjust coloring and opacity, used for status
Type-Style Sep 1, 2024
c5eb790
[Task] #83, adjust imports
Type-Style Sep 1, 2024
e14ffd7
[Task] #77, changed responsive design for mobile
Type-Style Sep 1, 2024
905ffcc
[Task] #83, extracted to own module, added fly option
Type-Style Sep 1, 2024
d19cfcd
[Task] #83, layers extracted, clickable minimap, corrected for mapbox…
Type-Style Sep 1, 2024
494aa06
Bump webpack from 5.91.0 to 5.94.0 (#117)
dependabot[bot] Sep 1, 2024
c4e3a92
Merge branch 'main' into dev
Type-Style Sep 1, 2024
3ba611c
[Task] #83, code cleanup
Type-Style Sep 1, 2024
ff36df7
[Fix] #83, mime type setting
Type-Style Sep 1, 2024
646bbaf
Merge branch 'main' into dev
Type-Style Sep 1, 2024
d51e1ff
[fix] #123, run pre and post build for production too
Type-Style Sep 1, 2024
042c743
Merge branch 'main' into dev
Type-Style Sep 1, 2024
5854f6f
[Change] #123, to see real user ip instead of localhost proxy (#126)
Type-Style Sep 2, 2024
e17dfb2
Main (#128)
Type-Style Sep 2, 2024
e5fb3ab
125 show old data from yesterday (#129)
Type-Style Sep 2, 2024
b083e02
Merge remote-tracking branch 'origin/main' into dev
Type-Style Sep 2, 2024
1c9bfdc
fix: upgrade express-validator from 7.1.0 to 7.2.0 (#133)
Type-Style Sep 2, 2024
4650423
fix: upgrade @mui/material from 5.16.6 to 5.16.7 (#132)
Type-Style Sep 2, 2024
1d96e6d
Create .env
Type-Style Sep 3, 2024
7c9343b
Update README.md Installation Guide
Type-Style Sep 3, 2024
6405562
fix: upgrade @mui/icons-material from 5.16.5 to 5.16.7 (#134)
Type-Style Sep 3, 2024
33f4227
Rename .env to .env_example
Type-Style Sep 3, 2024
6e4be92
[CHANGE] #84, writing key check to be simpler, introduced scripts for…
Type-Style Sep 3, 2024
547a7df
Update README.md
Type-Style Sep 3, 2024
1ad4c36
Update README.md
Type-Style Sep 3, 2024
59d0537
[Task] #123, add option to send testdata to production
Type-Style Sep 2, 2024
33d409e
[Task] #123, cleanup environment variables
Type-Style Sep 3, 2024
0eca482
[Task] #123, increase rateLimit
Type-Style Sep 3, 2024
f8a2c59
[TEMP] #123, repair test cases
Type-Style Sep 3, 2024
786f9e4
[Task] #84, update readme, add demo image
Type-Style Sep 4, 2024
8c84db3
Update README.md
Type-Style Sep 4, 2024
c6be0d0
Merge branch 'main' into dev
Type-Style Sep 4, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- run: npm run build --if-present
- name: Start server
run: |
sudo NODE_ENV=$NODE_ENV LOCALHOST=$LOCALHOST LOCALHOSTV6=$LOCALHOSTV6 KEY=$KEY USER_TEST=$USER_TEST npm start &
sudo NODE_ENV=$NODE_ENV KEY=$KEY USER_TEST=$USER_TEST npm start &
sleep 16 # Give server some time to start
- name: Check if server is running
run: |
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,5 +100,6 @@ This application is designed to be used with the [OSMAND+ mobile app]([url](http
Due to a plugin called [Triprecording]([url](https://osmand.net/docs/user/plugins/trip-recording/))
Using the above link or by [clicking here](https://osmand.net/docs/user/plugins/trip-recording#recording-settings) more information can be found to setup webtracking or "online tracking"



## DEMO
At this point, there is no demo, but here is a screenshot:
![Demo LOREX, markers on a map in berlin, information about speed and distance on the right](https://raw.githubusercontent.com/Type-Style/LOREX/dev/demo.png)
Binary file added demo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ app.use(error.handler);

// init server
const server = app.listen(80, () => {
logger.log(`Server running //localhost:80, ENV: ${process.env.NODE_ENV}`, true);
logger.log(`Server running //localhost:80, NODE_ENV: ${process.env.NODE_ENV}`, true);
});

// scheduled cleanup
Expand Down
Loading