Skip to content

Commit

Permalink
overhaul footer UI; use turborepo scripts on root
Browse files Browse the repository at this point in the history
  • Loading branch information
kuroji-fusky committed Feb 28, 2023
1 parent cc1d50e commit f145d1b
Show file tree
Hide file tree
Showing 10 changed files with 129 additions and 75 deletions.
12 changes: 5 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@
],
"scripts": {
"postinstall": "cd website && nuxt prepare",
"dev:web": "yarn workspace @myfursona/website dev",
"build:web": "yarn workspace @myfursona/website build",
"preview:web": "yarn workspace @myfursona/website preview",
"dev:api": "yarn workspace @myfursona/api dev",
"build:api": "yarn workspace @myfursona/api build",
"start:api": "yarn workspace @myfursona/api start",
"dev:web": "turbo dev --filter=website",
"build:web": "turbo build --filter=website",
"dev:api": "turbo dev --filter=api",
"build:api": "turbo build",
"build": "turbo build",
"prettier:check": "prettier --check .",
"prettier:write": "prettier --write ."
Expand All @@ -25,6 +23,6 @@
},
"devDependencies": {
"prettier": "^2.8.3",
"turbo": "^1.7.4"
"turbo": "latest"
}
}
6 changes: 4 additions & 2 deletions turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
"pipeline": {
"lint": {},
"build": {
"dependsOn": ["^build"],
"outputs": [".output/**"]
"dependsOn": ["^build"]
},
"deploy": {
"dependsOn": ["lint", "build"]
},
"dev": {
"cache": false
}
}
}
1 change: 1 addition & 0 deletions website/components/Icon/IconMono.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
xmlns="http://www.w3.org/2000/svg"
width="512"
height="512"
aria-label="MyFursona logo"
viewBox="0 0 512 512"
fill="none"
focusable="false"
Expand Down
3 changes: 1 addition & 2 deletions website/components/Landing/LandingHero.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ onMounted(() => {
trigger: scrollWrapper,
start: "top top",
end: "+=900",
scrub: 0.65,
markers: true,
scrub: 1,
},
})
.to(artItemsRight[2], { y: -145 })
Expand Down
9 changes: 7 additions & 2 deletions website/components/Landing/LandingThird.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ const gridItems = [
description:
"Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
},
{
heading: "Change profile type",
description:
"Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
},
]
const cardContainer = ref<HTMLDivElement>()
Expand Down Expand Up @@ -59,7 +64,7 @@ onMounted(() => {
<div id="card-contents">
<div class="border h-[14rem] rounded-md border-dashed"></div>
<article>
<h2 class="my-3 text-2xl font-bold font-inter">
<h2 class="my-3 text-3xl font-bold font-inter">
{{ item.heading }}
</h2>
<p>{{ item.description }}</p>
Expand All @@ -86,7 +91,7 @@ onMounted(() => {
&-item {
@apply rounded-md relative;
background: rgba(55, 3, 157, 0.5);
background: rgba(51, 3, 106, 0.5);
height: 30rem;
&::before {
Expand Down
74 changes: 60 additions & 14 deletions website/components/TheBaseFooter.vue
Original file line number Diff line number Diff line change
@@ -1,21 +1,67 @@
<script setup lang="ts">
const links = [
{ link: "/about", text: "About" },
{ link: "#", text: "Terms" },
{ link: "#", text: "Legal" },
{ link: "#", text: "Privacy" },
{ link: "#", text: "API" },
{ link: "#", text: "Sitemap" },
{ link: "#", text: "Feedback" },
]
const currentYear = new Date().getFullYear()
const copyrightText = `© 2022-${currentYear} The MyFursona Project - MIT License`
</script>

<template>
<footer>
<footer class="relative bui-gradient-mix">
<div class="footer-branding">
<NuxtLink to="/">
<IconMono class="flex-shrink-0 w-12 h-12" />
</NuxtLink>
</div>
<div
class="mt-[2rem] flex justify-between px-10 py-6 mx-auto max-w-screen-2xl"
class="flex items-center gap-8 pt-10 pb-12 mx-auto mt-12 text-sm px-14 max-w-screen-2xl"
>
<span id="copyright" class="text-sm">
Copyright &copy; 2022-{{ new Date().getFullYear() }} MyFursona
</span>
<div class="flex items-center gap-x-5">
<NuxtLink to="/contact">Contact</NuxtLink>
<NuxtLink
to="https://github.com/MyFursona-Project/MyFursona"
rel="noopener noreferrer"
target="_blank"
>
<i class="fab fa-github fa-fw fa-lg"></i>
</NuxtLink>
<ul class="grid w-full grid-flow-col border-r border-base-500">
<li v-for="items in links">
<NuxtLink
:to="items.link"
class="flex-shrink-0 text-opacity-50 transition-colors whitespace-nowrap hover:text-opacity-100 text-base-50 hover:text-base-100"
>
{{ items.text }}
</NuxtLink>
</li>
</ul>
<div id="copyright">
<span class="text-opacity-50 text-base-50">
{{ copyrightText }}
</span>
</div>
</div>
</footer>
</template>

<style lang="scss">
.bui-gradient-mix {
background: linear-gradient(
to bottom,
rgba(116, 72, 209, 0) 0%,
rgba(116, 72, 209, 0.1) 54%,
rgba(116, 72, 209, 0.2) 100%
);
}
.footer-branding {
@apply absolute left-0 right-0 inline-flex items-center gap-5 -top-12;
&::before,
&::after {
content: "";
@apply h-[0.75px] bg-base-500 w-full;
}
}
#copyright {
@apply flex gap-2.5 items-center flex-shrink-0;
}
</style>
11 changes: 7 additions & 4 deletions website/components/TheBaseNavbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ onMounted(() => {
transition-duration: 300ms;
&.scrolled {
@apply backdrop-blur-md border-base-500;
background-color: rgba(24, 5, 72, 0.775);
@apply backdrop-blur-md bg-opacity-75 border-base-500 bg-base-800;
}
}
Expand All @@ -99,11 +98,15 @@ onMounted(() => {
@apply text-3xl font-bold text-white select-none font-inter;
}
.navbar-sticky.scrolled input {
@apply border-base-600;
}
.search-input {
@apply ml-5 w-[18.5vw] relative text-sm;
input {
@apply relative z-[1] px-4 py-2.5 rounded-md bg-opacity-75 bg-base-800 focus:outline-base-600 w-full transition-colors;
@apply border-2 border-transparent relative z-[1] px-4 py-2.5 rounded-md bg-opacity-75 bg-base-800 focus:outline-base-600 w-full transition-colors;
}
&[data-focused="true"] input {
Expand All @@ -112,7 +115,7 @@ onMounted(() => {
}
.search-suggestions {
@apply absolute -left-2 -right-2 -top-2 py-3 pt-14 px-4 bg-base-600 transition-all pointer-events-none opacity-0 rounded-md;
@apply absolute -left-2 -right-2 -top-2 py-3 pt-14 px-4 bg-base-700 transition-all pointer-events-none opacity-0 rounded-md;
&[aria-hidden="false"] {
@apply opacity-100 pointer-events-auto;
Expand Down
5 changes: 3 additions & 2 deletions website/composables/useCalcViewport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
*/
export function useCalcViewport() {
function handleResize() {
const Vw = (window.innerWidth / 100).toString()

const htmlRoot = document.documentElement
const Vw = (window.innerWidth / 100).toString()
const Vh = (window.innerHeight / 100).toString()

htmlRoot.style.setProperty("--vw", `${Vw}px`)
htmlRoot.style.setProperty("--vh", `${Vh}px`)
}

onBeforeMount(() => handleResize())
Expand Down
3 changes: 1 addition & 2 deletions website/pages/login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

<style lang="scss">
.login-wrapper {
@apply grid place-items-center;
height: calc(100vh - 7rem);
@apply grid place-items-center h-screen;
}
</style>
80 changes: 40 additions & 40 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5461,47 +5461,47 @@ tunnel-agent@^0.6.0:
dependencies:
safe-buffer "^5.0.1"

[email protected].1:
version "1.8.1"
resolved "https://registry.yarnpkg.com/turbo-darwin-64/-/turbo-darwin-64-1.8.1.tgz#3e3e64fe7ea7d0bcd192e2e608274a06c662d1d5"
integrity sha512-H7pxGF/vsYG7kbY+vB8h+3r8VXn2L6hhYQi0XWA+EjZ1e2zu7+TzEMRWFYmvJPx8TRo5cV5txtg0I22/Y7bxUA==

[email protected].1:
version "1.8.1"
resolved "https://registry.yarnpkg.com/turbo-darwin-arm64/-/turbo-darwin-arm64-1.8.1.tgz#d855340af02a448c428881a65c2deef75108caff"
integrity sha512-zMcvplVGluR6v4oJXW7S1/R9QFsHdDkXMhPq8PIdvT3HwTb69ms0MNv7aKiQ0ZFy5D/eKCTyBRUFZvjorZmBqA==

[email protected].1:
version "1.8.1"
resolved "https://registry.yarnpkg.com/turbo-linux-64/-/turbo-linux-64-1.8.1.tgz#9f1dac8c7f40d7ba43adf407ed59dc03f52c7601"
integrity sha512-eJNx8iWDn5Lt8d0221RFd6lBjViLiPCVWNFF5JtqOohgRYplvepY3y/THa1GivMxY4px6zjTiy2oPE/VscVP4w==

[email protected].1:
version "1.8.1"
resolved "https://registry.yarnpkg.com/turbo-linux-arm64/-/turbo-linux-arm64-1.8.1.tgz#4ab5ca579b16b501ad98f0ed1ff22bcc13ffd1d7"
integrity sha512-hFZkm8tq9kLE8tdbOzD6EbNzftdzMR4JEuuoKC6AbTzx1ZsWRvXJ/BGTeSH9/dYYm/wfuIEUiOP7HeXWiZRx7g==

[email protected].1:
version "1.8.1"
resolved "https://registry.yarnpkg.com/turbo-windows-64/-/turbo-windows-64-1.8.1.tgz#4bc3648ff387ec4dfc781c4ec9213da320cac563"
integrity sha512-o3oDg0lTYZl5KZD3Mi753On2vQT51unIiungoUmHDCeDH5JXfWPFu+6p+GAoIyRwQkZPvaEzMLuUtRgklKcBJw==

[email protected].1:
version "1.8.1"
resolved "https://registry.yarnpkg.com/turbo-windows-arm64/-/turbo-windows-arm64-1.8.1.tgz#9b4487ec4382da8f95e2be361fbbaff9d1fb8901"
integrity sha512-NDYr2Mra21KOdl18BhMRoH2jQmlu+oqkpqRd+cGB8+c5P0B6LDVCM83cfcXQ+PNqX9S3Y1eZDRENZJx9I03sSw==

turbo@^1.7.4:
version "1.8.1"
resolved "https://registry.yarnpkg.com/turbo/-/turbo-1.8.1.tgz#f53c0dce2d69f75dc64dfd40a1d8faee2330744b"
integrity sha512-g8RltmG5zd0nYbKpkBQwnTSXTWUiup9+yileQ1TETNzpjxI3TL5k7kt2WkgUHEqR947IPUV+ckIduZHVITJmIQ==
[email protected].3:
version "1.8.3"
resolved "https://registry.yarnpkg.com/turbo-darwin-64/-/turbo-darwin-64-1.8.3.tgz#f220459e7636056d9a67bc9ead8dc01c495f9d55"
integrity sha512-bLM084Wr17VAAY/EvCWj7+OwYHvI9s/NdsvlqGp8iT5HEYVimcornCHespgJS/yvZDfC+mX9EQkn3V2JmYgGGw==

[email protected].3:
version "1.8.3"
resolved "https://registry.yarnpkg.com/turbo-darwin-arm64/-/turbo-darwin-arm64-1.8.3.tgz#1529f0755cd683e372140d6b9532efe4ca523b38"
integrity sha512-4oZjXtzakopMK110kue3z/hqu3WLv+eDLZOX1NGdo49gqca9BeD8GbH+sXpAp6tqyeuzpss+PIliVYuyt7LgbA==

[email protected].3:
version "1.8.3"
resolved "https://registry.yarnpkg.com/turbo-linux-64/-/turbo-linux-64-1.8.3.tgz#1aed7f4bb4492cb4c9d8278044a66d3c6107ee5b"
integrity sha512-uvX2VKotf5PU14FCxJA5iHItPQno2JWzerMd+g3/h/Asay6dvxvtVjc39MQeGT0H5njSvzVKFkT+3/5q8lgOEg==

[email protected].3:
version "1.8.3"
resolved "https://registry.yarnpkg.com/turbo-linux-arm64/-/turbo-linux-arm64-1.8.3.tgz#0269b31b2947c40833052325361a94193ca46150"
integrity sha512-E1p+oH3XKMaPS4rqWhYsL4j2Pzc0d/9P5KU7Kn1kqVLo2T3iRA7n2KVULEieUNE0nTH+aIJPXYXOpqCI5wFJaA==

[email protected].3:
version "1.8.3"
resolved "https://registry.yarnpkg.com/turbo-windows-64/-/turbo-windows-64-1.8.3.tgz#cf94f427414eb8416c1fe22229f9a578dd1ec78b"
integrity sha512-cnzAytHtoLXd0J7aNzRpZFpL/GTjcBmkvAPlbOdf/Pl1iwS4qzGrudZQ+OM1lmLgLIfBPIavsGHBknTwTNib4A==

[email protected].3:
version "1.8.3"
resolved "https://registry.yarnpkg.com/turbo-windows-arm64/-/turbo-windows-arm64-1.8.3.tgz#db5739fe1d6907d07874779f6d5fac87b3f3ca6a"
integrity sha512-ulIiItNm2w/zYJdD5/oAzjzNns1IjbpweRzpsE8tLXaWwo6+fnXXkyloUug0IUhcd2k6fJXfoiDZfygqpOVuXg==

turbo@latest:
version "1.8.3"
resolved "https://registry.yarnpkg.com/turbo/-/turbo-1.8.3.tgz#6fe1ce749a38b54f15f0fcb24ee45baefa98e948"
integrity sha512-zGrkU1EuNFmkq6iky6LcMqD4h0OLE8XysVFxQWRIZbcTNnf0XAycbsbeEyiJpiWeqb7qtg2bVuY9EYcNoNhVuQ==
optionalDependencies:
turbo-darwin-64 "1.8.1"
turbo-darwin-arm64 "1.8.1"
turbo-linux-64 "1.8.1"
turbo-linux-arm64 "1.8.1"
turbo-windows-64 "1.8.1"
turbo-windows-arm64 "1.8.1"
turbo-darwin-64 "1.8.3"
turbo-darwin-arm64 "1.8.3"
turbo-linux-64 "1.8.3"
turbo-linux-arm64 "1.8.3"
turbo-windows-64 "1.8.3"
turbo-windows-arm64 "1.8.3"

type-fest@^0.21.3:
version "0.21.3"
Expand Down

0 comments on commit f145d1b

Please sign in to comment.