diff --git a/.env b/.env deleted file mode 100644 index 81193ef0..00000000 --- a/.env +++ /dev/null @@ -1,23 +0,0 @@ -APP_NAME=ENEI -APP_KEY=base64:O8e0ShbVWB3OAAFGbSUweWr1JM3xutu1isYLKLk4mqU= -APP_DEBUG=true -APP_URL=http://localhost - -LOCALE=pt -FAKER_LOCALE=pt_PT - -DB_CONNECTION=pgsql -DB_HOST=pgsql -DB_PORT=5432 -DB_DATABASE=postgres -DB_PASSWORD=postgres -DB_USERNAME=postgres - -SCOUT_QUEUE=true -SCOUT_DRIVER=meilisearch -MEILISEARCH_HOST=http://meilisearch:3331 -MEILISEARCH_KEY=my-master-key - -MEILISEARCH_NO_ANALYTICS=false - -LOG_CHANNEL="eneiWebsite" diff --git a/.env.example b/.env.example index 1c727f8a..57a275ad 100644 --- a/.env.example +++ b/.env.example @@ -1,58 +1,35 @@ -APP_NAME=Laravel -APP_ENV=local -APP_KEY= +APP_NAME=ENEI +APP_ENV=local # Use "maintenance" to enable the maitenance page +APP_KEY=base64:AVegBkyjHs2QQsx53M9Kt9GbnrDLc6yG4cRg+WMJrbA= APP_DEBUG=true -APP_URL=http://localhost +APP_URL=http://localhost:8000 +APP_PORT=8000 -LOG_CHANNEL=stack -LOG_DEPRECATIONS_CHANNEL=null -LOG_LEVEL=debug +LOCALE=pt +FAKER_LOCALE=pt_PT -DB_CONNECTION=mysql -DB_HOST=127.0.0.1 -DB_PORT=3306 -DB_DATABASE=laravel -DB_USERNAME=root -DB_PASSWORD= +DB_HOST=pgsql +DB_PORT=5432 +DB_USERNAME=postgres +DB_PASSWORD=postgres +DB_DATABASE=sinf-website-2023 +DB_CONNECTION=pgsql -BROADCAST_DRIVER=log -CACHE_DRIVER=file -FILESYSTEM_DISK=local -QUEUE_CONNECTION=sync -SESSION_DRIVER=database -SESSION_LIFETIME=120 +MAIL_HOST=mailpit +MAIL_PORT=1025 -MEMCACHED_HOST=127.0.0.1 +REDIS_HOST=redis -REDIS_HOST=127.0.0.1 -REDIS_PASSWORD=null -REDIS_PORT=6379 +MAINTENANCE_DRIVER=cache -MAIL_MAILER=smtp -MAIL_HOST=mailpit -MAIL_PORT=1025 -MAIL_USERNAME=null -MAIL_PASSWORD=null -MAIL_ENCRYPTION=null -MAIL_FROM_ADDRESS="hello@example.com" -MAIL_FROM_NAME="${APP_NAME}" - -AWS_ACCESS_KEY_ID= -AWS_SECRET_ACCESS_KEY= -AWS_DEFAULT_REGION=us-east-1 -AWS_BUCKET= -AWS_USE_PATH_STYLE_ENDPOINT=false - -PUSHER_APP_ID= -PUSHER_APP_KEY= -PUSHER_APP_SECRET= -PUSHER_HOST= -PUSHER_PORT=443 -PUSHER_SCHEME=https -PUSHER_APP_CLUSTER=mt1 - -VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}" -VITE_PUSHER_HOST="${PUSHER_HOST}" -VITE_PUSHER_PORT="${PUSHER_PORT}" -VITE_PUSHER_SCHEME="${PUSHER_SCHEME}" -VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" +CACHE_DRIVER=redis + +QUEUE_CONNECTION=redis + +SCOUT_QUEUE=true +SCOUT_DRIVER=meilisearch +MEILISEARCH_HOST=http://meilisearch:7700 + +MEILISEARCH_NO_ANALYTICS=false + +LOG_CHANNEL="eneiWebsite" diff --git a/.gitignore b/.gitignore index 6d3dd272..2d58ecff 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,9 @@ /public/storage /storage/*.key /vendor -.env.backup -.env.production -.env.railway +.env* +!.env*.example +!.env*.encrypted .phpunit.result.cache Homestead.json Homestead.yaml diff --git a/docker-compose.yml b/docker-compose.yml index 2275e9b6..8e3b74aa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,7 +31,7 @@ services: build: context: . dockerfile: ./dockerfiles/Dockerfile.website - target: deploy + target: deploy-nocache args: - LARAVEL_ENV=${APP_ENV:-local} - LARAVEL_ENV_FILE=.env diff --git a/dockerfiles/Dockerfile.website b/dockerfiles/Dockerfile.website index c2208c51..a3c25e39 100644 --- a/dockerfiles/Dockerfile.website +++ b/dockerfiles/Dockerfile.website @@ -32,8 +32,8 @@ COPY routes/ ./routes/ RUN composer install --no-interaction --optimize-autoloader --no-dev --prefer-dist -# deploy -FROM trafex/php-nginx:3.6.0 AS deploy +# deploy-nocache +FROM trafex/php-nginx:3.6.0 AS deploy-nocache WORKDIR /var/www/html USER root @@ -72,10 +72,16 @@ COPY --chown=nobody --from=assets-build /app/public/ ./public/ ENV APP_ENV=${LARAVEL_ENV} RUN [ -z "${LARAVEL_ENV_FILE_KEY}" ] || ( mv .env.${LARAVEL_ENV} .env.${LARAVEL_ENV}.encrypted && php artisan env:decrypt -n --env=${LARAVEL_ENV} --key=${LARAVEL_ENV_FILE_KEY} ) + +COPY --chown=nobody ./etc/entrypoint.nocache.sh /entrypoint.sh +CMD [ "/entrypoint.sh" ] + +# deploy +FROM deploy-nocache AS deploy + RUN php artisan storage:link -n RUN php artisan event:cache -n RUN php artisan route:cache -n RUN php artisan view:cache -n COPY --chown=nobody ./etc/entrypoint.sh /entrypoint.sh -CMD [ "/entrypoint.sh" ] diff --git a/etc/entrypoint.nocache.sh b/etc/entrypoint.nocache.sh new file mode 100755 index 00000000..b3d16e35 --- /dev/null +++ b/etc/entrypoint.nocache.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +set -e + +/usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf diff --git a/package-lock.json b/package-lock.json index c8ab6422..abea944f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "website-2023", + "name": "enei-website", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/public/fonts/SpaceGrotesk-Bold.ttf b/public/fonts/SpaceGrotesk-Bold.ttf new file mode 100644 index 00000000..0408641c Binary files /dev/null and b/public/fonts/SpaceGrotesk-Bold.ttf differ diff --git a/public/fonts/SpaceGrotesk-Light.ttf b/public/fonts/SpaceGrotesk-Light.ttf new file mode 100644 index 00000000..d41bcccd Binary files /dev/null and b/public/fonts/SpaceGrotesk-Light.ttf differ diff --git a/public/fonts/SpaceGrotesk-Medium.ttf b/public/fonts/SpaceGrotesk-Medium.ttf new file mode 100644 index 00000000..7d44b663 Binary files /dev/null and b/public/fonts/SpaceGrotesk-Medium.ttf differ diff --git a/public/fonts/SpaceGrotesk-Regular.ttf b/public/fonts/SpaceGrotesk-Regular.ttf new file mode 100644 index 00000000..981bcf5b Binary files /dev/null and b/public/fonts/SpaceGrotesk-Regular.ttf differ diff --git a/public/fonts/SpaceGrotesk-SemiBold.ttf b/public/fonts/SpaceGrotesk-SemiBold.ttf new file mode 100644 index 00000000..e7e02e51 Binary files /dev/null and b/public/fonts/SpaceGrotesk-SemiBold.ttf differ diff --git a/public/images/background.jpeg b/public/images/background.jpeg new file mode 100644 index 00000000..59259650 Binary files /dev/null and b/public/images/background.jpeg differ diff --git a/public/images/enei-logo.png b/public/images/enei-logo.png new file mode 100644 index 00000000..7bef03a0 Binary files /dev/null and b/public/images/enei-logo.png differ diff --git a/public/images/gradient.png b/public/images/gradient.png new file mode 100644 index 00000000..9d71f6c7 Binary files /dev/null and b/public/images/gradient.png differ diff --git a/public/images/landing-page-background.png b/public/images/landing-page-background.png new file mode 100644 index 00000000..b6686509 Binary files /dev/null and b/public/images/landing-page-background.png differ diff --git a/public/images/logo-white.svg b/public/images/logo-white.svg new file mode 100644 index 00000000..7a73685a --- /dev/null +++ b/public/images/logo-white.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/css/app.css b/resources/css/app.css index 0de21207..a9a1ec76 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -2,6 +2,25 @@ @tailwind components; @tailwind utilities; +@layer base { + @font-face { + font-family: 'Space Grotesk'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url('/fonts/SpaceGrotesk-Regular.ttf') format('truetype'); + } + + @font-face { + font-family: 'Space Grotesk'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url('/fonts/SpaceGrotesk-Bold.ttf') format('truetype'); + } +} + +/* Custom utility for hiding elements */ [x-cloak] { display: none; } diff --git a/resources/js/Components/Navbar.vue b/resources/js/Components/Navbar.vue index 46c73140..9142b86e 100644 --- a/resources/js/Components/Navbar.vue +++ b/resources/js/Components/Navbar.vue @@ -3,14 +3,14 @@ import NavLink from "@/Components/NavLink.vue"; import Dropdown from "@/Components/Dropdown.vue"; import DropdownTrigger from "@/Components/DropdownTrigger.vue"; import DropdownLink from "@/Components/DropdownLink.vue"; -import HamburgerMenu from "@/Components/HamburgerMenu.vue"; +//import HamburgerMenu from "@/Components/HamburgerMenu.vue"; import route, { type QueryParams, type RouteParamsWithQueryOverload, } from "ziggy-js"; -import { usePage } from "@inertiajs/vue3"; -import { OhVueIcon } from "oh-vue-icons"; -import { isAdmin as checkIsAdmin } from "@/Types/User"; +//import { usePage } from "@inertiajs/vue3"; +//import { OhVueIcon } from "oh-vue-icons"; +//import { isAdmin as checkIsAdmin } from "@/Types/User"; interface Route { label: string; @@ -19,41 +19,41 @@ interface Route { type Routes = Record; const homeSections: Routes = { - aboutus: { + /*aboutus: { label: "Sobre nós", }, speakers: { label: "Oradores" }, - sponsors: { label: "Patrocínios" }, + sponsors: { label: "Patrocínios" },*/ }; const pageRoutes: Routes = { - program: { label: "Programa" }, + /*program: { label: "Programa" }, "shop.show": { label: "Loja" }, - team: { label: "Equipa" }, + team: { label: "Equipa" },*/ }; -const editionRoutes = [2022, 2021, 2020, 2019, 2018]; +// const editionRoutes = [2022, 2021, 2020, 2019, 2018]; -const { props } = usePage(); +// const { props } = usePage(); -const options = { - pages: pageRoutes, - competitions: props.competitions, - editions: editionRoutes, -}; +// const options = { +// pages: pageRoutes, +// competitions: props.competitions, +// editions: editionRoutes, +// }; -const isAdmin = checkIsAdmin(props.auth.user); +// const isAdmin = checkIsAdmin(props.auth.user); - + Stylized SINF logo @@ -92,7 +92,8 @@ const isAdmin = checkIsAdmin(props.auth.user); {{ label }} - +
- -
- diff --git a/resources/js/Layouts/AppLayout.vue b/resources/js/Layouts/AppLayout.vue index 888d6d71..d928c2b5 100644 --- a/resources/js/Layouts/AppLayout.vue +++ b/resources/js/Layouts/AppLayout.vue @@ -1,27 +1,26 @@ diff --git a/resources/js/Pages/Maintenance.vue b/resources/js/Pages/Maintenance.vue index 111a8de5..58741926 100644 --- a/resources/js/Pages/Maintenance.vue +++ b/resources/js/Pages/Maintenance.vue @@ -1,189 +1,63 @@ diff --git a/storage/app/.gitignore b/storage/app/.gitignore old mode 100644 new mode 100755 diff --git a/storage/app/public/.gitignore b/storage/app/public/.gitignore old mode 100644 new mode 100755 diff --git a/storage/debugbar/.gitignore b/storage/debugbar/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/.gitignore b/storage/framework/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/cache/.gitignore b/storage/framework/cache/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/cache/data/.gitignore b/storage/framework/cache/data/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/sessions/.gitignore b/storage/framework/sessions/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/testing/.gitignore b/storage/framework/testing/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/views/.gitignore b/storage/framework/views/.gitignore old mode 100644 new mode 100755 diff --git a/storage/logs/.gitignore b/storage/logs/.gitignore old mode 100644 new mode 100755 diff --git a/tailwind.config.js b/tailwind.config.js index f9643182..d9ca0a86 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -19,14 +19,11 @@ export default { extend: { fontFamily: { sans: ["Figtree", ...defaultTheme.fontFamily.sans], + "space-grotesk": ["Space Grotesk", "sans-serif"], }, colors: { - "2023-bg": "rgb(248, 245, 231)", - "2023-red": "rgb(217, 79, 4)", - "2023-red-dark": "rgb(177, 93, 93)", - "2023-teal": "rgb(0, 113, 114)", - "2023-teal-dark": "rgb(2, 82, 89)", - "2023-orange": "rgb(242, 147, 37)", + "enei-blue": "#0B4F6C", + "enei-beige": "#EFE3CA", }, boxShadow: { sm: "2px 2px 0 -1px var(--tw-shadow-color, currentColor), 2px 2px 0 0 black", @@ -60,7 +57,7 @@ export default { forms, typography, containers, - plugin(function ({ matchUtilities, theme }) { + plugin(function({ matchUtilities, theme }) { matchUtilities( { shadow: (value) => {