Code

Miles branch#20

Code

Open

mbb10324 wants to merge 233 commits intogSchool:maingSchool/sdi-capstone-base:mainfrom mbb10324:Miles-branchmbb10324/sdi-capstone-base:Miles-branchCopy head branch name to clipboard

+183,449-219

Commits

Commits on Dec 8, 2022

• Add files via upload

  mbb10324

  authored
  5f6adc6

• testing branch push

  mfouquier

  committed
  5bae1bc

• reverted knexfile

  mfouquier

  committed
  883f385

• test branch push

  mfouquier

  committed
  4c3cb41

• Merge pull request #1 from mbb10324/matt_branch

  Show description for 502387d
  mfouquier

  authored
  502387d

• removed Testing line

  mfouquier

  committed
  4a9ee99

• test

  mbb10324

  committed
  fbd943f

• Merge pull request #2 from mbb10324/Miles-branch

  Show description for 7872036
  mbb10324

  authored
  7872036

• add bash to api

  mfouquier

  committed
  3ed310f

• Merge pull request #3 from mbb10324/matt_branch

  Show description for e88e2eb
  mfouquier

  authored
  e88e2eb

• sfd

  mbb10324

  committed
  28bc441

• Merge github.com:mbb10324/sdi-capstone-base into Miles-branch

  Show description for c505c4a
  mbb10324

  committed
  c505c4a

• before lunch commit

  rommatt4

  committed
  d854661

• Merge pull request #4 from rommatt4/main

  Show description for bb255bf
  rommatt4

  authored
  bb255bf

• migrates and seeds done

  mfouquier

  committed
  c9ec2cb

• frontend links established

  mbb10324

  committed
  76a84f7

• initial links

  mbb10324

  committed
  409ca98

• Merge pull request #5 from mbb10324/Miles-branch

  Show description for 1edc6f8
  mbb10324

  authored
  1edc6f8

• changes

  mbb10324

  committed
  c9defa7

• ready for sidemenu

  rommatt4

  committed
  1247c47

• Merge pull request #6 from mbb10324/Miles-branch

  Show description for 3b52704
  mbb10324

  authored
  3b52704

• Merge branch 'main' into main

  rommatt4

  authored
  14207c8

• Merge pull request #7 from rommatt4/main

  Show description for 943e11f
  rommatt4

  authored
  943e11f

• migrate and seed complete

  mfouquier

  committed
  51f9652

• ready for that DB

  rommatt4

  committed
  4b13324

• add

  mfouquier

  committed
  dd4e43f

• Merge pull request #9 from rommatt4/main

  Show description for 793cb78
  rommatt4

  authored
  793cb78

• add

  mfouquier

  committed
  2dba9e3

• added

  mfouquier

  committed
  c984617

• Merge pull request #8 from mbb10324/matt_branch

  Show description for 9a9674f
  mfouquier

  authored
  9a9674f

• ready for the DB round 2

  rommatt4

  committed
  f06ee96

• Merge pull request #10 from rommatt4/main

  Show description for ad684e1
  rommatt4

  authored
  ad684e1

• end of Thursday

  rommatt4

  committed
  758897d

• Merge pull request #11 from rommatt4/main

  Show description for d2f4e60
  rommatt4

  authored
  d2f4e60

• home page

  mbb10324

  committed
  4e86179

• GET functions

  mfouquier

  committed
  d05ab3d

• Merge pull request #13 from mbb10324/matt_branch

  Show description for d133c99
  mfouquier

  authored
  d133c99

• Merge branch 'main' into Miles-branch

  mbb10324

  authored
  8542a0d

• Merge pull request #12 from mbb10324/Miles-branch

  Show description for b65be53
  mbb10324

  authored
  b65be53

• fixed header mismatch

  mbb10324

  committed
  b98c254

• Merge branch 'main' of github.com:mbb10324/sdi-capstone-base into Miles-branch

  mbb10324

  committed
  423f197

• Merge pull request #14 from mbb10324/Miles-branch

  Show description for e2196b5
  mbb10324

  authored
  e2196b5

• useEffect in Requests to pull DB data

  mfouquier

  committed
  716cbf8

• useEffect in Requests to pull DB data

  mfouquier

  committed
  25050df

Commits on Dec 9, 2022

• design adjustments

  mbb10324

  committed
  749edcc

• Merge branch 'main' of github.com:mbb10324/sdi-capstone-base into Miles-branch

  mbb10324

  committed
  ee982bf

• Merge pull request #15 from mbb10324/Miles-branch

  Show description for 513992b
  mbb10324

  authored
  513992b

• added post to login

  mfouquier

  committed
  f087881

• merged new content Merge branch 'main' of github.com:mbb10324/sdi-capstone-base into main

  mfouquier

  committed
  86f4ba8

• added post

  mfouquier

  committed
  1f71098

• fixed approvals get request

  mfouquier

  committed
  2a9b7f9

• added patch to request table

  mfouquier

  committed
  95dbacf

• Add files via upload

  mbb10324

  authored
  1cee69a

• ready for the merge with Matt

  rommatt4

  committed
  7e58615

• Merge pull request #16 from rommatt4/main

  Show description for 5ee7556
  rommatt4

  authored
  5ee7556

• added patch to request table

  mfouquier

  committed
  66e9036

• app

  mfouquier

  committed
  09b4e6d

• pulledMerge branch 'main' of github.com:mbb10324/sdi-capstone-base into main

  mfouquier

  committed
  78da18d

• fix knexfile

  mfouquier

  committed
  560939b

• fix knexfile

  mfouquier

  committed
  60ad9f9

• delete to requests

  mfouquier

  committed
  1f8d5d1

• added photos

  mfouquier

  committed
  33242a6

• end of friday commit

  rommatt4

  committed
  9aa722d

• Merge pull request #17 from rommatt4/main

  Show description for 9cb9110
  rommatt4

  authored
  9cb9110

Commits on Dec 10, 2022

• add

  mfouquier

  committed
  6e205b2

• commit to pull

  mfouquier

  committed
  41c8e63

• commit to pull Merge branch 'main' of github.com:mbb10324/sdi-capstone-base into main

  mfouquier

  committed
  fbbe6f3

• work on assets page

  mfouquier

  committed
  3ca1a28

Commits on Dec 12, 2022

• before monday commit

  rommatt4

  committed
  914dcc1

• Merge pull request #18 from rommatt4/main

  Show description for ab888f5
  rommatt4

  authored
  ab888f5

• login page 90%

  mbb10324

  committed
  b48a17f

• Merge remote-tracking branch 'origin' into Miles-branch

  mbb10324

  committed
  b3b442f

• Merge pull request #19 from mbb10324/Miles-branch

  Show description for b40ef70
  mbb10324

  authored
  b40ef70

• request page is good for now

  rommatt4

  committed
  2ab5508

• Merge branch 'main' into main

  rommatt4

  authored
  117a743

• Merge pull request #20 from rommatt4/main

  Show description for d53d804
  rommatt4

  authored
  d53d804

• fixed routes

  mfouquier

  committed
  a33d8a8

• added context

  mbb10324

  committed
  7346560

• Merge pull request #21 from mbb10324/Miles-branch

  Show description for 78cff6c
  mbb10324

  authored
  78cff6c

• changes to assets

  mfouquier

  committed
  945c9c7

• add

  mfouquier

  committed
  ebf403f

• updates

  mbb10324

  committed
  c588a5f

• Merge remote-tracking branch 'origin' into Miles-branch

  mbb10324

  committed
  268b097

Commits on Dec 13, 2022

• end of Monday 12 commit

  rommatt4

  committed
  2a8f096

• Merge pull request #22 from rommatt4/main

  Show description for a1eba06
  rommatt4

  authored
  a1eba06

• end of monday commit

  rommatt4

  committed
  9e320df

• fuck my life

  rommatt4

  committed
  ce05f01

• Merge pull request #23 from rommatt4/main

  Show description for 7cc4995
  rommatt4

  authored
  7cc4995

• tuesday push

  rommatt4

  committed
  689239b

• Merge pull request #24 from rommatt4/main

  Show description for 1e9dbcd
  rommatt4

  authored
  1e9dbcd

