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.

Sign up for GitHub

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

Jump to bottom

Feat(tournament)/dev #32

Merged
merged 30 commits into from
Feb 15, 2024
Merged

Feat(tournament)/dev #32

merged 30 commits into from
Feb 15, 2024

Conversation

lille-morille
Copy link
Contributor

Added ui for browse tournaments page, create tournament, tournament page, create team.
None of the ui is connected to state or backend, except the login

lille-morille and others added 27 commits January 22, 2024 16:37
@lille-morille
Pages shell for tournament wireframe
8c6d9d9
@lille-morille
Added tournament browse page shell
9434182
@lille-morille
Squashed commit of the following:
4032bc4 
commit 9434182
Author: Anders <[email protected]>
Date:   Mon Jan 22 19:19:19 2024 +0100

    Added tournament browse page shell
@lille-morille
Almost functioning ping code entry
fb28d7d
@lille-morille
Join tournament form functioning
05af05e
@lille-morille
Merge branch 'feat(tournament)/state' into feat(tournament)/dev
ed29bf2
@lille-morille
Fixed the form submitting multiple times
b367950
@lille-morille
Responsive design on tournament card
7704625
@lille-morille
Refactored tournament browsing page code
b26b059
@lille-morille
Fixed a typo
75ad59a
@lille-morille
Linked to create tournament page
f6d4db8
@henrikhaus
Create tournament page
12afc53
@lille-morille
Squashed commit of the following:
08ac040 
commit f6d4db8
Author: Anders Morille <[email protected]>
Date:   Mon Feb 5 19:19:38 2024 +0100

    Linked to create tournament page

commit 75ad59a
Author: Anders Morille <[email protected]>
Date:   Mon Feb 5 19:16:04 2024 +0100

    Fixed a typo

commit b26b059
Author: Anders Morille <[email protected]>
Date:   Mon Feb 5 19:14:44 2024 +0100

    Refactored tournament browsing page code

commit 7704625
Author: Anders Morille <[email protected]>
Date:   Mon Feb 5 19:11:07 2024 +0100

    Responsive design on tournament card

commit b367950
Author: Anders Morille <[email protected]>
Date:   Mon Feb 5 19:02:35 2024 +0100

    Fixed the form submitting multiple times
@lille-morille
Merge branch 'feat(tournament)/dev' of github.com:TIHLDE/Blitzed into…
061e8c5 
… feat(tournament)/dev
@henrikhaus
package fix
b55e970
@henrikhaus
Logo links to main page
f461d96
@lille-morille
Merge branch 'dev' into feat(tournament)/dev
ff39159
@lille-morille
Update package lock
f916d9f
@lille-morille
Merge branch 'feat(tournament)/dev' of github.com:TIHLDE/Blitzed into…
c6df6e5 
… feat(tournament)/dev

fixed merge conflict from Henrikhaus
@lille-morille
Addede placeholder pages for tournament id pages
dca6a82
@lille-morille
Merge branch 'feat(tournament)/state' into feat(tournament)/dev
3512fb6 
merged in placeholder tournament pages
@lille-morille
Merge branch 'feat(tournament)/dev' of github.com:TIHLDE/Blitzed into…
7976e13 
… feat(tournament)/dev

merged changes from remote
@lille-morille
linting
eb3612a
@lille-morille
Merge branch 'feat(tournament)/dev' of github.com:TIHLDE/Blitzed into…
2f7501d 
… feat(tournament)/dev
@lille-morille
Squashed commit of the following:
6fb6c65 
commit 5189673
Author: Anders <[email protected]>
Date:   Mon Feb 12 19:50:50 2024 +0100

    Added shadcn dialog component

commit 956ad9c
Author: Anders <[email protected]>
Date:   Mon Feb 12 19:50:42 2024 +0100

    Tournament page starts at before state

commit a9d302f
Author: Anders <[email protected]>
Date:   Mon Feb 12 19:50:31 2024 +0100

    Added create team dialog

commit 1a51849
Author: Anders <[email protected]>
Date:   Mon Feb 12 19:50:25 2024 +0100

    Implemented tournament before page

commit 903b6c8
Author: Anders <[email protected]>
Date:   Mon Feb 12 19:50:16 2024 +0100

    Link tournament to tournament id page

