Code

Release 13#209

Code

Merged

n3rdc4ptn merged 120 commits intomainamosproj/amos2022ws05-shared-desk-mgmt:mainfrom developamosproj/amos2022ws05-shared-desk-mgmt:developCopy head branch name to clipboardFeb 1, 2023

+10,073-3,099

Commits

Commits on Jan 23, 2023

• feat: implement update desk type

  Show description for f52ce3b
  

  woerndle

  and

  stefanpfahler

  committed
  f52ce3b

• feat: edit resource room

  Show description for ce4060e
  

  stefanpfahler

  and

  woerndle

  committed
  ce4060e

• chore: add tests for update room usecase

  Show description for 12a1f10
  

  stefanpfahler

  and

  woerndle

  committed
  12a1f10

• Merge branch '55-edit-resources' of github.com:amosproj/amos2022ws05-shared-desk-mgmt into 55-edit-resources

  Show description for f05a47d
  

  stefanpfahler

  and

  woerndle

  committed
  f05a47d

• fix: merge conflict resolved

  Show description for 4a73470
  

  stefanpfahler

  and

  woerndle

  committed
  4a73470

• feat: edit resource desk

  Show description for 19a4678
  

  woerndle

  and

  stefanpfahler

  committed
  19a4678

• feat: add updating resources for floors

  Show description for c0127b2
  

  stefanpfahler

  and

  woerndle

  committed
  c0127b2

• chore: add tests for update floor usecase

  Show description for 8c9f126
  

  stefanpfahler

  and

  woerndle

  committed
  8c9f126

• feat: edit desk tests

  Show description for aa27141
  

  woerndle

  and

  stefanpfahler

  committed
  aa27141

• feat: edit resource building

  Show description for a05eabf
  

  stefanpfahler

  and

  woerndle

  committed
  a05eabf

• chore: add tests for update building usecase

  Show description for 544f96b
  

  stefanpfahler

  and

  woerndle

  committed
  544f96b

• Merge branch '55-edit-resources' of github.com:amosproj/amos2022ws05-shared-desk-mgmt into 55-edit-resources

  Show description for 268ff64
  

  stefanpfahler

  and

  woerndle

  committed
  268ff64

• fix: resolve open conflicts

  Show description for 7974026
  

  woerndle

  and

  stefanpfahler

  committed
  7974026

• fix: adjust styling

  Show description for 20da3e5
  

  woerndle

  and

  stefanpfahler

  committed
  20da3e5

• feat: init ui

  Show description for 6650cbf
  

  woerndle

  and

  stefanpfahler

  committed
  6650cbf

Commits on Jan 24, 2023

• init restore page

  xilef45

  committed
  ec5cf51

Commits on Jan 25, 2023

• Merge branch 'develop' into restore-ressources

  xilef45

  committed
  22d5e35

• backend call mockups

  xilef45

  committed
  9cff3d6

• update ui

  xilef45

  committed
  44e7f7c

• implement data load

  xilef45

  committed
  63fee84

Commits on Jan 27, 2023

• fixed date issue

  Show description for eb8ef97
  n3rdc4ptn

  committed
  eb8ef97

• fixed type issue with "Function" Type

  Show description for 0039d6f
  n3rdc4ptn

  committed
  0039d6f

• return userName in getDesks route

  Show description for 7f93b60
  

  jantiegges

  and

  n3rdc4ptn

  committed
  7f93b60

• added desks endpoint for aggregating desks

  Show description for 9912cbc
  

  n3rdc4ptn

  and

  jantiegges

  committed
  9912cbc

• Merge branch '85-refactor-book-a-desk-experience' of github.com:amosproj/amos2022ws05-shared-desk-mgmt into 85-refactor-book-a-desk-experience

  n3rdc4ptn

  committed
  875a611

• improved add bookings ux

  Show description for dc1bc85
  

  n3rdc4ptn

  and

  jantiegges

  committed
  dc1bc85

• added booked information to see if a table is already booked

  Show description for 0830cd4
  n3rdc4ptn

  committed
  0830cd4

• fixed time issue

  Show description for a0f6d13
  n3rdc4ptn

  committed
  a0f6d13

• add restoration logic in backend

  Show description for 71f2652
  

  Faoilthiama

  and

  xilef45

  committed
  71f2652

• add tests for restoration

  Show description for c4f2383
  

  Faoilthiama

  and

  xilef45

  committed
  c4f2383

• update frontend for restoration

  Show description for af643e9
  

  Faoilthiama

  and

  xilef45

  committed
  af643e9

• connect frontend and backend for resource restoration

  Show description for 4c91afb
  

  xilef45

  and

  Faoilthiama

  committed
  4c91afb

• filter resources to not show deleted

  Show description for 4f1b9b4
  

  xilef45

  and

  Faoilthiama

  committed
  4f1b9b4

• Fix missing date bug @ bookings page

  Show description for 1254640
  eddyhakimi

  committed
  1254640

• Merge pull request #191 from amosproj/182-date-time-issue-edit-booking

  Show description for 698da41
  eddyhakimi

  authored
  698da41