• add

  mfouquier

  committed
  072ec0f

• merged

  mfouquier

  committed
  1bfe5e0

• cart

  mbb10324

  committed
  2876e60

• cart

  mbb10324

  committed
  1649992

• finished the approver, awaiting SME DB

  rommatt4

  committed
  bd6720f

• Merge pull request #25 from rommatt4/main

  Show description for 0c6bbff
  rommatt4

  authored
  0c6bbff

• added edit function to approver

  rommatt4

  committed
  7bc13ed

• Merge branch 'main' of github.com:rommatt4/sdi-capstone-base

  rommatt4

  committed
  eb3198c

• Merge pull request #26 from rommatt4/main

  Show description for c227f83
  rommatt4

  authored
  c227f83

• fixed sme - asset tables

  mfouquier

  committed
  460ce1a

• changed seed files

  mfouquier

  committed
  4a25995

• pUll latest

  Show description for a10528b
  mfouquier

  committed
  a10528b

• changes to SME

  rommatt4

  committed
  bc3a612

• Merge pull request #27 from rommatt4/main

  Show description for 6f947d6
  rommatt4

  authored
  6f947d6

• changed cmd seed and migration files

  mfouquier

  committed
  6db6255

• change to seed files

  mfouquier

  committed
  d137cf6

• merge pull Merge branch 'main' of github.com:mbb10324/sdi-capstone-base into main

  mfouquier

  committed
  309ab4b

• updated approvals

  mfouquier

  committed
  1db3729

• before lunch stuff

  rommatt4

  committed
  ee63a98

• Merge branch 'main' into main

  rommatt4

  authored
  e525a11

• Merge pull request #28 from rommatt4/main

  Show description for dd3ff75
  rommatt4

  authored
  dd3ff75

• messi goal commit

  rommatt4

  committed
  e2fbff2

• Merge pull request #29 from rommatt4/main

  Show description for a235f5a
  rommatt4

  authored
  a235f5a

• ready for the big merge

  rommatt4

  committed
  badc849

• added shopping cart table

  mfouquier

  committed
  929ba23

• merge

  mfouquier

  committed
  d7d331c

• cart update, bug fixes

  mbb10324

  committed
  10e7bc6

• confilcts resolved

  mbb10324

  committed
  4c007b9

• Merge pull request #30 from mbb10324/Miles-branch

  Show description for 506a1cd
  mbb10324

  authored
  506a1cd

• Merge pull request #31 from rommatt4/main

  Show description for a1cb441
  rommatt4

  authored
  a1cb441

• changes

  mfouquier

  committed
  9cdcac2

• added

  mfouquier

  committed
  f1dee85

• a

  rommatt4

  committed
  51906ce

• i hate this

  rommatt4

  committed
  ee339eb

• Merge pull request #32 from rommatt4/main

  Show description for 089447d
  rommatt4

  authored
  089447d

• waiting for login commit

  rommatt4

  committed
  0e2e010

• Merge pull request #33 from rommatt4/main

  Show description for fa6f064
  rommatt4

  authored
  fa6f064

• merge

  mbb10324

  committed
  b4f5957

• Merge branch 'main' into Miles-branch

  mbb10324

  authored
  92baccf

• Merge pull request #34 from mbb10324/Miles-branch

  Show description for e3c01ef
  mbb10324

  authored
  e3c01ef

• merge

  mbb10324

  committed
  22f0729

• merge

  mfouquier

  committed
  52ee248

• merg Merge branch 'main' of github.com:mbb10324/sdi-capstone-base into main

  mfouquier

  committed
  4c109c2

• merge

  mbb10324

  committed
  c89368a

• Merge pull request #35 from mbb10324/Miles-branch

  Show description for f2330ec
  mbb10324

  authored
  f2330ec

• merge

  mfouquier

  committed
  ea78cff

• merge Merge branch 'main' of github.com:mbb10324/sdi-capstone-base into main

  mfouquier

  committed
  d2bc75e

• post assets

  mfouquier

  committed
  5379929

• update

  mbb10324

  committed
  b5c7d71

• test

  mbb10324

  committed
  f74101b

