Designing v3 - #275

Open

HamzaBhatti125 wants to merge 182 commits into

Commits on Aug 2, 2021

Commits on Aug 3, 2021

richtext box ui
hakeemullahjan
committed
fcacf7d
Merge branch 'designing' into hj_designing
hakeemullahjan
authored
b2c5a2f
Merge pull request #242 from PhoenixDAO/hj_designing
hakeemullahjan
authored
991929f
Resolved bugs
HamzaBhatti125
committed
5c03981
height adjusted
HamzaBhatti125
committed
5be3cdf
event dashboard dropdown
hakeemullahjan
committed
5bcfa6b

Commits on Aug 4, 2021

account details page avatar issue fixed
Musfirazia
committed
7085304
Merge pull request #243 from PhoenixDAO/code-refactoring
Musfirazia
authored
2981ee3
Merge branch 'designing' into designingv2
faheelsattar
authored
83f8c4c
Merge pull request #246 from PhoenixDAO/designingv2
faheelsattar
authored
ad42bf1
initial
HamzaBhatti125
committed
582dded
Merge pull request #247 from PhoenixDAO/hj_designing
hakeemullahjan
authored
7e807c5
latest push
HamzaBhatti125
committed
0dcdb2c
Merge pull request #248 from PhoenixDAO/designing_v3
HamzaBhatti125
authored
1f10535
identity form error fixed
faheelsattar
committed
3110f3d
Merge pull request #249 from PhoenixDAO/designingv2
faheelsattar
authored
b70f52c
resolved create event dropdown issue
hakeemullahjan
committed
67eeee7
Merge pull request #250 from PhoenixDAO/hj_designing
hakeemullahjan
authored
51eebe6
connect wallet button routing set
Musfirazia
committed
bdd33ed
Merge pull request #251 from PhoenixDAO/code-refactoring
Musfirazia
authored
f7ae367
changes modified
HamzaBhatti125
committed
672a112
Merge pull request #252 from PhoenixDAO/designing_v3
Musfirazia
authored
728604f
purchases created
HamzaBhatti125
committed
3e25c0d
Merge pull request #253 from PhoenixDAO/designing_v3
HamzaBhatti125
authored
7f1f80b
working on event page tab functionality
hakeemullahjan
committed
737bafd

Commits on Aug 5, 2021

graph api params changed for topics
faheelsattar
committed
f0300db
Merge pull request #254 from PhoenixDAO/designingv2
Musfirazia
authored
625a91c
confirm purchase done
HamzaBhatti125
committed
bc40a5a
Merge pull request #255 from PhoenixDAO/designing_v3
Musfirazia
authored
8d21c1c
avatar adjusted
HamzaBhatti125
committed
7b7e4bd
Merge pull request #256 from PhoenixDAO/designing_v3
HamzaBhatti125
authored
cc897fe
event page tab functionality & create event page ui fixes
hakeemullahjan
committed
23e6a62

Commits on Aug 6, 2021

Merge pull request #257 from PhoenixDAO/hj_designing
hakeemullahjan
authored
0fadb39
header adjusted
HamzaBhatti125
committed
a029800
adjuste header
HamzaBhatti125
committed
f751471
Wallet fixed
faheelsattar
committed
6954805
Merge pull request #258 from PhoenixDAO/designingv2
faheelsattar
authored
bbea1b9
confirm purchase section integration completed
Musfirazia
committed
76c740b
Merge branch 'designing' into code-refactoring
Musfirazia
authored
49f3eef
Merge pull request #259 from PhoenixDAO/code-refactoring
Musfirazia
authored
10de300
Merge pull request #260 from PhoenixDAO/designing_v3
Musfirazia
authored
81c482b
bar adjusted
HamzaBhatti125
committed
657b20c
Merge pull request #261 from PhoenixDAO/designing_v3
HamzaBhatti125
authored
19387d4
latest
HamzaBhatti125
committed
466b8dd
contract params change
hakeemullahjan
committed
f9319e0

