Ficha 01 · Git fundamentos

git config --global user.name "Joana Silva"
git config --global user.email "joana@email.com"

mkdir meu-projecto
cd meu-projecto
git init

git status

On branch main
No commits yet
Untracked files:
  ficheiro1.txt
  ficheiro2.txt

git add ficheiro.txt        # específico
git add .                   # tudo na pasta actual
git add -A                  # tudo no repo

git commit -m "Mensagem descritiva no imperativo"
# Ex: git commit -m "Add login page"

# 1. Criar pasta e iniciar repo
mkdir meu-site
cd meu-site
git init

# 2. Criar ficheiros (no editor)
# Criar index.html com:
echo "<h1>Olá mundo</h1>" > index.html

# Criar style.css com:
echo "h1 { color: blue; }" > style.css

# 3. Verificar estado
git status
# Untracked: index.html, style.css

# 4. Adicionar ao staging
git add .

# 5. Verificar staging
git status
# Changes to be committed: index.html, style.css

# 6. Primeiro commit
git commit -m "Initial commit: add HTML and CSS"

# 7. Ver histórico
git log
# commit abc123...
# Author: Joana Silva
# Date: ...
# Message: Initial commit: add HTML and CSS

# 8. Versão compacta
git log --oneline
# abc123 Initial commit: add HTML and CSS

git branch feature/login

git checkout feature/login
# Ou (moderno):
git switch feature/login

git checkout -b feature/login
# Ou:
git switch -c feature/login

# Mudar para main primeiro
git checkout main

# Trazer mudanças da feature
git merge feature/login

# Se tudo correr bem:
# "Fast-forward" ou
# "Merge made by the 'recursive' strategy"

git branch -d feature/login
# -d é "safe delete" (só apaga se já merged)

# Forçar:
git branch -D feature/login

# Estás em main
git checkout -b feature/login

# Editar ficheiros...
git add .
git commit -m "feat(auth): add login form"

# Mais trabalho...
git commit -am "feat(auth): add login validation"

# Acabou a feature
git checkout main
git pull  # actualizar main se trabalho em equipa
git merge feature/login
git push  # publicar
git branch -d feature/login

# === Node.js / npm / yarn ===
node_modules/
npm-debug.log*
yarn-debug.log*
yarn-error.log*
package-lock.json.bak

# === React build ===
build/
dist/

# === Environment variables (CRÍTICO) ===
.env
.env.local
.env.development.local
.env.test.local
.env.production.local

# === IDE / Editor ===
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.idea/
*.swp
*.swo
*~

# === OS ===
.DS_Store
Thumbs.db
desktop.ini

# === Logs ===
logs/
*.log

# === Testing ===
coverage/
.nyc_output/

# === Cache ===
.cache/
.eslintcache
.parcel-cache/

# === Temporary ===
*.tmp
*.temp
.tmp/

# === Optional npm cache directory ===
.npm

# === Optional eslint cache ===
.eslintcache

# === Microbundle cache ===
.rpt2_cache/
.rts2_cache_cjs/
.rts2_cache_es/
.rts2_cache_umd/

# === Optional REPL history ===
.node_repl_history

# === Output of 'npm pack' ===
*.tgz

# === Yarn Integrity file ===
.yarn-integrity

# === Production build ===
build/
public/build/

# === Vercel / Netlify / etc ===
.vercel/
.netlify/

# === Local databases ===
*.sqlite
*.db

git rm --cached -r node_modules/
git rm --cached .env
git commit -m "chore: remove ignored files from tracking"

# Adicionar remote
git remote add origin git@github.com:teu-utilizador/meu-projecto.git

# Verificar
git remote -v
# origin    git@github.com:teu-utilizador/meu-projecto.git (fetch)
# origin    git@github.com:teu-utilizador/meu-projecto.git (push)

# Renomear branch master para main se necessário
git branch -M main

# Push pela primeira vez (-u define upstream)
git push -u origin main

Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
...
To github.com:teu-utilizador/meu-projecto.git
 * [new branch]      main -> main
Branch 'main' set up to track remote branch 'main' from 'origin'.

# Editar ficheiros
# ...