• home

  mbb10324

  committed
  589313e

Commits on Dec 14, 2022

• before wednesday commit

  rommatt4

  committed
  ce44a36

• Merge branch 'main' into main

  rommatt4

  authored
  299f43d

• Merge pull request #36 from rommatt4/main

  Show description for 2968b3e
  rommatt4

  authored
  2968b3e

• working on assetsview

  mfouquier

  committed
  f180b31

• pull Merge branch 'main' of github.com:mbb10324/sdi-capstone-base into main

  mfouquier

  committed
  760c3a1

• cart functionality complete

  mbb10324

  committed
  aea815c

• Merge branch 'main' into Miles-branch

  mbb10324

  authored
  ceb3191

• Merge pull request #37 from mbb10324/Miles-branch

  Show description for c2caea4
  mbb10324

  authored
  c2caea4

• added dropdown to SME and Approver

  rommatt4

  committed
  51f8289

• Merge pull request #38 from rommatt4/main

  Show description for a1cd5b6
  rommatt4

  authored
  a1cd5b6

• beautify

  mbb10324

  committed
  9ae279c

• updates

  mbb10324

  committed
  2c78cf4

• Merge pull request #40 from mbb10324/Miles-branch

  Show description for abb633a
  mbb10324

  authored
  abb633a

• asset work

  mfouquier

  committed
  db5860d

• merged

  mfouquier

  committed
  1c56095

• fixed some css on the approver and sme cards

  rommatt4

  committed
  5eed7a0

• changed return

  mfouquier

  committed
  a1031d3

• Merge pull request #41 from rommatt4/main

  Show description for abeead3
  rommatt4

  authored
  abeead3

• added typeofSME

  mbb10324

  committed
  efdb15f

• added typeofSME

  mbb10324

  committed
  028471c

• added snackbar

  mfouquier

  committed
  be550dd

• pull Merge branch 'main' of github.com:mbb10324/sdi-capstone-base into main

  mfouquier

  committed
  bd77f20

• added logo to approver and sme page

  rommatt4

  committed
  082e34c

• Merge pull request #42 from rommatt4/main

  Show description for 601f81a
  rommatt4

  authored
  601f81a

• added sme type

  mbb10324

  committed
  8bf2301

• added header to approver and sme

  rommatt4

  committed
  ef95521

• Merge pull request #45 from rommatt4/main

  Show description for e739ac8
  rommatt4

  authored
  e739ac8

• Merge branch 'main' into Miles-branch

  mbb10324

  authored
  8461907

• Merge pull request #44 from mbb10324/Miles-branch

  Show description for f09bb3c
  mbb10324

  authored
  f09bb3c

• assets

  mfouquier

  committed
  03adf45

• added

  mfouquier

  committed
  d555712

• pull Merge branch 'main' of github.com:mbb10324/sdi-capstone-base into main

  mfouquier

  committed
  8c97e61

• changed some pics in seed file

  mfouquier

  committed
  c4098fa

• added sme type

  mbb10324

  committed
  365fdcd

• Merge branch 'main' of github.com:mbb10324/sdi-capstone-base into Miles-branch

  mbb10324

  committed
  16c40f4

• wed 5pm commit

  rommatt4

  committed
  0708af9

• Merge branch 'main' into main

  rommatt4

  authored
  3a401b8

• Merge pull request #46 from rommatt4/main

  Show description for d367a15
  rommatt4

  authored
  d367a15

• pulled

  mfouquier

  committed
  5cac367

Commits on Dec 15, 2022

• thurday morning commit

  rommatt4

  committed
  dfb89d4

• Merge pull request #47 from rommatt4/main

  Show description for 6082b24
  rommatt4

  authored
  6082b24

• footer stuff

  mbb10324

  committed
  6042b55

• merged

  mbb10324

  committed
  c704768

• Merge pull request #48 from mbb10324/Miles-branch

  Show description for cce9cfc
  mbb10324

  authored
  cce9cfc

• footer stuff

  mbb10324

  committed
  64781f0

• Merge pull request #49 from mbb10324/Miles-branch

  Show description for 25ef763
  mbb10324

  authored
  25ef763