Commits on Aug 9, 2021

custom drop down added
Musfirazia
committed
77445c0
Merge pull request #262 from PhoenixDAO/code-refactoring
Musfirazia
authored
49d2588
Merge branch 'designing' of https://github.com/PhoenixDAO/events-dApp into designing_v3
HamzaBhatti125
committed
8de0a6e
Changes done
HamzaBhatti125
committed
fe646dc
analytics multiple top 5 events issue resolved
Musfirazia
committed
04518c4
Merge pull request #263 from PhoenixDAO/designing_v3
HamzaBhatti125
authored
666b792
Merge pull request #264 from PhoenixDAO/code-refactoring
Musfirazia
authored
792fd9a
custom date picker added
faheelsattar
committed
e23b74c
Merge branch 'designing' into designingv2
faheelsattar
authored
892c250
Merge pull request #265 from PhoenixDAO/designingv2
faheelsattar
authored
9a5d946
new contract and subgraph update
hakeemullahjan
committed
65cad77
Merge pull request #266 from PhoenixDAO/hj_designing
hakeemullahjan
authored
998eaf9
sidebar toggling issue resolved
Musfirazia
committed
d4fbe15
Merge pull request #267 from PhoenixDAO/code-refactoring
Musfirazia
authored
cd1ed8d
sidebar toggling issue resolved
Musfirazia
committed
478fbc0
Merge pull request #268 from PhoenixDAO/code-refactoring
Musfirazia
authored
a538d3d
All changes have been done
HamzaBhatti125
committed
0e794e5
Merge pull request #269 from PhoenixDAO/designing_v3
HamzaBhatti125
authored
e69d4d0

Commits on Aug 10, 2021

skeleton added on dashboard
HamzaBhatti125
committed
5e7866f
Merge pull request #270 from PhoenixDAO/designing_v3
HamzaBhatti125
authored
4b2de20
ticketcategory card ui fixes and edit functionality
hakeemullahjan
committed
7c27f87
Merge pull request #271 from PhoenixDAO/hj_designing
hakeemullahjan
authored
7a61978
custom calendar designing complete
Musfirazia
committed
4753224
Merge branch 'designing' into code-refactoring
Musfirazia
authored
f5d59db
Merge pull request #272 from PhoenixDAO/code-refactoring
Musfirazia
authored
1872b53
confirm purchase section completed
Musfirazia
committed
62954e7
Merge pull request #273 from PhoenixDAO/code-refactoring
Musfirazia
authored
30051e9
image label font color change
hakeemullahjan
committed
a2de0d7
Merge pull request #274 from PhoenixDAO/hj_designing
hakeemullahjan
authored
e88cc42

Commits on Aug 11, 2021

skeleton added on topics page
HamzaBhatti125
committed
b73febc
Merge pull request #276 from PhoenixDAO/designing_v3
HamzaBhatti125
authored
40d6b4d
loading state added with connect wallet modal completed
Musfirazia
committed
19c482c
loading state added with connect wallet modal completed
Musfirazia
committed
2925979
search bar heading updated
HamzaBhatti125
committed
293ba7f
createevent alignment issue & coutry/state/city ui
hakeemullahjan
committed
0edcfea
ticket purchase modal completed
Musfirazia
committed
27e10ef
Merge pull request #277 from PhoenixDAO/code-refactoring
Musfirazia
authored
9ef90dc

Commits on Aug 12, 2021

transak added
faheelsattar
committed
d0e443f
pull from designing
faheelsattar
committed
17ddff2
issues resolved of frontend
HamzaBhatti125
committed
174d40f
Merge pull request #278 from PhoenixDAO/designing_v3
HamzaBhatti125
authored
df1e6a4
country->state->city functionality
hakeemullahjan
committed
868f64f
Merge pull request #280 from PhoenixDAO/hj_designing
hakeemullahjan
authored
27a9efd

Commits on Aug 13, 2021