git add .
git commit -m "feat: add new feature"
git push   # já sabe push para origin/main (configurado com -u)

# 1. Gerar chave
ssh-keygen -t ed25519 -C "teu.email@example.com"
# (Premir Enter para path default)
# (Opcional: passphrase)

# 2. Iniciar ssh-agent
eval "$(ssh-agent -s)"
ssh-add ~/.ssh/id_ed25519

# 3. Copiar chave pública
cat ~/.ssh/id_ed25519.pub
# Copiar todo o output (começa com ssh-ed25519...)

# 4. No GitHub:
# Settings → SSH and GPG keys → New SSH key
# Title: "Laptop pessoal"
# Key: colar
# Add SSH key

# 5. Testar
ssh -T git@github.com
# Hi teu-utilizador! You've successfully authenticated...

git clone git@github.com:teu-utilizador/meu-projecto.git
cd meu-projecto
# Trabalhar normalmente

# Calculator

![Tests](https://github.com/user/calculator/actions/workflows/tests.yml/badge.svg)
![License](https://img.shields.io/badge/license-MIT-blue.svg)

A simple yet powerful command-line calculator built in Python, supporting basic arithmetic and advanced functions.

## Features

- ✅ Basic arithmetic: addition, subtraction, multiplication, division
- ✅ Advanced operations: powers, roots, percentages
- ✅ Memory functions: M+, M-, MR, MC
- ✅ History of last 100 operations
- ✅ Interactive mode and one-shot mode
- ✅ Configurable decimal precision
- ✅ Comprehensive error handling

## Installation

### From PyPI (recommended)

```bash
pip install simple-calculator

git clone https://github.com/user/calculator.git
cd calculator
pip install -e .

$ calc
Welcome to Calculator v1.0
> 5 + 3
8
> 10 * 7
70
> exit

$ calc "5 + 3"
8

$ calc "sqrt(16)"
4

from calculator import Calculator

calc = Calculator()
result = calc.add(5, 3)        # 8
result = calc.multiply(2, 7)   # 14
result = calc.sqrt(16)         # 4.0

# Chain operations
calc.add(5, 3).multiply(2)     # 16

calc --precision 4 "1/3"
# 0.3333

git clone https://github.com/user/calculator.git
cd calculator
python -m venv venv
source venv/bin/activate  # Linux/Mac
# venv\Scripts\activate   # Windows

pip install -e ".[dev]"

pytest

# With coverage
pytest --cov=calculator

# Specific test
pytest tests/test_calculator.py::test_addition

# Format
black calculator/

# Lint
flake8 calculator/

# Type check
mypy calculator/

**Princípios de bom README**:

1. **Nome + descrição** clara no topo.
2. **Badges**: build status, license (visual).
3. **Features** principais (bullet list).
4. **Installation** clara.
5. **Quick Start** mostra como usar imediatamente.
6. **Usage** detalhado com exemplos de código.
7. **Documentation** link para mais info.
8. **Development** secção para contribuidores.
9. **Contributing** convite explícito.
10. **License** clara.
11. **Contact** opcional.

**Markdown features úteis**:
- `# H1`, `## H2`, `### H3` headers.
- `**bold**`, `*italic*`.
- `` `code` `` inline.
- `[link](url)`.
- `![alt](image-url)`.
- Code blocks com ``` ```.
- Listas com `-` ou `1.`.
- Tabelas com `|`.
- Blockquotes com `>`.

**README é a primeira coisa que utilizadores vêem** — investir tempo nele.

</div>

## Parte IV · Pull Requests

### Exercício 7 · Criar PR (15 pts)

Descreve workflow completo para criar Pull Request.

<div class="resposta"></div>

<div class="solucao" markdown="1">

**Workflow Completo: Criar Pull Request**

**Cenário**: vais adicionar feature de "Esqueci password" ao site.

**Passo 1 — Sincronizar main**:

```bash
git checkout main
git pull origin main

git checkout -b feature/forgot-password

# Editar ficheiros do formulário
# ...
git add src/components/ForgotPassword.jsx
git commit -m "feat(auth): add forgot password form component"

# Adicionar endpoint backend
# ...
git add src/api/auth.js
git commit -m "feat(auth): add forgot password API endpoint"

# Adicionar email service
# ...
git add src/services/email.js
git commit -m "feat(auth): integrate email service for password reset"

# Adicionar testes
# ...
git add tests/
git commit -m "test(auth): add tests for forgot password flow"

# Actualizar documentação
# ...
git add docs/
git commit -m "docs: document forgot password feature"

# Primeira vez (define upstream)
git push -u origin feature/forgot-password

# Pushes seguintes
git push

remote: Create a pull request for 'feature/forgot-password' on GitHub by visiting:
remote:      https://github.com/org/repo/pull/new/feature/forgot-password

git fetch origin
git checkout main
git pull
git checkout feature/forgot-password
git merge main
# Resolver conflitos se houver
git push

feat(auth): Add forgot password flow

## Description

Implements the forgot password feature, allowing users to reset their password via email.

## Changes

- Added `ForgotPassword` component with form validation
- Added `POST /api/auth/forgot-password` endpoint
- Integrated SendGrid for email delivery
- Added unit tests (95% coverage on new code)
- Updated user documentation

## Screenshots

![Forgot password form](url-to-screenshot.png)

## How to test

1. Go to login page
2. Click "Forgot password?"
3. Enter email
4. Check email for reset link
5. Click link → enter new password
6. Login with new password

## Checklist

- [x] Code follows project style (passes lint)
- [x] Tests added (95% coverage)
- [x] Documentation updated
- [x] Self-review done
- [x] No console.log left
- [x] No secrets in code
- [x] Manual testing done

## Related issues

Closes #123 (Forgot password feature request)
Related to #145 (Email service integration)

# Fazer mudanças localmente
git add fixes/
git commit -m "fix: address review comments — extract validation"
git push

# Localmente
git checkout main
git pull
git branch -d feature/forgot-password

# A branch no GitHub é apagada automaticamente (se opção habilitada)

git checkout main
git merge feature/x

Auto-merging app.js
CONFLICT (content): Merge conflict in app.js
Automatic merge failed; fix conflicts and then commit the result.

git status

On branch main
You have unmerged paths.
  (fix conflicts and run "git commit")

Unmerged paths:
  (use "git add <file>..." to mark resolution)
        both modified:   app.js
        both modified:   src/utils.js

code app.js  # ou vim, nano, qualquer editor

function calculatePrice(items) {
<<<<<<< HEAD
    // Versão da branch actual (main)
    let total = 0;
    for (let item of items) {
        total += item.price;
    }
    return total;
=======
    // Versão da branch a fundir (feature/x)
    return items.reduce((sum, item) => sum + item.price, 0);
>>>>>>> feature/x
}

function calculatePrice(items) {
    let total = 0;
    for (let item of items) {
        total += item.price;
    }
    return total;
}

function calculatePrice(items) {
    return items.reduce((sum, item) => sum + item.price, 0);
}

function calculatePrice(items) {
    // Better: use reduce for cleaner code, with type check
    if (!Array.isArray(items)) return 0;
    return items.reduce((sum, item) => sum + (item.price || 0), 0);
}

function calculatePrice(items) {
    if (!Array.isArray(items)) return 0;
    return items.reduce((sum, item) => sum + (item.price || 0), 0);
}

git add app.js

code src/utils.js
# Resolver conflito
git add src/utils.js

git status

On branch main
All conflicts fixed but you are still merging.
  (use "git commit" to conclude merge)

Changes to be committed:
        modified:   app.js
        modified:   src/utils.js

git commit

Merge branch 'feature/x' into main

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.

git push

# Manter versão actual (descartar feature)
git checkout --ours app.js
git add app.js

# Manter versão da feature (descartar actual)
git checkout --theirs app.js
git add app.js

git merge --abort

git mergetool
# Lança ferramenta configurada (vimdiff, meld, kdiff3, etc.)

git config --global merge.tool meld

# Após resolver conflito
git add file.js
git rebase --continue

# Ou abortar
git rebase --abort

<<<<<<< HEAD
// código quebrado
=======