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

Merge dev into main #50

Merged
merged 6 commits into from
Dec 10, 2024
Merged

Merge dev into main #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b3d84f5
Holding page (#43)
danrparker Dec 5, 2024
aecef27
Dparker/ros 34 (#45)
danrparker Dec 5, 2024
1a5549e
Merge branch 'main' into develop
nathanbillis Dec 5, 2024
39583d1
Holding page tweaks (#47)
danrparker Dec 9, 2024
2917ff8
fix eslint and add meta tags (#49)
nathanbillis Dec 10, 2024
a381a09
Merge branch 'main' into develop
nathanbillis Dec 10, 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
3 changes: 0 additions & 3 deletions .eslintrc.json
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"eslint.useFlatConfig": true
}
13 changes: 11 additions & 2 deletions app.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<template>
<div class="container mx-auto h-screen flex justify-center items-center">
<HoldingPage />
<div>
<Head>
<Title>Roses Live</Title>
<Meta
name="description"
content="Roses 2025 will be returning to York! #RosesAreWhite"
/>
</Head>
<div class="container mx-auto h-screen flex justify-center items-center">
<HoldingPage />
</div>
</div>
</template>
2 changes: 1 addition & 1 deletion assets/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ body {
}

.countdown-text {
@apply text-6xl font-bold font-black;
@apply text-6xl font-black;
}

.countdown-title {
Expand Down
50 changes: 21 additions & 29 deletions components/Countdown.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,46 +6,38 @@
{{ time.days }}
</p>
</div>
<p class="countdown-title">
DAYS
</p>
<p class="countdown-title">DAYS</p>
</div>
<div class="flex flex-col items-center gap-4">
<div class="countdown-tile">
<p class="countdown-text">
{{ time.hours }}
</p>
</div>
<p class="countdown-title">
HOURS
</p>
<p class="countdown-title">HOURS</p>
</div>
<div class="flex flex-col items-center gap-4">
<div class="countdown-tile">
<p class="countdown-text">
{{ time.minutes }}
</p>
</div>
<p class="countdown-title">
MINUTES
</p>
<p class="countdown-title">MINUTES</p>
</div>
<div class="flex flex-col items-center gap-4">
<div class="countdown-tile">
<p class="countdown-text">
{{ time.seconds }}
</p>
</div>
<p class="countdown-title">
SECONDS
</p>
<p class="countdown-title">SECONDS</p>
</div>
</div>
</template>

<script>
export default {
name: 'RosesCountdown',
name: "RosesCountdown",
props: {
date: {
type: String,
Expand All @@ -60,34 +52,34 @@ export default {
minutes: 0,
seconds: 0,
},
}
};
},
mounted() {
this.countdown()
this.countdown();
},
methods: {
countdown() {
const countDownDate = new Date(this.date).getTime()
const countDownDate = new Date(this.date).getTime();
const x = setInterval(() => {
const now = new Date().getTime()
const distance = countDownDate - now
this.time.days = Math.floor(distance / (1000 * 60 * 60 * 24))
const now = new Date().getTime();
const distance = countDownDate - now;
this.time.days = Math.floor(distance / (1000 * 60 * 60 * 24));
this.time.hours = Math.floor(
(distance % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60),
)
);
this.time.minutes = Math.floor(
(distance % (1000 * 60 * 60)) / (1000 * 60),
)
this.time.seconds = Math.floor((distance % (1000 * 60)) / 1000)
);
this.time.seconds = Math.floor((distance % (1000 * 60)) / 1000);
if (distance < 0) {
clearInterval(x)
this.time.days = 0
this.time.hours = 0
this.time.minutes = 0
this.time.seconds = 0
clearInterval(x);
this.time.days = 0;
this.time.hours = 0;
this.time.minutes = 0;
this.time.seconds = 0;
}
}, 1000)
}, 1000);
},
},
}
};
</script>
25 changes: 12 additions & 13 deletions components/HoldingPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,35 @@
src="https://assets-cdn.sums.su/YU/website/img/Roses/500x500_Roses_Holding_Page.webp"
class="aspect-square w-full object-contain"
alt="Roses 2025 logo"
>
/>
</div>
<div class="flex flex-col gap-y-8 text-center">
<h1 class="text-5xl xxs:text-6xl sm:text-8xl">
#RosesAreWhite
</h1>
<h1 class="text-5xl xxs:text-6xl sm:text-8xl">#RosesAreWhite</h1>
<RosesCountdown date="2025-05-02T20:00:00" />
<div class="flex justify-center">
<SocialLinks />
</div>
<div class="flex justify-center items-center gap-6 h-20">
<a href="https://yorksu.org/"><img
src="https://assets-cdn.sums.su/YU/website/img/yorksu-logo-black-full.png"
alt="University of York Students' Union"
class="w-40"
></a>
<a href="https://yorksu.org/"
><img
src="https://assets-cdn.sums.su/YU/website/img/yorksu-logo-black-full.png"
alt="University of York Students' Union"
class="w-40"
/></a>
</div>
</div>
</div>
</template>