commit 17b2e66
Author: Anders <[email protected]>
Date:   Mon Feb 12 18:45:34 2024 +0100

    Squashed commit of the following:

    commit 2f7501d
    Merge: eb3612a 7976e13
    Author: Anders <[email protected]>
    Date:   Mon Feb 12 18:43:25 2024 +0100

        Merge branch 'feat(tournament)/dev' of github.com:TIHLDE/Blitzed into feat(tournament)/dev

    commit eb3612a
    Author: Anders <[email protected]>
    Date:   Mon Feb 12 18:43:21 2024 +0100

        linting

    commit 7976e13
    Merge: 3512fb6 c6df6e5
    Author: Anders <[email protected]>
    Date:   Mon Feb 12 17:16:11 2024 +0100

        Merge branch 'feat(tournament)/dev' of github.com:TIHLDE/Blitzed into feat(tournament)/dev
        merged changes from remote

    commit 3512fb6
    Merge: b55e970 dca6a82
    Author: Anders <[email protected]>
    Date:   Mon Feb 12 17:15:18 2024 +0100

        Merge branch 'feat(tournament)/state' into feat(tournament)/dev
        merged in placeholder tournament pages

    commit c6df6e5
    Merge: f916d9f f461d96
    Author: Anders <[email protected]>
    Date:   Mon Feb 12 16:38:09 2024 +0100

        Merge branch 'feat(tournament)/dev' of github.com:TIHLDE/Blitzed into feat(tournament)/dev
        fixed merge conflict from Henrikhaus

    commit f916d9f
    Author: Anders <[email protected]>
    Date:   Mon Feb 12 16:37:23 2024 +0100

        Update package lock

    commit ff39159
    Merge: b55e970 8013991
    Author: Anders <[email protected]>
    Date:   Mon Feb 12 16:37:18 2024 +0100

        Merge branch 'dev' into feat(tournament)/dev

    commit f461d96
    Author: henrikhaus <[email protected]>
    Date:   Mon Feb 12 16:35:53 2024 +0100

        Logo links to main page

    commit 8013991
    Author: Jonatan Andre Vevang <[email protected]>
    Date:   Mon Feb 12 07:30:22 2024 -0800

        fixed some errors with the authprovider (#23)

        hell yeah

    commit b55e970
    Author: henrikhaus <[email protected]>
    Date:   Mon Feb 5 19:46:15 2024 +0100

        package fix

    commit 061e8c5
    Merge: 08ac040 12afc53
    Author: Anders <[email protected]>
    Date:   Mon Feb 5 19:43:06 2024 +0100

        Merge branch 'feat(tournament)/dev' of github.com:TIHLDE/Blitzed into feat(tournament)/dev

    commit 08ac040
    Author: Anders <[email protected]>
    Date:   Mon Feb 5 19:42:43 2024 +0100

        Squashed commit of the following:

        commit f6d4db8
        Author: Anders Morille <[email protected]>
        Date:   Mon Feb 5 19:19:38 2024 +0100

            Linked to create tournament page

        commit 75ad59a
        Author: Anders Morille <[email protected]>
        Date:   Mon Feb 5 19:16:04 2024 +0100

            Fixed a typo

        commit b26b059
        Author: Anders Morille <[email protected]>
        Date:   Mon Feb 5 19:14:44 2024 +0100

            Refactored tournament browsing page code

        commit 7704625
        Author: Anders Morille <[email protected]>
        Date:   Mon Feb 5 19:11:07 2024 +0100

            Responsive design on tournament card

        commit b367950
        Author: Anders Morille <[email protected]>
        Date:   Mon Feb 5 19:02:35 2024 +0100

            Fixed the form submitting multiple times

    commit 12afc53
    Author: henrikhaus <[email protected]>
    Date:   Mon Feb 5 19:38:37 2024 +0100

        Create tournament page

    commit ed29bf2
    Merge: fb28d7d 05af05e
    Author: Anders Morille <[email protected]>
    Date:   Mon Feb 5 18:41:30 2024 +0100

        Merge branch 'feat(tournament)/state' into feat(tournament)/dev

    commit fb28d7d
    Author: Anders <[email protected]>
    Date:   Mon Jan 22 21:37:37 2024 +0100

        Almost functioning ping code entry

    commit 4032bc4
    Author: Anders <[email protected]>
    Date:   Mon Jan 22 19:19:47 2024 +0100

        Squashed commit of the following:

        commit 9434182
        Author: Anders <[email protected]>
        Date:   Mon Jan 22 19:19:19 2024 +0100

            Added tournament browse page shell
@lille-morille
Merge branch 'dev' into feat(tournament)/dev
458eb50
@lille-morille
Update package-lock.json
ebfd5fa
@lille-morille lille-morille added the new feature New feature or request label Feb 12, 2024
@lille-morille lille-morille self-assigned this Feb 12, 2024
@vercel Vercel
Copy link

vercel bot commented Feb 12, 2024 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
blitzed ✅ Ready (Inspect) Visit Preview 💬 Add feedback Feb 15, 2024 0:37am

@Jonabarce Jonabarce requested a review from MadsNyl February 14, 2024 18:13
MadsNyl
MadsNyl requested changes Feb 14, 2024
View reviewed changes
@MadsNyl MadsNyl merged commit 5e6e30d into dev Feb 15, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MadsNyl MadsNyl MadsNyl requested changes

@thomsen85 thomsen85 Awaiting requested review from thomsen85

Assignees

@lille-morille lille-morille

Labels
new feature New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lille-morille @MadsNyl @henrikhaus