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

Chore/Licenses #386

Merged
merged 48 commits into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from 47 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
e2f5003
chore: removes image from src and seeding
JohanHjelsethStorstad Dec 3, 2024
1f26ea0
chore: sets up functions and limits for migrating users
JohanHjelsethStorstad Oct 9, 2024
0f3c12a
chore: makes sure all profile images are migrated into profileimage c…
JohanHjelsethStorstad Oct 9, 2024
1928f68
chore: some spagetti to infer historic grades of users
JohanHjelsethStorstad Oct 9, 2024
65f192a
chore: return userIdMap
JohanHjelsethStorstad Oct 9, 2024
8138950
chore: adds a dobbelomega logger
JohanHjelsethStorstad Oct 9, 2024
3f55cbb
chore: links omegaQuotes to correct poster
JohanHjelsethStorstad Oct 10, 2024
9a345e8
chore: takes some yearOfStudy nonsense from veven into account
JohanHjelsethStorstad Oct 10, 2024
8b72681
fix: user was seeded with veven id, change to auto increment
JohanHjelsethStorstad Oct 10, 2024
bfe5dcb
chore: adds batched image upload
JohanHjelsethStorstad Oct 10, 2024
ae5d3b9
style: fix linter
JohanHjelsethStorstad Nov 15, 2024
0ab32e8
fix: Registration form
theodorklauritzen Nov 24, 2024
365d912
fix: Username generation
theodorklauritzen Nov 24, 2024
d943447
feat: Add special users to the migration list
theodorklauritzen Nov 24, 2024
cc43d2f
fix: Expand buffer size in nginx, due to larges headers while login w…
theodorklauritzen Nov 24, 2024
b1a9406
fix: Small fixes in the registration
theodorklauritzen Nov 24, 2024
e826b87
chore: Add some details around the OmegaID QR code
theodorklauritzen Nov 24, 2024
4343e16
fix: resolve conversations
theodorklauritzen Nov 26, 2024
2ca9f02
chore: update prisma to 6.1
Paulijuz Dec 17, 2024
4aebb0e
chore(deps): bump the minor group across 1 directory with 3 updates
dependabot[bot] Dec 19, 2024
3279352
chore(deps): bump the minor group across 1 directory with 15 updates
dependabot[bot] Dec 19, 2024
f15d842
chore: add new models for lisencing and credit
JohanHjelsethStorstad Dec 20, 2024
72e327b
chore: change five standard images
JohanHjelsethStorstad Dec 22, 2024
f28ffeb
chore: set up boilerplate for license admin page
JohanHjelsethStorstad Dec 22, 2024
1adbeca
feat: add fuinctionality ro view all licences on admin page
JohanHjelsethStorstad Dec 22, 2024
96f313d
fix: small styling fault using bButton component giving wrong color i…
JohanHjelsethStorstad Dec 22, 2024
04ecf87
chore: display credit on image when it exists
JohanHjelsethStorstad Dec 22, 2024
151b8c5
fix: all license spelling errors
JohanHjelsethStorstad Dec 22, 2024
3251bc4
chore: display license information on images
JohanHjelsethStorstad Dec 22, 2024
027bf7e
chore: make the display of license better in some spesific situations…
JohanHjelsethStorstad Dec 22, 2024
df8cab7
refactor: create actions of images
JohanHjelsethStorstad Jan 8, 2025
72d41e7
refactor: all images read actions
JohanHjelsethStorstad Jan 8, 2025
d176feb
chore: adds a component to choose license
JohanHjelsethStorstad Jan 8, 2025
c2c90e7
fix: convertion from string to number in selection in image create an…
JohanHjelsethStorstad Jan 8, 2025
a806fac
chore: add fields to choose credit and license on upload many images
JohanHjelsethStorstad Jan 8, 2025
7b561f5
chore: add field to change license on already upladed image
JohanHjelsethStorstad Jan 12, 2025
671c0b7
chore: add basic service method and handle to destroy a license
JohanHjelsethStorstad Jan 12, 2025
6f41f7b
chore: add UI to delete a license
JohanHjelsethStorstad Jan 12, 2025
28bdb8d
chore: guard licenses with images connected from being destroyed
JohanHjelsethStorstad Jan 21, 2025
2d5cce1
fix: modify prisma call to recognize smorekopps
JohanHjelsethStorstad Jan 21, 2025
b7ac3b6
fix: modify prisma call to recognize smorekopps
JohanHjelsethStorstad Jan 21, 2025
49c0c04
chore: change error name to be more spesific
JohanHjelsethStorstad Jan 21, 2025
8bc4575
feat: create new licenses
JohanHjelsethStorstad Jan 21, 2025
0e2ca05
chore: clean up form layout
JohanHjelsethStorstad Jan 21, 2025
2f813fe
feat: update meta on a license
JohanHjelsethStorstad Jan 21, 2025
f6fdcfc
style: linting
JohanHjelsethStorstad Jan 21, 2025
2bf4831
chore: style images vetter in CmsImageEditor
JohanHjelsethStorstad Jan 21, 2025
3abccf0
chore: change name of Images.createBad to Images.createSourceless
JohanHjelsethStorstad Jan 23, 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
5 changes: 4 additions & 1 deletion containers/nginx/default.conf
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,8 @@ server {
proxy_cache_bypass $http_upgrade;
client_max_body_size 1000M;
proxy_set_header Referrer-Policy no-referrer;
proxy_buffer_size 32k;
proxy_buffers 4 64k;
proxy_busy_buffers_size 64k;
}
}
}
7 changes: 5 additions & 2 deletions containers/nginx/nginx.dev.conf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ http {
}
default_type application/octet-stream;
}

location / {
proxy_pass http://projectnext:3000;
proxy_http_version 1.1;
Expand All @@ -21,6 +21,9 @@ http {
proxy_cache_bypass $http_upgrade;
client_max_body_size 1000M;
proxy_set_header Referrer-Policy no-referrer;
proxy_buffer_size 32k;
proxy_buffers 4 64k;
proxy_busy_buffers_size 64k;
}
}
}
}
1 change: 1 addition & 0 deletions default.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Server info
DOMAIN=omega.ntnu.no
SERVER_LINK_PREFIX=http://localhost:80

# API Keys
# Feide
Expand Down
3 changes: 3 additions & 0 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ services:
volumes:
- ${PROJECT_ROOT:-.}/src/prisma/schema:/usr/src/app/schema
- devstore:/usr/src/app/prismaservice/store
- dobbelOmegaManifest:/usr/src/app/prismaservice/dobbelOmegaManifest
depends_on:
db:
condition: service_healthy
Expand All @@ -112,3 +113,5 @@ volumes:
driver: local
dotnext:
driver: local
dobbelOmegaManifest:
driver: local
3 changes: 3 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ services:
API_KEY_ENCRYPTION_KEY: ${API_KEY_ENCRYPTION_KEY}
volumes:
- store:/usr/src/app/prismaservice/store
- dobbelOmegaManifest:/usr/src/app/prismaservice/dobbelOmegaManifest
depends_on:
db:
condition: service_healthy
Expand Down Expand Up @@ -145,3 +146,5 @@ volumes:
driver: local
logs:
driver: local
dobbelOmegaManifest:
driver: local
Loading
Loading