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

Early August Update #1056

Merged
merged 106 commits into from
Aug 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
d7ef66f
chore(deps): bump @babel/traverse from 7.22.15 to 7.23.2 (#912)
dependabot[bot] Oct 19, 2023
2780318
chore: cleanup calendar pup-up (#913)
martcl Oct 19, 2023
5198423
chore: fix pre-commit file permissions
martcl Oct 19, 2023
3bc003e
chore(deps-dev): bump postcss from 8.4.29 to 8.4.31 (#904)
dependabot[bot] Oct 19, 2023
61e5351
Feat(event)/waitlist (#911)
lille-morille Oct 25, 2023
66243d1
Feat/event add users maunually (#917)
lille-morille Nov 6, 2023
c576650
Update CHANGELOG.md
MadsNyl Nov 6, 2023
6f3760d
Trigger build
MadsNyl Nov 6, 2023
47cde63
made page for creating and deleting QR codes (#907)
MadsNyl Nov 16, 2023
932a6ce
Activity (#922)
MadsNyl Nov 16, 2023
506ba7c
Update CHANGELOG.md
MadsNyl Nov 16, 2023
38eb2a5
Merge branch 'master' of https://github.com/TIHLDE/Kvark into dev
MadsNyl Nov 16, 2023
a81d890
Merge branch 'dev' of https://github.com/TIHLDE/Kvark into dev
MadsNyl Nov 16, 2023
590032f
vite 5.0.0 update (#928)
martcl Nov 20, 2023
3c591b9
added buttuns for filtering (#924)
Ester2109 Nov 20, 2023
7ee9e0d
fixed filtering of events and activities (#939)
MadsNyl Dec 14, 2023
a9df886
Reaksjoner (#900)
MadsNyl Dec 14, 2023
a7f2657
moved checkbox for emojies outside paid event collapse
MadsNyl Dec 15, 2023
d7a6d17
added id for each user in copy of participants of an event (#940)
MadsNyl Dec 16, 2023
c3b9ab9
disabled switch to change from free to paid event if an event has reg…
MadsNyl Jan 9, 2024
cf14ad7
changed text (#944)
MadsNyl Jan 9, 2024
049cb43
changed email for strike message (#945)
MadsNyl Jan 9, 2024
396565b
added package for allowing iframe (#949)
MadsNyl Jan 15, 2024
2fb83b6
reduced number of showcase to two for mobile fit (#950)
MadsNyl Jan 15, 2024
463062c
Update CHANGELOG.md (#951)
MadsNyl Jan 15, 2024
10bdd02
merge
MadsNyl Jan 15, 2024
4ff2078
added helpertext (#957)
MadsNyl Jan 22, 2024
196928a
removed timepicker. Paytime is set to constant 2 hours (#958)
MadsNyl Feb 7, 2024
1f10a06
Update CHANGELOG.md (#959)
MadsNyl Feb 7, 2024
45877e9
Merge branch 'master' of https://github.com/TIHLDE/Kvark into dev
MadsNyl Feb 7, 2024
d1f0104
Merge branch 'dev' of https://github.com/TIHLDE/Kvark into dev
MadsNyl Feb 7, 2024
3c49fa4
Clickable user component in reactions list (#961)
EmilJohns1 Feb 15, 2024
ee7fcd0
changed cheatsheet button (#962)
EmilJohns1 Feb 16, 2024
78a070d
Feat/paragraph description (#963)
MindChirp Feb 22, 2024
c94a4ea
Fix(waiting list)/fix waiting list order (#965)
eriskjel Mar 10, 2024
2f0d3ed
added tailwindcss and shadcn (#964)
MadsNyl Mar 11, 2024
f665c0a
Update CHANGELOG.md (#966)
MadsNyl Mar 11, 2024
51adbb8
Merge branch 'master' of https://github.com/TIHLDE/Kvark into dev
MadsNyl Mar 11, 2024
a8c8b2c
waiting-list will now only be sorted if there is a priority pool (#968)
eriskjel Mar 12, 2024
4ec1032
waiting list info will now only be rendered if not null (#969)
eriskjel Mar 12, 2024
007d516
Shadcn button refdesign (#970)
MadsNyl Mar 12, 2024
a12f6df
Shadcn redesign footer (#971)
MadsNyl Mar 13, 2024
8238279
Merge branch 'master' of https://github.com/TIHLDE/Kvark into dev
MadsNyl Mar 13, 2024
394c985
fixed pnpm-lock
MadsNyl Mar 13, 2024
456583c
Refactor(shadcn)/markdown (#974)
MadsNyl Mar 13, 2024
7955be0
fixed link for event calender (#976)
MadsNyl Mar 14, 2024
ebf8a63
redesigned to shadcn avatars (#977)
MadsNyl Mar 15, 2024
22fc72e
changed themesettings component to shadcn (#978)
MadsNyl Mar 15, 2024
68d1fe1
fixed merge
MadsNyl Mar 15, 2024
3b24b1e
fixed seperator for markdown (#981)
MadsNyl Mar 23, 2024
9f4869c
fixed seperator for markdown (#982)
MadsNyl Mar 24, 2024
9d87fb1
Refactor event renderer (#983)
MadsNyl Mar 27, 2024
b79c44d
started on redesign of profile page (#980)
MadsNyl Mar 27, 2024
a84e94b
chore(deps): bump eslint from 8.48.0 to 8.56.0 (#941)
dependabot[bot] Mar 27, 2024
459a4e5
docs(changelog): iterate changelog version (#919)
github-actions[bot] Mar 27, 2024
8261e20
refactored news renderer (#989)
MadsNyl Apr 2, 2024
a280ac5
chore(deps): bump @emotion/react from 11.9.0 to 11.11.4 (#988)
dependabot[bot] Apr 2, 2024
30318fb
chore(deps): bump @vercel/analytics from 1.0.2 to 1.1.4 (#984)
dependabot[bot] Apr 2, 2024
7e2dd0b
chore(deps): bump react-router-dom from 6.15.0 to 6.22.3 (#985)
dependabot[bot] Apr 2, 2024
5b4567a
chore(deps-dev): bump vite from 5.0.0 to 5.0.12 (#956)
dependabot[bot] Apr 2, 2024
60b1c79
Update CHANGELOG.md (#990)
MadsNyl Apr 2, 2024
ba6f7cd
fixed merge
MadsNyl Apr 2, 2024
9cec19b
fixed ts error
MadsNyl Apr 2, 2024
691aca0
added description of how to use spaces (#992)
MadsNyl Apr 3, 2024
6753d87
changed position of share and edit button for event (#993)
MadsNyl Apr 3, 2024
bc9c05a
diasbled theme selector (#998)
MadsNyl Apr 4, 2024
3a553d0
fixed merge
MadsNyl Apr 4, 2024
2e06dfc
NITO logo footer (#1002)
MadsNyl Apr 10, 2024
016ab60
added version name to changelog
MadsNyl Apr 10, 2024
6112c18
trigger build
MadsNyl Apr 10, 2024
fa61a9e
Menu for shortcuts (#1006)
MadsNyl Apr 11, 2024
76761d2
changed info for contact for strikes (#1007)
MadsNyl Apr 11, 2024
47707bd
changed changelog
MadsNyl Apr 11, 2024
b5fa49e
merge
MadsNyl Apr 11, 2024
15b8835
User bio (#1010)
LeMiTam Apr 16, 2024
2dd9aa6
Update CHANGELOG.md
MadsNyl Apr 16, 2024
efdee38
fixed pnpm-lock
MadsNyl Apr 16, 2024
4fcd320
PNG image bg fix (#1013)
MadsNyl Apr 26, 2024
22ab1c6
removed unregister button if registration is paid (#1015)
MadsNyl May 1, 2024
a1acf5b
fixed merge
MadsNyl May 1, 2024
5fa40b8
sort after category (#1018)
MadsNyl May 2, 2024
1687923
fixed merge
MadsNyl May 2, 2024
f3e8d42
fixed category for event view (#1020)
MadsNyl May 2, 2024
88be5d5
Remove MUI from Navigation (#1028)
MadsNyl Jun 10, 2024
755faaf
Remove MUI from signin pages (#1030)
MadsNyl Jun 10, 2024
8f1d766
Remove Page component (#1031)
MadsNyl Jun 11, 2024
4aba5e9
Replace MUI with ShadCN (#1038)
MadsNyl Jul 4, 2024
d53e79f
changelog
MadsNyl Jul 4, 2024
350154b
merge
MadsNyl Jul 4, 2024
bcbe3b4
fixed small design bugs and added scrollToTop component (#1040)
MadsNyl Jul 4, 2024
19c672b
merge
MadsNyl Jul 4, 2024
5d4b2f9
feat(changelog)/changelog site for logged in users (#1045)
lille-morille Jul 22, 2024
591bfa3
Fix bugs (#1044)
antontveito Jul 22, 2024
92f2109
Fix accordion stutter (#1043)
MarkussMadsbakken Jul 22, 2024
6c927a5
updated changelog.md
MadsNyl Jul 22, 2024
91d85a4
Redesing of Ny student page (#1050)
MadsNyl Jul 28, 2024
cf9da7c
added new button for wiki page redirect
MadsNyl Jul 29, 2024
4aa8cae
merge conflict and changelog update
MadsNyl Jul 29, 2024
b119ee2
merged from master
MadsNyl Jul 29, 2024
e3ae3e5
fixed small writing error
MadsNyl Jul 29, 2024
77f8e03
created option for registration with FEIDE
MadsNyl Jul 30, 2024
1c4e5b6
changelog update
MadsNyl Jul 30, 2024
14b9174
added paginate button for event participants
MadsNyl Aug 1, 2024
ddfee93
merge conflict
MadsNyl Aug 1, 2024
94b738a
changed main sponsor logo (#1055)
MadsNyl Aug 4, 2024
ded0c47
Update CHANGELOG.md
MadsNyl Aug 4, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

## Versjon 2024.30.07
- ✨ **Feide**. Man kan nå registrere bruker automatisk med Feide.
- ✨ **Sponsor**. Logo for ny sponsor i footer.

## Versjon 2024.29.07
- 🎨 **Ny student**. Ny student side er redesignet.
Expand Down
Binary file removed src/assets/img/mainSponsor.png
Binary file not shown.
1 change: 1 addition & 0 deletions src/assets/img/mainSponsor.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/components/navigation/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import SLACK from 'assets/icons/slack.svg';
import SNAPCHAT from 'assets/icons/snapchat.svg';
import TWITTER from 'assets/icons/twitter.svg';
import VERCEL from 'assets/icons/vercel.svg';
import MAINSPONSOR from 'assets/img/mainSponsor.png';
import MAINSPONSOR from 'assets/img/mainSponsor.svg';
import NITO from 'assets/img/nito.png';

const Footer = () => {
Expand Down Expand Up @@ -58,7 +58,7 @@ const Footer = () => {

<div className='space-y-12 lg:max-w-sm w-full'>
<div className='space-y-4'>
<a className='mx-auto' href='https://www.accenture.com/no-en' rel='noopener noreferrer' target='_blank'>
<a className='mx-auto' href='https://www.lysekonsern.no/' rel='noopener noreferrer' target='_blank'>
<img alt='Sponsor' className='w-60 md:w-72 mx-auto' loading='lazy' src={MAINSPONSOR} />
</a>
<h1 className='text-sm text-center'>Hovedsamarbeidspartner</h1>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,9 @@ const Registrations = ({ onWait = false, eventId, needsSorting = false }: Regist
</Button>
</form>
</Form>

{hasNextPage && <PaginateButton className='w-full mt-4' isLoading={isFetching} nextPage={fetchNextPage} />}
</>
)}
{hasNextPage && <PaginateButton className='w-full mt-4' isLoading={isFetching} nextPage={fetchNextPage} />}
</>
) : (
<h1>{onWait ? 'Ingen på ventelisten' : 'Ingen påmeldte'}</h1>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/SignUpFeide/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const SignUpFeide = () => {
}, [location]);

return (
<Page className='mt-12'>
<Page>
<div className='max-w-xl w-full mx-auto'>
{queryError && (
<div className='space-y-8'>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/SignUpOptions/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const SignUpOptions = () => {
};

return (
<Page className='mt-12'>
<Page>
<Card className='max-w-2xl w-full mx-auto'>
<CardContent className='space-y-12 p-8'>
<div className='space-y-4'>
Expand Down
Loading