Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1215 commits
Select commit Hold shift + click to select a range
3cb6e1b
Update main.yml
sherazakhtar Sep 9, 2021
eb39b1e
Update main.yml
sherazakhtar Sep 9, 2021
e58730a
Merge branch 'devdesign' into UIimprovement
faheelsattar Sep 9, 2021
a162f95
Merge pull request #394 from PhoenixDAO/UIimprovement
faheelsattar Sep 9, 2021
150679e
conflicts resolved
Musfirazia Sep 9, 2021
84deb45
Update Sidebar.jsx
Musfirazia Sep 9, 2021
c89fd9d
upcomingevents url
hakeemullahjan Sep 9, 2021
6a1c804
new contract integrated with price issue resolved
Musfirazia Sep 9, 2021
64fec8a
Merge pull request #395 from PhoenixDAO/code-refactoring
Musfirazia Sep 9, 2021
6f59b3a
Merge pull request #396 from PhoenixDAO/hj_designing
hakeemullahjan Sep 9, 2021
f11f987
Merge pull request #397 from PhoenixDAO/devdesign
Musfirazia Sep 10, 2021
58df607
Update changes.sh
Musfirazia Sep 10, 2021
9ba4056
Update changes.sh
sherazakhtar Sep 10, 2021
e329c20
geo find api changed
faheelsattar Sep 10, 2021
4994a7a
Merge branch 'devdesign' into designingv2
faheelsattar Sep 10, 2021
d762856
Merge pull request #398 from PhoenixDAO/designingv2
faheelsattar Sep 10, 2021
bacf8b1
Merge branch 'devdesign' of https://github.com/PhoenixDAO/events-dApp…
SyedMuqeetAqib Sep 10, 2021
9d2f823
buyticket modal image fix height, event preview page, sidebar image c…
SyedMuqeetAqib Sep 10, 2021
39d0355
price conversion changed
Musfirazia Sep 10, 2021
19831f9
Merge pull request #400 from PhoenixDAO/code-refactoring
Musfirazia Sep 10, 2021
03ecf8a
token false erorr issue resolved
hakeemullahjan Sep 10, 2021
cf2d2cd
Merge pull request #401 from PhoenixDAO/hj_designing
hakeemullahjan Sep 10, 2021
1a1fc9e
publish event button size
SyedMuqeetAqib Sep 10, 2021
01c94f3
Merge branch 'devdesign' of https://github.com/PhoenixDAO/events-dApp…
SyedMuqeetAqib Sep 10, 2021
8e7dea3
publish event button size
SyedMuqeetAqib Sep 10, 2021
bab06fd
publish event button size
SyedMuqeetAqib Sep 10, 2021
07dd041
Merge pull request #403 from PhoenixDAO/UIimprovement
Musfirazia Sep 10, 2021
f2b11c5
git workflow folder restoration
SyedMuqeetAqib Sep 10, 2021
a7bf3bb
Merge pull request #405 from PhoenixDAO/UIimprovement
Musfirazia Sep 10, 2021
b92b51e
build updated
Musfirazia Sep 10, 2021
b0099b6
ticket send aligned
faheelsattar Sep 10, 2021
4ec2067
create event code refactoring stepepper1 & 2
hakeemullahjan Sep 11, 2021
ce85e1c
Merge pull request #407 from PhoenixDAO/designingv2
faheelsattar Sep 11, 2021
4679ac5
stepper2 images conditions
hakeemullahjan Sep 11, 2021
7d540f8
dropdown improvement in event preview, by ticket modal improvement, h…
SyedMuqeetAqib Sep 11, 2021
ebba1c1
analytics date fixed
faheelsattar Sep 11, 2021
84eb713
Merge pull request #408 from PhoenixDAO/designingv2
faheelsattar Sep 11, 2021
0423983
transak network added , my ticket sorting
Musfirazia Sep 11, 2021
f7083ad
Revert "Merge pull request #408 from PhoenixDAO/designingv2"
Musfirazia Sep 11, 2021
6bd1752
Merge pull request #409 from PhoenixDAO/code-refactoring
Musfirazia Sep 11, 2021
18ee49b
sidebar social media icons alignment, event preview card improvement,…
SyedMuqeetAqib Sep 11, 2021
cbda320
Loading Animations event page
SyedMuqeetAqib Sep 11, 2021
04eb6f7
error resolved
Musfirazia Sep 11, 2021
9506b40
Merge pull request #410 from PhoenixDAO/UIimprovement
faheelsattar Sep 11, 2021
c2c4dbe
travalla footer image improvement in dashboard and mytickets page, si…
SyedMuqeetAqib Sep 11, 2021
a116613
Merge branch 'devdesign' of https://github.com/PhoenixDAO/events-dApp…
SyedMuqeetAqib Sep 11, 2021
43a82c3
multiple ticket
hakeemullahjan Sep 11, 2021
f6c901b
create event code refactored
hakeemullahjan Sep 12, 2021
8653b9f
analytics empty state, event topic alignment in preview page and crea…
SyedMuqeetAqib Sep 13, 2021
88be46e
Merge pull request #411 from PhoenixDAO/UIimprovement
hakeemullahjan Sep 13, 2021
b7098fc
Merge branch 'devdesign' into hj_designing
hakeemullahjan Sep 13, 2021
744a3fb
Merge pull request #412 from PhoenixDAO/hj_designing
hakeemullahjan Sep 13, 2021
e39f6c2
analytics file changed and networkId issue resolved on organizer det…
Musfirazia Sep 13, 2021
c4b4cec
dashboard text added
Musfirazia Sep 13, 2021
3f4aee3
Merge pull request #414 from PhoenixDAO/code-refactoring
Musfirazia Sep 13, 2021
9b89777
event page fixes
faheelsattar Sep 13, 2021
57d1321
Merge pull request #415 from PhoenixDAO/designingv2
faheelsattar Sep 13, 2021
26e23a2
carousel title, create event publish button alignment, geolocation pr…
SyedMuqeetAqib Sep 13, 2021
8393c98
new contract integrated
Musfirazia Sep 13, 2021
59670bf
Merge branch 'devdesign' into code-refactoring
Musfirazia Sep 13, 2021
dea614e
Merge pull request #416 from PhoenixDAO/code-refactoring
Musfirazia Sep 13, 2021
1ca7889
Merge pull request #417 from PhoenixDAO/UIimprovement
Musfirazia Sep 13, 2021
efffada
createEvent image issue resolved
hakeemullahjan Sep 13, 2021
9a8f3da
delete image icon on corner in create event
SyedMuqeetAqib Sep 13, 2021
cc4267b
delete image icon's position changed to right with blue color in crea…
SyedMuqeetAqib Sep 13, 2021
d5d1bf5
event page working
faheelsattar Sep 14, 2021
bb11d19
Merge branch 'devdesign' into designingv2
faheelsattar Sep 14, 2021
0404984
Merge pull request #418 from PhoenixDAO/designingv2
faheelsattar Sep 14, 2021
4c49690
Merge branch 'devdesign' into hj_designing
Musfirazia Sep 14, 2021
da2e7e9
Merge pull request #419 from PhoenixDAO/hj_designing
Musfirazia Sep 14, 2021
aee044d
Merge pull request #420 from PhoenixDAO/UIimprovement
Musfirazia Sep 14, 2021
90f79f0
link issue resolved
Musfirazia Sep 14, 2021
3af3661
Merge pull request #421 from PhoenixDAO/code-refactoring
Musfirazia Sep 14, 2021
a770ab7
price filter
SyedMuqeetAqib Sep 14, 2021
8cc9898
topics filter fixed
faheelsattar Sep 14, 2021
56d4f46
Merge pull request #422 from PhoenixDAO/UIimprovement
hakeemullahjan Sep 14, 2021
c5575e7
working on geolocation
hakeemullahjan Sep 14, 2021
821ec38
Merge branch 'devdesign' into designingv2
faheelsattar Sep 14, 2021
7c8073a
Merge pull request #423 from PhoenixDAO/designingv2
faheelsattar Sep 14, 2021
37a166d
travala issue resolved with event url
Musfirazia Sep 14, 2021
4e9f091
Merge branch 'devdesign' into hj_designing
hakeemullahjan Sep 14, 2021
23e980f
Merge pull request #424 from PhoenixDAO/hj_designing
hakeemullahjan Sep 14, 2021
9c8fa69
travala issue resolved with event url
Musfirazia Sep 14, 2021
a421229
Merge pull request #425 from PhoenixDAO/code-refactoring
Musfirazia Sep 14, 2021
e0e7acb
pricing input alignment
SyedMuqeetAqib Sep 14, 2021
57c1c89
Merge branch 'devdesign' of https://github.com/PhoenixDAO/events-dApp…
SyedMuqeetAqib Sep 14, 2021
f874c38
tavalla image on buy ticket
SyedMuqeetAqib Sep 14, 2021
999b854
sidebar message shown
faheelsattar Sep 14, 2021
f3169bf
Merge pull request #426 from PhoenixDAO/designingv2
faheelsattar Sep 14, 2021
baf63c8
Update main.css
Musfirazia Sep 14, 2021
3576d55
dollar prices decimal places
hakeemullahjan Sep 14, 2021
074ccaa
Merge pull request #428 from PhoenixDAO/UIimprovement
Musfirazia Sep 14, 2021
a15bc63
Merge branch 'devdesign' into hj_designing
Musfirazia Sep 14, 2021
e231fed
Merge pull request #427 from PhoenixDAO/hj_designing
Musfirazia Sep 14, 2021
1f7b7f8
travala issue resolved with event url
Musfirazia Sep 14, 2021
2f3b812
Merge branch 'devdesign' of https://github.com/PhoenixDAO/events-dApp…
Musfirazia Sep 14, 2021
8744ef7
test comment
SyedMuqeetAqib Sep 14, 2021
ada3885
scroll added to favourites and analytics
faheelsattar Sep 14, 2021
59c0b81
Merge pull request #429 from PhoenixDAO/designingv2
faheelsattar Sep 14, 2021
70689d2
approval modal fixed
faheelsattar Sep 14, 2021
b3774b4
Merge pull request #430 from PhoenixDAO/designingv2
faheelsattar Sep 14, 2021
c565627
buy modal time
hakeemullahjan Sep 14, 2021
8ee4c22
Merge pull request #431 from PhoenixDAO/hj_designing
hakeemullahjan Sep 14, 2021
954f32c
contract updated
Musfirazia Sep 14, 2021
0ecb79f
Merge branch 'devdesign' into code-refactoring
Musfirazia Sep 14, 2021
58d07c1
Merge pull request #433 from PhoenixDAO/code-refactoring
Musfirazia Sep 14, 2021
bbd22fc
contract updated
Musfirazia Sep 14, 2021
1e9311a
Merge branch 'devdesign' into code-refactoring
Musfirazia Sep 14, 2021
dc0f8d3
Merge pull request #434 from PhoenixDAO/code-refactoring
Musfirazia Sep 14, 2021
90701ba
rich text ediitor lenght count issue resolved
hakeemullahjan Sep 15, 2021
28e26ea
clock timing issue with more than a one day event
SyedMuqeetAqib Sep 15, 2021
8540ec2
evnt link limit
hakeemullahjan Sep 15, 2021
baee1c4
Merge pull request #435 from PhoenixDAO/UIimprovement
hakeemullahjan Sep 15, 2021
8b82e08
Merge pull request #436 from PhoenixDAO/hj_designing
hakeemullahjan Sep 15, 2021
40f089a
from wei conversion done rpc issue resolved
Musfirazia Sep 15, 2021
76ad128
Merge branch 'devdesign' into code-refactoring
hakeemullahjan Sep 15, 2021
2d34ea2
Merge pull request #437 from PhoenixDAO/code-refactoring
hakeemullahjan Sep 15, 2021
f0bd72c
price formatter function added
Musfirazia Sep 15, 2021
aa6a03d
Merge branch 'devdesign' of https://github.com/PhoenixDAO/events-dApp…
Musfirazia Sep 15, 2021
722870a
event page snackbar fixed allowance
faheelsattar Sep 15, 2021
9515071
Merge pull request #438 from PhoenixDAO/designingv2
faheelsattar Sep 15, 2021
81b1a0c
faq added
Musfirazia Sep 15, 2021
060ce2b
trending event&allevents
hakeemullahjan Sep 15, 2021
09a7d77
Merge pull request #439 from PhoenixDAO/hj_designing
hakeemullahjan Sep 15, 2021
b6e3707
Merge branch 'devdesign' of https://github.com/PhoenixDAO/events-dApp…
Musfirazia Sep 15, 2021
0731abd
my tickets trending page UI fixing, event card ticket sold count for …
SyedMuqeetAqib Sep 15, 2021
108c853
Merge branch 'devdesign' of https://github.com/PhoenixDAO/events-dApp…
SyedMuqeetAqib Sep 15, 2021
b4d233f
event card large prize issue
SyedMuqeetAqib Sep 15, 2021
fb75789
working on location
hakeemullahjan Sep 15, 2021
b229532
working on geolocation
hakeemullahjan Sep 15, 2021
54e0cb2
ethereum contract integrated
Musfirazia Sep 16, 2021
2c4a27a
Merge pull request #440 from PhoenixDAO/code-refactoring
faheelsattar Sep 16, 2021
a6c1122
Merge branch 'devdesign' into hj_designing
hakeemullahjan Sep 16, 2021
a6d5536
Merge pull request #441 from PhoenixDAO/hj_designing
hakeemullahjan Sep 16, 2021
964dbb3
geolocation2
hakeemullahjan Sep 16, 2021
f0071c7
password updated with favicon deleted
Musfirazia Sep 17, 2021
9923fd0
Merge branch 'devdesign' into code-refactoring
faheelsattar Sep 17, 2021
d5927ab
Merge pull request #442 from PhoenixDAO/code-refactoring
faheelsattar Sep 17, 2021
bfeae34
mobile screen experience alert modal, banner footer improvement, my c…
SyedMuqeetAqib Sep 17, 2021
450e484
changes
SyedMuqeetAqib Sep 17, 2021
f8656a2
FAQ is added
Musfirazia Sep 17, 2021
f7d61dc
read me added
faheelsattar Sep 17, 2021
7a0b2d3
Merge branch 'devdesign' into code-refactoring
faheelsattar Sep 17, 2021
20c8150
Merge pull request #443 from PhoenixDAO/code-refactoring
faheelsattar Sep 17, 2021
1b3df97
Merge branch 'devdesign' into designingv2
faheelsattar Sep 17, 2021
1ba9c35
Merge pull request #444 from PhoenixDAO/designingv2
faheelsattar Sep 17, 2021
71f99a4
loation done and changed slider
hakeemullahjan Sep 17, 2021
e35b2d9
content added before launch
Musfirazia Sep 18, 2021
af8b537
FAQ, my created events appbar
SyedMuqeetAqib Sep 18, 2021
b337c92
Merge branch 'devdesign' into UIimprovement
Musfirazia Sep 18, 2021
3044adf
Merge pull request #446 from PhoenixDAO/UIimprovement
Musfirazia Sep 18, 2021
1ecac48
Merge branch 'devdesign' into code-refactoring
Musfirazia Sep 18, 2021
3d2775d
Merge pull request #447 from PhoenixDAO/code-refactoring
Musfirazia Sep 18, 2021
303e778
copied create-event
hakeemullahjan Sep 18, 2021
c0661bf
Merge branch 'devdesign' into hj_designing
hakeemullahjan Sep 18, 2021
b399a82
Merge pull request #448 from PhoenixDAO/hj_designing
hakeemullahjan Sep 18, 2021
8901d6c
console removed
Musfirazia Sep 18, 2021
e842c5a
merging issues
SyedMuqeetAqib Sep 20, 2021
4b3eb53
console removed
Musfirazia Sep 20, 2021
1c17c56
Merge branch 'devdesign' into code-refactoring
Musfirazia Sep 20, 2021
fad31f3
Merge pull request #449 from PhoenixDAO/code-refactoring
Musfirazia Sep 20, 2021
cead431
console removed
Musfirazia Sep 20, 2021
0edef99
switched to rinkeby
Musfirazia Sep 21, 2021
2723bd4
switched to rinkeby
Musfirazia Sep 21, 2021
58173b8
Merge pull request #451 from PhoenixDAO/code-refactoring
Musfirazia Sep 21, 2021
a51efd2
warnings, UI responsive, header for mobile half fixing, footer banner…
SyedMuqeetAqib Sep 21, 2021
87e3518
Merge pull request #452 from PhoenixDAO/UIimprovement
SyedMuqeetAqib Sep 21, 2021
2545477
Merge branch 'devdesign' of https://github.com/PhoenixDAO/events-dApp…
SyedMuqeetAqib Sep 21, 2021
cb99f24
banner footer
SyedMuqeetAqib Sep 21, 2021
d4284ba
Merge pull request #453 from PhoenixDAO/UIimprovement
SyedMuqeetAqib Sep 21, 2021
790ad65
switched to rinkeby
Musfirazia Sep 21, 2021
b4a5e41
analytics refactored
faheelsattar Sep 21, 2021
d06a3bc
code conflicts resolved
faheelsattar Sep 21, 2021
e508c23
Merge pull request #455 from PhoenixDAO/designingv2
faheelsattar Sep 21, 2021
0141991
graph api url added
faheelsattar Sep 21, 2021
91f8004
Merge pull request #456 from PhoenixDAO/designingv2
faheelsattar Sep 21, 2021
6f4ffc8
conflicts resolved
faheelsattar Sep 21, 2021
bfbea0d
Merge pull request #457 from PhoenixDAO/designingv2
faheelsattar Sep 21, 2021
d8acccb
scroll on search on dashboard and topics, FAQ answersLink, responsive…
SyedMuqeetAqib Sep 22, 2021
9a7eae8
Merge branch 'devdesign' of https://github.com/PhoenixDAO/events-dApp…
SyedMuqeetAqib Sep 22, 2021
53f126a
changes from UIimprovement
SyedMuqeetAqib Sep 22, 2021
ecbaf83
server url chhange
SyedMuqeetAqib Sep 22, 2021
9e0ca6e
server url change
SyedMuqeetAqib Sep 22, 2021
a68f9d8
Merge pull request #461 from PhoenixDAO/UIimprovement
SyedMuqeetAqib Sep 22, 2021
00bcd24
server url change
SyedMuqeetAqib Sep 22, 2021
37f3082
Merge pull request #463 from PhoenixDAO/UIimprovement
SyedMuqeetAqib Sep 22, 2021
3f7d25c
Merge branch 'devdesign' of https://github.com/PhoenixDAO/events-dApp…
Musfirazia Sep 22, 2021
8cfd57b
footer banner for mobile, guide and terms page improvement, analytics…
SyedMuqeetAqib Sep 23, 2021
9740f13
Merge pull request #465 from PhoenixDAO/UIimprovement
SyedMuqeetAqib Sep 23, 2021
28accd3
analytics card text, event page dropdown improvement, event page desc…
SyedMuqeetAqib Sep 24, 2021
da1f046
Merge pull request #467 from PhoenixDAO/UIimprovement
SyedMuqeetAqib Sep 24, 2021
d351dc6
Merge branch 'devdesign' of https://github.com/PhoenixDAO/events-dApp…
Musfirazia Sep 24, 2021
89c66b1
analytics graph issue resolved
faheelsattar Sep 25, 2021
a4848f6
Merge pull request #468 from PhoenixDAO/designingv2
faheelsattar Sep 25, 2021
c3ec6f1
analytics addresses removed
faheelsattar Sep 25, 2021
d7fe81a
Merge pull request #469 from PhoenixDAO/designingv2
faheelsattar Sep 25, 2021
60e7900
transak modal for mobile screens, increased height of editor, event p…
SyedMuqeetAqib Sep 25, 2021
43fe020
Merge pull request #470 from PhoenixDAO/UIimprovement
SyedMuqeetAqib Sep 25, 2021
b4f5b58
Merge branch 'devdesign' of https://github.com/PhoenixDAO/events-dApp…
Musfirazia Sep 27, 2021
c58ec34
Event page buf fixed
faheelsattar Sep 27, 2021
5bc3d01
analytics addresses remvoved
faheelsattar Sep 27, 2021
98a8fe1
Merge pull request #472 from PhoenixDAO/designingv2
faheelsattar Sep 27, 2021
aa82d0f
twitter uncommented
faheelsattar Sep 27, 2021
5b77db0
Merge pull request #473 from PhoenixDAO/designingv2
faheelsattar Sep 27, 2021
63bcc99
grey calendar past events, event card, event page image, identity for…
SyedMuqeetAqib Sep 27, 2021
30426b1
Merge branch 'devdesign' into UIimprovement
SyedMuqeetAqib Sep 27, 2021
7f5f8a7
Merge pull request #474 from PhoenixDAO/UIimprovement
SyedMuqeetAqib Sep 27, 2021
6b50571
commented user tweets
faheelsattar Sep 28, 2021
62175c6
Merge pull request #477 from PhoenixDAO/designingv2
faheelsattar Sep 28, 2021
d33f28e
Merge branch 'devdesign' of https://github.com/PhoenixDAO/events-dApp…
hakeemullahjan Sep 28, 2021
79813f1
resolve confilts
hakeemullahjan Sep 28, 2021
af8b18e
syntax error
hakeemullahjan Sep 28, 2021
6cc516f
Merge pull request #476 from PhoenixDAO/hj_designing
hakeemullahjan Sep 28, 2021
b018f1e
share event for past events fixed
faheelsattar Sep 28, 2021
8fbc933
Merge branch 'devdesign' of https://github.com/PhoenixDAO/events-dApp…
Musfirazia Sep 28, 2021
eff2338
responsive slider, buyTicket modal padding, event card alignment, hea…
SyedMuqeetAqib Sep 29, 2021
2c63fa7
changes
SyedMuqeetAqib Sep 29, 2021
929ab1b
Merge pull request #479 from PhoenixDAO/UIimprovement
SyedMuqeetAqib Sep 29, 2021
4889776
event card, header alignment, buypheonix button, terms and conditions…
SyedMuqeetAqib Sep 29, 2021
34c0cf0
Merge pull request #481 from PhoenixDAO/UIimprovement
SyedMuqeetAqib Sep 29, 2021
d39f549
createEvent code refactored
hakeemullahjan Sep 29, 2021
f6547ce
event page location added
faheelsattar Sep 30, 2021
8bb4bbd
Merge branch 'devdesign' into designingv2
faheelsattar Sep 30, 2021
6edbd63
Merge pull request #483 from PhoenixDAO/designingv2
faheelsattar Sep 30, 2021
7a06278
drizzle options changed
faheelsattar Sep 30, 2021
ec6a0e1
Merge pull request #484 from PhoenixDAO/designingv2
faheelsattar Sep 30, 2021
1050ec3
Merge pull request #485 from PhoenixDAO/hj_designing
hakeemullahjan Sep 30, 2021
eabd73c
Merge branch 'devdesign' of https://github.com/PhoenixDAO/events-dApp…
Musfirazia Sep 30, 2021
98e36c3
share url title added
faheelsattar Sep 30, 2021
35d5983
Merge pull request #486 from PhoenixDAO/designingv2
faheelsattar Sep 30, 2021
e30535d
guide, event page and preview image handling, event card share and se…
SyedMuqeetAqib Sep 30, 2021
0f1a35b
changes
SyedMuqeetAqib Sep 30, 2021
f12958a
Merge branch 'devdesign' into UIimprovement
SyedMuqeetAqib Sep 30, 2021
b4c9b5a
Merge pull request #487 from PhoenixDAO/UIimprovement
SyedMuqeetAqib Sep 30, 2021
7c0a712
Merge branch 'devdesign' of https://github.com/PhoenixDAO/events-dApp…
Musfirazia Sep 30, 2021
235508c
50 blocks error
hakeemullahjan Sep 30, 2021
e3b1e95
Merge pull request #488 from PhoenixDAO/hj_designing
hakeemullahjan Sep 30, 2021
7bcb567
header z-index changes
SyedMuqeetAqib Sep 30, 2021
f83a345
Merge pull request #490 from PhoenixDAO/UIimprovement
SyedMuqeetAqib Sep 30, 2021
389209f
cta message added in my created events
faheelsattar Oct 1, 2021
f464f37
Merge branch 'devdesign' of https://github.com/PhoenixDAO/events-dApp…
Musfirazia Oct 1, 2021
92f28a8
Merge pull request #492 from PhoenixDAO/designingv2
faheelsattar Oct 1, 2021
b371167
Merge branch 'devdesign' of https://github.com/PhoenixDAO/events-dApp…
Musfirazia Oct 1, 2021
90ec2f9
share event button disabled in my past events created
faheelsattar Oct 1, 2021
ce1b34e
Merge pull request #493 from PhoenixDAO/designingv2
faheelsattar Oct 1, 2021
de72d87
event page header title line limit
SyedMuqeetAqib Oct 1, 2021
87ac690
Merge pull request #494 from PhoenixDAO/UIimprovement
SyedMuqeetAqib Oct 1, 2021
e32d3f4
switched to mainnet
Musfirazia Oct 1, 2021
9c85ad4
Merge pull request #495 from PhoenixDAO/code-refactoring
Musfirazia Oct 1, 2021
2a08da0
activeFlamingStep
hakeemullahjan Oct 1, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
319 changes: 319 additions & 0 deletions .firebase/hosting.YnVpbGQ.cache

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions .firebaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"projects": {
"default": "test-app-ad562"
}
}
58 changes: 58 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: Development Workflow

on:
push:
branches:
- designing
jobs:
deploy:
runs-on: ubuntu-latest
env:
AWS_ACCESS_KEY_ID: '${{ secrets.AWS_ACCESS_KEY_ID }}'
AWS_SECRET_ACCESS_KEY: '${{ secrets.AWS_SECRET_ACCESS_KEY }}'
steps:
- uses: actions/checkout@v2
- name: Set up nodejs 14 LTS
uses: actions/setup-node@v2
with:
node-version: '14'

- name: Copy a file from s3
uses: prewk/s3-cp-action@v2
with:
aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
source: 's3://events-dapp-modules/node_modules.zip'
dest: '.'

- name: Unzip modules
run: unzip -o node_modules.zip

- name: Cache node_modules
uses: actions/cache@v2.0.0
with:
path: node_modules
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-${{ env.cache-name }}-
${{ runner.os }}-node-
${{ runner.os }}-

- name: building new build
run: npm build

- name: give execution permission
run: chmod +x changes.sh

- name: Run script
run: ./changes.sh

- name: Deploy to S3
uses: reggionick/s3-deploy@v3
with:
folder: build
bucket: 'events-dapp-frontend'
bucket-region: 'us-east-1'
delete-removed: true
no-cache: true
private: true
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
#folders
node_modules
build
.env

