Skip to content

Commit

Permalink
Merge branch 'dev' into feat/maps
Browse files Browse the repository at this point in the history
  • Loading branch information
RigottiG authored May 20, 2024
2 parents 711ca09 + b34b1ad commit 33535b0
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ DATABASE_URL="postgresql://postgres:password@localhost:5432/sos-pet"

# Next Auth
NEXTAUTH_URL="http://localhost:3000"
NEXTAUTH_SECRET="nextauthsecret"
NEXTAUTH_SECRET="nextauth-secret"

# Next Auth Providers
GOOGLE_CLIENT_ID=""
GOOGLE_CLIENT_SECRET=""
GOOGLE_CLIENT_ID="google-client-id"
GOOGLE_CLIENT_SECRET="google-client-secret"

# Google Maps
NEXT_PUBLIC_GOOGLE_MAPS_API_KEY=""
NEXT_PUBLIC_GOOGLE_MAPS_API_KEY="google-maps-api-key"

# Docker related variables, not used on Next.js
POSTGRES_DB="sos-pet"
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/lint-type-check-and-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
jobs:
lint-type-check-and-build:
runs-on: ubuntu-latest
name: Lint, Type Check, and Build
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand All @@ -20,7 +21,10 @@ jobs:
cache: "yarn"

- name: Setup .env file
run: echo "${{ secrets.DOT_ENV_FILE_CONTENT }}" > .env
# All the environment variables in .env.example are invalid,
# therefore the application will not be functional. But, it is enough
# for linting, type checking, and building.
run: cat .env.example > .env

- name: Install dependencies
run: yarn
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ Com o SOS Pet, as pessoas que resgatam animais de enchentes podem rapidamente en
1. Instale as dependências
1. Crie um arquivo `.env` baseando se no `.env.example`
1. Assegure se de preencher todas as variáveis ambiente.
1. Suba o baco de dados: `docker compose up -d`
1. Suba o baco de dados: `docker-compose up -d`
1. Rode as migrations: `npx prisma migrate dev`
1. Rode o projeto com o script `dev` disponível no `package.json`
2 changes: 2 additions & 0 deletions src/app/about/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ export default function About() {
transformar um momento de crise em uma oportunidade para fazer a
diferença na vida de um animal. Juntos, podemos salvar vidas e
construir um futuro mais seguro para nossos amigos de quatro patas.
Além disso, esse projeto tem o código fonte aberto e disponível para colaboração:
<a href="https://github.com/emiliosheinz/sos-pet" target="blank"> https://github.com/emiliosheinz/sos-pet</a>
</p>
</div>
</div>
Expand Down
10 changes: 9 additions & 1 deletion src/components/footer/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Image from "next/image";
import Link from "next/link";
import { FaInstagram } from "react-icons/fa";
import { FaInstagram, FaGithub } from "react-icons/fa";

export function Footer() {
return (
Expand All @@ -15,6 +15,13 @@ export function Footer() {
/>
</div>
<div className="flex flex-col items-center gap-1 text-center align-middle md:flex-row md:gap-8">
<Link
target="_blank"
href="https://github.com/emiliosheinz/sos-pet"
className="flex items-center gap-1 text-sm text-gray-500 hover:text-gray-700"
>
<FaGithub size={16} /> sos-pet
</Link>
<Link
target="_blank"
href="https://www.instagram.com/oficial_sospet/"
Expand All @@ -40,6 +47,7 @@ export function Footer() {
>
Políticas de privacidade
</Link>

</div>
</div>
</footer>
Expand Down

0 comments on commit 33535b0

Please sign in to comment.