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

Accountant #56

Open
wants to merge 69 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
4088b45
Config
redmanuel1 Sep 2, 2024
8d73ec3
config 2
redmanuel1 Sep 2, 2024
814fa03
config 3
redmanuel1 Sep 2, 2024
39c4fa4
config #4
redmanuel1 Sep 2, 2024
a4aa025
config #5
redmanuel1 Sep 2, 2024
716242e
App authentication and firebase setup
redmanuel1 Sep 7, 2024
688929a
Config for angular 14 - base branch
kyraantonio Sep 7, 2024
0672fa9
ng generate fix
kyraantonio Sep 7, 2024
44e6d3f
Login with user role
redmanuel1 Sep 8, 2024
5423a38
basic-navigation
redmanuel1 Sep 12, 2024
675d815
admin-routing
redmanuel1 Sep 12, 2024
06b2a2b
add student module and logout
redmanuel1 Sep 12, 2024
bc8c486
routing and products template
redmanuel1 Sep 12, 2024
6a4cd85
loginguard
redmanuel1 Sep 12, 2024
e3ce1ae
Merge branch 'red-dev-branch' into routing-student
redmanuel1 Sep 12, 2024
94afdbf
dupe
redmanuel1 Sep 12, 2024
742c1df
Merge pull request #1 from redmanuel1/base18
redmanuel1 Sep 12, 2024
32c66e2
change header color
redmanuel1 Sep 13, 2024
a236286
fix user login and enter button on login
redmanuel1 Sep 13, 2024
ce47cc4
fix angular devtools
kyraantonio Sep 16, 2024
9c59f50
custodian: base (routes, table component, products page)
kyraantonio Sep 16, 2024
59756d4
student-products-display
redmanuel1 Sep 16, 2024
3a42924
Merge branch 'student-products' into custodian
kyraantonio Sep 16, 2024
761c927
custodian: models, product table display
kyraantonio Sep 17, 2024
ad42f3c
Merge pull request #2 from redmanuel1/custodian
kyraantonio Sep 17, 2024
95c71ac
fix product display and add to cart function
redmanuel1 Sep 17, 2024
385803f
Merge branch 'master' into student-products
redmanuel1 Sep 17, 2024
713d332
Added Registration
mattsayco Sep 17, 2024
54b220e
Merge branch 'master' of https://github.com/redmanuel1/argon-dashboar…
mattsayco Sep 17, 2024
3ba26c4
Fixed registration to default role to student
mattsayco Sep 17, 2024
b393f3f
Added functionality to user profile
mattsayco Sep 18, 2024
b6e2be1
display products, variants, sizes and add blu logo
redmanuel1 Sep 19, 2024
4e93015
Merge pull request #3 from redmanuel1/Registration_And_Profile
kyraantonio Sep 19, 2024
54eb094
Merge branch 'master' into student-products
kyraantonio Sep 19, 2024
810c587
Merge pull request #4 from redmanuel1/student-products
kyraantonio Sep 19, 2024
8c1304b
Reusable Components
kyraantonio Sep 19, 2024
943042f
fix product display and routing
redmanuel1 Sep 21, 2024
f193145
display shopping cart items
redmanuel1 Sep 21, 2024
fad2435
get max quantity per item and add total when increasing or decreasing
redmanuel1 Sep 26, 2024
1d7f5b5
Merge pull request #5 from redmanuel1/Student-Shopping-Cart
kyraantonio Sep 26, 2024
788e09b
Reusable Components: Table and Forms - Add, Edit, Save (Table)
kyraantonio Sep 26, 2024
a3b09f3
Added Order Details UI
mattsayco Sep 27, 2024
497e5b7
Merge branch 'master' of https://github.com/redmanuel1/argon-dashboar…
mattsayco Sep 27, 2024
e67eb41
Custodian - Products: CRUD and validation
kyraantonio Sep 29, 2024
e1c32bc
Custodian - Products: Upload Image (Add, Update)
kyraantonio Sep 29, 2024
8b1832f
checkout products
redmanuel1 Sep 30, 2024
7b1abed
Merge branch 'master' of https://github.com/redmanuel1/argon-dashboar…
mattsayco Sep 30, 2024
72f7a83
Finished Student Transaction and Order details but still needs to be …
mattsayco Sep 30, 2024
a9d4209
Merge pull request #6 from redmanuel1/Registration_And_Profile
kyraantonio Oct 1, 2024
df8c04b
Merge branch 'master' into Student-check-out
redmanuel1 Oct 1, 2024
4951cc8
connect checkout and transactions
redmanuel1 Oct 1, 2024
ed05af4
Merge pull request #7 from redmanuel1/Student-check-out
kyraantonio Oct 1, 2024
0b17f4f
modals-toast and ui improvements
redmanuel1 Oct 3, 2024
a880859
Merge pull request #8 from redmanuel1/modal-and-navigations-student
kyraantonio Oct 3, 2024
a51b2f6
Fixed Order details upload file UI
mattsayco Oct 3, 2024
29c66ab
fix registration, user profile, ui
redmanuel1 Oct 4, 2024
364815a
Merge pull request #9 from redmanuel1/user-profile-registration-login
kyraantonio Oct 4, 2024
a9da853
Used firestore service and fixed logic for upload
mattsayco Oct 7, 2024
8c76917
Merge branch 'master' of https://github.com/redmanuel1/argon-dashboar…
mattsayco Oct 8, 2024
2d23ca9
Fixed UI of transactions and order details from the student
mattsayco Oct 8, 2024
82ac3d7
Merge pull request #10 from redmanuel1/Registration_And_Profile
kyraantonio Oct 9, 2024
4c59b63
accountant UI
redmanuel1 Oct 10, 2024
255dc02
Merge branch 'master' into accountant
redmanuel1 Oct 10, 2024
49c7ebc
accountant module
redmanuel1 Oct 11, 2024
0305f78
Merge pull request #11 from redmanuel1/accountant
kyraantonio Oct 11, 2024
c695858
fix ui - added saving of data for accountant
redmanuel1 Oct 11, 2024
da09ee7
accountant-confirmation
redmanuel1 Oct 14, 2024
9adfa99
add custodian pick up
redmanuel1 Oct 14, 2024
40e848d
fix display of images
redmanuel1 Oct 14, 2024
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
15 changes: 15 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "chrome",
"request": "launch",
"name": "Launch Chrome against localhost",
"url": "http://localhost:4200",
"webRoot": "${workspaceFolder}"
}
]
}
40 changes: 19 additions & 21 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@
"prefix": "app",
"schematics": {
"@schematics/angular:component": {
"styleext": "scss"
"style": "scss"
}
},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"sourceMap": true,
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
Expand All @@ -31,7 +32,12 @@
],
"styles": [
"src/styles.scss",
"src/assets/scss/argon.scss"
"src/assets/scss/argon.scss",
"src/assets/vendor/nucleo/css/nucleo.css",
"src/assets/vendor/@fortawesome/fontawesome-free/css/all.min.css",
"node_modules/ngx-toastr/toastr.css",
"node_modules/ngx-spinner/animations/ball-scale-multiple.css"

],
"scripts": [
"node_modules/chart.js/dist/Chart.min.js",
Expand All @@ -40,7 +46,8 @@
},
"configurations": {
"production": {
"optimization": {
"optimization":
{
"scripts": true,
"styles": {
"minify": false,
Expand All @@ -49,7 +56,7 @@
"fonts": true
},
"outputHashing": "all",
"sourceMap": false,
"sourceMap": true,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
Expand All @@ -62,42 +69,34 @@
]
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true,
"buildOptimizer": false,
"optimization": {
"scripts": true,
"styles": {
"minify": false,
"inlineCritical": true
},
"fonts": true
},
"outputHashing": "all"
"namedChunks": true
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "argon-dashboard-angular:build"
"buildTarget": "argon-dashboard-angular:build"
},
"configurations": {
"production": {
"browserTarget": "argon-dashboard-angular:build:production"
"buildTarget": "argon-dashboard-angular:build:production"
},
"development": {
"browserTarget": "argon-dashboard-angular:build:development"
"buildTarget": "argon-dashboard-angular:build:development"
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "argon-dashboard-angular:build"
"buildTarget": "argon-dashboard-angular:build"
}
},
"test": {
Expand Down Expand Up @@ -159,10 +158,9 @@
}
}
},
"defaultProject": "argon-dashboard-angular",
"schematics": {
"@schematics/angular:component": {
"styleext": "scss"
"style": "scss"
}
},
"cli": {
Expand Down
8 changes: 7 additions & 1 deletion docs/argon.css
Original file line number Diff line number Diff line change
Expand Up @@ -3575,7 +3575,8 @@ fieldset:disabled a.btn
background-color: transparent;
background-image: none;
}
.btn-outline-info:hover
.btn-outline-info:hover,
.btn-outline-info.active
{
color: #fff;
border-color: #11cdef;
Expand Down Expand Up @@ -6254,6 +6255,11 @@ input[type='button'].btn-block
background-color: #0da5c0;
}