Commits on Dec 16, 2022

• adding to backend migration

  mfouquier

  committed
  d2868d8

• change for Render

  mfouquier

  committed
  74096e5

• Update package.json

  mfouquier

  authored
  2bd420e

• added a map to the map and made some changes to the request data seed

  rommatt4

  committed
  debb673

• Merge branch 'main' into main

  rommatt4

  authored
  59dedba

• Merge pull request #50 from rommatt4/main

  Show description for d46d4af
  rommatt4

  authored
  d46d4af

Commits on Dec 18, 2022

• added features to the map and changed some some data in the request table (countries)

  rommatt4

  committed
  3fc93b7

• Merge pull request #51 from rommatt4/main

  Show description for 07d646d
  rommatt4

  authored
  07d646d

Commits on Dec 19, 2022

• added a link to the map in the approver page, added a globe icon for link

  rommatt4

  committed
  301e338

• Merge pull request #52 from rommatt4/main

  Show description for ced542c
  rommatt4

  authored
  ced542c

• changed the sorting in approver

  rommatt4

  committed
  31fa6b1

• Merge pull request #53 from rommatt4/main

  Show description for 3e5f199
  rommatt4

  authored
  3e5f199

• added caroline's suggestion and some css

  rommatt4

  committed
  c74c9f0

• Merge pull request #54 from rommatt4/main

  Show description for 1d0d9ff
  rommatt4

  authored
  1d0d9ff

• added changes to the map

  rommatt4

  committed
  3cf876e

• Merge pull request #55 from rommatt4/main

  Show description for a934bd9
  rommatt4

  authored
  a934bd9

• final map commit

  rommatt4

  committed
  c21ccc7

• Merge pull request #56 from rommatt4/main

  Show description for 308a1ce
  rommatt4

  authored
  308a1ce

• sme, and css

  mbb10324

  committed
  41f7b89

• monday afternoon

  mbb10324

  committed
  8c58166

• Merge pull request #57 from mbb10324/Miles-branch

  Show description for 24a3148
  mbb10324

  authored
  24a3148

• monday afternoon

  mbb10324

  committed
  ab39de9

• Merge pull request #58 from mbb10324/Miles-branch

  Show description for d00d9b9
  mbb10324

  authored
  d00d9b9

• a

  rommatt4

  committed
  5f65b5f

• Merge pull request #59 from rommatt4/main

  Show description for e716d44
  rommatt4

  authored
  e716d44

• updated map and updated some request css

  rommatt4

  committed
  beb82cd

• Merge pull request #60 from rommatt4/main

  Show description for 1815cfe
  rommatt4

  authored
  1815cfe

Commits on Dec 20, 2022

• cleaned up one line in cart

  rommatt4

  committed
  ef684af

• Merge pull request #61 from rommatt4/main

  Show description for 312f834
  rommatt4

  authored
  312f834

• file upload

  mfouquier

  committed
  5926a5f

• reverted cart back to original

  rommatt4

  committed
  c1139e9

• Merge pull request #62 from rommatt4/main

  Show description for 4f1c0d9
  rommatt4

  authored
  4f1c0d9

• shopping cart

  mfouquier

  committed
  b175d2c

• merge

  mfouquier

  committed
  03883f3

• merge

  mfouquier

  committed
  3f24077

• parallax

  mbb10324

  committed
  86d7bef

• parallax

  mbb10324

  committed
  19caf11

• merged file upload and parallax

  mbb10324

  committed
  ac15e31

• Merge pull request #63 from mbb10324/Miles-branch

  Show description for 611702f
  mbb10324

  authored
  611702f

• add file to approver, fixed no file uploaded

  mfouquier

  committed
  02bb497

• merge

  Show description for 4da660f
  mfouquier

  committed
  4da660f

• fixed hover in assets

  mfouquier

  committed
  0e3255b

• merge

  mfouquier

  committed
  b51d576

• better hover

  mfouquier

  committed
  6efddbf

Commits on Dec 21, 2022

• approver styling

  mbb10324

  committed
  72d468d

Commits on Dec 22, 2022

• final css

  mbb10324

  committed
  0c0829d