Skip to content

Commit

Permalink
Merge pull request #63 from pirates-ophase/develop
Browse files Browse the repository at this point in the history
2024 Update
  • Loading branch information
PhilippSeidel authored Oct 12, 2024
2 parents ab92ad1 + 8dd3204 commit ddee480
Show file tree
Hide file tree
Showing 59 changed files with 82 additions and 58 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
fetch-depth: 0 # speeds up the checkout

- name: Set up pnpm (package manager)
uses: pnpm/action-setup@v2.2.2
uses: pnpm/action-setup@v4.0.0

- name: Install dependencies
run: pnpm install
Expand Down
5 changes: 1 addition & 4 deletions components/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const Footer = () => {

<div>
<ul>
<li className={styles.flag}>Pirates, 2023</li>
<li className={styles.flag}>Pirates, 2024</li>
<li>&nbsp;</li>
<li>An Land gezogen von Max und Philipp</li>
</ul>
Expand All @@ -41,9 +41,6 @@ export const Footer = () => {
<NextLink href="https://www.badische-backstub.de/"><img src='/sponsoring/badischeBackstub.png' width={170}/></NextLink>
</div>

<div>
<NextLink href="https://www.billy-boy.de/"><img src='/sponsoring/billyboy.png' width={220}/></NextLink>
</div>
</footer>
);
};
114 changes: 63 additions & 51 deletions pages/crew.tsx

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pages/imprint.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const Home: NextPage = () => {
<p className={styles.centeredDescription}>
Wir freuen uns auch dieses Jahr wieder von unseren
Sponsoren mit Nahrung, Goodies und finanziellen Mitteln versorgt worden zu sein.
Vielen Dank dafür an <NextLink href="https://www.andrena.de/">Andrena Objects</NextLink>, <NextLink href="https://www.billy-boy.de/">Billy Boy</NextLink> und die <NextLink href="https://www.badische-backstub.de/">Badische Backstub</NextLink>.
Vielen Dank dafür an <NextLink href="https://www.andrena.de/">Andrena Objects</NextLink> und die <NextLink href="https://www.badische-backstub.de/">Badische Backstub</NextLink>.
</p>

<p className={styles.centeredDescription}>
Expand Down
2 changes: 1 addition & 1 deletion pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const Home: NextPage = () => {

<ul className={styles.description}>
<li><a href="https://www.instagram.com/kit_pirates/">Instagrrrram &rarr;</a></li>
<li><NextLink href="/schedule">Wochenplan 2023 &rarr;</NextLink></li>
<li><NextLink href="/schedule">Wochenplan 2024 &rarr;</NextLink></li>
<li><a href="https://o-phase.com">Allgemeine O-Phasen Infos der Fachschaft &rarr;</a></li>
</ul>
</section>
Expand Down
15 changes: 15 additions & 0 deletions pages/log.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,21 @@ const Home: NextPage = () => {
</h1>

<div style={{maxWidth: '100%', overflowY: 'auto', overflowX: 'scroll', textAlign: 'center'}}>
<p className={styles.description}>
O-Phase 2023
</p>
<div className={stylesCrew.frameGrid}>
<ImageFrame src="/log/mid_res/2023/1.jpg" frameSize="50px" frameStyle="frame5" gridColStart={19} gridColEnd={45} gridRowStart={22} gridRowEnd={55}/>
<ImageFrame src="/log/mid_res/2023/2.jpg" frameSize="60px" frameStyle="frame2" gridColStart={47} gridColEnd={73} gridRowStart={24} gridRowEnd={55}/>
<ImageFrame src="/log/mid_res/2023/3.jpg" frameSize="40px" frameStyle="frame4" gridColStart={51} gridColEnd={86} gridRowStart={4} gridRowEnd={23}/>
<ImageFrame src="/log/mid_res/2023/4.jpg" frameSize="70px" frameStyle="frame1" gridColStart={17} gridColEnd={45} gridRowStart={1} gridRowEnd={22}/>
<ImageFrame src="/log/mid_res/2023/5.jpg" frameSize="40px" frameStyle="frame4" gridColStart={51} gridColEnd={86} gridRowStart={58} gridRowEnd={86}/>
<ImageFrame src="/log/mid_res/2023/6.jpg" frameSize="60px" frameStyle="frame2" gridColStart={24} gridColEnd={47} gridRowStart={57} gridRowEnd={82}/>
<ImageFrame src="/log/mid_res/2023/7.jpg" frameSize="70px" frameStyle="frame1" gridColStart={15} gridColEnd={43} gridRowStart={88} gridRowEnd={125}/>
<ImageFrame src="/log/mid_res/2023/8.jpg" frameSize="40px" frameStyle="frame5" gridColStart={70} gridColEnd={94} gridRowStart={88} gridRowEnd={116}/>
<ImageFrame src="/log/mid_res/2023/9.jpg" frameSize="60px" frameStyle="frame3" gridColStart={44} gridColEnd={68} gridRowStart={87} gridRowEnd={112}/>
</div>

<p className={styles.description}>
O-Phase 2022
</p>
Expand Down
Binary file removed public/crew/crewmates_low_res/chloe.jpg
Binary file not shown.
Binary file modified public/crew/crewmates_low_res/edwin.jpg
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/crew/crewmates_low_res/eileen.jpg
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/crew/crewmates_low_res/finn.jpg
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/crew/crewmates_low_res/kevin.jpg
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/crew/crewmates_low_res/luis.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/crew/crewmates_low_res/paul.jpg
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/crew/crewmates_low_res/pradi.jpg
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/crew/crewmates_low_res/yanniko.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/crew/crewmates_mid_res/chloe.jpg
Binary file not shown.
Binary file modified public/crew/crewmates_mid_res/edwin.jpg
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/crew/crewmates_mid_res/eileen.jpg
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/crew/crewmates_mid_res/finn.jpg
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/crew/crewmates_mid_res/kevin.jpg
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/crew/crewmates_mid_res/luis.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/crew/crewmates_mid_res/paul.jpg
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/crew/crewmates_mid_res/pradi.jpg
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/crew/crewmates_mid_res/yanniko.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/crew/crewmates_original/chloe.jpg
Binary file not shown.
Binary file modified public/crew/crewmates_original/edwin.jpg
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/crew/crewmates_original/eileen.jpg
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/crew/crewmates_original/finn.jpg
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/crew/crewmates_original/kevin.jpg
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/crew/crewmates_original/luis.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/crew/crewmates_original/paul.jpg
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/crew/crewmates_original/pradi.jpg
Binary file added public/crew/crewmates_original/yanniko.jpg
Binary file added public/log/mid_res/2023/1.jpg
Binary file added public/log/mid_res/2023/2.jpg
Binary file added public/log/mid_res/2023/3.jpg
Binary file added public/log/mid_res/2023/4.jpg
Binary file added public/log/mid_res/2023/5.jpg
Binary file added public/log/mid_res/2023/6.jpg
Binary file added public/log/mid_res/2023/7.jpg
Binary file added public/log/mid_res/2023/8.jpg
Binary file added public/log/mid_res/2023/9.jpg
Binary file added public/log/original_res/2023/1.jpg
Binary file added public/log/original_res/2023/2.jpg
Binary file added public/log/original_res/2023/3.jpg
Binary file added public/log/original_res/2023/4.jpg
Binary file added public/log/original_res/2023/5.jpg
Binary file added public/log/original_res/2023/6.jpg
Binary file added public/log/original_res/2023/7.jpg
Binary file added public/log/original_res/2023/8.jpg
Binary file added public/log/original_res/2023/9.jpg
Binary file added public/pirates2024.png
Binary file modified public/schedule/friday.png
Binary file modified public/schedule/monday.png
Binary file modified public/schedule/saturday.png
Binary file modified public/schedule/start.png
Binary file modified public/schedule/thursday.png
Binary file modified public/schedule/tuesday.png
Binary file modified public/schedule/wednesday.png

0 comments on commit ddee480

Please sign in to comment.