/* .badge-info.active {
color: #fff !important;
background-color: #0da5c0 !important;
} */

.badge-warning
{
color: #ff3709;
Expand Down
67 changes: 38 additions & 29 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,47 +5,57 @@
"ng": "ng",
"start": "ng serve",
"build": "cross-env CI=false ng build",
"build:prod": "ng build --prod",
"build:dev": "ng build --configuration development",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e",
"install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm start"
"install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install --force && npm start"
},
"private": true,
"dependencies": {
"@angular/animations": "^14.2.0",
"@angular/cdk": "^14.2.0",
"@angular/common": "^14.2.0",
"@angular/compiler": "^14.2.0",
"@angular/core": "^14.2.0",
"@angular/elements": "^14.2.0",
"@angular/forms": "^14.2.0",
"@angular/google-maps": "^14.2.0",
"@angular/localize": "^14.2.0",
"@angular/material": "^14.2.0",
"@angular/platform-browser": "^14.2.0",
"@angular/platform-browser-dynamic": "^14.2.0",
"@angular/router": "^14.2.0",
"@ng-bootstrap/ng-bootstrap": "12.0.1",
"@angular/animations": "^18.2.2",
"@angular/cdk": "^18.2.2",
"@angular/common": "^18.2.2",
"@angular/compiler": "^18.2.2",
"@angular/core": "^18.2.2",
"@angular/elements": "^18.2.2",
"@angular/fire": "^18.0.1",
"@angular/forms": "^18.2.2",
"@angular/google-maps": "^18.2.2",
"@angular/localize": "^18.2.2",
"@angular/material": "^18.2.2",
"@angular/platform-browser": "^18.2.2",
"@angular/platform-browser-dynamic": "^18.2.2",
"@angular/router": "^18.2.2",
"@ng-bootstrap/ng-bootstrap": "^17.0.1",
"@popperjs/core": "^2.11.4",
"bootstrap": "4.6.1",
"bootstrap": "^4.6.2",
"chart.js": "2.9.4",
"clipboard": "2.0.10",
"firebase": "^10.13.1",
"lodash": "^4.17.21",
"ngx-clipboard": "15.0.1",
"ngx-toastr": "14.2.2",
"ngx-spinner": "^17.0.0",
"ngx-toastr": "^19.0.0",
"nouislider": "15.5.1",
"rxjs": "~7.5.0",
"zone.js": "~0.11.4",
"web-animations-js": "2.3.2"
"rxjs": "~7.8.0",
"sass": "^1.77.8",
"sass-loader": "^16.0.1",
"web-animations-js": "2.3.2",
"zone.js": "~0.14.10"
},
"devDependencies": {
"@angular-devkit/build-angular": "^14.2.7",
"@angular/cli": "~14.2.7",
"@angular/compiler-cli": "^14.2.0",
"@angular/language-service": "14.2.0",
"@angular-devkit/build-angular": "^18.2.2",
"@angular/cli": "~18.2.2",
"@angular/compiler-cli": "^18.2.2",
"@angular/language-service": "18.2.2",
"@types/jasmine": "~4.0.0",
"@types/jasminewd2": "~2.0.10",
"@types/node": "^17.0.21",
"codelyzer": "6.0.2",
"@types/lodash": "^4.17.10",
"@types/node": "^22.5.2",
"codelyzer": "^6.0.2",
"cross-env": "^7.0.3",
"jasmine-core": "~4.4.0",
"jasmine-spec-reporter": "~7.0.0",
"karma": "~6.4.0",
Expand All @@ -54,9 +64,8 @@
"karma-coverage-istanbul-reporter": "~3.0.3",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.0.0",
"protractor": "7.0.0",
"protractor": "^7.0.0",
"ts-node": "~10.9.1",
"typescript": "~4.7.2",
"cross-env": "^7.0.3"
"typescript": "^5.5.4"
}
}
2 changes: 1 addition & 1 deletion src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ import { Component } from '@angular/core';
styleUrls: ['./app.component.scss']
})
export class AppComponent {
title = 'argon-dashboard-angular';
title = 'Blu Inventory';
}
47 changes: 32 additions & 15 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { HttpClientModule } from '@angular/common/http';
import { RouterModule } from '@angular/router';
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from "@angular/core";
import { FormsModule } from "@angular/forms";
import { HttpClientModule } from "@angular/common/http";
import { RouterModule } from "@angular/router";

