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

231 website overhaul #249

Merged
merged 180 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
180 commits
Select commit Hold shift + click to select a range
0b7fe86
Bump axios from 1.5.1 to 1.6.0
dependabot[bot] Nov 10, 2023
c40146c
initial changes
lxgr-linux Nov 27, 2023
489c243
Added button teal
lxgr-linux Nov 27, 2023
0835c8b
finished buttons and added demo page
lxgr-linux Nov 27, 2023
f7ab225
Merge pull request #234 from DecentralCardGame/233-create-buttons
lxgr-linux Nov 27, 2023
0457f06
add content to footer
patrickwieth Nov 27, 2023
6e3b6c4
Added navbar
lxgr-linux Nov 27, 2023
26ec029
Added a lot
lxgr-linux Nov 28, 2023
b50b273
Merge branch '231-website-overhaul' into 237-create-landingpage
lxgr-linux Nov 28, 2023
f30a36b
Merge pull request #236 from DecentralCardGame/235-update-navbar
lxgr-linux Nov 28, 2023
5d5f03f
links now work on footer
patrickwieth Nov 28, 2023
73b6c8e
Merge pull request #238 from DecentralCardGame/232-update-footer
lxgr-linux Nov 28, 2023
f55bf0e
Added sets and boosters box
lxgr-linux Nov 28, 2023
3ceee34
Merge branch '231-website-overhaul' into 237-create-landingpage
lxgr-linux Nov 28, 2023
f6a2488
fix scroll back to top
patrickwieth Nov 28, 2023
72a179e
increase font size
patrickwieth Nov 28, 2023
ddf2891
Added pics
lxgr-linux Nov 28, 2023
464676b
fix footer wrapping
patrickwieth Nov 28, 2023
521ff69
Merge pull request #240 from DecentralCardGame/232-update-footer
lxgr-linux Nov 28, 2023
27cb86e
Added cardbacks
lxgr-linux Nov 28, 2023
c09ab16
fix scroll back to top
patrickwieth Nov 28, 2023
a2a3b5b
increase font size
patrickwieth Nov 28, 2023
f5471a9
fix footer wrapping
patrickwieth Nov 28, 2023
6624458
Added text to cardbacks
lxgr-linux Nov 29, 2023
a883185
Merge branch 'devnet' into 231-website-overhaul
lxgr-linux Nov 30, 2023
04197c7
Merge branch '231-website-overhaul' into 237-create-landingpage
lxgr-linux Nov 30, 2023
a140d11
Fixed build
lxgr-linux Nov 30, 2023
004bd91
Added FadeTeaser
lxgr-linux Nov 30, 2023
5cd1f5b
Added Be Part of the game
lxgr-linux Nov 30, 2023
13f5e41
a little bit of card creator done
patrickwieth Dec 1, 2023
4436fb0
update
patrickwieth Dec 2, 2023
5168d62
more card creator stuff
patrickwieth Dec 7, 2023
6b10d0d
dropdown action and favicon
patrickwieth Dec 13, 2023
c73db01
card creator tags
patrickwieth Dec 13, 2023
a824bae
fix up
lxgr-linux Dec 25, 2023
91bee72
added better shadow
lxgr-linux Dec 26, 2023
0492edf
looks good on normal display
lxgr-linux Dec 26, 2023
5fc1d60
Made boosters look better on wider displays
lxgr-linux Dec 26, 2023
6c946c5
Added RouterCCButton
lxgr-linux Dec 26, 2023
3b8985b
Update main.yml
lxgr-linux Dec 26, 2023
ead1ae2
Fixed menu header
lxgr-linux Dec 26, 2023
583715e
Merge branch '242-fix-header-and-make-buttons-router-linkable' of git…
lxgr-linux Dec 26, 2023
a2d8f1c
Added a lot
lxgr-linux Nov 28, 2023
3eb1d92
Added sets and boosters box
lxgr-linux Nov 28, 2023
35e15e2
Added pics
lxgr-linux Nov 28, 2023
e862e1f
Added cardbacks
lxgr-linux Nov 28, 2023
3c074d2
fix scroll back to top
lxgr-linux Dec 26, 2023
570657b
increase font size
patrickwieth Nov 28, 2023
96bd9e8
fix footer wrapping
patrickwieth Nov 28, 2023
4401130
Added text to cardbacks
lxgr-linux Nov 29, 2023
d421534
Fixed build
lxgr-linux Nov 30, 2023
a04a440
Added FadeTeaser
lxgr-linux Nov 30, 2023
d457994
Added Be Part of the game
lxgr-linux Nov 30, 2023
d6f7527
fix up
lxgr-linux Dec 25, 2023
3003e1c
added better shadow
lxgr-linux Dec 26, 2023
960f5a5
looks good on normal display
lxgr-linux Dec 26, 2023
f7fb098
Made boosters look better on wider displays
lxgr-linux Dec 26, 2023
10c9176
Added RouterCCButton
lxgr-linux Dec 26, 2023
d275a46
Fixed menu header
lxgr-linux Dec 26, 2023
53d8a08
Update main.yml
lxgr-linux Dec 26, 2023
39a5b11
Merge branch '242-fix-header-and-make-buttons-router-linkable' of git…
lxgr-linux Dec 26, 2023
5b5a945
Merge pull request #248 from DecentralCardGame/242-fix-header-and-mak…
lxgr-linux Dec 26, 2023
eb6dc45
Fixed build
lxgr-linux Nov 30, 2023
a37b197
Added pics
lxgr-linux Nov 28, 2023
07739d9
Merge branch 'master' into 231-website-overhaul
lxgr-linux Dec 26, 2023
7e1e6c5
Added RouterCCButton
lxgr-linux Dec 26, 2023
208cd4b
Update main.yml
lxgr-linux Dec 26, 2023
1a8b4f9
Fixed menu header
lxgr-linux Dec 26, 2023
0ab75db
Merge branch '231-website-overhaul' into 237-create-landingpage
lxgr-linux Dec 26, 2023
5b3891e
Merge branch '237-create-landingpage' of github.com:DecentralCardGame…
lxgr-linux Dec 26, 2023
24d4e8c
Added login comp and login page
lxgr-linux Dec 26, 2023
e54c5e1
login page works now
lxgr-linux Dec 28, 2023
061efe8
Merge pull request #245 from DecentralCardGame/237-create-landingpage
lxgr-linux Dec 28, 2023
3525f6a
Added auto login
lxgr-linux Dec 28, 2023
bf6e058
Merge branch '231-website-overhaul' into 243-login
lxgr-linux Dec 28, 2023
e0df41d
removed captcha modal
lxgr-linux Dec 28, 2023
ca27b60
Added base userview
lxgr-linux Dec 31, 2023
2dcedd7
Bump follow-redirects from 1.15.2 to 1.15.4
dependabot[bot] Jan 10, 2024
f010395
add ability stuff to cardcreator
patrickwieth Jan 11, 2024
ca5d6ff
Added profilepic component and made userview more mobild friendly
lxgr-linux Jan 14, 2024
80d70d3
made login page viewport relative and very nice
lxgr-linux Jan 14, 2024
67e099b
Added PBChooser
lxgr-linux Jan 15, 2024
76c6fb7
Cleaned up
lxgr-linux Jan 15, 2024
602828b
Bump vite from 4.5.0 to 4.5.2
dependabot[bot] Jan 20, 2024
fd4bb20
Added matches overview
lxgr-linux Jan 24, 2024
147e1cd
Userview more mobile friendly
lxgr-linux Jan 25, 2024
ed27a40
fixed mobile
lxgr-linux Jan 25, 2024
7a9bc9b
Changed images and added scale on hover on Landingpage
lxgr-linux Jan 25, 2024
30230e0
Adder LinkCCBitton and discord lunk on landing page
lxgr-linux Jan 25, 2024
652bb5d
Added under construction view
lxgr-linux Jan 25, 2024
6a950d5
integrated constructionpage
lxgr-linux Jan 25, 2024
22de41d
Merge pull request #256 from DecentralCardGame/251-polishing-for-anna…
lxgr-linux Jan 25, 2024
87978ad
Merge branch '231-website-overhaul' into 243-login
lxgr-linux Jan 25, 2024
5bf1900
Merge pull request #250 from DecentralCardGame/243-login
lxgr-linux Jan 25, 2024
36ce136
Added dvanced caardview and Compact addresscomponent
lxgr-linux Jan 26, 2024
1665fd3
fixed Flavourtext
lxgr-linux Jan 27, 2024
2009167
fixed Flavourtext again
lxgr-linux Jan 27, 2024
0851a41
more card creator fun
patrickwieth Jan 27, 2024
47a5cb5
Merge pull request #258 from DecentralCardGame/257-advanced-cardview
lxgr-linux Jan 27, 2024
5e0c28c
Chnaged scrollbar style
lxgr-linux Jan 28, 2024
6d06f0e
Merge pull request #254 from DecentralCardGame/dependabot/npm_and_yar…
lxgr-linux Jan 28, 2024
9c3f796
Merge pull request #252 from DecentralCardGame/dependabot/npm_and_yar…
lxgr-linux Jan 28, 2024
b91375c
Merge pull request #230 from DecentralCardGame/dependabot/npm_and_yar…
lxgr-linux Jan 28, 2024
a17e41a
Merge branch 'master' into 231-website-overhaul
lxgr-linux Jan 28, 2024
b302bfb
Merge pull request #260 from DecentralCardGame/259-scrollbar
lxgr-linux Jan 28, 2024
f502c09
Added infiniscroll to gallerycomponent
lxgr-linux Feb 3, 2024
a751a8e
Started rework of gallerypage
lxgr-linux Feb 4, 2024
6ee821a
Fixed gallery button on Landingpage
lxgr-linux Feb 4, 2024
fd2c9ff
Added cardview on click to gallery
lxgr-linux Feb 4, 2024
22334ab
more card creator fun
patrickwieth Feb 5, 2024
75ab365
Merge branch 'master' into 239-update-cardcreator
patrickwieth Feb 6, 2024
1a15920
merged
patrickwieth Feb 6, 2024
be25fbb
more cardcreator fun
patrickwieth Feb 7, 2024
770ca38
cardcreator abilities update
patrickwieth Feb 8, 2024
54ec00d
more abilitycomponent fun
patrickwieth Feb 9, 2024
7123ca2
ability container fix
patrickwieth Feb 9, 2024
06a4aba
#239 Updated dependencies and composables
lxgr-linux Feb 10, 2024
cbf57a2
#263 Added useGallery
lxgr-linux Feb 11, 2024
332cadb
#263 Added GalleryFilterImageChooser
lxgr-linux Feb 11, 2024
1efbfa6
removed dropdown
lxgr-linux Feb 11, 2024
140603e
readded dropdown
lxgr-linux Feb 11, 2024
224b724
readded dropdown
lxgr-linux Feb 11, 2024
21d8afe
updated vue to 3.4.18
lxgr-linux Feb 11, 2024
7f7f505
removed local vite profile
lxgr-linux Feb 11, 2024
9b8e369
Added local vite configuration
lxgr-linux Feb 11, 2024
0966f44
Added local vite configuration
lxgr-linux Feb 11, 2024
dc31749
#267 Updated Dropdown logic to be less awfull
lxgr-linux Feb 11, 2024
8082c7f
#267 Updated demopage
lxgr-linux Feb 11, 2024
577be9b
#267 Restyled dropdown
lxgr-linux Feb 11, 2024
4a38107
#267 Added pussyred and integrated Dropdown coloring into CCButton co…
lxgr-linux Feb 11, 2024
83b3305
#267 Made dropdown roundet
lxgr-linux Feb 11, 2024
45619d5
Merge pull request #268 from DecentralCardGame/267-dropdown
lxgr-linux Feb 11, 2024
32e2979
Merge branch '231-website-overhaul' into 263-gallery
lxgr-linux Feb 11, 2024
616d796
#263 Added sort by dropdown
lxgr-linux Feb 11, 2024
d9de753
let delpoyment run aginst lxgr.xyz
lxgr-linux Feb 11, 2024
c3eaa29
Made gallery view sorted
lxgr-linux Feb 11, 2024
6784774
merge dropdown in here
patrickwieth Feb 14, 2024
64fadc9
cardcreator mostly working
patrickwieth Feb 14, 2024
46a76f2
fix class and type images
patrickwieth Feb 14, 2024
1517bb3
replace trading with collectible card game
patrickwieth Feb 14, 2024
86a84ce
discard buttons
patrickwieth Feb 15, 2024
af34398
#263 Added checkbox and fixed cardloading
lxgr-linux Feb 17, 2024
97d7e97
card creator box now centered and covering only the desired speace
patrickwieth Feb 18, 2024
31fc1f2
#263 Card sorting now very nice
lxgr-linux Feb 19, 2024
0fc247f
#263 Fixed gallery related state issues
lxgr-linux Feb 28, 2024
d788498
#263 cleaned up
lxgr-linux Feb 28, 2024
ab038f7
#263 changed deploy routes
lxgr-linux Feb 29, 2024
bab722b
Merge branch '239-update-cardcreator' of github.com:DecentralCardGame…
lxgr-linux Feb 29, 2024
795c3e6
#263 added more search actions
lxgr-linux Mar 1, 2024
5a85760
Merge branch '263-gallery' of github.com:DecentralCardGame/frontend i…
lxgr-linux Mar 1, 2024
9b06748
#263 Added cardview modal
lxgr-linux Mar 2, 2024
5cf77f6
#263 Updated versions and configs
lxgr-linux Mar 2, 2024
90297ab
Merge branch '263-gallery' of github.com:DecentralCardGame/frontend i…
lxgr-linux Mar 2, 2024
e225ebf
Fixed eslint
lxgr-linux Mar 2, 2024
a4831a1
Fixed AdvancedCardviewPage
lxgr-linux Mar 2, 2024
dc3caec
#263 Added sort direction button
lxgr-linux Mar 2, 2024
5b87ec7
#263 Added file
lxgr-linux Mar 2, 2024
5adbad2
#263 Fixed rarity filter
lxgr-linux Mar 3, 2024
ee8771b
#263 Made sidebar sticky
lxgr-linux Mar 3, 2024
0ef3213
#263 Added my cards
lxgr-linux Mar 3, 2024
f63d2b9
#263 Fixed rarity linebreak
lxgr-linux Mar 3, 2024
504946a
Merge branch '263-gallery' of github.com:DecentralCardGame/frontend i…
lxgr-linux Mar 3, 2024
3a3c731
missing cardcreator functions added on the last page, discard draft & co
patrickwieth Mar 5, 2024
a01e4bb
clear abilities function in cardcreator
patrickwieth Mar 5, 2024
36f2fcf
fix creator box size
patrickwieth Mar 5, 2024
f83c7ad
buy frame modal makeshift fixes
patrickwieth Mar 5, 2024
1357038
card creator element sizes
patrickwieth Mar 5, 2024
989c892
update pixely icons
patrickwieth Mar 6, 2024
5cfe170
fix all dropdowns in cardcreator broken
patrickwieth Mar 7, 2024
cf27259
fix additional cost
patrickwieth Mar 7, 2024
0f8ba5f
remove logs
patrickwieth Mar 7, 2024
9040f9f
Merge pull request #265 from DecentralCardGame/239-update-cardcreator
lxgr-linux Mar 7, 2024
0e758a2
Merge pull request #270 from DecentralCardGame/vorab_merge
lxgr-linux Mar 7, 2024
762d6f1
rewind dropdown fix
patrickwieth Mar 7, 2024
45b28a6
Merge branch 'master' into 231-website-overhaul
lxgr-linux Mar 7, 2024
9f7b302
Merge pull request #271 from DecentralCardGame/vorab_merge
lxgr-linux Mar 7, 2024
d3e4573
Linted
lxgr-linux Mar 7, 2024
22bc631
fix buttons wandering in card creator
patrickwieth Mar 7, 2024
02d7edd
Merge pull request #272 from DecentralCardGame/vorab_merge
lxgr-linux Mar 7, 2024
ddfe105
Made button point to cardcreator
lxgr-linux Mar 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
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ VITE_APP_FAUCET="https://cardchain.crowdcontrol.network/faucet/claimTokens"

