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

Dev #44

Merged
merged 128 commits into from
Jan 20, 2025
Merged

Dev #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
128 commits
Select commit Hold shift + click to select a range
b2b7353
feat: header & hero block
PaulWeb30 Jan 9, 2025
6060a6d
fix: static checks
PaulWeb30 Jan 9, 2025
6c6b0c2
fix: static checks corepack
PaulWeb30 Jan 9, 2025
72b9dc4
fix: build
PaulWeb30 Jan 9, 2025
7d2df2e
feat: update About and Footer components for improved layout and resp…
yarre-uk Jan 10, 2025
c171e6c
chore: return game page to it's original form
yarre-uk Jan 10, 2025
a92f99e
Merge pull request #10 from RedDuck-Software/feat/about-and-footer-re…
NikiTaysRD Jan 10, 2025
ec72dea
chore: temp commit
PaulWeb30 Jan 10, 2025
9ae0a47
feat: cards images
yarre-uk Jan 10, 2025
b622540
feat: remove install state
NikiTays Jan 10, 2025
d33a087
feat: change git ignore
NikiTays Jan 10, 2025
69ac5fe
refactor: improve code structure and formatting in GameSection and Ac…
yarre-uk Jan 10, 2025
9f97cbb
Merge pull request #11 from RedDuck-Software/feat/cards-images
yarre-uk Jan 10, 2025
cd686e4
feat: enable corepack in static checks workflow
yarre-uk Jan 10, 2025
1705580
Merge pull request #12 from RedDuck-Software/fix/eslint-errors
NikiTaysRD Jan 10, 2025
2a26abc
feat: cta & faq blocks
PaulWeb30 Jan 10, 2025
3a73179
fix: conflict
PaulWeb30 Jan 10, 2025
c216e2e
chore: minor
PaulWeb30 Jan 10, 2025
88b656e
Merge pull request #7 from RedDuck-Software/feat/landing-layout
NikiTaysRD Jan 10, 2025
741f258
feat: add game logic
NikiTays Jan 10, 2025
c30726e
Merge branch 'dev' into feat/tarot-design-1
NikiTays Jan 10, 2025
70c843e
Merge pull request #13 from RedDuck-Software/feat/tarot-design-1
NikiTaysRD Jan 10, 2025
2408132
feat: enhance Connect Wallet button UI and improve dialog styles
yarre-uk Jan 10, 2025
f0fb288
chore: fix
yarre-uk Jan 10, 2025
a281b9c
Merge pull request #14 from RedDuck-Software/feat/connect-wallet-ui
NikiTaysRD Jan 10, 2025
d3ba606
feat: implement useSendSol hook for sending SOL transactions and add …
yarre-uk Jan 10, 2025
970721b
fix: header
PaulWeb30 Jan 10, 2025
aa5178f
feat: improve error messages for question validation and refactor toa…
yarre-uk Jan 10, 2025
390ad82
Merge pull request #15 from RedDuck-Software/feat/thank-the-oracle
NikiTaysRD Jan 10, 2025
76ec7cd
feat: refactoring
NikiTays Jan 10, 2025
87f759e
fix: lint
NikiTays Jan 10, 2025
cb2d87d
Merge branch 'dev' of https://github.com/RedDuck-Software/ai-tarot-we…
PaulWeb30 Jan 10, 2025
3244623
Merge pull request #16 from RedDuck-Software/feat/tarot-design-1
NikiTaysRD Jan 10, 2025
4b02b4c
Merge branch 'dev' of https://github.com/RedDuck-Software/ai-tarot-we…
PaulWeb30 Jan 10, 2025
59f4a63
feat: refactoring
NikiTays Jan 10, 2025
9016c47
feat: refactoring
NikiTays Jan 10, 2025
c9d1538
Merge pull request #17 from RedDuck-Software/feat/tarot-design-1
NikiTaysRD Jan 10, 2025
bcb9d4f
feat: main images animation & change
PaulWeb30 Jan 10, 2025
bfd1a25
Merge branch 'dev' of https://github.com/RedDuck-Software/ai-tarot-we…
PaulWeb30 Jan 10, 2025
6224440
fix: lint
PaulWeb30 Jan 10, 2025
13dbe21
feat: update Accordion component to be collapsible and remove unused …
yarre-uk Jan 10, 2025
7b3c980
style: reorder class names for consistency in GameSection component
yarre-uk Jan 10, 2025
eebac7d
fix: header burger menu
PaulWeb30 Jan 11, 2025
a86a9ad
Merge pull request #19 from RedDuck-Software/fix/accorion-collapsible
NikiTaysRD Jan 13, 2025
6aba721
Merge branch 'dev' of https://github.com/RedDuck-Software/ai-tarot-we…
PaulWeb30 Jan 13, 2025
ea919bb
feat: fix bugs
NikiTays Jan 13, 2025
ec53fe5
Merge pull request #20 from RedDuck-Software/feat/tarot-design-1
NikiTaysRD Jan 13, 2025
2c858d7
Merge branch 'dev' of https://github.com/RedDuck-Software/ai-tarot-we…
PaulWeb30 Jan 13, 2025
1e14c91
feat: fix bugs
NikiTays Jan 13, 2025
8b2d24f
feat: fix bugs
NikiTays Jan 13, 2025
7ac8e31
feat: fix bugs
NikiTays Jan 13, 2025
d9af4de
Merge pull request #21 from RedDuck-Software/feat/tarot-design-1
NikiTaysRD Jan 13, 2025
fac8586
fix: game images & conflict
PaulWeb30 Jan 13, 2025
eee5ebd
Merge branch 'dev' of https://github.com/RedDuck-Software/ai-tarot-we…
PaulWeb30 Jan 13, 2025
d97bcb0
Merge pull request #18 from RedDuck-Software/feat/ui-improvements
NikiTaysRD Jan 13, 2025
1eb56ad
feat: add tarot cards animation
PaulWeb30 Jan 13, 2025
cff8814
Merge pull request #22 from RedDuck-Software/feat/cards-animation
NikiTaysRD Jan 13, 2025
b5f6f75
feat: favicon
PaulWeb30 Jan 13, 2025
0a8ddd5
feat: loader
PaulWeb30 Jan 13, 2025
8df2f19
Merge branch 'dev' of https://github.com/RedDuck-Software/ai-tarot-we…
PaulWeb30 Jan 13, 2025
3d126b3
Merge pull request #23 from RedDuck-Software/feat/admin-page
NikiTaysRD Jan 13, 2025
4ec906f
fix: tip
yarre-uk Jan 13, 2025
dffa7e6
Merge pull request #24 from RedDuck-Software/fix/tip
NikiTaysRD Jan 13, 2025
fa94834
feat: 404 page
PaulWeb30 Jan 13, 2025
172ae21
fix: format prediction answer before setting question value
yarre-uk Jan 13, 2025
ee1da1e
fix: update prediction answer formatting and upgrade TypeScript targe…
yarre-uk Jan 13, 2025
a15d129
feat: fix bugs
NikiTays Jan 13, 2025
f0c2eda
fix: tarot line & button scroll
PaulWeb30 Jan 13, 2025
0489705
Merge pull request #25 from RedDuck-Software/fix/tip
NikiTaysRD Jan 13, 2025
c3a763e
Merge pull request #26 from RedDuck-Software/feat/admin-page
NikiTaysRD Jan 13, 2025
ccba7c2
feat: text
NikiTays Jan 14, 2025
61b5100
feat: texts, validation, image optimization, decreased reverted %
PaulWeb30 Jan 14, 2025
d7dd346
fix: build
PaulWeb30 Jan 14, 2025
1f785c2
feat: add beforeunload handler and update textarea disabled state
yarre-uk Jan 14, 2025
3cb1efe
Merge pull request #28 from RedDuck-Software/feat/onunload
NikiTaysRD Jan 14, 2025
5b3d002
Merge pull request #27 from RedDuck-Software/feat/text
NikiTaysRD Jan 14, 2025
bff5872
feat: update CTA text and adjust styling for improved readability
yarre-uk Jan 14, 2025
e371f51
feat: addresses
NikiTays Jan 14, 2025
d1ca091
Merge remote-tracking branch 'origin/dev' into dev
NikiTays Jan 14, 2025
bafe795
feat: addresses
NikiTays Jan 14, 2025
2a222af
feat: add admin page and button, update routing and addresses
yarre-uk Jan 14, 2025
e1c9aa4
feat: update Devnet owner address and implement toast notifications f…
yarre-uk Jan 14, 2025
de22ec2
feat: update header background and enhance game section beforeunload …
yarre-uk Jan 14, 2025
13908bf
feat: update default deposit amount for Solana
yarre-uk Jan 14, 2025
cb0835c
Merge pull request #29 from RedDuck-Software/fix/text
NikiTaysRD Jan 14, 2025
196eb01
Merge pull request #30 from RedDuck-Software/fix/14.01.25
NikiTaysRD Jan 14, 2025
3078d3c
feat: update header background image to use sand texture
yarre-uk Jan 14, 2025
bd5c165
Merge pull request #31 from RedDuck-Software/fix/14.01.25
NikiTaysRD Jan 14, 2025
3907960
feat: addresses
NikiTays Jan 14, 2025
cd94055
feat: improvements
yarre-uk Jan 15, 2025
33359ff
Merge pull request #32 from RedDuck-Software/fix/ui-improvemeents-15.…
NikiTaysRD Jan 15, 2025
c645a70
Merge branch 'dev' of github.com:RedDuck-Software/ai-tarot-web into f…
yarre-uk Jan 15, 2025
c94c2fa
feat: update formatting and improve control service functionality
yarre-uk Jan 15, 2025
ff9ebe8
refactor: simplify toast notification handling in prediction hook
yarre-uk Jan 15, 2025
3377418
feat: animation
NikiTays Jan 15, 2025
a3fbeb3
Merge pull request #33 from RedDuck-Software/feat/admin
NikiTaysRD Jan 15, 2025
65dffea
feat: undo animation
NikiTays Jan 15, 2025
0b5694f
feat: improve 404
yarre-uk Jan 15, 2025
2651c87
fix: admin btn
yarre-uk Jan 16, 2025
0114df9
Merge pull request #34 from RedDuck-Software/feat/improve-404
NikiTaysRD Jan 16, 2025
1ae47fc
Merge pull request #35 from RedDuck-Software/fix/admin-btn
NikiTaysRD Jan 16, 2025
a5ee457
feat: blowfish verification
PaulWeb30 Jan 16, 2025
02aa24f
feat: integrate shutdown status in game section and update owner address
yarre-uk Jan 16, 2025
0107bc9
Merge pull request #36 from RedDuck-Software/feat/shutdown
NikiTaysRD Jan 16, 2025
a0f9128
fix: update tooltip message for shutdown status in game section
yarre-uk Jan 16, 2025
8b794d2
Merge pull request #37 from RedDuck-Software/feat/shutdown
NikiTaysRD Jan 16, 2025
651e059
feat: implement status modal store and integrate with prediction flow
yarre-uk Jan 16, 2025
e233dd6
Merge pull request #38 from RedDuck-Software/feat/shutdown
NikiTaysRD Jan 16, 2025
7c859bc
feat: add currencies
NikiTays Jan 17, 2025
6444b42
feat: add currencies
NikiTays Jan 17, 2025
f8b4ac6
feat: add currencies
NikiTays Jan 17, 2025
451a062
feat: add currencies
NikiTays Jan 17, 2025
6139876
Merge pull request #39 from RedDuck-Software/feat/other-currency
NikiTaysRD Jan 17, 2025
9e6ea62
feat: add status modals for transaction outcomes and enhance error ha…
yarre-uk Jan 20, 2025
329159e
chore: clean up
yarre-uk Jan 20, 2025
013629a
Merge pull request #40 from RedDuck-Software/feat/new-error-modals
NikiTaysRD Jan 20, 2025
bf180f0
refactor: 20.01.2025
yarre-uk Jan 20, 2025
f94fd2f
refactor: use type and clear namings for type definitions, and interf…
yarre-uk Jan 20, 2025
22582a5
chore: fix imports
yarre-uk Jan 20, 2025
227a5d2
chore: update GitHub Actions workflow for static checks
yarre-uk Jan 20, 2025
f69978e
Merge pull request #42 from RedDuck-Software/refactor/20.01.2025
yarre-uk Jan 20, 2025
cf8ea23
refactor: remove duplicate routesWhereAvoidAbout declaration and stre…
yarre-uk Jan 20, 2025
1819703
chore: test
yarre-uk Jan 20, 2025
e305bdb
fix: remame to correct file names
yarre-uk Jan 20, 2025
f9e0ebc
chore: for deploy
yarre-uk Jan 20, 2025
c365dd0
chore: fix
yarre-uk Jan 20, 2025
ff500f1
refactor: rename type and improve accessibility in currency select co…
yarre-uk Jan 20, 2025
bc1f48b
Merge pull request #43 from RedDuck-Software/refactor/20.01.2025
NikiTaysRD Jan 20, 2025
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
60 changes: 31 additions & 29 deletions .github/workflows/static-checks.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,31 @@
name: Static Checks

