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.

Sign up for GitHub

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

Jump to bottom

Development #11

Open
wants to merge 58 commits into
base: mitesh21july
Choose a base branch
from
Open

Development #11

wants to merge 58 commits into from

Conversation

PriyansuMaurya
Copy link
Collaborator

No description provided.

Mitesh315 and others added 30 commits July 21, 2022 12:51
@Mitesh315
Merge pull request #3 from ShubhamKhale/mitesh21july
5bf342f 
git installed
@the-shivam-gupta
Shivam first commit
10cec26 
Did commit from mobile browser using desktop
@the-shivam-gupta
checking
0eacc31 
checking
@the-shivam-gupta
Here is my first visit
d75bac6 
My self shivam gupta
@PriyansuMaurya
created node modules
d420ab6 
----
@the-shivam-gupta
Changed Tab1.tsx and Tab1.css
9516f02 
Merged Mitesh and shivam files
@the-shivam-gupta
Created a new branch
97afdf2 
Made labour changes for readme.md to check a new branch
@the-shivam-gupta
Merge pull request #4 from ShubhamKhale/shivam2002
a6a41db 
Created a new branch
@ShubhamKhale
created labourDashboard.tsx and labourDashboard.css
28009d5 
just created dashboard of labour
@the-shivam-gupta
Image1, 2, 3
c230293 
Image files imported
@the-shivam-gupta
Merge pull request #6 from ShubhamKhale/shivam2002
8c17818 
Image1, 2, 3
@ShubhamKhale
Merge branch 'main' into shubham20
2a50b8a
@ShubhamKhale
Merge pull request #5 from ShubhamKhale/shubham20
3044e70 
created labourDashboard.tsx and labourDashboard.css
@ShubhamKhale
sorted labourServices.tsx and selectedServices.tsx
6e8f1ff 
finally made changes in tsx and css file for better UI
@ShubhamKhale
Merge pull request #7 from ShubhamKhale/shubham9
9b290e1 
sorted labourServices.tsx and selectedServices.tsx
@the-shivam-gupta
changed .css to .module.css | added routing | created starting pages
49554a7
@PriyansuMaurya
added SettingBtn.tsx and SettingBtn.module.css
22b0b0b
@PriyansuMaurya
added all the useful components in the components folder
72ee442
@PriyansuMaurya
added setting_pages folder in pages folder
55be232
@PriyansuMaurya
finnally fixed all the bugs in setting and added routing in App.tsx file
30a08fc
@ShubhamKhale
created otp.tsx and changed .css file extension to .module.css
74da295 
added otp-react-input a custom otp react js package and chaged some file extensions
@ShubhamKhale
resolved conflict
9bc7651
@PriyansuMaurya
Made components with existing code | Fixed some bugs | updated some c…
746f459 
…ode syntax
@PriyansuMaurya
fixed bugs of camel case for labourDashboard.tsx and selectServices.tsx
b1a2535
@PriyansuMaurya
updated import name of SelectServices.tsx and LaborDashboard.tsx in A…
ca9fdf8 
…pp.tsx
@PriyansuMaurya
Added Report a Error Section in about page
85805f8
@PriyansuMaurya
Added autoplay in banner
e549357
@PriyansuMaurya
Commented out search bar and Removed IonAlert mode attribute containi…
7c9b155 
…ng ios
@PriyansuMaurya
Merge branch 'mitesh21july' of https://github.com/ShubhamKhale/labour…
1c3bb52 
…Services into development
@PriyansuMaurya
CustomerAllocateLabour.css to CustomerAllocateLabour.module.css
86dbb8d
PriyansuMaurya and others added 28 commits August 31, 2022 06:38
@PriyansuMaurya
deleted profilePhoto.tsx
34eaa5b
@PriyansuMaurya
Added ProfilePhoto.tsx
47b97ef
@PriyansuMaurya
Integrated CustomerAllocateLabour.tsx with project and fixed little b…
cda1c85 
…ug in its associated file ChangeText.tsx
@PriyansuMaurya
Merge branch 'development' of https://github.com/ShubhamKhale/labourS…
f089357 
…ervices into priyanshu/dev
@PriyansuMaurya
Added lazy loader for Banner.tsx and About.tsx images
ab0ab8b
@ShubhamKhale
added serviceCount cand ServiceContent component
c8b6c80
@ShubhamKhale
Merge branch 'development' of https://github.com/ShubhamKhale/labourS…
8346b2a 
…ervices into shubham9
@PriyansuMaurya
added backdropBreakpoint in customer-allocation-labour page
5468e93
@PriyansuMaurya
labor allocation modal not getting close after going back bug fixed |…
5fd1fe0 
… onClick on title of the home page we can go to labour-dashboard page
@PriyansuMaurya
Added usePhotoGallery.tsx hook
daa2b76
@PriyansuMaurya
Merge pull request #12 from ShubhamKhale/priyanshu/dev
0960db8 
Priyanshu/dev
@PriyansuMaurya
Fixed Shubham otp bugs
da4a2be
@PriyansuMaurya
Merge pull request #13 from ShubhamKhale/shubham9
f7e45fa 
Shubham9
@PriyansuMaurya
commented useGallery hook dependency
642d445
@ShubhamKhale
deleted serviceContent.tsx and added required css properties in Servi…
e7011d2 
…ceCount component
@the-shivam-gupta
changed the laguage and theme from action sheet to modal
bc1327a
@Mitesh315
Added features 1. clicking on schedule button close modal and opens n…
7bfb665 
…ew modal. 2. On new modal customer can add description and schedule after schedule toast will come
@the-shivam-gupta
changed the language from english to hindi, marathi
2770d1f
@the-shivam-gupta
updated the onClick radio button functionality
f1b7d48
@PriyansuMaurya
Merged shivam/dev in development
634335e
@PriyansuMaurya
Merge branch 'mitesh/dev' of https://github.com/ShubhamKhale/labourSe…
765385d 
…rvices into development
@the-shivam-gupta
radio button remains checked when selected for both language as well …
bd0c093 
…as theme
@the-shivam-gupta
Added language change in about page
2be030c
@the-shivam-gupta
fixed changedText file
45c59e5
@the-shivam-gupta
Finally done with the language change in all pages
8481eb9
@the-shivam-gupta
Fixed the css property for starting page
d5167e7
@PriyansuMaurya
Merge pull request #15 from ShubhamKhale/shivam/dev-language
682ad35 
Shivam/dev language
@the-shivam-gupta
starting pages are interconnected with each other
e9adc00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@PriyansuMaurya @Mitesh315 @the-shivam-gupta @ShubhamKhale