switch icon added my ticket on calendar page issue resolved
Musfirazia
committed
e373256
Merge branch 'designing' into code-refactoring
Musfirazia
authored
94ee0b8
Merge pull request #281 from PhoenixDAO/code-refactoring
Musfirazia
authored
e870032
Merge pull request #282 from PhoenixDAO/designingv2
Musfirazia
authored
592ac28
createEvent ui fixes
hakeemullahjan
committed
c71033a
Merge pull request #283 from PhoenixDAO/hj_designing
hakeemullahjan
authored
5995a56
faq guide pages bugs resolved
Musfirazia
committed
279cfec
Merge pull request #284 from PhoenixDAO/code-refactoring
Musfirazia
authored
32a68a4
skeleton and calendar button adjusted
HamzaBhatti125
committed
b58a9f7
Merge pull request #285 from PhoenixDAO/designing_v3
HamzaBhatti125
authored
abd62f1
dollarIcon and phnxIcon backgroundcolor in ticketprice
hakeemullahjan
committed
b044325
Merge pull request #286 from PhoenixDAO/hj_designing
hakeemullahjan
authored
5832645

Commits on Aug 15, 2021

header and error resolved
HamzaBhatti125
committed
3370808
Merge pull request #287 from PhoenixDAO/designing_v3
HamzaBhatti125
authored
d3f4bd7

Commits on Aug 16, 2021

changes modified
HamzaBhatti125
committed
c7c31e4
Merge pull request #288 from PhoenixDAO/designing_v3
HamzaBhatti125
authored
20dc4fd
app crash issue resolved on event page
Musfirazia
committed
449fc16
Merge branch 'designing' into code-refactoring
Musfirazia
authored
1e6902d
Merge pull request #290 from PhoenixDAO/code-refactoring
Musfirazia
authored
033e8f4
pagination added for appBar
HamzaBhatti125
committed
6f904ed
checkbox icon change, label styling and date&time alignment
hakeemullahjan
committed
2ebac27
Merge branch 'designing' into hj_designing
hakeemullahjan
authored
62d32fe
Merge pull request #291 from PhoenixDAO/hj_designing
hakeemullahjan
authored
7f95427

Commits on Aug 17, 2021

analytics stats updated
faheelsattar
committed
90e2602
Merge pull request #292 from PhoenixDAO/designingv2
faheelsattar
authored
b726748
Merge branch 'designing' of https://github.com/PhoenixDAO/events-dApp into designing_v3
HamzaBhatti125
committed
ad0527a
calendar dropdown adjusted
HamzaBhatti125
committed
7a7aac5
Merge pull request #293 from PhoenixDAO/designing_v3
HamzaBhatti125
authored
532bb79
place holder image added
Musfirazia
committed
0f7dea3
Merge pull request #294 from PhoenixDAO/code-refactoring
Musfirazia
authored
85577ca
stepper circle, ticketcard category and ui fixes
hakeemullahjan
committed
5cc4a65
Merge pull request #295 from PhoenixDAO/hj_designing
hakeemullahjan
authored
134ea54

Commits on Aug 20, 2021

maxLength minLength andprogressbar
hakeemullahjan
committed
7a924bd
bugs resolved
Musfirazia
committed
4dd108d
Merge pull request #296 from PhoenixDAO/code-refactoring
Musfirazia
authored
b9e4206

Commits on Aug 21, 2021

Toggling setup in place
faheelsattar
committed
9c12048
progressbar and upgrade contract address
hakeemullahjan
committed
8fa1043
network toggling
faheelsattar
committed
44d00fc
Merge pull request #297 from PhoenixDAO/hj_designing
hakeemullahjan
authored
575410f
Merge branch 'designing' into designingv2
faheelsattar
authored
1a7092d
Merge pull request #298 from PhoenixDAO/designingv2
faheelsattar
authored
7c6344a

Commits on Aug 22, 2021

events page adjusted
HamzaBhatti125
committed
7727b91

Commits on Aug 23, 2021