#files
yarn-error.log
.yarnrc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local
Empty file added 1000000){
Empty file.
296 changes: 273 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,44 +1,294 @@
# 🎫 OpenTicket DApp
<p align="center">
<a href="https://phoenixdao-events-dapp.herokuapp.com/" target="blank"><img src="https://events.phoenixdao.io/app/icon.svg" width="100" alt="PhoenixDao logo" /></a>
</p>

Demo running on the Rinkeby network: [OpenTicket DApp](https://monosux.github.io/open-ticket-dapp/)
# 🎫 PhoenixDAO Events Marketplace - V2

## What is it?
OpenTicket it is a dApp based on Ethereum Blockchain that provides an ability to create events and sell tickets for events as ERC721 tokens.

PhoenixDAO Events Marketplace is a dApp based on Ethereum Blockchain that provides an ability to create events and sell tickets for events as ERC721 tokens.

## Use Cases

### Event creator.

A user can create an event: set up a title, description, image, date, price (The price can be set in Ethereum or in USD tokens), availability of seats (limited seats or not, if limited - the number of seats). When the event is created it is showed in the list of events. Other users can buy tickets for this event. All funds from the ticket's sale go to the event creator directly.

### Ticket buyer

A user can see the list of events and can choose and buy a ticket for it. The user can pay by Ethereum or USD tokens depends on event's settings. The user can see the list of all its tickets. The user can send its ticket to another user. All tickets are ERC721 tokens that means that users can do any action available for these type of tokens.

## USD Token
DApp uses test tokens which user can receive on a special page.
## PhoenixDAO Token

This dApp uses test tokens which user can receive on a special page.

- Functions/Modules
- View Events
- Create Events
- Buy Tickets
- Send Tickets

### Integrated Stack

- ReactJS
- Web3
- IPFS
- Smartcontract

### Current Standings
The event marketplace now is supported on the Matic as well as the Ethereum Mainnet. Matic network is preferrable to carry on the transactions as it is a Layer 2 solution thus making the transactions gas efficient.

## File Structure

<pre>
├── avoiding_common_attacks.md
├── build
│   ├── app
│   │   ├── asset-manifest.json
│   │   ├── favicon.ico
│   │   ├── index.html
│   │   ├── service-worker.js
│   │   └── static
│   │   ├── css
│   │   ├── js
│   │   └── media
│   ├── asset-manifest.json
│   ├── contracts
│   │   ├── AddressUtils.json
│   │   ├── BasicToken.json
│   │   ├── Destructible.json
│   │   ├── ERC165.json
│   │   ├── ERC20Basic.json
│   │   ├── ERC20.json
│   │   ├── ERC721Basic.json
│   │   ├── ERC721BasicToken.json
│   │   ├── ERC721Enumerable.json
│   │   ├── ERC721.json
│   │   ├── ERC721Metadata.json
│   │   ├── ERC721Receiver.json
│   │   ├── ERC721Token.json
│   │   ├── Migrations.json
│   │   ├── OpenEvents.json
│   │   ├── OpenTicket.json
│   │   ├── Ownable.json
│   │   ├── Pausable.json
│   │   ├── SafeMath.json
│   │   ├── StableToken.json
│   │   ├── StandardToken.json
│   │   └── SupportsInterfaceWithLookup.json
│   ├── favicon.ico
│   ├── images
│   ├── index.html
│   ├── manifest.json
│   ├── _redirects
│   ├── service-worker.js
│   └── static
│   ├── css
│   ├── js
│   └── media
├── config.json
├── config-overrides.js
├── contracts
│   ├── Migrations.sol
│   ├── OpenEvents.sol
│   ├── OpenTicket.sol
│   └── StableToken.sol
├── debug.log
├── migrations
│   ├── 1_initial_migration.js
│   └── 2_deploy_contracts.js
├── package.json
├── package-lock.json
├── public
│   ├── index.html
│   ├── manifest.json
│   └── _redirects
├── README.md
├── src
│   ├── components
| | ├───CreateEvent/
| │ ├───Done.jsx
| │ ├───Error.jsx
| │ ├───EventPreviewPage.jsx
| │ ├───Form.jsx
| │ ├───Loader.jsx
| │ ├───MyStepper.jsx
| │ ├───MyStepperCopy.jsx
| │ ├───PreviewEvent.jsx
| │ ├───StepperFormControls.jsx
| │ ├───StepperFormStyling.jsx
| │ ├───TimeAndDateLoader.jsx
| │ ├───index.jsx
| │ └───style.css
| ├───EditEvent/
| │ ├───Done.jsx
| │ ├───Error.jsx
| │ ├───Form.jsx
| │ ├───Loader.jsx
| │ ├───TimeAndDateLoader.jsx
| │ └───index.jsx
| ├───account/
| │ ├───alreadyform.css
| │ ├───alreadyform.jsx
| │ ├───customform.css
| │ ├───customform.jsx
| │ ├───detailform.css
| │ ├───detailform.jsx
| │ ├───holderform.jsx
| │ ├───identityform.css
| │ ├───identityform.jsx
| │ └───index.jsx
| ├───common/
| │ ├───AvatarSelector/
| │ │ ├───alreadyform.css
| │ │ ├───alreadyform.jsx
| │ │ ├───customform.css
| │ │ ├───customform.jsx
| │ │ ├───holderform.jsx
| │ │ ├───identityform.css
| │ │ ├───identityform.jsx
| │ │ └───index.jsx
| │ ├───AccordianCard.jsx
| │ ├───BodyTextEditor.jsx
| │ ├───BuyPhnxButton.jsx
| │ ├───BuyPhoenixModal.jsx
| │ ├───BuyTicket.jsx
| │ ├───Card.jsx
| │ ├───ConnectWalletButton.jsx
| │ ├───CustomTextField.jsx
| │ ├───DatePicker.jsx
| │ ├───DialogueBox.jsx
| │ ├───EventCard.jsx
| │ ├───GeoLocation.jsx
| │ ├───Header.jsx
| │ ├───NearToYou.jsx
| │ ├───SearchBar.jsx
| │ ├───SendTicket.jsx
| │ ├───ShareModal.jsx
| │ ├───SkeletonEvent.jsx
| │ ├───SkeletonLayout.jsx
| │ ├───SkeletonTopic.jsx
| │ ├───Slider.jsx
| │ ├───Snackbar.jsx
| │ ├───SocialMedia.jsx
| │ ├───Switch.jsx
| │ ├───TicketCategory.jsx
| │ ├───TimePicker.jsx
| │ ├───TopicCard.jsx
| │ ├───TravallaBannerFooter.jsx
| │ └───Wallet.jsx
| ├───Analytics.jsx
| ├───AnalyticsWrapper.jsx
| ├───App.jsx
| ├───Calendars.jsx
| ├───CheckUser.jsx
| ├───Clock.jsx
| ├───ConfirmPurchase.jsx
| ├───Dashboard.jsx
| ├───EmptyState.jsx
| ├───EmptyStateAnalytics.jsx
| ├───Event.jsx
| ├───EventNotFound.jsx
| ├───EventPage.jsx
| ├───EventsAnalytics.jsx
| ├───FAQ.jsx
| ├───Favorite.jsx
| ├───FindEvents-copy.jsx
| ├───FindEvents.jsx
| ├───Guide.jsx
| ├───Home.jsx
| ├───Loading.jsx
| ├───LoadingApp.jsx
| ├───LocationLandingPage.jsx
| ├───LocationsLandingPage.jsx
| ├───MyEventStat.jsx
| ├───MyEvents.jsx
| ├───MyTickets.jsx
| ├───NetworkError.jsx
| ├───Notify.jsx
| ├───PageNotFound.jsx
| ├───PastEvents.jsx
| ├───PhoenixDAOLoader.jsx
| ├───Sidebar.jsx
| ├───Snackbar.jsx
| ├───Snackbar2.jsx
| ├───Snackbar3.jsx
| ├───Terms.jsx
| ├───Ticket.jsx
| ├───TicketOld.jsx
| ├───Token.jsx
| ├───Topic.jsx
| ├───TopicLandingPage.jsx
| ├───TopicsLandingPage.jsx
| ├───UniswapModal.jsx
| ├───WrapperTopicsLandingPage.jsx
| └───approvalModal.jsx
│   ├── config
│   │   ├── countries.json
│   │   ├── event_ctas.json
│   │   ├── hydrocontract_testnet.js
│   │   ├── location_ctas.json
│   │   ├── Moon.json
│   │   ├── OMG.js
│   │   ├── OMG.json
│   │   ├── OpenEvents.js
│   │   ├── OpenEvents.json
│   │   ├── phoenixDAOcontract_testnet.js
│   │   ├── sidebar.json
│   │   ├── slides_generic.json
│   │   ├── slides_locations.json
│   │   ├── StableToken.json
│   │   ├── states.json
│   │   ├── topics.json
│   │   └── types.json
│   ├── Error.jsx
│   ├── index.js
│   ├── styles
│   │   ├── main.css
│   │   └── Ticket.css
│   └── utils
│   └── ipfs.js
├── test
│   ├── OpenEvents.test.js
│   └── StableToken.test.js
├── truffle-config.js
└── yarn.lock
</pre>

## App Link

[PhoenixDAO Events DApp](https://events.phoenixdao.io/)

## Setup

1. Install packages.
```javascript
yarn install
// or
npm install
```
## Installation

2. Run the development blockchain.
```javascript
ganache-cli -b 5
```bash
$ npm install
```

3. Compile and migrate contracts.
```javascript
truffle compile
truffle migrate
## Running the app

```bash
# development
$ npm run start

# watch mode
$ npm run start:dev

# production mode
$ npm run start:prod
```

4. Run app.
```javascript
yarn run start
// or
npm start
## Test

```bash
# unit tests
$ npm run test

# e2e tests
$ npm run test:e2e

# test coverage
$ npm run test:cov
```
Loading