Code

Accountant#56

Code

Open

redmanuel1 wants to merge 69 commits intocreativetimofficial:mastercreativetimofficial/argon-dashboard-angular:masterfrom redmanuel1:accountantredmanuel1/blu-inventory-app:accountantCopy head branch name to clipboard

+5,461-245

Commits

Commits on Sep 2, 2024

• Config

  redmanuel1

  committed
  4088b45

• config 2

  redmanuel1

  committed
  8d73ec3

• config 3

  redmanuel1

  committed
  814fa03

• config #4

  redmanuel1

  committed
  39c4fa4

• config #5

  redmanuel1

  committed
  a4aa025

Commits on Sep 7, 2024

• App authentication and firebase setup

  redmanuel1

  committed
  716242e

• Config for angular 14 - base branch

  kyraantonio

  committed
  688929a

• ng generate fix

  kyraantonio

  committed
  0672fa9

Commits on Sep 8, 2024

• Login with user role

  redmanuel1

  committed
  44e6d3f

Commits on Sep 12, 2024

• basic-navigation

  redmanuel1

  committed
  5423a38

• admin-routing

  redmanuel1

  committed
  675d815

• add student module and logout

  redmanuel1

  committed
  06b2a2b

• routing and products template

  redmanuel1

  committed
  bc8c486

• loginguard

  redmanuel1

  committed
  6a4cd85

• Merge branch 'red-dev-branch' into routing-student

  redmanuel1

  committed
  e3ce1ae

• dupe

  redmanuel1

  committed
  94afdbf

• Merge pull request #1 from redmanuel1/base18

  Show description for 742c1df
  redmanuel1

  authored
  742c1df

Commits on Sep 13, 2024

• change header color

  redmanuel1

  committed
  32c66e2

• fix user login and enter button on login

  redmanuel1

  committed
  a236286

Commits on Sep 16, 2024

• fix angular devtools

  kyraantonio

  committed
  ce47cc4

• custodian: base (routes, table component, products page)

  kyraantonio

  committed
  9c59f50

• student-products-display

  redmanuel1

  committed
  59756d4

• Merge branch 'student-products' into custodian

  kyraantonio

  committed
  3a42924

Commits on Sep 17, 2024

• custodian: models, product table display

  kyraantonio

  committed
  761c927

• Merge pull request #2 from redmanuel1/custodian

  Show description for ad42f3c
  kyraantonio

  authored
  ad42f3c

• fix product display and add to cart function

  redmanuel1

  committed
  95c71ac

• Merge branch 'master' into student-products

  redmanuel1

  committed
  385803f

• Added Registration

  mattsayco

  committed
  713d332

• Merge branch 'master' of https://github.com/redmanuel1/argon-dashboard-angular into Registration_And_Profile

  mattsayco

  committed
  54b220e

• Fixed registration to default role to student

  mattsayco

  committed
  3ba26c4

Commits on Sep 18, 2024

• Added functionality to user profile

  mattsayco

  committed
  b393f3f

Commits on Sep 19, 2024

• display products, variants, sizes and add blu logo

  redmanuel1

  committed
  b6e2be1

• Merge pull request #3 from redmanuel1/Registration_And_Profile

  Show description for 4e93015
  kyraantonio

  authored
  4e93015

• Merge branch 'master' into student-products

  kyraantonio

  authored
  54eb094

• Merge pull request #4 from redmanuel1/student-products

  Show description for 810c587
  kyraantonio

  authored
  810c587

• Reusable Components

  kyraantonio

  committed
  8c1304b

Commits on Sep 21, 2024

• fix product display and routing

  redmanuel1

  committed
  943042f

• display shopping cart items

  redmanuel1

  committed
  f193145

Commits on Sep 26, 2024

• get max quantity per item and add total when increasing or decreasing

  redmanuel1

  committed
  fad2435

• Merge pull request #5 from redmanuel1/Student-Shopping-Cart

  Show description for 1d7f5b5
  kyraantonio

  authored
  1d7f5b5

• Reusable Components: Table and Forms - Add, Edit, Save (Table)

  kyraantonio

  committed
  788e09b

Commits on Sep 27, 2024

• Added Order Details UI

  mattsayco

  committed
  a3b09f3

• Merge branch 'master' of https://github.com/redmanuel1/argon-dashboard-angular into Registration_And_Profile

  mattsayco

  committed
  497e5b7

Commits on Sep 29, 2024

• Custodian - Products: CRUD and validation

  kyraantonio

  committed
  e67eb41

• Custodian - Products: Upload Image (Add, Update)

  kyraantonio

  committed
  e1c32bc

Commits on Sep 30, 2024

• checkout products

  redmanuel1

  committed
  8b1832f

• Merge branch 'master' of https://github.com/redmanuel1/argon-dashboard-angular into Registration_And_Profile

  mattsayco

  committed
  7b1abed

• Finished Student Transaction and Order details but still needs to be optimized

  mattsayco

  committed
  72f7a83

Commits on Oct 1, 2024

• Merge pull request #6 from redmanuel1/Registration_And_Profile

  Show description for a9d4209
  kyraantonio

  authored
  a9d4209

• Merge branch 'master' into Student-check-out

  redmanuel1

  committed
  df8c04b

• connect checkout and transactions

  redmanuel1

  committed
  4951cc8

• Merge pull request #7 from redmanuel1/Student-check-out

  Show description for ed05af4
  kyraantonio

  authored
  ed05af4

Commits on Oct 3, 2024

• modals-toast and ui improvements

  redmanuel1

  committed
  0b17f4f

• Merge pull request #8 from redmanuel1/modal-and-navigations-student

  Show description for a880859
  kyraantonio

  authored
  a880859

• Fixed Order details upload file UI

  mattsayco

  committed
  a51b2f6

Commits on Oct 4, 2024

• fix registration, user profile, ui

  redmanuel1

  committed
  29c66ab

• Merge pull request #9 from redmanuel1/user-profile-registration-login

  Show description for 364815a
  kyraantonio

  authored
  364815a

Commits on Oct 7, 2024

• Used firestore service and fixed logic for upload

  mattsayco

  committed
  a9da853

Commits on Oct 8, 2024

• Merge branch 'master' of https://github.com/redmanuel1/argon-dashboard-angular into Registration_And_Profile

  mattsayco

  committed
  8c76917

• Fixed UI of transactions and order details from the student

  mattsayco

  committed
  2d23ca9

Commits on Oct 9, 2024

• Merge pull request #10 from redmanuel1/Registration_And_Profile

  Show description for 82ac3d7
  kyraantonio

  authored
  82ac3d7

Commits on Oct 10, 2024

• accountant UI

  redmanuel1

  committed
  4c59b63

• Merge branch 'master' into accountant

  redmanuel1

  committed
  255dc02

Commits on Oct 11, 2024

• accountant module

  redmanuel1

  committed
  49c7ebc

• Merge pull request #11 from redmanuel1/accountant

  Show description for 0305f78
  kyraantonio

  authored
  0305f78

• fix ui - added saving of data for accountant

  redmanuel1

  committed
  c695858

Commits on Oct 14, 2024

• accountant-confirmation

  redmanuel1

  committed
  da09ee7

• add custodian pick up

  redmanuel1

  committed
  9adfa99

• fix display of images

  redmanuel1

  committed
  40e848d