transack production api integrated
faheelsattar
committed
d080a19
Merge pull request #299 from PhoenixDAO/designingv2
faheelsattar
authored
bc34c16
account addresses changed
faheelsattar
committed
953e689
Merge pull request #300 from PhoenixDAO/designingv2
faheelsattar
authored
34cceb2
buy issue resolved & working on Near to You
hakeemullahjan
committed
38d7b80
Merge pull request #301 from PhoenixDAO/hj_designing
hakeemullahjan
authored
7c1d9a6

Commits on Aug 24, 2021

Commits on Aug 25, 2021

Delete BuyPhoenixModal.jsx
Musfirazia
authored
9c7657c
dropdowns, cards alignments, responsiveness of clock fixes
SyedMuqeetAqib
committed
dd5c880
transak api key added
hakeemullahjan
committed
2ffde95
Merge pull request #304 from PhoenixDAO/hj_designing
hakeemullahjan
authored
ddfdada
added
HamzaBhatti125
committed
1b6d507
transakApi added
hakeemullahjan
committed
1130b3f
Merge pull request #305 from PhoenixDAO/hj_designing
hakeemullahjan
authored
315edd4
remove console.log
hakeemullahjan
committed
f1d3381
Merge pull request #306 from PhoenixDAO/hj_designing
hakeemullahjan
authored
46563ba
UI improvements, drop downs and clock
SyedMuqeetAqib
committed
0c8b3d7
Merge branch 'designing' of https://github.com/PhoenixDAO/events-dApp into UIimprovement
SyedMuqeetAqib
committed
b14ca70
resolving conflits
SyedMuqeetAqib
committed
cf162fa
Merge pull request #309 from PhoenixDAO/UIimprovement
hakeemullahjan
authored
a85604d
purchase modal issue resolved with Ui changes
Musfirazia
committed
56b342c
purchase modal issue resolved with Ui changes
Musfirazia
committed
fd4953f
Merge branch 'designing' into code-refactoring
Musfirazia
authored
dfba5f0
Merge pull request #310 from PhoenixDAO/code-refactoring
Musfirazia
authored
8a2390f
choose avatar when logging in first
faheelsattar
committed
f8f2781
Update BuyPhoenixModal.jsx
Musfirazia
authored
624e0d2
resolving code conflicts
Musfirazia
committed
3c440ce
Merge pull request #311 from PhoenixDAO/code-refactoring
Musfirazia
authored
300ba24
Merge branch 'designing' into designingv2
Musfirazia
authored
8d80687
Merge pull request #312 from PhoenixDAO/designingv2
Musfirazia
authored
9336038
ui changes
Musfirazia
committed
a091cf0
Merge pull request #313 from PhoenixDAO/code-refactoring
Musfirazia
authored
6697ad1
working on event preview modal
hakeemullahjan
committed
187c032

Commits on Aug 26, 2021

handling timestamps
hakeemullahjan
committed
27b7ff2

Commits on Aug 27, 2021

graph Url changed in whole app
Musfirazia
committed
1c4e150
Merge pull request #314 from PhoenixDAO/code-refactoring
Musfirazia
authored
e56dd4c
dropdown improvements in calender, topics, dashboard, connect wallet icon, create event page improvement, responsiceness of clock, card overlapping in my ticket page
SyedMuqeetAqib
committed
70dda01
merge conflict resolved
HamzaBhatti125
committed
a398e2e
resolving merge conflict
SyedMuqeetAqib
committed
31043b7
Merge pull request #315 from PhoenixDAO/UIimprovement
Musfirazia
authored
cbde120
resolved time issues
hakeemullahjan
committed
4f5ad96
Merge branch 'designing' into hj_designing
hakeemullahjan
authored
02f1dc4
Merge pull request #316 from PhoenixDAO/hj_designing
hakeemullahjan
authored
4751b19
format converted to utc
HamzaBhatti125
committed
289231a
error resolved
HamzaBhatti125
committed
f480ae8
Winding up
HamzaBhatti125
committed
68753da