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

Feature/admin new #34

Closed
wants to merge 109 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
c905b00
added customer sign up
Sheane-mario Aug 22, 2024
7cf5cd5
Merge pull request #1 from fixmetech/feature/customer-sign-up
Sheane-mario Aug 22, 2024
6ebc2e5
added home page layout
Sheane-mario Aug 22, 2024
1313680
added technician sign up page
kasunmendis7 Aug 22, 2024
bbbf93a
Merge pull request #2 from kasunmendis7/feature/technician-sign-up
Sheane-mario Aug 22, 2024
02b33b8
added the technician landing page
kasunmendis7 Sep 14, 2024
fa4de7c
created the add post design
kasunmendis7 Sep 15, 2024
90f15cb
added the technician home page sidebar
kasunmendis7 Sep 15, 2024
2980e49
Merge pull request #3 from kasunmendis7/feature/technician-landing-page
Sheane-mario Sep 15, 2024
c18623b
configured the technician landing page to a button
kasunmendis7 Sep 15, 2024
832cfbe
minor change to navigate
kasunmendis7 Sep 15, 2024
369b106
Merge pull request #4 from kasunmendis7/develop
kasunmendis7 Sep 15, 2024
f6767ab
added components
kasunmendis7 Sep 16, 2024
a27ccaf
service centre landing page
Abhishke391 Sep 16, 2024
b4a5022
Merge pull request #5 from Abhishke391/feature/service-centre
kasunmendis7 Sep 16, 2024
dd30046
dashboard of service centre
Abhishke391 Sep 18, 2024
888efcc
service centre login page and signup pages
Abhishke391 Sep 18, 2024
bb269aa
models, forms, validations
kasunmendis7 Oct 13, 2024
af63dd2
works on service centre.
Abhishke391 Oct 13, 2024
57ee936
Merge pull request #6 from Abhishke391/feature/service-centre
kasunmendis7 Oct 14, 2024
a4851df
database connection was unsuccessful
kasunmendis7 Oct 14, 2024
8252643
changed few mistakes
kasunmendis7 Oct 14, 2024
91ade94
added the technician dashboard
kasunmendis7 Oct 14, 2024
5113dfa
Merge pull request #7 from kasunmendis7/feature/technician-dashboard
kasunmendis7 Oct 14, 2024
ca90bc7
Merge branch 'develop' of https://github.com/Abhishke391/fixme-techno…
Abhishke391 Oct 14, 2024
41eea65
partially finished the dashboard
kasunmendis7 Oct 14, 2024
6db83d3
Merge pull request #9 from kasunmendis7/feature/technician-dashboard
kasunmendis7 Oct 14, 2024
1cb6604
added the technician dashboard
kasunmendis7 Oct 17, 2024
d514855
Merge remote-tracking branch 'origin/develop' into feature/service-ce…
Abhishke391 Oct 24, 2024
cb8b356
service-centre-dashboard
Abhishke391 Oct 24, 2024
888604d
added authController
Sheane-mario Nov 2, 2024
d33d77a
completed the user interfaces of the dashboard
kasunmendis7 Nov 3, 2024
80a1a66
Merge branch 'develop' into feature/technician-dashboard
kasunmendis7 Nov 3, 2024
b84733c
Merge pull request #11 from kasunmendis7/feature/technician-dashboard
kasunmendis7 Nov 3, 2024
d731a49
login register validation procedure start
Sheane-mario Nov 3, 2024
7a54c8d
started to do technicians signup to the database
kasunmendis7 Nov 3, 2024
ba942a4
Save changes before switching branches
kasunmendis7 Nov 3, 2024
1b29e6b
added new fields to the technician sign up form
kasunmendis7 Nov 3, 2024
26d3c03
Merge pull request #12 from kasunmendis7/develop
kasunmendis7 Nov 3, 2024
e850144
Merge remote-tracking branch 'origin/develop' into feature/service-ce…
Abhishke391 Nov 3, 2024
81c9030
added customer register model and the database connection
Sheane-mario Nov 3, 2024
f76cdca
Merge branch 'feature/auth-models' into develop
Sheane-mario Nov 3, 2024
8cc76d3
Merge branch 'develop' of https://github.com/Abhishke391/fixme-techno…
Abhishke391 Nov 3, 2024
2e7a25f
implement technician and service center register models
Sheane-mario Nov 3, 2024
752c2d2
finished register models
Sheane-mario Nov 3, 2024
28c659f
committing to change the branch
kasunmendis7 Nov 4, 2024
7fad078
database connection
kasunmendis7 Nov 4, 2024
7c1536e
merged the develop branch
kasunmendis7 Nov 4, 2024
1034f82
technician registration completed
kasunmendis7 Nov 4, 2024
08ed162
resolved some conflicts
kasunmendis7 Nov 4, 2024
faadc69
Merge pull request #14 from kasunmendis7/feature/database-connection
kasunmendis7 Nov 4, 2024
3515c3e
form submission error need to be resolved
kasunmendis7 Nov 4, 2024
8d45fd1
Merge branch 'develop' of https://github.com/Abhishke391/fixme-techno…
Abhishke391 Nov 4, 2024
b46c5ee
Merge branch 'develop' of https://github.com/kasunmendis7/fixme-techn…
kasunmendis7 Nov 5, 2024
2c1c3b6
deleted some additional files that was unnecessary
kasunmendis7 Nov 5, 2024
48ff3ad
Merge pull request #15 from kasunmendis7/develop
kasunmendis7 Nov 5, 2024
7df6488
minor changes in the technician sign up page
kasunmendis7 Nov 5, 2024
c388393
committing to resolve merge conflicts
kasunmendis7 Nov 5, 2024
a8a5cf3
started implementing technician login
kasunmendis7 Nov 5, 2024
06c0e80
implemented technician login
kasunmendis7 Nov 6, 2024
be2d2ad
Added a section to the home page
kasunmendis7 Nov 6, 2024
9fcc6ea
added navigation for customers in the home page
Sheane-mario Nov 6, 2024
6b865da
resolved a conflict
Sheane-mario Nov 6, 2024
978b989
Merge branch 'develop' of https://github.com/Abhishke391/fixme-techno…
Abhishke391 Nov 6, 2024
9e042ab
resolved a error with the model
kasunmendis7 Nov 6, 2024
15ed7e1
resolved a conflict
kasunmendis7 Nov 6, 2024
6fe422b
Merge pull request #17 from kasunmendis7/feature/database-connection
kasunmendis7 Nov 6, 2024
543a3d7
done some refactoring
Sheane-mario Nov 6, 2024
9f258ed
resolved conflict
Sheane-mario Nov 6, 2024
4ef2d99
Merge branch 'develop' of https://github.com/Abhishke391/fixme-techno…
Abhishke391 Nov 6, 2024
f38e92d
commit
Sheane-mario Nov 6, 2024
a306dee
completing service-centre sign up
Abhishke391 Nov 6, 2024
b51cdf2
implement customer registration process
Sheane-mario Nov 6, 2024
e7cbb96
added addErrorMessage() in model to simply display error messages
Sheane-mario Nov 7, 2024
a45ad63
Merge branch 'develop' into feature/service-centre
kasunmendis7 Nov 7, 2024
9263d33
Merge pull request #10 from Abhishke391/feature/service-centre
kasunmendis7 Nov 7, 2024
3e46762
implemented customer login
Sheane-mario Nov 7, 2024
ff527a5
Merge branch 'fixmetech:develop' into develop
kasunmendis7 Nov 7, 2024
5d97556
Merge pull request #18 from kasunmendis7/develop
kasunmendis7 Nov 7, 2024
1443525
Merge branch 'feature/customer-login' into develop
Sheane-mario Nov 8, 2024
0ea3cf9
implemented customer dashboard with logout feature
Sheane-mario Nov 8, 2024
e1a915f
added overlay to customer-dashboard.php
Sheane-mario Nov 8, 2024
3374b6f
resolve an error
kasunmendis7 Nov 8, 2024
17c7ade
resolved a merge conflict
kasunmendis7 Nov 8, 2024
fa8d4b6
implemented login logic
kasunmendis7 Nov 8, 2024
3b17b25
implemented technician login
kasunmendis7 Nov 8, 2024
fdd9f00
implemented technician login
kasunmendis7 Nov 8, 2024
4fd8b26
changed a name of a function
kasunmendis7 Nov 8, 2024
69f8dd0
Merge branch 'develop' into feature/technician-login
kasunmendis7 Nov 8, 2024
0f2b7b1
Merge pull request #20 from kasunmendis7/feature/technician-login
kasunmendis7 Nov 8, 2024
aa7cfd2
added a select user pages
kasunmendis7 Nov 8, 2024
ba35305
added some UI features to customer dashboard
Sheane-mario Nov 8, 2024
1b37934
#completing login/logout in service-center and css/service-center home
Abhishke391 Nov 8, 2024
7693cea
Merge branch 'develop' of https://github.com/Abhishke391/fixme-techno…
Abhishke391 Nov 8, 2024
3e2b281
implement customer profile info to change dynamically
Sheane-mario Nov 8, 2024
537ca11
Merge branch 'feature/customer-settings' into develop
Sheane-mario Nov 8, 2024
e1b4fbb
resolved non static function error
Sheane-mario Nov 8, 2024
22602a0
Merge branch 'develop' into feature/service-centre
kasunmendis7 Nov 9, 2024
675cbcd
Merge pull request #21 from Abhishke391/feature/service-centre
kasunmendis7 Nov 9, 2024
99be6c7
Merge branch 'fixmetech:develop' into develop
kasunmendis7 Nov 9, 2024
39594cd
added select user pages
kasunmendis7 Nov 9, 2024
b98f1c2
resolved several conflicts
kasunmendis7 Nov 9, 2024
c5fff65
added few sections to the home page
kasunmendis7 Nov 9, 2024
9d091ae
Merge pull request #22 from kasunmendis7/develop
kasunmendis7 Nov 9, 2024
6fd7516
added search functionality for technicians inside the customer dashbo…
Sheane-mario Nov 10, 2024
b5c4e14
added functionality to update customer profile info by visiting profi…
Sheane-mario Nov 10, 2024
bd2ceca
added technician profile update functionality
kasunmendis7 Nov 11, 2024
7208a39
Merge pull request #23 from kasunmendis7/develop
kasunmendis7 Nov 11, 2024
3f393cd
creating admin ui
rathinimal Nov 21, 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
3 changes: 3 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
DB_DSN = "mysql:host=localhost;dbname=fixmedb"
DB_USER = root
DB_PASSWORD = Nimal@123
3 changes: 3 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
DB_DSN = mysql:host=localhost;port=3306;dbname=php-mvc-framework
DB_USER = root
DB_PASSWORD = root
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
vendor
.idea
.idea
.env
composer.lock
4 changes: 3 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,7 @@
"email": "[email protected]"
}
],
"require": {}
"require": {
"vlucas/phpdotenv": "^5.6"
}
}
Loading