Skip to content

Sabrinadev #109

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

Open
wants to merge 172 commits into
base: testing
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
172 commits
Select commit Hold shift + click to select a range
61402c6
added nothing
AktherHosen May 21, 2024
385674c
Merge branch 'testing' of https://github.com/TechBuilderTeam/Project-…
AktherHosen May 21, 2024
e1475d6
workspace ui changed
AktherHosen May 31, 2024
983ae9b
updated plan component
rasel-chowdhury1 May 31, 2024
796e149
update
AktherHosen May 31, 2024
f69729d
Merge pull request #68 from TechBuilderTeam/Akther
AktherHosen May 31, 2024
353a732
Feature page last section added
AktherHosen Jun 1, 2024
ec836a8
Merge pull request #70 from TechBuilderTeam/Akther
AktherHosen Jun 1, 2024
ea65138
Merge branch 'Development' of https://github.com/TechBuilderTeam/Proj…
sabrinara Jun 1, 2024
75e9256
editworkspace some changes
sabrinara Jun 1, 2024
cd22e50
Merge pull request #71 from TechBuilderTeam/Sabrinadev
sabrinara Jun 1, 2024
e3e87ad
pdf export feature done
sabrinara Jun 1, 2024
bf4b215
board redesign done
sabrinara Jun 1, 2024
580c167
board task add option done and task edit delete done
sabrinara Jun 2, 2024
8c4f305
board delete done
sabrinara Jun 2, 2024
7581671
chat ui done
sabrinara Jun 2, 2024
6a71a7d
chat ui done
sabrinara Jun 2, 2024
d2c0dcc
Merge pull request #73 from TechBuilderTeam/Sabrinadev
sabrinara Jun 2, 2024
6922064
Merge pull request #74 from TechBuilderTeam/Development
sabrinara Jun 2, 2024
91fea56
Merge branch 'test1' into Development
sabrinara Jun 2, 2024
6a97c60
Merge pull request #75 from TechBuilderTeam/Development
sabrinara Jun 2, 2024
1694e8d
working member form
rasel-chowdhury1 Jun 2, 2024
7c0c598
conflict solved
rasel-chowdhury1 Jun 2, 2024
dc80486
contact section added to the system with email js functionality.
AktherHosen Jun 2, 2024
5d7c84e
update route issues
AktherHosen Jun 2, 2024
984a099
update route issue
AktherHosen Jun 2, 2024
5b6aab7
Merge pull request #76 from TechBuilderTeam/Akther
AktherHosen Jun 2, 2024
e8c2b4b
Home email section updated
AktherHosen Jun 2, 2024
d224c63
update
AktherHosen Jun 2, 2024
321f16a
Merge pull request #77 from TechBuilderTeam/Akther
AktherHosen Jun 2, 2024
845a2c9
registration is taking user image and convert it into url
sabrinara Jun 2, 2024
3e016d2
Merge branch 'Development' of https://github.com/TechBuilderTeam/Proj…
sabrinara Jun 2, 2024
6c7bb9d
profile route added
sabrinara Jun 2, 2024
127f038
Merge pull request #78 from TechBuilderTeam/Sabrinadev
sabrinara Jun 2, 2024
cc45535
Dynamic tab details page added
AktherHosen Jun 2, 2024
7591502
Merge pull request #79 from TechBuilderTeam/Akther
AktherHosen Jun 2, 2024
ce84c24
Tab section completeed
AktherHosen Jun 3, 2024
2348c38
update footer, sponsor, slider cards text and title font-size
AktherHosen Jun 3, 2024
7e1b5a3
Merge pull request #81 from TechBuilderTeam/Akther
AktherHosen Jun 3, 2024
79f9be6
create task functionlity and delete board done
rasel-chowdhury1 Jun 3, 2024
c8f344d
drag and drop of the task feature done
sabrinara Jun 3, 2024
5b25dab
working chat in dashboard
rasel-chowdhury1 Jun 3, 2024
442227b
All task Drag and drop funtionality done
sabrinara Jun 3, 2024
27280ba
All task Drag and drop design done
sabrinara Jun 3, 2024
c2ec0ac
Merge pull request #82 from TechBuilderTeam/Sabrinadev
sabrinara Jun 3, 2024
0eb731b
working on chat api code up to date
rasel-chowdhury1 Jun 4, 2024
66d0d12
conflict has been solved
sabrinara Jun 4, 2024
0b9928f
conflict has been solved
sabrinara Jun 4, 2024
4224ac4
some property removed from login
sabrinara Jun 4, 2024
5c5f840
color changed of the project
sabrinara Jun 4, 2024
5ee5883
navbar and banner changes
sabrinara Jun 4, 2024
1abb499
home page design changes
sabrinara Jun 4, 2024
b3a3fa6
Customer section design has been improved
sabrinara Jun 4, 2024
b83eac7
working on chat
rasel-chowdhury1 Jun 4, 2024
89216c9
profile page banner and info section done
sabrinara Jun 4, 2024
315eb54
Merge branch 'test1' of https://github.com/TechBuilderTeam/Project-Sy…
sabrinara Jun 4, 2024
5d72c88
Merge pull request #83 from TechBuilderTeam/Sabrinadev
sabrinara Jun 4, 2024
4081c9e
Merge pull request #84 from TechBuilderTeam/Development
sabrinara Jun 4, 2024
adf0e12
dummy text removed
AktherHosen Jun 4, 2024
0cd5e68
Merge pull request #86 from TechBuilderTeam/Akther
AktherHosen Jun 4, 2024
54f403d
navbar responsive done
sabrinara Jun 4, 2024
fdf50ab
Merge pull request #87 from TechBuilderTeam/Sabrinadev
sabrinara Jun 4, 2024
ae0c778
Merge pull request #88 from TechBuilderTeam/Development
sabrinara Jun 4, 2024
fdcf04f
counter added to customer section
AktherHosen Jun 4, 2024
7c99c87
Merge pull request #89 from TechBuilderTeam/Akther
AktherHosen Jun 4, 2024
3bcd212
Merge branch 'main' of https://github.com/TechBuilderTeam/Project-Syn…
AktherHosen Jun 4, 2024
7ce1770
Merge branch 'Development' of https://github.com/TechBuilderTeam/Proj…
AktherHosen Jun 4, 2024
cdabff2
one to one chat from profile done
sabrinara Jun 4, 2024
88fd0fb
Merge branch 'Development' into Sabrinadev
sabrinara Jun 4, 2024
24de621
Merge pull request #90 from TechBuilderTeam/Sabrinadev
sabrinara Jun 4, 2024
ce47762
profile nav items done with add modal
sabrinara Jun 4, 2024
0d594f1
Merge branch 'Sabrinadev' of https://github.com/TechBuilderTeam/Proje…
sabrinara Jun 4, 2024
6564ac4
Merge branch 'test1' of https://github.com/TechBuilderTeam/Project-Sy…
sabrinara Jun 4, 2024
8163389
Merge branch 'Development' into test1
sabrinara Jun 4, 2024
c8e3a1e
Merge pull request #91 from TechBuilderTeam/test1
sabrinara Jun 4, 2024
9f84ef4
porfile page with protfolio, about and edit design done
sabrinara Jun 4, 2024
df9c94f
porfile page with skill design done
sabrinara Jun 4, 2024
c527508
porfile page design done
sabrinara Jun 4, 2024
3596043
Merge pull request #92 from TechBuilderTeam/Sabrinadev
sabrinara Jun 4, 2024
91baabf
private routing done
sabrinara Jun 4, 2024
7c4af1c
Merge pull request #93 from TechBuilderTeam/Development
sabrinara Jun 4, 2024
fc06143
Merge pull request #94 from TechBuilderTeam/Sabrinadev
sabrinara Jun 4, 2024
cd82aca
calendar added
AktherHosen Jun 5, 2024
240b810
worksapace create modal fixing
sabrinara Jun 5, 2024
f8fd3bf
profile fixed
sabrinara Jun 5, 2024
7262192
Merge pull request #95 from TechBuilderTeam/Sabrinadev
sabrinara Jun 5, 2024
942c93c
Merge pull request #96 from TechBuilderTeam/Development
sabrinara Jun 5, 2024
5311487
Merge branch 'Development' into Akther
sabrinara Jun 5, 2024
2bb60dd
Merge pull request #97 from TechBuilderTeam/Akther
sabrinara Jun 5, 2024
b1b8bfd
calender ui improved
sabrinara Jun 5, 2024
5a541de
dynamic navbar changes done
sabrinara Jun 5, 2024
9bec1fc
navbar toggle issues fixed
sabrinara Jun 5, 2024
6b8d279
board, member and dynamic profile create component and functionlity done
rasel-chowdhury1 Jun 5, 2024
c8f3264
Merge branch 'test1' of https://github.com/TechBuilderTeam/Project-Sy…
rasel-chowdhury1 Jun 5, 2024
75497e4
Merge pull request #98 from TechBuilderTeam/Sabrinadev
sabrinara Jun 5, 2024
e191084
Merge pull request #99 from TechBuilderTeam/Development
sabrinara Jun 5, 2024
87b421c
profile page again improvement
sabrinara Jun 5, 2024
06159f1
Merge pull request #100 from TechBuilderTeam/Sabrinadev
sabrinara Jun 5, 2024
d79a97a
Merge pull request #101 from TechBuilderTeam/test1
sabrinara Jun 5, 2024
2686852
Merge branch 'test1' of https://github.com/TechBuilderTeam/Project-Sy…
rasel-chowdhury1 Jun 5, 2024
a0b864f
board, member and create dynamic profile/chat functionlity done
rasel-chowdhury1 Jun 5, 2024
5fb9634
Merge pull request #102 from TechBuilderTeam/test1
rasel-chowdhury1 Jun 5, 2024
371d868
login hard reload bug done
rasel-chowdhury1 Jun 5, 2024
81312fc
Merge pull request #103 from TechBuilderTeam/test1
rasel-chowdhury1 Jun 5, 2024
e5cf24b
plans redesign
sabrinara Jun 5, 2024
1a84f06
Merge branch 'Development' into Sabrinadev
sabrinara Jun 5, 2024
3d9bdbf
Merge pull request #104 from TechBuilderTeam/Sabrinadev
sabrinara Jun 5, 2024
93d52d3
final dashboard design done
sabrinara Jun 5, 2024
76b45db
Merge branch 'Sabrinadev' of https://github.com/TechBuilderTeam/Proje…
sabrinara Jun 5, 2024
995b79e
Merge branch 'Development' of https://github.com/TechBuilderTeam/Proj…
sabrinara Jun 5, 2024
cef5a25
Merge pull request #105 from TechBuilderTeam/Sabrinadev
sabrinara Jun 5, 2024
dd59d01
Merge pull request #106 from TechBuilderTeam/Development
sabrinara Jun 5, 2024
b1cefdc
ínsights component create and functionlity done
rasel-chowdhury1 Jun 6, 2024
4945cec
Merge branch 'test1' of https://github.com/TechBuilderTeam/Project-Sy…
rasel-chowdhury1 Jun 6, 2024
5e6f085
conflict solved in member component
rasel-chowdhury1 Jun 6, 2024
6c89933
Merge pull request #107 from TechBuilderTeam/test1
rasel-chowdhury1 Jun 6, 2024
c317805
Timeline features completed
AktherHosen Jun 6, 2024
06e35d9
profile bug fixed
AktherHosen Jun 6, 2024
d5a1765
Merge branch 'Development' into Akther
AktherHosen Jun 6, 2024
b680153
Merge pull request #108 from TechBuilderTeam/Akther
AktherHosen Jun 6, 2024
9cf5d9a
conflict solved
sabrinara Jun 6, 2024
b72d28a
conflict
sabrinara Jun 6, 2024
19d5b26
dynamic user timeline in calendar added
AktherHosen Jun 6, 2024
599b5d7
Merge branch 'Development' of https://github.com/TechBuilderTeam/Proj…
AktherHosen Jun 6, 2024
3361b2a
design issues on board
sabrinara Jun 6, 2024
06d71ec
dynamic api added in calendar component
AktherHosen Jun 6, 2024
d9b1dd8
calender api fixed and has some board issues
sabrinara Jun 6, 2024
ccaee22
Merge pull request #110 from TechBuilderTeam/Sabrinadev
sabrinara Jun 6, 2024
cc002e1
Merge pull request #111 from TechBuilderTeam/Sabrinadev
sabrinara Jun 6, 2024
c28a763
error
AktherHosen Jun 6, 2024
055ada4
nothing
AktherHosen Jun 6, 2024
8aa50ef
fixed responsive issues on features page
AktherHosen Jun 6, 2024
746b315
contact page dummy text removed
AktherHosen Jun 6, 2024
fa86b4a
Merge pull request #112 from TechBuilderTeam/Akther
AktherHosen Jun 6, 2024
4227d41
temrs & condition page added
AktherHosen Jun 6, 2024
0c8a32a
Merge pull request #113 from TechBuilderTeam/Akther
AktherHosen Jun 6, 2024
a43e9e8
privacy page added
AktherHosen Jun 6, 2024
1e2655a
Merge pull request #114 from TechBuilderTeam/Akther
AktherHosen Jun 6, 2024
7637a2f
update
AktherHosen Jun 6, 2024
b08e1c9
Merge pull request #115 from TechBuilderTeam/Akther
AktherHosen Jun 6, 2024
c02656b
Footer issues fixed
sabrinara Jun 6, 2024
46f7331
Merge pull request #116 from TechBuilderTeam/Sabrinadev
sabrinara Jun 6, 2024
e958605
changes made on home page
AktherHosen Jun 6, 2024
03b8e3b
Board issues fixed
sabrinara Jun 6, 2024
c6f0ebf
toast issues fixed
sabrinara Jun 6, 2024
ba11ce7
Merge pull request #118 from TechBuilderTeam/Akther
AktherHosen Jun 6, 2024
c10fa00
insights issues fixed
sabrinara Jun 6, 2024
0024846
feature section updated for responsive layout
AktherHosen Jun 6, 2024
135a4a8
some changes made on features page
AktherHosen Jun 6, 2024
ca2fd2d
Merge pull request #117 from TechBuilderTeam/Development
sabrinara Jun 6, 2024
f83c560
Merge pull request #119 from TechBuilderTeam/Akther
AktherHosen Jun 6, 2024
578fa3f
contact page redesign
sabrinara Jun 6, 2024
5727fc1
Merge branch 'Development' of https://github.com/TechBuilderTeam/Proj…
sabrinara Jun 6, 2024
b9b8c3b
again some issues fixed
sabrinara Jun 6, 2024
d5c3165
workspace delete issues fixed
sabrinara Jun 6, 2024
d8ee53e
Merge pull request #120 from TechBuilderTeam/Sabrinadev
sabrinara Jun 6, 2024
19424e8
Merge pull request #121 from TechBuilderTeam/Development
sabrinara Jun 6, 2024
dd08363
update
AktherHosen Jun 6, 2024
b8b3210
Featured page redesign
sabrinara Jun 6, 2024
60ee819
Merge pull request #122 from TechBuilderTeam/Sabrinadev
sabrinara Jun 6, 2024
d65f8d3
updated
rasel-chowdhury1 Jun 6, 2024
59758a8
conflict solved
rasel-chowdhury1 Jun 6, 2024
83e5c38
Profile all functionlity done
rasel-chowdhury1 Jun 6, 2024
03a432d
local change
sabrinara Jun 7, 2024
8cb6a78
New banner on desktop device added
AktherHosen Jun 7, 2024
f86e146
new banner added on desktop devices
AktherHosen Jun 7, 2024
dfe7e1f
some changes made
sabrinara Jun 7, 2024
5e0ed9d
Merge branch 'Development' into Akther
sabrinara Jun 7, 2024
d7c3755
Merge pull request #124 from TechBuilderTeam/Akther
sabrinara Jun 7, 2024
ac0a3a3
Merge pull request #125 from TechBuilderTeam/Sabrinadev
sabrinara Jun 7, 2024
f03f771
update
sabrinara Jun 7, 2024
ecfecee
one to one chat bug fixed
sabrinara Jun 7, 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
696 changes: 688 additions & 8 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"preview": "vite preview"
},
"dependencies": {
"@emailjs/browser": "^4.3.3",
"axios": "^1.6.8",
"dayjs": "^1.11.11",
"firebase": "^10.12.0",
Expand All @@ -19,12 +20,17 @@
"match-sorter": "^6.3.4",
"react": "^18.2.0",
"react-calendar": "^5.0.0",
"react-countup": "^6.5.3",
"react-dom": "^18.2.0",
"react-fast-marquee": "^1.6.4",
"react-icons": "^5.2.1",
"react-router-dom": "^6.23.0",
"react-scroll": "^1.9.0",
"react-scroll-trigger": "^0.6.14",
"react-slick": "^0.30.2",
"react-sweetalert2": "^0.6.0",
"react-toastify": "^10.0.5",
"recharts": "^2.12.7",
"sort-by": "^0.0.2"
},
"devDependencies": {
Expand Down
Binary file added public/banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/dnd.json

Large diffs are not rendered by default.

Binary file added public/document (1).pdf
Binary file not shown.
Binary file added public/document (2).pdf
Binary file not shown.
Binary file added public/document.pdf
Binary file not shown.
1 change: 1 addition & 0 deletions public/pdf.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions public/pdf2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"v":"5.6.6","ip":0,"op":160,"fr":60,"w":1857,"h":1319,"layers":[{"ind":2336,"nm":"surface12299","ao":0,"ip":0,"op":264,"st":0,"ty":4,"ks":{"ty":"tr","o":{"k":100},"r":{"k":0},"p":{"k":[0,0]},"a":{"k":[0,0]},"s":{"k":[133.37,133.31]},"sk":{"k":0},"sa":{"k":0}},"shapes":[{"ty":"gr","hd":false,"nm":"surface12299","it":[{"ty":"gr","hd":false,"it":[{"ty":"sh","ks":{"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[717.62,872.05],[917.56,872.05],[917.56,427.57],[1215.67,427.57],[1215.67,872.05],[1415.6,872.05],[1066.61,1266.56]],"c":true}}},{"ty":"st","lc":3,"lj":2,"ml":10,"o":{"k":100},"w":{"k":8},"c":{"k":[0.4,0,0,1]},"hd":false},{"ty":"gf","s":{"k":[717.62,427.57]},"e":{"k":[717.62,1266.56]},"t":1,"h":{"k":0},"a":{"k":0},"g":{"p":2,"k":{"k":[0,0.86,0,0,1,0.33,0.01,0.01,0,1,1,1]}},"hd":false,"o":{"a":1,"k":[{"i":{"x":[0.67],"y":[1]},"o":{"x":[0.33],"y":[0]},"t":59,"s":[0]},{"t":109,"s":[100]}],"ix":5}},{"ty":"tr","o":{"k":100},"r":{"k":0},"p":{"k":[0,0]},"a":{"k":[0,0]},"s":{"k":[75,75]},"sk":{"k":0},"sa":{"k":0},"hd":false}]},{"ty":"gr","hd":false,"it":[{"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[483.77,1080.19],[1106.76,1076.6]],"c":false}}},{"ty":"st","lc":3,"lj":2,"ml":10,"o":{"k":100},"w":{"k":4},"c":{"k":[0.4,0.4,0.4,1]},"hd":false},{"ty":"tr","o":{"k":100},"r":{"k":0},"p":{"k":[0,0]},"a":{"k":[0,0]},"s":{"k":[75,75]},"sk":{"k":0},"sa":{"k":0},"hd":false}]},{"ty":"gr","hd":false,"it":[{"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[483.77,979.31],[1106.76,975.72]],"c":false}}},{"ty":"st","lc":3,"lj":2,"ml":10,"o":{"k":100},"w":{"k":4},"c":{"k":[0.4,0.4,0.4,1]},"hd":false},{"ty":"tr","o":{"k":100},"r":{"k":0},"p":{"k":[0,0]},"a":{"k":[0,0]},"s":{"k":[75,75]},"sk":{"k":0},"sa":{"k":0},"hd":false}]},{"ty":"gr","hd":false,"it":[{"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[483.77,871.27],[1106.76,867.68]],"c":false}}},{"ty":"st","lc":3,"lj":2,"ml":10,"o":{"k":100},"w":{"k":4},"c":{"k":[0.4,0.4,0.4,1]},"hd":false},{"ty":"tr","o":{"k":100},"r":{"k":0},"p":{"k":[0,0]},"a":{"k":[0,0]},"s":{"k":[75,75]},"sk":{"k":0},"sa":{"k":0},"hd":false}]},{"ty":"gr","hd":false,"it":[{"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[483.77,662.34],[1106.76,658.76]],"c":false}}},{"ty":"st","lc":3,"lj":2,"ml":10,"o":{"k":100},"w":{"k":4},"c":{"k":[0.4,0.4,0.4,1]},"hd":false},{"ty":"tr","o":{"k":100},"r":{"k":0},"p":{"k":[0,0]},"a":{"k":[0,0]},"s":{"k":[75,75]},"sk":{"k":0},"sa":{"k":0},"hd":false}]},{"ty":"gr","hd":false,"it":[{"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[483.77,766.81],[1106.76,763.22]],"c":false}}},{"ty":"st","lc":3,"lj":2,"ml":10,"o":{"k":100},"w":{"k":4},"c":{"k":[0.4,0.4,0.4,1]},"hd":false},{"ty":"tr","o":{"k":100},"r":{"k":0},"p":{"k":[0,0]},"a":{"k":[0,0]},"s":{"k":[75,75]},"sk":{"k":0},"sa":{"k":0},"hd":false}]},{"ty":"gr","hd":false,"it":[{"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[483.77,557.88],[1106.76,554.29]],"c":false}}},{"ty":"st","lc":3,"lj":2,"ml":10,"o":{"k":100},"w":{"k":4},"c":{"k":[0.4,0.4,0.4,1]},"hd":false},{"ty":"tr","o":{"k":100},"r":{"k":0},"p":{"k":[0,0]},"a":{"k":[0,0]},"s":{"k":[75,75]},"sk":{"k":0},"sa":{"k":0},"hd":false}]},{"ty":"gr","hd":false,"it":[{"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[483.77,453.42],[1106.76,449.83]],"c":false}}},{"ty":"st","lc":3,"lj":2,"ml":10,"o":{"k":100},"w":{"k":4},"c":{"k":[0.4,0.4,0.4,1]},"hd":false},{"ty":"tr","o":{"k":100},"r":{"k":0},"p":{"k":[0,0]},"a":{"k":[0,0]},"s":{"k":[75,75]},"sk":{"k":0},"sa":{"k":0},"hd":false}]},{"ty":"gr","hd":false,"it":[{"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[483.77,348.96],[1106.76,345.37]],"c":false}}},{"ty":"st","lc":3,"lj":2,"ml":10,"o":{"k":100},"w":{"k":4},"c":{"k":[0.4,0.4,0.4,1]},"hd":false},{"ty":"tr","o":{"k":100},"r":{"k":0},"p":{"k":[0,0]},"a":{"k":[0,0]},"s":{"k":[75,75]},"sk":{"k":0},"sa":{"k":0},"hd":false}]},{"ty":"gr","hd":false,"it":[{"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[933.17,244.49],[1106.77,244.49]],"c":false}}},{"ty":"st","lc":3,"lj":2,"ml":10,"o":{"k":100},"w":{"k":4},"c":{"k":[0.4,0.4,0.4,1]},"hd":false},{"ty":"tr","o":{"k":100},"r":{"k":0},"p":{"k":[0,0]},"a":{"k":[0,0]},"s":{"k":[75,75]},"sk":{"k":0},"sa":{"k":0},"hd":false}]},{"ty":"gr","hd":false,"it":[{"ty":"sh","ks":{"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[933.17,147.31],[1106.77,147.31]],"c":false}}},{"ty":"st","lc":3,"lj":2,"ml":10,"o":{"k":100},"w":{"k":4},"c":{"k":[0.4,0.4,0.4,1]},"hd":false},{"ty":"tr","o":{"k":100},"r":{"k":0},"p":{"k":[0,0]},"a":{"k":[0,0]},"s":{"k":[75,75]},"sk":{"k":0},"sa":{"k":0},"hd":false}]},{"ty":"gr","hd":false,"it":[{"ty":"sh","ks":{"k":{"i":[[0,0],[-7.09,-5.98],[0,-10.45],[7.09,-5.93],[12.5,0],[0,0],[0,0],[0,0],[0,0]],"o":[[12.5,0],[7.09,5.97],[0,10.45],[-7.09,5.92],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[407.49,109.46],[436.88,118.42],[447.52,143.05],[436.88,167.63],[407.49,176.51],[381.17,176.51],[381.17,207.45],[370.81,207.45],[370.81,109.46]],"c":true}}},{"ty":"sh","ks":{"k":{"i":[[0,0],[-5.13,4.24],[0,7.74],[5.13,4.24],[9.7,0],[0,0],[0,0]],"o":[[9.7,0],[5.13,-4.25],[0,-7.94],[-5.13,-4.25],[0,0],[0,0],[0,0]],"v":[[407.21,167.41],[429.46,161.04],[437.16,143.05],[429.46,124.79],[407.21,118.41],[381.17,118.41],[381.17,167.41]],"c":true}}},{"ty":"sh","ks":{"k":{"i":[[0,0],[0,0],[-7.93,-4.16],[-4.38,-7.42],[0,-9.52],[4.39,-7.42],[7.94,-4.16],[10.36,0],[0,0]],"o":[[0,0],[10.36,0],[7.94,4.15],[4.39,7.41],[0,9.52],[-4.38,7.42],[-7.93,4.15],[0,0],[0,0]],"v":[[471.32,109.46],[511.21,109.46],[538.65,115.69],[557.13,133.05],[563.71,158.45],[557.13,183.86],[538.65,201.23],[511.21,207.45],[471.32,207.45]],"c":true}}},{"ty":"sh","ks":{"k":{"i":[[0,0],[-6.44,3.41],[-3.55,6.02],[0,7.84],[3.55,6.02],[6.44,3.41],[8.59,0],[0,0],[0,0]],"o":[[8.59,0],[6.44,-3.41],[3.55,-6.02],[0,-7.84],[-3.55,-6.02],[-6.44,-3.41],[0,0],[0,0],[0,0]],"v":[[510.66,198.48],[533.2,193.38],[548.18,179.24],[553.5,158.45],[548.18,137.66],[533.2,123.52],[510.66,118.41],[481.68,118.41],[481.68,198.48]],"c":true}}},{"ty":"sh","ks":{"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[597.32,118.41],[597.32,156.91],[647.99,156.91],[647.99,165.87],[597.32,165.87],[597.32,207.45],[586.96,207.45],[586.96,109.46],[654.15,109.46],[654.15,118.41]],"c":true}}},{"ty":"fl","o":{"a":1,"k":[{"i":{"x":[0.67],"y":[1]},"o":{"x":[0.33],"y":[0]},"t":59,"s":[0]},{"t":109,"s":[100]}],"ix":5},"c":{"k":[0.4,0.4,0.4,1]}},{"ty":"tr","o":{"k":100},"r":{"k":0},"p":{"k":[0,0]},"a":{"k":[0,0]},"s":{"k":[100,100]},"sk":{"k":0},"sa":{"k":0},"hd":false}]},{"ty":"gr","hd":false,"it":[{"ty":"sh","ks":{"k":{"i":[[0,0],[-27.6,0],[0,0],[-9.38,-9.37],[0,-13.26],[0,0],[27.6,0],[0,0],[0,27.6]],"o":[[0,-27.6],[0,0],[13.26,0],[9.37,9.37],[0,0],[0,27.6],[0,0],[-27.6,0],[0,0]],"v":[[424.86,107.99],[474.83,58.02],[1130.01,58.02],[1165.34,72.65],[1179.98,107.99],[1179.98,1110.34],[1130.01,1160.32],[474.83,1160.32],[424.86,1110.34]],"c":true}}},{"ty":"st","lc":3,"lj":2,"ml":10,"o":{"k":100},"w":{"k":8},"c":{"k":[0.4,0.4,0.4,1]},"hd":false},{"ty":"fl","o":{"a":1,"k":[{"i":{"x":[0.67],"y":[1]},"o":{"x":[0.33],"y":[0]},"t":59,"s":[0]},{"t":109,"s":[100]}],"ix":5},"c":{"k":[0.95,0.95,0.95,1]}},{"ty":"tr","o":{"k":100},"r":{"k":0},"p":{"k":[0,0]},"a":{"k":[0,0]},"s":{"k":[75,75]},"sk":{"k":0},"sa":{"k":0},"hd":false}]},{"ty":"tr","o":{"k":100},"r":{"k":0},"p":{"k":[0,0]},"a":{"k":[0,0]},"s":{"k":[100,100]},"sk":{"k":0},"sa":{"k":0},"hd":false}]},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.27],"y":[1]},"o":{"x":[0.5],"y":[0]},"t":0,"s":[0]},{"t":66,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"hd":false}]}],"meta":{"g":"LF SVG to Lottie"},"assets":[]}
1 change: 1 addition & 0 deletions public/pdft.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/tasks.json

Large diffs are not rendered by default.

Binary file added public/workspace_8.pdf
Binary file not shown.
7 changes: 5 additions & 2 deletions src/Providers/AuthProviders/AuthProviders.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@


import { createContext, useEffect, useState } from "react";
import axiosInstance from "../../Utils/axiosInstance";

import { useNavigate } from "react-router-dom";
import { toast } from "react-toastify";



export const AuthContext = createContext(null);

const AuthProviders = ({children}) => {
const AuthProviders = ({children, workspaceId }) => {
const [user, setUser] = useState(null);
const [workspaceDetails, setWorkspaceDetails] = useState(null);
const [loading, setLoading] = useState(false);
const navigate = useNavigate();

Expand Down Expand Up @@ -54,6 +55,7 @@ const AuthProviders = ({children}) => {
}
}


unsubscribe()
// console.log("user data show from authproviders -> ", user)
},[])
Expand All @@ -63,6 +65,7 @@ const AuthProviders = ({children}) => {
handleLogout,
loading,
setLoading,
workspaceDetails,
}

return (
Expand Down
309 changes: 207 additions & 102 deletions src/Route/Route.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,113 +12,218 @@ import CreateWorkspace from "../components/Pages/Workspace/CreateWorkspace";
import EditWorkspace from "../components/Pages/Workspace/EditWorkspace";
import DynamicDashboard from "../components/Pages/DynamicDashboard/DynamicDashboard";
import Member from "../components/Pages/DynamicDashboard/Member";
import Dashboard from "../components/Pages/Dashboard/Dashboard";
// import Dashboard from "../components/Pages/Dashboard/Dashboard";
import Calendarui from "../components/Pages/Dashboard/Calendarui/Calendarui";
import PrivateRoute from "../PrivateRoute/PrivateRoute";
import Board from "../components/Pages/Board/Board";
import Plans from "../components/Pages/Plans/Plans";
import Tasks from "../components/Pages/Tasks/Tasks";

import Features from "../components/Pages/Features/Features";
import Export from "../components/Pages/Export/Export";
import Contact from "../components/Pages/Contact/Contact";
import MarketingDetails from "../components/Pages/Home/DifferentTypeOfTabSection/TabPages/MarketingDetails";
import OperationDetails from "../components/Pages/Home/DifferentTypeOfTabSection/TabPages/OperationDetails";
import ItDetials from "../components/Pages/Home/DifferentTypeOfTabSection/TabPages/ItDetials";
import ProductDetails from "../components/Pages/Home/DifferentTypeOfTabSection/TabPages/ProductDetails";
import CompanyDetails from "../components/Pages/Home/DifferentTypeOfTabSection/TabPages/CompanyDetails";
import Inside from "./../components/Pages/Inside/Inside";
import DynamicProfile from "../components/User/DynamicProfile";
import TermsCondition from "../components/Pages/TermsCondition/TermsCondition";
import PrivacyPolicy from "../components/Pages/PrivacyPolicy/PrivacyPolicy";
const router = createBrowserRouter([
{
path: "/",
element: <Root />,
children: [
{
path: "/",
element: <Home />,
},
{
path: "/login",
element: <Login />,
},
{
path: "/register",
element: <Register />,
},
{
path: "/otp/verify",
element: <VerifyEmail />,
},
{
path: "/forgotpassword",
element: <ForgetPassword />,
},
{
path: "/profile",
element:<Profile/>
},
{
path: "/forget",
element: <ForgetPassword/>
},
{
path: "/password-reset-confirm/:uid/:token",
element: <ResetPassword/>
},
{
path: "/workspace",
element: <PrivateRoute><UserWorkspace /></PrivateRoute>,
},
{
path: "/createworkspace",
element: <PrivateRoute><CreateWorkspace /></PrivateRoute>,
},
{
path: "/editworkspace/:workspaceId",
element: <PrivateRoute><EditWorkspace /></PrivateRoute>,
},
// {
// path: "workspace/:id",
// element: <DynamicDashboard></DynamicDashboard>,
// // loader: ({params}) => fetch(`https://projectsyncifyapi.onrender.com/workspace/list/${params.id}`)
// },
],
},

{
path: "/workspace/:id",
element: <DynamicDashboard/>,
// loader: ({params}) => fetch(`https://projectsyncifyapi.onrender.com/workspace/list/${params.id}`),
children: [
{
path: "/workspace/:id",
element: <PrivateRoute><Member/></PrivateRoute>,
},
{
path: "/workspace/:id/profile",
element: <PrivateRoute> <Profile/> </PrivateRoute>,
},
{
path: "/workspace/:id/boards",
element:<PrivateRoute> <Board/> </PrivateRoute>,
},
{
path: "/workspace/:id/tasks",
element:<PrivateRoute> <Tasks/> </PrivateRoute>,
},
{
path: "/workspace/:id/plans",
element: <Plans/>
},
{
path: "/workspace/:id/calendar",
element: <Calendarui/>
}
]
},
{
path: "/dashboard",
element: <PrivateRoute><Dashboard /></PrivateRoute>,
children: [
{
path: "/dashboard/profile",
element: <Profile />,
},

],
},
]);
{
path: "/",
element: <Root />,
children: [
{
path: "/",
element: <Home />,
},
{
path: "/features",
element: <Features />,
},

{
path: "/contact",
element: <Contact />,
},
{
path: "/login",
element: <Login />,
},
{
path: "/register",
element: <Register />,
},
{
path: "/otp/verify",
element: <VerifyEmail />,
},
{
path: "/forgotpassword",
element: <ForgetPassword />,
},
{
path: "/profile",
element: (
<PrivateRoute>
<Profile />
</PrivateRoute>
),
},
{
path: "/terms&condition",
element: (
<PrivateRoute>
<TermsCondition />
</PrivateRoute>
),
},
{
path: "/privacypolicy",
element: (
<PrivateRoute>
<PrivacyPolicy />
</PrivateRoute>
),
},
{
path: "/profile/:pId",
element: <DynamicProfile />,
},
{
path: "/forget",
element: <ForgetPassword />,
},
{
path: "/password-reset-confirm/:uid/:token",
element: <ResetPassword />,
},
{
path: "/marketingDetails",
element: <MarketingDetails />,
},
{
path: "/operationDetails",
element: <OperationDetails />,
},
{
path: "/itDetails",
element: <ItDetials />,
},
{
path: "/productDetails",
element: <ProductDetails />,
},
{
path: "/companyDetails",
element: <CompanyDetails />,
},
{
path: "/workspace",
element: (
<PrivateRoute>
{" "}
<UserWorkspace />
</PrivateRoute>
),
},
{
path: "/createworkspace",
element: (
<PrivateRoute>
<CreateWorkspace />
</PrivateRoute>
),
},
{
path: "/editworkspace/:workspaceId",
element: (
<PrivateRoute>
{" "}
<EditWorkspace />
</PrivateRoute>
),
},

],
},

{
path: "/workspace/:id",
element: <DynamicDashboard />,
children: [
{
path: "/workspace/:id",
element: (
<PrivateRoute>
{" "}
<Member />{" "}
</PrivateRoute>
),
},

{
path: "/workspace/:id/boards",
element: (
<PrivateRoute>
{" "}
<Board />{" "}
</PrivateRoute>
),
},
{
path: "/workspace/:id/tasks",
element: (
<PrivateRoute>
{" "}
<Tasks />{" "}
</PrivateRoute>
),
},
{
path: "/workspace/:id/plans",
element: (
<PrivateRoute>
{" "}
<Plans />{" "}
</PrivateRoute>
),
},
{
path: "/workspace/:id/export",
element: (
<PrivateRoute>
{" "}
<Export />{" "}
</PrivateRoute>
),
},
{
path: "/workspace/:id/calendar",
element: <Calendarui />,
},
{
path: "/workspace/:id/inside",
element: <Inside />,
},
],
},
// {
// path: "/dashboard",
// element: (
// <PrivateRoute>
// <Dashboard />
// </PrivateRoute>
// ),
// children: [
// {
// path: "/dashboard/profile",
// element: <Profile />,
// },
// ],
// },
]);

export default router;
export default router;
Loading