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

Gallery #218

Merged
merged 69 commits into from
Mar 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
23cb42a
Added WIP Gallery, Secondary Gallery, dynamic Events page
WAEliasmith Feb 24, 2024
eb3ce98
eslint fix
WAEliasmith Feb 25, 2024
a08dd5e
Fixed up gallery UI to better match examples
WAEliasmith Feb 26, 2024
f731f97
Fixed style checks
WAEliasmith Feb 26, 2024
1e3ef7e
Added gradient
WAEliasmith Feb 26, 2024
3662097
Gallery and events page
WAEliasmith Feb 29, 2024
5256feb
Merge branch 'feat/nft-drops' into Gallery
WAEliasmith Feb 29, 2024
8429567
WIP gallery revamp
WAEliasmith Mar 2, 2024
dd8d8c9
Many frontend fixes and changes
7axel7 Mar 3, 2024
e6f1241
Many changes for the gallery and events page prototypes
7axel7 Mar 4, 2024
8296d3c
A bunch of changes to get the gallery and events page into a suitable…
WAEliasmith Mar 4, 2024
9626d24
eslint fix 1
WAEliasmith Mar 4, 2024
65cc17e
More styling fixes and abstraction
WAEliasmith Mar 4, 2024
aa4fb3a
events WIP
WAEliasmith Mar 5, 2024
96cd8be
Merge branch 'feat/my-events-page' into gallery
WAEliasmith Mar 5, 2024
c684dc8
Integration day 1
WAEliasmith Mar 5, 2024
aecb8cd
Daily updates for gallery
WAEliasmith Mar 6, 2024
7b92211
daily changes for gallery
WAEliasmith Mar 7, 2024
de2675e
Merge branch 'feat/my-events-page' into Gallery
WAEliasmith Mar 8, 2024
55c45da
wip new data
WAEliasmith Mar 8, 2024
befdc8c
Merge branch 'fydp' into Gallery
WAEliasmith Mar 8, 2024
25cb287
daily gallery updates friday
WAEliasmith Mar 8, 2024
fe2deb5
Merge branch 'fydp' into Gallery
WAEliasmith Mar 9, 2024
fcfed12
custom date range picker beginning implementation
BenKurrek Mar 9, 2024
f50a46d
date range picker finished
BenKurrek Mar 9, 2024
07e22be
working on event preview page
BenKurrek Mar 10, 2024
9c6d838
about to refactor
BenKurrek Mar 11, 2024
5cda669
successful refactor
BenKurrek Mar 11, 2024
f2d01d1
finalized step 3
BenKurrek Mar 12, 2024
1e2ee2e
daily gallery and events page update
WAEliasmith Mar 12, 2024
079b819
almost finished ticket creation page
BenKurrek Mar 13, 2024
1afb2d7
first pass at ticket creation tab
BenKurrek Mar 13, 2024
dbc661d
preview modal progress
BenKurrek Mar 14, 2024
cc05f71
secondary market and purchase WIP
WAEliasmith Mar 14, 2024
1d00a92
Merge branch 'feat/create-tickets' into Gallery
WAEliasmith Mar 14, 2024
165cbb9
cleared build errors
BenKurrek Mar 14, 2024
38dd1ba
first pass at review details
BenKurrek Mar 14, 2024
b7fd94a
fix build
BenKurrek Mar 14, 2024
a534120
first pass at event creation pseudo successful
BenKurrek Mar 14, 2024
10ee3d6
first pass at cost breakdown
BenKurrek Mar 14, 2024
9aa5414
ticket creation almost finished
BenKurrek Mar 14, 2024
16dd3cb
Daily update, demo working
WAEliasmith Mar 15, 2024
cb7c020
build errors
BenKurrek Mar 15, 2024
c69da93
Merge branch 'feat/create-tickets' into Gallery
WAEliasmith Mar 15, 2024
17969ed
small fix after merge
WAEliasmith Mar 15, 2024
bacd54e
getting ready for demo
BenKurrek Mar 15, 2024
f31d0ab
full functioning demo
BenKurrek Mar 15, 2024
68cb466
changes to navbar and modals
BenKurrek Mar 18, 2024
031d9a5
started work on linting errors
BenKurrek Mar 18, 2024
0b1fbc9
began working on QOL code changes
BenKurrek Mar 19, 2024
14a7657
changed estimator
BenKurrek Mar 19, 2024
89ee0e0
reset button for date time picker, date validation in event creation,…
BenKurrek Mar 19, 2024
1d12f69
stripe and free integration
WAEliasmith Mar 19, 2024
ee4e529
refactor time picker
BenKurrek Mar 19, 2024
7964214
refactor placeholder text for date
BenKurrek Mar 19, 2024
3d8f657
added proper redirects for events managers
BenKurrek Mar 19, 2024
0446100
Merge pull request #226 from keypom/chore/ticket-creation
WAEliasmith Mar 19, 2024
358900c
added sell button and removed connect button from navbar
BenKurrek Mar 19, 2024
d3c0625
added no connect button on mobile
BenKurrek Mar 19, 2024
979d31b
fixed bugs introduced with fresh builds and no caching
BenKurrek Mar 19, 2024
01ab153
changed worker base URL
BenKurrek Mar 19, 2024
0ff9228
added gitattributes file
WAEliasmith Mar 19, 2024
4c793b4
changed vcproj to lf in gitattributes
WAEliasmith Mar 19, 2024
efadc10
eslint fixes
WAEliasmith Mar 21, 2024
1ebc3ec
fixed a bunch of type checks
WAEliasmith Mar 22, 2024
0aa273c
Merge branch 'feat/qr-page' into Gallery
WAEliasmith Mar 22, 2024
1893317
Merge branch 'chore/fresh-build-tests' into Gallery
WAEliasmith Mar 22, 2024
5261d7f
removed eslint errors and warnings
WAEliasmith Mar 22, 2024
03ab928
Fixed more check-types
WAEliasmith Mar 23, 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
8 changes: 8 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ module.exports = {
'prettier',
'plugin:prettier/recommended',
],

