Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
141 commits
Select commit Hold shift + click to select a range
5cbb9fc
Merge pull request #1 from disc-template/env-example
ethanpaneraa Feb 3, 2025
7fa9ca1
Implemented video API POST and GET routes
HareshWed Mar 4, 2025
c084984
Implemented video API POST and GET routes
HareshWed Mar 4, 2025
4f133ff
Implemented resumable uploading
HareshWed Mar 8, 2025
ad4a52e
Implemented resumable uploading
HareshWed Mar 8, 2025
a255552
Make it pretty?
HareshWed Mar 8, 2025
b762573
Make it pretty?
HareshWed Mar 8, 2025
3a27df2
Make it pretty again?
HareshWed Mar 8, 2025
5c3b52d
Make it pretty again?
HareshWed Mar 8, 2025
7cddc68
Make it pretty again? Please work
HareshWed Mar 8, 2025
fce7135
Make it pretty again? Please work
HareshWed Mar 8, 2025
1234fb2
Make it pretty!!!
HareshWed Mar 8, 2025
afbc673
Make it pretty!!!
HareshWed Mar 8, 2025
04c8843
This WILL work
HareshWed Mar 8, 2025
14249f5
This WILL work
HareshWed Mar 8, 2025
823bf8e
Update vercel.json
geperez8 Mar 8, 2025
4985043
Update vercel.json
geperez8 Mar 8, 2025
d9f638a
Update vercel.json
geperez8 Mar 8, 2025
3dce2ad
Update vercel.json
geperez8 Mar 8, 2025
7ef88a1
Finished uploading, editing, getting courses with authorization check…
HareshWed Apr 2, 2025
151e619
Finished uploading, editing, getting courses with authorization check…
HareshWed Apr 2, 2025
ead240d
Merge branch 'feature/auth-backend' of https://github.com/disc-sweb/b…
HareshWed Apr 2, 2025
b25ab38
Merge branch 'feature/auth-backend' of https://github.com/disc-sweb/b…
HareshWed Apr 2, 2025
57a7dbe
Updates for Linter
geperez8 Apr 7, 2025
f30f93a
Updates for Linter
geperez8 Apr 7, 2025
c25400a
Updates for Linter
geperez8 Apr 7, 2025
c95e58a
Updates for Linter
geperez8 Apr 7, 2025
3d22dfd
Update supabase.js
geperez8 Apr 7, 2025
18ff638
Update supabase.js
geperez8 Apr 7, 2025
dce17bb
Changes for Vercel Deployment
geperez8 Apr 7, 2025
76a3967
Changes for Vercel Deployment
geperez8 Apr 7, 2025
f50c37e
Update vercel.json
geperez8 Apr 7, 2025
364534e
Update vercel.json
geperez8 Apr 7, 2025
97a4a84
Update vercel.json
geperez8 Apr 7, 2025
a42d0ff
Update vercel.json
geperez8 Apr 7, 2025
56d44b5
Update vercel.json
geperez8 Apr 7, 2025
415d303
Update vercel.json
geperez8 Apr 7, 2025
3113de4
Changes by prettier
geperez8 Apr 7, 2025
f73c7cf
Changes by prettier
geperez8 Apr 7, 2025
5d6ef28
Merge pull request #1 from disc-sweb/feature/auth-backend
disc-sweb Apr 7, 2025
c77a233
Merge pull request #1 from disc-sweb/feature/auth-backend
disc-sweb Apr 7, 2025
d7926f8
Update server.js
geperez8 Apr 7, 2025
fc63378
Update server.js
geperez8 Apr 7, 2025
473fbb9
Finished Stripe Integration for buy courses
HareshWed Apr 12, 2025
db92ddf
Finished Stripe Integration for buy courses
HareshWed Apr 12, 2025
b3f8bf1
Merge pull request #3 from disc-sweb/feature/auth-backend
geperez8 Apr 12, 2025
ec8ff1b
Merge pull request #3 from disc-sweb/feature/auth-backend
geperez8 Apr 12, 2025
caf3054
Added new fields to backend. Returned separate user courses and non u…
HareshWed Apr 19, 2025
56264d6
Added new fields to backend. Returned separate user courses and non u…
HareshWed Apr 19, 2025
4279375
Changed backend to return user and nonuser courses
HareshWed Apr 22, 2025
54df04c
Changed backend to return user and nonuser courses
HareshWed Apr 22, 2025
8b7edff
Trying to fix lint stuff
HareshWed Apr 22, 2025
23a164d
Trying to fix lint stuff
HareshWed Apr 22, 2025
b6a453d
Changed git ignore file
HareshWed Apr 22, 2025
bd884ab
Changed git ignore file
HareshWed Apr 22, 2025
66e74be
Fixed small errors with backend
HareshWed Apr 26, 2025
15c227f
Fixed small errors with backend
HareshWed Apr 26, 2025
3315717
Merge pull request #4 from disc-sweb/feature/auth-backend
HareshWed Apr 26, 2025
dfc616e
Merge pull request #4 from disc-sweb/feature/auth-backend
HareshWed Apr 26, 2025
b8993e2
Added video upload optimizations. Changed auth controller to return a…
HareshWed May 9, 2025
ffba42b
Added video upload optimizations. Changed auth controller to return a…
HareshWed May 9, 2025
5cf831d
Merge pull request #5 from disc-sweb/feature/auth-backend
HareshWed May 10, 2025
b6d6aa8
Merge pull request #5 from disc-sweb/feature/auth-backend
HareshWed May 10, 2025
2376e84
Changed file url bug for editting course
HareshWed May 11, 2025
4f835fd
Changed file url bug for editting course
HareshWed May 11, 2025
78cb1a6
Allowed support for different course types
HareshWed May 12, 2025
71c6075
Allowed support for different course types
HareshWed May 12, 2025
3278a31
Removed video controller as it was not needed
HareshWed May 12, 2025
d3eef0b
Removed video controller as it was not needed
HareshWed May 12, 2025
4d865b2
Put webhook endpoint in environment variable folder
HareshWed May 12, 2025
a518c07
Put webhook endpoint in environment variable folder
HareshWed May 12, 2025
fdcbeb4
Fixed trimmed video bug
HareshWed May 13, 2025
80e45c0
Fixed trimmed video bug
HareshWed May 13, 2025
270218b
Merge pull request #6 from disc-sweb/feature/auth-backend
HareshWed May 13, 2025
88790de
Merge pull request #6 from disc-sweb/feature/auth-backend
HareshWed May 13, 2025
e4e0616
Migrated file uploading from cloudinary to cloudflare r2. Deleted fil…
HareshWed May 19, 2025
875a57f
Migrated file uploading from cloudinary to cloudflare r2. Deleted fil…
HareshWed May 19, 2025
1faa187
Added timing report on backend for debugging
HareshWed May 19, 2025
b83172c
Added timing report on backend for debugging
HareshWed May 19, 2025
76625f9
Returned whether user owns a course on backend
HareshWed May 20, 2025
21669c6
Returned whether user owns a course on backend
HareshWed May 20, 2025
cafa111
Made changes to R2 worker to handle range requessts
HareshWed May 22, 2025
7ac9ecc
Made changes to R2 worker to handle range requessts
HareshWed May 22, 2025
7d564f5
Made changes to use buffer instead of file paths for video and image …
HareshWed May 23, 2025
08e0879
Made changes to use buffer instead of file paths for video and image …
HareshWed May 23, 2025
50bde30
Trying to fix lint issues in r2 worker
HareshWed May 23, 2025
34c7bf9
Trying to fix lint issues in r2 worker
HareshWed May 23, 2025
dd4cf92
Trying to fix lint errors
HareshWed May 23, 2025
2c17cc3
Trying to fix lint errors
HareshWed May 23, 2025
f856d6b
Trying to fix lint errors
HareshWed May 23, 2025
bccc860
Trying to fix lint errors
HareshWed May 23, 2025
f20de24
Trying to fix lint errors
HareshWed May 23, 2025
6737d52
Trying to fix lint errors
HareshWed May 23, 2025
db39954
Trying to fix lint errors
HareshWed May 23, 2025
1339b54
Trying to fix lint errors
HareshWed May 23, 2025
1d0af1c
Merge pull request #7 from disc-sweb/feature/auth-backend
HareshWed May 23, 2025
5c5982b
Merge pull request #7 from disc-sweb/feature/auth-backend
HareshWed May 23, 2025
a7dc4ff
Fixed CORS issue with server
HareshWed May 23, 2025
e6f3c45
Fixed CORS issue with server
HareshWed May 23, 2025
69677f8
Merge pull request #8 from disc-sweb/feature/auth-backend
HareshWed May 23, 2025
666a96e
Merge pull request #8 from disc-sweb/feature/auth-backend
HareshWed May 23, 2025
22ada88
Problem was upload size. Not cors. Reversing previous change
HareshWed May 23, 2025
95a6d08
Problem was upload size. Not cors. Reversing previous change
HareshWed May 23, 2025
efd66fa
Added shorter trimmed video in order to meet vercel requirements
HareshWed May 24, 2025
e62500b
Added shorter trimmed video in order to meet vercel requirements
HareshWed May 24, 2025
5c53651
Merge pull request #9 from disc-sweb/feature/auth-backend
HareshWed May 24, 2025
b8ace25
Merge pull request #9 from disc-sweb/feature/auth-backend
HareshWed May 24, 2025
6094a4f
Trying to fix ffmpeg problmen
HareshWed May 24, 2025
4fd41db
Trying to fix ffmpeg problmen
HareshWed May 24, 2025
2549c03
Merge pull request #10 from disc-sweb/feature/auth-backend
HareshWed May 24, 2025
84ce0b1
Merge pull request #10 from disc-sweb/feature/auth-backend
HareshWed May 24, 2025
3d152e7
Trying to fix ffmpeg deployment problem
HareshWed May 24, 2025
ea30ecc
Trying to fix ffmpeg deployment problem
HareshWed May 24, 2025
b90bc1e
Trying to fix ffmpeg deployment problem
HareshWed May 24, 2025
7b47bde
Trying to fix ffmpeg deployment problem
HareshWed May 24, 2025
d6248c9
Trying to fix ffmpeg deployment problem
HareshWed May 24, 2025
78bdd62
Trying to fix ffmpeg deployment problem
HareshWed May 24, 2025
31a0047
Installing ffmpeg package
HareshWed May 24, 2025
e2b7e2a
Installing ffmpeg package
HareshWed May 24, 2025
d973085
Trying to solve ffmpeg issues
HareshWed May 24, 2025
7530ad6
Trying to solve ffmpeg issues
HareshWed May 24, 2025
1807fd1
Trying to solve ffmpeg issues
HareshWed May 24, 2025
57554fd
Trying to solve ffmpeg issues
HareshWed May 24, 2025
30bc90a
Reversing back to old version to fix errors on different branch
HareshWed May 24, 2025
ee652ed
Reversing back to old version to fix errors on different branch
HareshWed May 24, 2025
83ff44f
Reversing back to old version to fix errors on different branch
HareshWed May 24, 2025
291534c
Reversing back to old version to fix errors on different branch
HareshWed May 24, 2025
68baa1b
Using cloudinary for video trimming with unlimited free credits
HareshWed May 26, 2025
1b413ab
Using cloudinary for video trimming with unlimited free credits
HareshWed May 26, 2025
af5db4d
Merge branch 'main' into feature/auth-backend
HareshWed May 26, 2025
a878528
Merge branch 'main' into feature/auth-backend
HareshWed May 26, 2025
87cafbb
Updating editing trimming
HareshWed May 26, 2025
d4e1b4f
Updating editing trimming
HareshWed May 26, 2025
3475167
Merge branch 'feature/auth-backend' of https://github.com/disc-sweb/b…
HareshWed May 26, 2025
af03779
Merge branch 'feature/auth-backend' of https://github.com/disc-sweb/b…
HareshWed May 26, 2025
f4a7ac6
Reverting to old changes and deploying on Render
HareshWed May 26, 2025
70371f5
Reverting to old changes and deploying on Render
HareshWed May 26, 2025
10e2d9d
Reverting back to ffmpeg for test
HareshWed May 26, 2025
c8fff04
Fixing lint issues
HareshWed May 26, 2025
89e0f5a
Render deployment seems to work. Changing video trimming size back
HareshWed May 26, 2025
e3f063b
Trying to speed up trimming
HareshWed 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
9 changes: 7 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
SUPABASE_URL= #your supabase url here
SUPABASE_URL= #your supabase url here''
SUPABASE_ANON_KEY= # your supabase anon key here
SUPBASE_SERVICE_ROLE=
SUPABASE_PROJECT_ID=
PORT=5050 # this is the default that we used when making the template
FRONTEND_URL=http://localhost:3001 # this is the default we used when making the template
API_URL=http://localhost:5050 # this is the default we used when making the template
FRONTEND_URL_DEV=http://localhost:3001 # this is the default we used when making the template
NODE_ENV=development # NOTE: you should change this to `production` when you deploy to vercel!!!!
NODE_ENV=development # NOTE: you should change this to `production` when you deploy to vercel!!!!
STRIPE_API_KEY =
CLOUDINARY_URL=
STRIPE_WEBHOOK_SECRET =
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.DS_STORE
.env
node_modules/
node_modules/
uploads/
15 changes: 15 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ export default [
languageOptions: {
globals: {
...globals.node,
Response: 'readonly',
Headers: 'readonly',
Request: 'readonly',
},
},
},
Expand Down Expand Up @@ -43,6 +46,18 @@ export default [
rootDir: 'src',
},
],
'import/no-unresolved': [
'error',
{
ignore: ['cloudflare:test', 'vitest'],
},
],
'prettier/prettier': [
'error',
{
endOfLine: 'auto',
},
],
},
},
// use with prettier
Expand Down
Loading