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.

Sign up for GitHub

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

Jump to bottom

Release/20240918 #401

Merged
merged 90 commits into from
Sep 18, 2024
Merged

Release/20240918 #401

merged 90 commits into from
Sep 18, 2024

Conversation

MichaelHorwitz
Copy link
Contributor

No description provided.

MichaelHorwitz and others added 30 commits August 9, 2024 17:32
@MichaelHorwitz
feat: Added reactflow page
62b8052
@MichaelHorwitz
feat: attempt at a custom edge
118562d
@MichaelHorwitz
refac: reset to basic reactflow example
5169cbd
@MichaelHorwitz
feat: added workflows to navbar
83bc754
@MichaelHorwitz
feat: added packages for react flow
b7bdf4c
@MichaelHorwitz
feat: changed to server side
632e8ba
@MichaelHorwitz
feat: updated e2e tests
bce39cf
@MichaelHorwitz
Merge branch 'dev' into feat/react-flow-trying
ec6d728
@MichaelHorwitz
feat: added addNode button
15eccec
@MichaelHorwitz
feat: functionality to add new nodes
7c3bc11
@MichaelHorwitz
feat: Changed to form and minor refactor
60b6195
@Vafdaf12
chore: Removed some dead code
851f57f
@vfeistel
Merge pull request #388 from COS301-SE-2024/feat/react-flow-trying
2ed1e4a 
Feat/react flow trying
@Vafdaf12
chore: Move user-facing files to seperate route group
a29047d
@Vafdaf12
fix: Broken styling on the archive page
594e998
@Vafdaf12
feat: Stub out admin layout
c351341
@Vafdaf12
feat: Add collapse functionality to sidebar
9deba6a
@Vafdaf12
feat: Stub out all admin pages
6ab5a93
@Vafdaf12
feat: Make navbar responsive
68a710a
@Vafdaf12
fix: Give some love to light mode
ab4ad13
@Vafdaf12
feat: Add transition to sidebar width
3a09823
@Vafdaf12
docs: Add contracts for dispute list
23fe9c9
@MichaelHorwitz
feat: Custom node styling
fff933d
@Vafdaf12
chore: Initialize new Next.js project for admin frontend
64702e2
@Vafdaf12
feat: Set up docker for admin frontend
6e017aa
@Vafdaf12
feat: Migrate admin pages to seperate project
9a03f61
@Vafdaf12
feat: Tweak styling of buttons to be more theme-"compliant"
8e7c30c
@MichaelHorwitz
feat: more node styling
c91c73d
@MichaelHorwitz
feat: node styling
3d20787
@MichaelHorwitz
feat: oh boy look michael added some more styling how exciting is tha…
b313ec6 
…t (Please dear god let this suffering end, HTML and CSS are cruel, cruel masters)
Vafdaf12 and others added 24 commits September 9, 2024 11:17
@Vafdaf12
feat: Move update triggers to database
02000e5
@Vafdaf12
chore: Add some structure to the SQL init
452aa9f
@MichaelHorwitz
feat: passing edges to nodes
2d93baa
@Vafdaf12
feat: Replace dispute_experts.status with an automatic view
f19131c
@Vafdaf12
feat: Added some ON DELETE CASCADE rules to some attributes
fdd1943
@Vafdaf12
feat: Update the API to reflect DB changes (untested)
0726d73
@ZaguePrime
Merge pull request #391 from COS301-SE-2024/feat/database-cleanup
c22bfdd 
Feat/database cleanup
@ZaguePrime
fix/backend-issues-v1
a55d29b 
big uber fix
@ZaguePrime
fix/backend-issues-v1: typos, incorrect placements and miscellaneous …
7b0df24 
…code fixes
@Vafdaf12
fix: Compilation error due to pagination
9af8c1d
@vfeistel
Merge pull request #394 from COS301-SE-2024/fix/backend-issues-v1
001f18c 
Fix/backend issues v1
@Vafdaf12
feat: Add login page with customized error pages
57a293b
@Vafdaf12
feat: Add middleware to redirect to login page
ff5eb01
@Vafdaf12
feat: Add login form submission
5c50a19
@MichaelHorwitz
feat: useState useCallback use use use use use use use use
a5f1036
@ZaguePrime
fix: reactNode error fix
378662e
@Vafdaf12
Merge branch 'feat/admin-dashboard' of https://github.com/COS301-SE-2…
39e4276 
…024/Dispute-Resolution-Engine into feat/admin-dashboard
@Vafdaf12
fix: I hate javascript
9e7e34d
@MichaelHorwitz
feat: functionality for edgesasdf
273aa96
@MichaelHorwitz
Merge branch 'dev' into feat/workflow-designer
dfcb6d9
@MichaelHorwitz
Merge pull request #396 from COS301-SE-2024/feat/workflow-designer
d18fa00 
Feat/workflow designer
@vfeistel
Merge pull request #397 from COS301-SE-2024/feat/admin-dashboard
c2b717e 
Feat/admin dashboard
@MichaelHorwitz
Merge branch 'dev' into feat/traefik
90df551
@MichaelHorwitz
Merge pull request #398 from COS301-SE-2024/feat/traefik
8560fc2 
Feat/traefik
@codecov Codecov
Copy link

codecov bot commented Sep 18, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (main@6dd02a7). Learn more about missing BASE report.
Report is 105 commits behind head on main.

Additional details and impacted files 
@@           Coverage Diff           @@
##             main     #401   +/-   ##
=======================================
  Coverage        ?   72.08%           
=======================================
  Files           ?       25           
  Lines           ?      369           
  Branches        ?       34           
=======================================
  Hits            ?      266           
  Misses          ?      102           
  Partials        ?        1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

vfeistel
vfeistel approved these changes Sep 18, 2024
View reviewed changes
Copy link
Contributor

@vfeistel vfeistel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i aint reading all that. lgtm

@ZaguePrime ZaguePrime self-requested a review September 18, 2024 16:00
ZaguePrime
ZaguePrime approved these changes Sep 18, 2024
View reviewed changes
Copy link
Contributor

@ZaguePrime ZaguePrime left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

meow meow good good

@MichaelHorwitz MichaelHorwitz merged commit e8662a4 into main Sep 18, 2024
9 checks passed
@MichaelHorwitz MichaelHorwitz deleted the release/20240918 branch September 18, 2024 16:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vfeistel vfeistel vfeistel approved these changes

@ZaguePrime ZaguePrime ZaguePrime approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@MichaelHorwitz @ZaguePrime @vfeistel @Vafdaf12