import { AppComponent } from './app.component';
import { AdminLayoutComponent } from './layouts/admin-layout/admin-layout.component';
import { AuthLayoutComponent } from './layouts/auth-layout/auth-layout.component';
import { AppComponent } from "./app.component";
import { AdminLayoutComponent } from "./layouts/admin-layout/admin-layout.component";
import { AuthLayoutComponent } from "./layouts/auth-layout/auth-layout.component";

import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { NgbModule } from "@ng-bootstrap/ng-bootstrap";

import { AppRoutingModule } from './app.routing';
import { ComponentsModule } from './components/components.module';
import { AppRoutingModule } from "./app.routing";
import { ComponentsModule } from "./components/components.module";
import { environment } from "../environments/environment";
import { AngularFireModule } from "@angular/fire/compat";
import { AngularFireAuthModule } from "@angular/fire/compat/auth";
import { AngularFirestoreModule } from "@angular/fire/compat/firestore";
import { ToastrModule } from "ngx-toastr";
import { StudentLayoutComponent } from "./layouts/student-layout/student-layout.component";
import { CustodianLayoutComponent } from "./layouts/custodian-layout/custodian-layout.component";
import { NgxSpinnerModule } from "ngx-spinner";import { AccountantLayoutComponent } from './layouts/accountant-layout/accountant-layout.component';


@NgModule({
Expand All @@ -22,14 +30,23 @@ import { ComponentsModule } from './components/components.module';
ComponentsModule,
NgbModule,
RouterModule,
AppRoutingModule
AppRoutingModule,
AngularFireModule.initializeApp(environment.firebaseConfig),
AngularFireAuthModule,
AngularFirestoreModule,
ToastrModule.forRoot(),
NgxSpinnerModule.forRoot(),
],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
declarations: [
AppComponent,
AdminLayoutComponent,
AuthLayoutComponent
AuthLayoutComponent,
StudentLayoutComponent,
CustodianLayoutComponent,
AccountantLayoutComponent,
],
providers: [],
bootstrap: [AppComponent]
bootstrap: [AppComponent],
})
export class AppModule { }
export class AppModule {}
Loading