on:
push:
branches:
- main
- staging
pull_request: {}
workflow_dispatch: {}

jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '20'
- uses: actions/cache@v3
id: cache
with:
path: '**/node_modules'
key: ${{ runner.os }}-npm-${{ hashFiles('**/yarn.lock') }}
restore-keys: ${{ runner.os }}-npm-
- name: Install project dependencies
if: steps.cache.outputs.cache-hit != 'true'
run: yarn install --frozen-lockfile
- name: Testing
run: yarn tsc --noEmit && yarn lint && yarn build
name: Static Checks

on:
push:
branches:
- main
- dev
pull_request:

permissions:
actions: read
contents: read

jobs:
main:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-node@v4
with:
node-version: 22
- name: Enable Corepack
run: corepack enable
- name: Prepare Yarn
run: corepack prepare [email protected] --activate
- name: Install dependencies
run: yarn install --frozen-lockfile
- name: Testing
run: yarn tsc --noEmit && yarn lint && yarn build
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ dist-ssr
*.njsproj
*.sln
*.sw?
.env
.env
.yarn
14 changes: 7 additions & 7 deletions .prettierrc.cjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
singleQuote: true,
trailingComma: "all",
printWidth: 120,
semi: true,
plugins: ["prettier-plugin-tailwindcss"],
};
module.exports = {
singleQuote: true,
trailingComma: 'all',
printWidth: 120,
semi: true,
plugins: ['prettier-plugin-tailwindcss'],
};
Binary file removed .yarn/install-state.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nodeLinker: node-modules
nodeLinker: node-modules
51 changes: 5 additions & 46 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,50 +1,9 @@
# React + TypeScript + Vite
# Tarotsol AI