VITE_APP_FAUCET_SITEKEY="ea68532a-a9e6-4f99-9361-db90a3071b72"
VITE_APP_ADDRESS_PREFIX=cc
VITE_APP_CHAIN_ID="cardtestnet-6"
VITE_APP_CHAIN_ID="cardtestnet-9"
VITE_APP_CHAIN_NAME="Cardchain"
VITE_APP_CARDIMG_MAXKB=500
VITE_APP_CARDIMG_SIZE_X=840
Expand Down
5 changes: 5 additions & 0 deletions .env.localhost
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
VITE_APP_CHAIN_ID="carddevnet-2"

VITE_API_COSMOS="http://localhost:1317"
VITE_WS_TENDERMINT="http://localhost:26657"
VITE_APP_FAUCET="http://localhost:4500/claimTokens"
60 changes: 49 additions & 11 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,56 @@
module.exports = {
root: true,
env: {
node: true
node: true,
},
'extends': [
'plugin:vue/recommended',
'eslint:recommended'
],
extends: ["plugin:vue/vue3-recommended", "eslint:recommended"],
plugins: ["vue"],
parserOptions: {
parser: 'babel-eslint'
parser: "@typescript-eslint/parser",
ecmaVersion: 2020,
sourceType: "module",
"vue/no-parsing-error": ["error", {
"abrupt-closing-of-empty-comment": true,
"absence-of-digits-in-numeric-character-reference": true,
"cdata-in-html-content": true,
"character-reference-outside-unicode-range": true,
"control-character-in-input-stream": true,
"control-character-reference": true,
"eof-before-tag-name": true,
"eof-in-cdata": true,
"eof-in-comment": true,
"eof-in-tag": true,
"incorrectly-closed-comment": true,
"incorrectly-opened-comment": true,
"invalid-first-character-of-tag-name": true,
"missing-attribute-value": true,
"missing-end-tag-name": true,
"missing-semicolon-after-character-reference": true,
"missing-whitespace-between-attributes": true,
"nested-comment": true,
"noncharacter-character-reference": true,
"noncharacter-in-input-stream": true,
"null-character-reference": true,
"surrogate-character-reference": true,
"surrogate-in-input-stream": true,
"unexpected-character-in-attribute-name": true,
"unexpected-character-in-unquoted-attribute-value": true,
"unexpected-equals-sign-before-attribute-name": true,
"unexpected-null-character": true,
"unexpected-question-mark-instead-of-tag-name": true,
"unexpected-solidus-in-tag": true,
"unknown-named-character-reference": true,
"end-tag-with-attributes": true,
"duplicate-attribute": true,
"end-tag-with-trailing-solidus": true,
"non-void-html-element-start-tag-with-trailing-solidus": false,
"x-invalid-end-tag": true,
"x-invalid-namespace": true
}]
},
rules: {
'no-console': 'off',
'no-debugger': 'off',
'no-unused-vars': 'off',
}
}
"no-console": "off",
"no-debugger": "off",
"no-unused-vars": "off",
},
};
3 changes: 2 additions & 1 deletion .fleet/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"backend.maxHeapSizeMb": 1568
"backend.maxHeapSizeMb": 1568,
"editor.formatOnSave": true
}
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ jobs:
echo "${{ secrets.LXGR_DEPLOY_PRIV }}" > ~/.ssh/id_rsa
ssh-keyscan -H ${{ secrets.LXGR_HOST }} > ~/.ssh/known_hosts
- name: connect and pull
run: ssh ${{ secrets.LXGR_USER }}@${{ secrets.LXGR_HOST }} "cd ~/$LABEL && git fetch && git checkout ${{ github.event.pull_request.head.ref }} && git pull && npm i && npm run build && chgrp -R www-data ~/$LABEL && exit"
run: ssh ${{ secrets.LXGR_USER }}@${{ secrets.LXGR_HOST }} "cd ~/$LABEL && git checkout . && git fetch && git checkout ${{ github.event.pull_request.head.ref }} && git pull && npm i && npm run build && chgrp -R www-data ~/$LABEL && exit"
- name: cleanup
run: rm -rf ~/.ssh
Loading
Loading