Commits on Jan 28, 2023

• fix type error

  Show description for 966163f
  jantiegges

  committed
  966163f

Commits on Jan 29, 2023

• Merge pull request #192 from amosproj/85-refactor-book-a-desk-experience

  Show description for 3bfd896
  n3rdc4ptn

  authored
  3bfd896

• simple fix for the centering of the container

  Show description for bc6bfcc
  n3rdc4ptn

  committed
  bc6bfcc

• Merge branch 'develop' of github.com:amosproj/amos2022ws05-shared-desk-mgmt into develop

  n3rdc4ptn

  committed
  2b7c3e6

• fixed date issue

  Show description for 26691aa
  n3rdc4ptn

  committed
  26691aa

• Merge branch 'develop' into 190-time-issue-book-a-desk-bookings

  Show description for c8fa821
  n3rdc4ptn

  committed
  c8fa821

• redone change after merge

  Show description for f98226a
  n3rdc4ptn

  committed
  f98226a

• Merge branch 'develop' into restore-ressources

  xilef45

  committed
  b797ded

Commits on Jan 30, 2023

• fix import bug

  jantiegges

  authored
  af5e279

• added types to fix typescript build error

  Show description for 85950c5
  n3rdc4ptn

  committed
  85950c5

• fix naming issue

  jantiegges

  committed
  b56429c

• feat: adjust models and usecases to return updated entity

  Show description for e10902b
  

  woerndle

  and

  stefanpfahler

  committed
  e10902b

• feat: create fe service layer for resource endpoints

  Show description for 44b3ab0
  

  woerndle

  and

  stefanpfahler

  committed
  44b3ab0

• feat: create edit building modal component

  Show description for 86b1bc0
  

  woerndle

  and

  stefanpfahler

  committed
  86b1bc0

• feat: create edit floor modal component

  Show description for 72d37fa
  

  woerndle

  and

  stefanpfahler

  committed
  72d37fa

• feat: create edit room modal component

  Show description for e7c0289
  

  woerndle

  and

  stefanpfahler

  committed
  e7c0289

• feat: create edit desk modal component

  Show description for 8b6ffe0
  

  woerndle

  and

  stefanpfahler

  committed
  8b6ffe0

• fix: add desk type column

  Show description for 98fb542
  

  woerndle

  and

  stefanpfahler

  committed
  98fb542

• feat: create edit desk type modal component

  Show description for a1f01d7
  

  woerndle

  and

  stefanpfahler

  committed
  a1f01d7

• feat: connect edit resource modals with resource table entries

  Show description for b7a8be9
  

  woerndle

  and

  stefanpfahler

  committed
  b7a8be9

• add resource usecases

  Show description for 2d9d9b6
  jantiegges

  committed
  2d9d9b6

• made hierarchial fetching optional

  Show description for b3c448c
  n3rdc4ptn

  committed
  b3c448c

• add new resources controller

  Show description for 00bb508
  jantiegges

  committed
  00bb508

• fix: adjust error messages for update building

  Show description for 530a0c2
  

  woerndle

  and

  stefanpfahler

  committed
  530a0c2

• fix: adjust floor error messages

  Show description for 308656e
  

  woerndle

  and

  stefanpfahler

  committed
  308656e

• fix: adjust room error messages

  Show description for 52abcc0
  

  woerndle

  and

  stefanpfahler

  committed
  52abcc0

• fix: adjust edit desk error messages

  Show description for fc524f2
  

  woerndle

  and

  stefanpfahler

  committed
  fc524f2

• fix: edit desk types error messages

  Show description for a62ec84
  

  woerndle

  and

  stefanpfahler

  committed
  a62ec84

• Merge pull request #201 from amosproj/edit-resource-ui

  Show description for 047107a
  stefanpfahler

  authored
  047107a

• feat: create register admin dto

  Show description for 48f72a8
  

  woerndle

  and

  stefanpfahler

  committed
  48f72a8

• feat: setup response obj and mapping

  Show description for 05b7ce5
  

  woerndle

  and

  stefanpfahler

  committed
  05b7ce5

• feat: setup register admin usecase

  Show description for fab1660
  

  woerndle

  and

  stefanpfahler

  committed
  fab1660

• feat: setup register admin endpoint

  Show description for f67fd56
  

  woerndle

  and

  stefanpfahler

  committed
  f67fd56

• added getAll in Backend

  xilef45

  committed
  fac9e73

• fix: adjust usecase and enpoint interface according to architecture

  Show description for 6cce23b
  

  woerndle

  and

  stefanpfahler

  committed
  6cce23b

• feat: provide tests for register admin usecase

  Show description for 0699561
  

  woerndle

  and

  stefanpfahler

  committed
  0699561

• Merge branch 'develop' into 55-edit-resources

  Show description for c22f306
  

  woerndle

  and

  stefanpfahler

  committed
  c22f306

• Merge pull request #193 from amosproj/190-time-issue-book-a-desk-bookings

  Show description for e41690b
  eddyhakimi

  authored
  e41690b

Commits on Jan 31, 2023