This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
## Blowfish ticket number: 5948

Currently, two official plugins are available:
## Domain

- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
[https://tarotsol.ai/](https://tarotsol.ai/)

## Expanding the ESLint configuration

If you are developing a production application, we recommend updating the configuration to enable type aware lint rules:

- Configure the top-level `parserOptions` property like this:

```js
export default tseslint.config({
languageOptions: {
// other options...
parserOptions: {
project: ['./tsconfig.node.json', './tsconfig.app.json'],
tsconfigRootDir: import.meta.dirname,
},
},
})
```

- Replace `tseslint.configs.recommended` to `tseslint.configs.recommendedTypeChecked` or `tseslint.configs.strictTypeChecked`
- Optionally add `...tseslint.configs.stylisticTypeChecked`
- Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and update the config:

```js
// eslint.config.js
import react from 'eslint-plugin-react'

export default tseslint.config({
// Set the react version
settings: { react: { version: '18.3' } },
plugins: {
// Add the react plugin
react,
},
rules: {
// other rules...
// Enable its recommended rules
...react.configs.recommended.rules,
...react.configs['jsx-runtime'].rules,
},
})
```
[https://regal-moonbeam-3e1c0e.netlify.app/game](https://regal-moonbeam-3e1c0e.netlify.app/game)
2 changes: 1 addition & 1 deletion components.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
"hooks": "@/hooks"
},
"iconLibrary": "lucide"
}
}
1 change: 1 addition & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ export default tseslint.config(
'@typescript-eslint/no-unsafe-call': 'off',
'@typescript-eslint/no-unsafe-assignment': 'off',
'@typescript-eslint/restrict-template-expressions': 'off',
'@typescript-eslint/consistent-type-definitions': ['error', 'type'],
},
},
);
8 changes: 6 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,19 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite + React + TS</title>
<title>Tarotsol AI</title>
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Inknut+Antiqua:wght@300;400;500;600;700;800;900&display=swap"
rel="stylesheet"
/>
<link
href="https://fonts.googleapis.com/css2?family=Bona+Nova+SC:ital,wght@0,400;0,700;1,400&display=swap"
rel="stylesheet"
/>
</head>
<body>
<div id="root" style="max-width: 100vw; width: 100%"></div>
Expand Down
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
"@radix-ui/react-accordion": "^1.2.2",
"@radix-ui/react-dialog": "^1.1.4",
"@radix-ui/react-popover": "^1.1.4",
"@radix-ui/react-select": "^2.1.4",
"@radix-ui/react-slot": "^1.1.1",
"@radix-ui/react-tooltip": "^1.1.6",
"@solana/spl-token": "^0.4.9",
"@solana/wallet-adapter-react": "^0.15.35",
"@solana/wallet-adapter-wallets": "^0.19.32",
Expand All @@ -29,6 +31,7 @@
"lucide-react": "^0.469.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-fast-marquee": "^1.6.5",
"react-hook-form": "^7.54.2",
"react-router": "^7.1.1",
"react-toastify": "^11.0.2",
Expand Down
2 changes: 1 addition & 1 deletion postcss.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ export default {
tailwindcss: {},
autoprefixer: {},
},
}
};
14 changes: 14 additions & 0 deletions public/favicon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions public/icons/currencies/usdcMint.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions public/icons/currencies/usdtMint.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions public/icons/currencies/wSolMint.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/icons/dot.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading