Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
234 commits
Select commit Hold shift + click to select a range
90646ff
simple server
Melisaysnuh Nov 26, 2024
dbb3085
Merge branch 'websockets' into server
Melisaysnuh Nov 27, 2024
694ed66
merged sockets server
Melisaysnuh Nov 27, 2024
aa94853
updated server
Melisaysnuh Nov 27, 2024
1808f9d
Merge branch 'amenities' into server
Melisaysnuh Nov 27, 2024
6b95c7b
saving changes
Melisaysnuh Nov 27, 2024
2d2fb6b
commit before adding user model
Melisaysnuh Nov 27, 2024
24c5433
updated
Melisaysnuh Nov 27, 2024
ef46e1f
adjusted tsconfig and hashed password
Melisaysnuh Nov 27, 2024
e7d1ccf
commit so jonas can branch
Melisaysnuh Nov 27, 2024
5c15ba6
Revert "commit so jonas can branch"
Melisaysnuh Nov 27, 2024
ce5fdaf
feat: implements routes needed for shares
JonasCodeworks Nov 27, 2024
e5b40be
fix: gets rid of node_modules folder in git
JonasCodeworks Nov 27, 2024
d69f8e7
fix: deleted dist folder and added it to gitignore
JonasCodeworks Nov 27, 2024
2aa96fd
middleware adjusted
Melisaysnuh Nov 28, 2024
e02b8d1
login service, pending register service to function
Melisaysnuh Nov 28, 2024
f88604f
saving changes
Melisaysnuh Nov 28, 2024
eadfaaf
Merge branch 'server-share-routes' into server
Melisaysnuh Nov 28, 2024
f93d931
merged w jonas
Melisaysnuh Nov 28, 2024
8ab05e9
fix: fixed mongoose import in Share model and deleted node_modules fo…
JonasCodeworks Nov 28, 2024
6a59884
middleware adjustment
Melisaysnuh Nov 28, 2024
ce02e77
Merge branch 'server' of https://github.com/GlowPathOrg/GlowPath into…
Melisaysnuh Nov 28, 2024
08a5347
middleware working and login seems to be working
Melisaysnuh Nov 28, 2024
e0f081d
commit before merging main
Melisaysnuh Nov 28, 2024
b31250a
Revert "commit so jonas can branch"
Melisaysnuh Nov 28, 2024
e949291
adjusted middleware for error handling
Melisaysnuh Nov 28, 2024
5882cc9
navbar added
Melisaysnuh Nov 28, 2024
629cfc3
update to server before merge to main
Melisaysnuh Nov 28, 2024
685da61
Merge pull request #24 from GlowPathOrg/server
Melisaysnuh Nov 28, 2024
1a21ec1
fixed small bug
Melisaysnuh Nov 28, 2024
271aaec
fixed cors
Melisaysnuh Nov 28, 2024
27406b6
wip
JonasCodeworks Nov 28, 2024
c29985f
feat: websockets server working
JonasCodeworks Nov 28, 2024
fe0660b
Merge pull request #25 from GlowPathOrg/websockets-3
JonasCodeworks Nov 28, 2024
e328a9a
fixed typing errors in controller
Melisaysnuh Nov 29, 2024
80e9620
modified: client/src/App.tsx
Melisaysnuh Nov 29, 2024
717b96b
types for route
Melisaysnuh Nov 29, 2024
56ba826
fix: refactor with vic's suggestions
JonasCodeworks Nov 29, 2024
ccc9f44
types
Melisaysnuh Nov 29, 2024
a8078bc
undid adjustments to Share schema
Melisaysnuh Nov 29, 2024
ea41f7b
adjusted route schema
Melisaysnuh Nov 29, 2024
cc1e66f
Merge branch 'server' of https://github.com/GlowPathOrg/GlowPath into…
Melisaysnuh Nov 29, 2024
eea6366
further updates to route schema
Melisaysnuh Nov 29, 2024
17f8170
feat: integrating new route model
JonasCodeworks Nov 29, 2024
729c33e
Merge pull request #36 from GlowPathOrg/server-share-routes-2
JonasCodeworks Nov 29, 2024
7b70165
Merge branch 'server' of https://github.com/GlowPathOrg/GlowPath into…
Melisaysnuh Nov 29, 2024
474869d
Merge branch 'main' into user-profile
Melisaysnuh Nov 29, 2024
46ac3d8
fixing types
Melisaysnuh Nov 29, 2024
ccfee0b
udpated from main
Melisaysnuh Nov 29, 2024
b9af54d
commit before updating from main
Melisaysnuh Nov 30, 2024
1f02d47
Merge pull request #35 from GlowPathOrg/geolocation-refactor-1
Melisaysnuh Nov 30, 2024
ffe640c
Merge branch 'geofencing' into user-profile
Melisaysnuh Nov 30, 2024
7965704
merged w hadils branch
Melisaysnuh Nov 30, 2024
b6a765f
profile integration to home page
Melisaysnuh Nov 30, 2024
6c077ae
fix: initializes position with null values instead of empty object
JonasCodeworks Nov 30, 2024
76cebb9
fix: type inconsistency between usePosition and MapComponent
JonasCodeworks Nov 30, 2024
a6a1dfb
updated userLogin with hook
Melisaysnuh Nov 30, 2024
bbedf16
successfully storing user info
Melisaysnuh Nov 30, 2024
c8def47
basic styling for profile and settings
Melisaysnuh Nov 30, 2024
691d86d
styling change
Melisaysnuh Dec 1, 2024
598b153
Merge branch 'main' into user-profile
Melisaysnuh Dec 1, 2024
b3bd5b1
bug fix from merge
Melisaysnuh Dec 1, 2024
0206594
Merge pull request #38 from GlowPathOrg/user-profile
Melisaysnuh Dec 1, 2024
b9a3f08
bug fixes after merge
Melisaysnuh Dec 1, 2024
16f0c5d
small fix
Melisaysnuh Dec 1, 2024
92932fd
Merge branch 'main' into user-profile
Melisaysnuh Dec 1, 2024
eccb79e
Merge branch 'geofencing' into main
hadeelbk Dec 1, 2024
9a336fd
Merge pull request #43 from GlowPathOrg/geofencing
hadeelbk Dec 1, 2024
3b6b982
feat: edit profile
Melisaysnuh Dec 2, 2024
e1309b6
fixed package.json syntax error
Melisaysnuh Dec 2, 2024
8b2795b
fixed bugs and built with hadils changes
Melisaysnuh Dec 2, 2024
3a51ffe
Merge branch 'server' of https://github.com/GlowPathOrg/GlowPath into…
Melisaysnuh Dec 2, 2024
6452861
fixed settings component case
Melisaysnuh Dec 2, 2024
557c6c6
trying again to fix
Melisaysnuh Dec 2, 2024
eecc95d
merged changes from main
Melisaysnuh Dec 2, 2024
de0f334
added hospitals and police and lit streets and sidewalks
hadeelbk Dec 2, 2024
a784406
commit before pull request
Melisaysnuh Dec 2, 2024
6070972
Merge branch 'user-profile' into vic-fixes-mel
Melisaysnuh Dec 2, 2024
e639531
basics done, now troubleshooting
Melisaysnuh Dec 2, 2024
84e47d0
Merge branch 'user-profile'
Melisaysnuh Dec 2, 2024
f1c7960
removed buggy components
Melisaysnuh Dec 2, 2024
0cb61de
try again
Melisaysnuh Dec 2, 2024
b5a8bf5
reinstalling node modules and trying again
Melisaysnuh Dec 2, 2024
12d2646
fix: removed redundant MapComponent, reinstalled node modules
JonasCodeworks Dec 2, 2024
8c2c226
commit before switching branches
Melisaysnuh Dec 2, 2024
63eec47
routing in backend
Melisaysnuh Dec 2, 2024
0e400d8
Merge branch 'main' into vic-fixes-mel
Melisaysnuh Dec 2, 2024
828109a
bug fixes from merge with main, build working
Melisaysnuh Dec 2, 2024
a06b3d8
Merge pull request #45 from GlowPathOrg/vic-fixes-mel
Melisaysnuh Dec 2, 2024
4c64c5f
Merge branch 'server' of https://github.com/GlowPathOrg/GlowPath into…
Melisaysnuh Dec 3, 2024
be48752
remerged vic fixes
Melisaysnuh Dec 3, 2024
f1cc6e1
delete this later
JonasCodeworks Dec 3, 2024
b482113
changes for stylng and adding more features
hadeelbk Dec 3, 2024
45290cf
melissa bug fixes
Melisaysnuh Dec 3, 2024
0a4c121
removed berlin crime data
hadeelbk Dec 3, 2024
34e6a7d
typing across
Melisaysnuh Dec 3, 2024
3c01c18
fix: deactivated rerouting on deviation, made baseDuration optional i…
JonasCodeworks Dec 3, 2024
4a00c59
Merge branch 'safety' into dev
Melisaysnuh Dec 3, 2024
d129ed5
save before switching branches
Melisaysnuh Dec 3, 2024
c8cac34
running dev on front end and back end
Melisaysnuh Dec 3, 2024
e0cea0c
potential fix for socket issues
JonasCodeworks Dec 3, 2024
1616905
potential fix for socket issue
JonasCodeworks Dec 3, 2024
3993cc8
reworked JourneyPage to use socket directly
JonasCodeworks Dec 3, 2024
89b8ce7
Merge pull request #50 from GlowPathOrg/fix-socket-1
JonasCodeworks Dec 3, 2024
8f37b3f
save before switching branch
Melisaysnuh Dec 3, 2024
24e8613
sos
hadeelbk Dec 3, 2024
226a8cd
commiting before testing
Melisaysnuh Dec 3, 2024
62087b9
trying again
Melisaysnuh Dec 3, 2024
37d90f5
changed package json
Melisaysnuh Dec 3, 2024
0c46d42
correct package json
Melisaysnuh Dec 3, 2024
99edbdf
changed package json
Melisaysnuh Dec 3, 2024
d17106e
updated dependencies
Melisaysnuh Dec 3, 2024
0aee9f7
user captials
Melisaysnuh Dec 3, 2024
302dec5
try again
Melisaysnuh Dec 3, 2024
6c8c7db
fixed dotenv
Melisaysnuh Dec 3, 2024
2d8d8b8
forced change
Melisaysnuh Dec 3, 2024
fd49641
trying with lib
Melisaysnuh Dec 3, 2024
65f2d6a
fixing lib and target
Melisaysnuh Dec 3, 2024
ec10bfc
try again
Melisaysnuh Dec 3, 2024
d943315
test
Melisaysnuh Dec 3, 2024
b70ff35
test
Melisaysnuh Dec 3, 2024
d179a61
try again
Melisaysnuh Dec 3, 2024
7aa2332
test
Melisaysnuh Dec 3, 2024
3e1f7e2
try again
Melisaysnuh Dec 3, 2024
0ce30d5
try again
Melisaysnuh Dec 3, 2024
a87936e
some stuff
Melisaysnuh Dec 3, 2024
eac1cd4
fixed some stuff
Melisaysnuh Dec 4, 2024
33af68f
authrefactor
Melisaysnuh Dec 4, 2024
603b7a5
updated root
Melisaysnuh Dec 4, 2024
f0f514e
fixed pakcage json bugs
Melisaysnuh Dec 4, 2024
4b15158
Merge branch 'dev' into heroku
Melisaysnuh Dec 4, 2024
450092b
fixed tsconfig.node.json to revert changes made yesterday
Melisaysnuh Dec 4, 2024
2e386a7
reverted tsconfig in root
Melisaysnuh Dec 4, 2024
6090c1e
front end build running well -- settings updated
Melisaysnuh Dec 4, 2024
58fb3bb
lib changed
Melisaysnuh Dec 4, 2024
79fa6df
cors for socket server
Melisaysnuh Dec 4, 2024
10bc395
Update .gitignore and package.json for environment setup and exclusions
Melisaysnuh Dec 4, 2024
c3af19a
reconfig
Melisaysnuh Dec 4, 2024
ce90193
adjusted port variables
Melisaysnuh Dec 4, 2024
a099591
client port in config
Melisaysnuh Dec 4, 2024
1c491ba
refactor server
Melisaysnuh Dec 4, 2024
2d66fe2
debug
Melisaysnuh Dec 4, 2024
e442882
fixing package json
Melisaysnuh Dec 4, 2024
df1646f
force heroku node version
Melisaysnuh Dec 4, 2024
bfd1e84
unhardcoded mongodb uri
Melisaysnuh Dec 4, 2024
4ff1da9
fixed connection model
Melisaysnuh Dec 4, 2024
529c882
updated ip address
Melisaysnuh Dec 4, 2024
6bb0327
wip fix websockets
JonasCodeworks Dec 4, 2024
4813261
saving for jonas
Melisaysnuh Dec 4, 2024
a665879
refactoring for mongo atlas
JonasCodeworks Dec 4, 2024
00aae61
fix: exchanges id for _id in authMiddleware
JonasCodeworks Dec 4, 2024
806e1c9
Merge pull request #51 from GlowPathOrg/heroku
JonasCodeworks Dec 4, 2024
a62bfb2
fixed middleware error
Melisaysnuh Dec 4, 2024
3aa1a1d
styling half way
hadeelbk Dec 4, 2024
4ee4e4e
melissa updates
Melisaysnuh Dec 4, 2024
608cdd8
everything working, saving to revert
Melisaysnuh Dec 4, 2024
deb022a
Merge branch 'dev' into sos
JonasCodeworks Dec 4, 2024
55e8e9e
Merge pull request #52 from GlowPathOrg/sos
JonasCodeworks Dec 4, 2024
2599597
fix: removed double initialization of express
JonasCodeworks Dec 4, 2024
d4a0ae1
fix: updated root package.json to reflect server package.json
JonasCodeworks Dec 4, 2024
91c646d
fix: removed double port declaration from index.ts
JonasCodeworks Dec 4, 2024
0009125
Merge pull request #53 from GlowPathOrg/heroku
JonasCodeworks Dec 4, 2024
e8458b4
Merge pull request #54 from GlowPathOrg/dev
JonasCodeworks Dec 4, 2024
a68d601
connected to observer page
Melisaysnuh Dec 4, 2024
3378759
started
Melisaysnuh Dec 4, 2024
367ea6b
added map component
Melisaysnuh Dec 4, 2024
bc55360
more styles
hadeelbk Dec 4, 2024
b88e06a
Merge branch 'sos' of https://github.com/GlowPathOrg/GlowPath into sos
hadeelbk Dec 4, 2024
bfad048
Merge branch 'sos' into sos-merge-dev
Melisaysnuh Dec 4, 2024
17c4241
Merge branch 'websockets-4' into sos-merge-dev
Melisaysnuh Dec 4, 2024
0321bed
build successful
Melisaysnuh Dec 4, 2024
a1d8820
Merge branch 'main' into dev
Melisaysnuh Dec 4, 2024
d7d9d4d
hardocded urls
Melisaysnuh Dec 4, 2024
8bfbdfd
Merge branch 'dev' into heroku
Melisaysnuh Dec 4, 2024
c01bafb
working with backend
Melisaysnuh Dec 4, 2024
6bdc3e7
feat: basic observer page
JonasCodeworks Dec 4, 2024
3909fba
everything working
Melisaysnuh Dec 4, 2024
1abcbba
fixed login and websockets cors for production
Melisaysnuh Dec 4, 2024
22a193e
rebuild heroku
Melisaysnuh Dec 4, 2024
df148f6
Merge branch 'websockets-4' into dev
Melisaysnuh Dec 4, 2024
25f0f4d
update
Melisaysnuh Dec 4, 2024
430dd1c
fixing links
Melisaysnuh Dec 4, 2024
d1208c1
updated liks
Melisaysnuh Dec 4, 2024
2a413d4
cors for websockets
Melisaysnuh Dec 4, 2024
25a6dc7
further cors refactoring
Melisaysnuh Dec 4, 2024
35025a6
trying with no cors
Melisaysnuh Dec 4, 2024
9b2d462
open cors
Melisaysnuh Dec 4, 2024
0ea2a35
route in page?
Melisaysnuh Dec 5, 2024
68489aa
Updated backend URL and wheather API key
JonasCodeworks Dec 5, 2024
e84c108
Fix stray comma
JonasCodeworks Dec 5, 2024
f7e5e17
Merge branch 'main' of https://github.com/GlowPathOrg/GlowPath
Melisaysnuh Dec 5, 2024
e998904
Merge branch 'main' into dev
Melisaysnuh Dec 5, 2024
a9e3ce3
fix
hadeelbk Dec 5, 2024
798696d
fix: reverted to sending route via API instead of socket
JonasCodeworks Dec 5, 2024
c97107d
fix: observer page working
JonasCodeworks Dec 5, 2024
b9e5961
Merge pull request #56 from GlowPathOrg/dev-fix-observer
Melisaysnuh Dec 5, 2024
f2376ef
quick fix share urls
JonasCodeworks Dec 5, 2024
020fa64
Create README.md
hadeelbk Dec 8, 2024
0893919
Update README.md
hadeelbk Dec 8, 2024
041d177
Update README.md
hadeelbk Dec 9, 2024
32c22ee
Update README.md
hadeelbk Dec 9, 2024
ae35ad6
Update README.md
hadeelbk Dec 9, 2024
5dcd29d
commit
Melisaysnuh Jan 20, 2025
53f8f47
move auth hook to context
Melisaysnuh Feb 4, 2025
d7927a0
almost all changes to user context ready
Melisaysnuh Feb 4, 2025
f244296
user context migrated
Melisaysnuh Feb 5, 2025
2ef15ef
udpated auth context
Melisaysnuh Feb 5, 2025
2e8c250
Merge branch 'dev'
Melisaysnuh Feb 5, 2025
c4874ea
adjusted cors on main
Melisaysnuh Feb 5, 2025
b91a8a1
fixes
Melisaysnuh Feb 5, 2025
78ad0ca
server fix
Melisaysnuh Feb 12, 2025
dddfc06
fixes to editing, context now works
Melisaysnuh Feb 12, 2025
94250b4
commit before adjusting .env for dev!
Melisaysnuh May 14, 2025
80b29e3
save before checking out
Melisaysnuh May 14, 2025
2215dce
backend fixes, moving to fe
Melisaysnuh May 14, 2025
d428da6
feat: settings & tripHistory update
Melisaysnuh May 15, 2025
b4d0a9c
Merge pull request #61 from GlowPathOrg/dev
Melisaysnuh May 24, 2025
65df0f1
dependencies change
Melisaysnuh May 24, 2025
c2b2ab5
update
Melisaysnuh May 24, 2025
42052d5
changed backend from heroku to railway
Melisaysnuh May 24, 2025
10a8a66
update 2
Melisaysnuh May 24, 2025
cdb9cf7
logging
Melisaysnuh May 24, 2025
541cb2e
typo fix url
Melisaysnuh May 24, 2025
ff41c78
update
Melisaysnuh May 24, 2025
e257094
enhanced server logging for debugging
Melisaysnuh May 26, 2025
b9adc4b
enhanced logging typed
Melisaysnuh May 26, 2025
a45892c
trailing blackslash fix
Melisaysnuh May 26, 2025
7b99198
fix
Melisaysnuh May 26, 2025
0679302
db naming fix
Melisaysnuh May 26, 2025
e28a9ea
password security fix
Melisaysnuh May 26, 2025
a9183cc
feat: save places locally
Melisaysnuh May 26, 2025
02c9eaf
fixes to fe and be
Melisaysnuh May 26, 2025
4509f73
places
Melisaysnuh May 26, 2025
6593972
Merge branch 'dev'
Melisaysnuh May 26, 2025
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: 2 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ concurrency:

#Allow repo secrets
env:
VITE_HERE_API_KEY: ${{ secrets.VITE_HERE_API_KEY }}
VITE_BACKEND_URL: "https://web-production-4659.up.railway.app"
VITE_WEATHER_API_KEY: ${{ secrets.VITE_WEATHER_API_KEY }}

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
Expand Down
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# Root .gitignore

# dependencies
/node_modules
package-lock.json

# production
/build
/dist
dev-dist/
/dev-dist/

# misc
.bak
Expand Down
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: npm run start
88 changes: 88 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
# 🌟 GlowPath

GlowPath is a progressive web application designed to enhance user safety by enabling **real-time location sharing** that can be shared easily via chat, and providing instant alerts to contacts or authorities via an **SOS button**.

---

## 🚀 Key Features:
- **Real-Time Location Sharing**: Share your live location with a trusted contact list.
- **SOS Button**: Notify contacts and authorities during emergencies with a personalized emergency button.
- **Safe Zone Mapping**: View nearby safe zones like police stations and hospitals on an interactive map.
- **Safety Analytics**: Visualize important safety statistics for better decision-making.

---

## 🛠️ Getting Started:
GlowPath is live! Visit the live version at https://glowpathorg.github.io/GlowPath/


To run GlowPath locally, ensure the following dependencies and accounts are set up:
1. **Node.js**: [Download and install Node.js](https://nodejs.org).
2. **MongoDB**: Set up a local or cloud-based MongoDB instance (e.g., [MongoDB Atlas](https://www.mongodb.com/atlas)).
3. **API Keys**:
- [HERE API](https://developer.here.com)
- [Weather API](https://www.weatherapi.com/)
- [Twilio](https://www.twilio.com/) for sending emergency messages.
4. **OpenStreetMap and Overpass API**: No additional setup needed.

---

## 📦 Installation:

### 1. Clone the repository:

git clone <repository-link>
cd GlowPath

### 2. Install dependencies:
-root Directory
npm install

- server:
cd server
npm install

- client:
cd client
npm install

### 3. Set up environment variables:
Create a .env file in the client for the weather API Key
Create a .env file in the server directory and add the following:
SERVER_PORT=3002
CLIENT_PORT=5173
MONGODB_URI=your_mongodb_connection_string
JWT_SECRET=your_secret_key
TWILIO_ACCOUNT_SID
TWILIO_AUTH_TOKEN
TWILIO_PHONE_NUMBER


## 💻 Tech Stack
• Frontend: React.js and Typescript
• Backend: Node.js with Express.js for routing and API logic.
• Database: MongoDB for storing data.
• Authentication: JSON Web Tokens (JWT) for secure user sessions.
• Mapping: Leaflet.js for an interactive map.
• APIs and Tools:
HERE API
Nominatim
Twilio
Openstreetmaps
Overpass
Weather API
• Others: Axios.


## 🤝 Contributing:

Contributions, issues, and feature requests are welcome!
Feel free to check the issues page or submit a pull request.

## Authors:
- Hadil Ben Koura - linkedIn:www.linkedin.com/in/hadil-benkoura
- Mellissa Cessna - linkedIn: www.linkedin.com/in/cessna
- Jonas Rinderlin - linkedIn: www.linkedin.com/in/

Enjoy using GlowPath, and stay safe! 🚶‍♂️🛡️

14 changes: 7 additions & 7 deletions client/eslint.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import js from '@eslint/js'
import globals from 'globals'
import reactHooks from 'eslint-plugin-react-hooks'
import reactRefresh from 'eslint-plugin-react-refresh'
import tseslint from 'typescript-eslint'
import js from '@eslint/js';
import globals from 'globals';
import reactHooks from 'eslint-plugin-react-hooks';
import reactRefresh from 'eslint-plugin-react-refresh';
import tseslint from 'typescript-eslint';

export default tseslint.config(
{ ignores: ['dist'] },
Expand All @@ -24,5 +24,5 @@ export default tseslint.config(
{ allowConstantExport: true },
],
},
},
)
}
);
2 changes: 1 addition & 1 deletion client/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/icon-32.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite + React + TS</title>
<title>GlowPath</title>
</head>
<body>
<div id="root"></div>
Expand Down
Loading