overrides: [],
parser: '@typescript-eslint/parser',
parserOptions: {
Expand All @@ -33,6 +34,13 @@ module.exports = {
'@typescript-eslint',
],
rules: {
'prettier/prettier': [
'error',
{
endOfLine: 'auto',
},
],
endOfLine: 'off',
'react/react-in-jsx-scope': 'off',
'react/jsx-sort-props': [
2,
Expand Down
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.vcproj eol=lf
*.sh eol=lf
3 changes: 2 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
"singleQuote": true,
"jsxSingleQuote": false,
"semi": true,
"printWidth": 100
"printWidth": 100,
"endOfLine": "auto"
}
9 changes: 2 additions & 7 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
{
// eslint extension options
"eslint.enable": true,
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact"
],
"eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
// prettier extension setting
"editor.formatOnSave": true,
"[javascript]": {
Expand All @@ -23,7 +18,7 @@
},
"editor.rulers": [80],
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"source.fixAll.eslint": "explicit"
},
"cSpell.words": ["bgcolor"],
"typescript.tsdk": "node_modules/typescript/lib"
Expand Down
9 changes: 7 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,21 @@
"idb-keyval": "^6.2.0",
"ipfs-car": "^0.9.2",
"keypom-js": "^1.4.7",
"luxon": "^3.4.4",
"mathjs": "^11.5.1",
"near-api-js": "^1.1.0",
"react": "^18.2.0",
"react-datepicker": "^6.2.0",
"react-dom": "^18.2.0",
"react-hook-form": "^7.43.0",
"react-input-mask": "^2.0.4",
"react-qr-code": "^2.0.11",
"react-qr-reader": "3.0.0-beta-1",
"react-qr-reader": "^3.0.0-beta-1",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was this added?

"react-router-dom": "^6.8.0",
"rxjs": "^7.8.0",
"string_decoder": "^1.3.0",
"swr": "^2.0.3",
"tweetnacl-util": "^0.15.1",
"zod": "^3.20.2"
},
"devDependencies": {
Expand Down Expand Up @@ -84,7 +88,8 @@
"stream-browserify": "^3.0.0",
"tslint-config-prettier": "^1.18.0",
"typescript": "^4.9.5",
"util": "^0.12.3"
"util": "^0.12.3",
"vm-browserify": "^1.1.2"
},
"browserslist": [
"last 2 Chrome versions"
Expand Down
Binary file added public/assets/alcohol.webp
Binary file not shown.
Binary file added public/img/Ticket1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/Ticket2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/Ticket3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/alcohol.webp
Binary file not shown.
Binary file added public/img/ballet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/basketball.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/car.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/friends.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/hockeygame.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/hockeyticket.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/monalisa.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/music.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/paintticket.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 src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { RouterProvider } from 'react-router-dom';
import { ChakraProvider } from '@chakra-ui/react';

import { theme } from '@/theme';
import './components/DateRangePicker/DatePickerStyle.css'; // Path to your custom CSS
import { router } from '@/router';
import { router as storybookRouter } from '@/storybook-router';
import { Loading } from '@/components/Loading';
Expand Down
Loading
Loading