• Merge remote-tracking branch 'origin/185-resource-filterbar' into 185-resource-filterbar

  jantiegges

  committed
  bbf17e8

• modify models in be

  jantiegges

  committed
  dfdde28

• fix resource filterbar

  jantiegges

  committed
  9dcc18a

• add new tests

  jantiegges

  committed
  449673f

• add get all routes for resources

  Show description for 431c27a
  

  xilef45

  and

  Faoilthiama

  committed
  431c27a

• fix frontend restore resources

  Show description for f36afef
  

  xilef45

  and

  Faoilthiama

  committed
  f36afef

• Merge pull request #181 from amosproj/restore-ressources

  Show description for 3c6808e
  xilef45

  authored
  3c6808e

• disable admin from deleting themself and their own rights

  Show description for d85fdd8
  

  xilef45

  and

  Faoilthiama

  committed
  d85fdd8

• add guards for last admin

  Show description for 338639d
  

  xilef45

  and

  Faoilthiama

  committed
  338639d

• added tests

  Show description for 130f154
  

  xilef45

  and

  Faoilthiama

  committed
  130f154

• fixes build error

  Show description for 5a00f3b
  

  xilef45

  and

  Faoilthiama

  committed
  5a00f3b

• Merge pull request #204 from amosproj/87-last-admin

  Show description for 96ee96f
  xilef45

  authored
  96ee96f

• update and add screenshots

  Show description for 0f2bc88
  

  xilef45

  and

  Faoilthiama

  committed
  0f2bc88

• update delete modals

  Show description for dd935ce
  

  xilef45

  and

  Faoilthiama

  committed
  dd935ce

• add tests

  Show description for 2392a58
  

  xilef45

  and

  Faoilthiama

  committed
  2392a58

• Fix nextjs production build

  eddyhakimi

  committed
  b9f53f4

• Merge branch 'develop' into 55-edit-resources

  woerndle

  committed
  344a2c9

• fix: fix typo

  woerndle

  committed
  ab72a7b

• Add initial registeration method to AuthService

  Show description for a6c39e8
  eddyhakimi

  committed
  a6c39e8

• Merge pull request #173 from amosproj/55-edit-resources

  Show description for a40a800
  woerndle

  authored
  a40a800

• Add initial registration ui

  Show description for ebf81ff
  eddyhakimi

  committed
  ebf81ff

• Handle initial registration submit

  Show description for 2585bbd
  eddyhakimi

  committed
  2585bbd

• fix: adjust endpoint to fe

  Show description for d95d2dc
  

  woerndle

  authored and

  eddyhakimi

  committed
  d95d2dc

• Adjust fe error handling to backend

  Show description for 0468b3f
  eddyhakimi

  committed
  0468b3f

• Merge pull request #205 from amosproj/83-initial-admin-registration

  Show description for 1ffbb39
  woerndle

  authored
  1ffbb39

• Merge branch 'develop' into 185-resource-filterbar

  jantiegges

  committed
  f7a971f

• fix + add emails

  Show description for 5296a62
  

  xilef45

  and

  Faoilthiama

  committed
  5296a62

• resolve merge conflicts with develop

  jantiegges

  committed
  7f90c8f

• email fixes

  xilef45

  committed
  e3e7c73

• fix small bugs

  xilef45

  committed
  de0a266

• delete modal for bookings

  xilef45

  committed
  2fc96d6

• change direction for index page

  xilef45

  committed
  6242f6a

• Merge pull request #207 from amosproj/fix-email-bugs

  Show description for e06d257
  xilef45

  authored
  e06d257

• Created sprint 13 folder

  Show description for 72a9d30
  qy21gafy

  authored
  72a9d30

• Submitted PO homework for sprint 13

  Show description for 72f430c
  qy21gafy

  authored
  72f430c

• Submitted Demo Day Slide authored by Svenja Strobel

  Show description for 31bb628
  qy21gafy

  authored
  31bb628

• Deleted dummy file from sprint 13

  Show description for eb6fe1a
  qy21gafy

  authored
  eb6fe1a

• fix typos

  xilef45

  committed
  99f349c

• Merge pull request #208 from amosproj/fix-email-bugs

  Show description for c620ade
  xilef45

  authored
  c620ade

• Merge pull request #202 from amosproj/185-resource-filterbar

  Show description for 1281f81
  n3rdc4ptn

  authored
  1281f81

• fix Type error

  xilef45

  committed
  c2cf9d7

• Create demo-day-video.mp4

  xilef45

  committed
  73570ca

• Revert "Create demo-day-video.mp4"

  Show description for 834cf0f
  xilef45

  committed
  834cf0f

• Create demo-day-video.mp4

  Show description for ce4b397
  

  xilef45

  and

  Faoilthiama

  committed
  ce4b397

• Update demo-day-video.mp4

  xilef45

  committed
  d21ed58

• Revert "Update demo-day-video.mp4"

  Show description for 8646497
  xilef45

  committed
  8646497

• Update demo-day-video.mp4

  Show description for db586c1
  

  xilef45

  and

  Faoilthiama

  committed
  db586c1