<script>
import RosesCountdown from './Countdown.vue'
import SocialLinks from './Socials.vue'
import RosesCountdown from "./Countdown.vue";
import SocialLinks from "./Socials.vue";

export default {
name: 'HoldingPage',
name: "HoldingPage",
components: {
RosesCountdown,
SocialLinks,
},
}
};
</script>
44 changes: 22 additions & 22 deletions components/Socials.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
<template>
<div class="flex gap-6 text-2xl xxs:text-3xl">
<a
href="https://www.instagram.com/yorkunisu"
target="_blank"
><i class="fa-brands fa-instagram" /></a>
<a
href="https://www.facebook.com/yorkunisu"
target="_blank"
><i class="fa-brands fa-facebook" /></a>
<a
href="https://tiktok.com/@yorkunisu"
target="_blank"
><i class="fa-brands fa-tiktok" /></a>
<a
href="http://www.youtube.com/@ThisIsRosesLive"
target="_blank"
><i class="fa-brands fa-youtube" /></a>
<a
href="https://github.com/YUSU-Dev/roses-live"
target="_blank"
><i class="fa-brands fa-github" /></a>
<a href="https://www.instagram.com/yorkunisu" target="_blank"
><i class="fa-brands fa-instagram" />
<p class="sr-only">York SU Instagram</p>
</a>
<a href="https://www.facebook.com/yorkunisu" target="_blank"
><i class="fa-brands fa-facebook" />
<p class="sr-only">York SU Facebook</p>
</a>
<a href="https://tiktok.com/@yorkunisu" target="_blank"
><i class="fa-brands fa-tiktok" />
<p class="sr-only">York SU TikTok</p>
</a>
<a href="http://www.youtube.com/@ThisIsRosesLive" target="_blank"
><i class="fa-brands fa-youtube" />
<p class="sr-only">Roses Live YouTube</p>
</a>
<a href="https://github.com/YUSU-Dev/roses-live" target="_blank"
><i class="fa-brands fa-github"></i>
<p class="sr-only">York SU Roses Live Github</p>
</a>
</div>
</template>

<script>
export default {
name: 'SocialLinks',
}
name: "SocialLinks",
};
</script>
9 changes: 7 additions & 2 deletions eslint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
import withNuxt from './.nuxt/eslint.config.mjs'
import withNuxt from "./.nuxt/eslint.config.mjs";
import eslintConfigPrettier from "eslint-config-prettier";
import eslintPluginPrettierRecommended from "eslint-plugin-prettier/recommended";

export default withNuxt()
export default withNuxt([
eslintConfigPrettier,
eslintPluginPrettierRecommended,
]);
22 changes: 11 additions & 11 deletions nuxt.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
// https://nuxt.com/docs/api/configuration/nuxt-config
export default defineNuxtConfig({
compatibilityDate: '2024-04-03',
compatibilityDate: "2024-04-03",
devtools: { enabled: true },

nitro: {
prerender: {
autoSubfolderIndex: false,
},
},
css: ['~/assets/css/main.css'],
modules: ['@nuxt/eslint', '@sentry/nuxt/module', '@nuxtjs/tailwindcss'],
css: ["~/assets/css/main.css"],
modules: ["@nuxt/eslint", "@sentry/nuxt/module", "@nuxtjs/tailwindcss"],
eslint: {
config: {
stylistic: true,
stylistic: false,
},
},
app: {
head: {
link: [
{
rel: 'icon',
type: 'image/x-icon',
href: '/roses-logo.png',
rel: "icon",
type: "image/x-icon",
href: "/roses-logo.png",
},
{ rel: 'stylesheet', href: 'https://use.typekit.net/nks8xpu.css' },
{ rel: "stylesheet", href: "https://use.typekit.net/nks8xpu.css" },
{
rel: 'stylesheet',
href: 'https://use.fontawesome.com/releases/v6.7.1/css/all.css',
rel: "stylesheet",
href: "https://use.fontawesome.com/releases/v6.7.1/css/all.css",
},
],
},
},
})
});
66 changes: 66 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading