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.

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

Use Next.js #15

Merged
merged 87 commits into from
Oct 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
7846cfd
WIP
amrabed Aug 11, 2024
bc1dae9
Clean up code
amrabed Aug 11, 2024
4d882ab
Customize colors
amrabed Aug 11, 2024
eac77e5
Fix header
amrabed Aug 11, 2024
e2652b0
Fix social profiles
amrabed Aug 11, 2024
3d144dc
Format and lint
amrabed Aug 11, 2024
3302fbf
Add GitHub workflows
amrabed Aug 12, 2024
d27d729
Remove unused files
amrabed Aug 12, 2024
7a96f69
Update dependencies
amrabed Aug 12, 2024
322659e
DEploy to Firebase
amrabed Aug 12, 2024
1ece828
Fix workflows
amrabed Aug 12, 2024
b147ca6
Fix sonar issues
amrabed Aug 12, 2024
486c8b9
Fix workflows
amrabed Aug 12, 2024
2cf75d4
Minor changes
amrabed Aug 13, 2024
fecd277
Use app routing
amrabed Aug 13, 2024
74b3664
attempt to fix theme toggle
amrabed Aug 13, 2024
fdcd08a
Remove unused files
amrabed Aug 18, 2024
3d767ed
Fix theme toggle
amrabed Aug 18, 2024
a4f0429
Format and lint
amrabed Aug 18, 2024
01c8c7b
Update dependencies
amrabed Aug 18, 2024
4fca6d1
Add experience page
amrabed Aug 18, 2024
4faac4c
Update Makefile
amrabed Aug 19, 2024
d61c324
Fix sonar issues
amrabed Aug 19, 2024
db86adb
Add footer to all pages
amrabed Aug 19, 2024
3786a1f
Fix experience view
amrabed Aug 19, 2024
85d62f0
Fix intro view
amrabed Aug 19, 2024
38687a6
Remove experience section
amrabed Aug 19, 2024
cf3a398
Add projects page
amrabed Aug 19, 2024
04ecf76
Rename navLinks
amrabed Aug 19, 2024
55870c3
Fix error
amrabed Aug 19, 2024
485c370
Fix footer
amrabed Aug 19, 2024
6fa56c3
Fix intro view on mobile
amrabed Aug 19, 2024
cd7122d
Redesign projects page
amrabed Aug 19, 2024
cfe7a60
Change skills into map
amrabed Aug 20, 2024
beca968
Clean up code
amrabed Aug 20, 2024
b402196
Enrich projects
amrabed Aug 22, 2024
7a6023b
Improve views
amrabed Aug 23, 2024
ee9bcdb
Search projects by name, role, skill, or tool
amrabed Aug 24, 2024
ef532ae
Fix social view
amrabed Aug 24, 2024
cb20e6c
Use NextUI
amrabed Aug 24, 2024
b6cb8b1
Use switch for theme selection
amrabed Aug 24, 2024
9b9a801
Add website to projects
amrabed Aug 24, 2024
39ea2a6
Ignore log files
amrabed Aug 25, 2024
1ff0c24
Use search context
amrabed Aug 25, 2024
1d82735
Archive legacy website
amrabed Aug 25, 2024
3e3ff0a
Move files to top level
amrabed Aug 25, 2024
9c20f7d
Use Typescript
amrabed Aug 26, 2024
72af82f
Remove unused files
amrabed Aug 27, 2024
e1b6c66
Add tooltips
amrabed Aug 27, 2024
2878201
Fix search text color
amrabed Aug 27, 2024
5d58e0c
Add more skills
amrabed Aug 27, 2024
c32908a
Update theme background colors
amrabed Aug 27, 2024
838b9a2
Clean up header
amrabed Aug 27, 2024
45d4cde
Fix color of scrollToTopButton
amrabed Aug 27, 2024
d0d65a6
Remove unnecessary div
amrabed Aug 27, 2024
ba10023
Fix search background color
amrabed Aug 27, 2024
22c7c8f
Fix positions view
amrabed Aug 27, 2024
fddbc0b
Add filters
amrabed Aug 28, 2024
fdf568f
Place modal at top
amrabed Aug 31, 2024
264804a
Add teaching ad research positions
amrabed Aug 31, 2024
b9529ab
Fix type
amrabed Aug 31, 2024
21e754a
Fix view
amrabed Aug 31, 2024
e9d7cc0
Rename filter components
amrabed Sep 1, 2024
b4e271c
Clean up filter view
amrabed Sep 1, 2024
5a5c25b
Change education to degrees
amrabed Sep 1, 2024
c6f332b
Clean up main header
amrabed Sep 1, 2024
6e1a0dd
Clean up social icons
amrabed Sep 1, 2024
cb64716
Address sonar sceurity hotspots
amrabed Sep 1, 2024
fbe9fa4
Fix mobile navbar
amrabed Sep 2, 2024
0385487
Clean up search view
amrabed Sep 2, 2024
9e67520
Clean up home page
amrabed Sep 2, 2024
8ddb377
Make intro padding responsive
amrabed Sep 2, 2024
31bef27
Fix intro padding
amrabed Sep 2, 2024
9f8468a
Fix social icons on small screens
amrabed Sep 2, 2024
7941dbe
Fix sidebar
amrabed Sep 2, 2024
5d9dcf9
Clean up footer
amrabed Sep 2, 2024
c364138
Minor fixes
amrabed Sep 2, 2024
8537ef3
Adjust footer
amrabed Sep 5, 2024
210dc3c
Clean up intro code
amrabed Sep 7, 2024
f109d2a
Fix social bar placement
amrabed Sep 30, 2024
447600c
Final touches
amrabed Oct 19, 2024
e3bae22
Clean up
amrabed Oct 19, 2024
be4d04f
Fix section component
amrabed Oct 20, 2024
9573d95
Fix sonar issues
amrabed Oct 20, 2024
b1ed02b
Enhance intro
amrabed Oct 20, 2024
9626735
Cache context values
amrabed Oct 20, 2024
bbad6fc
Refactor conditions
amrabed Oct 20, 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
Binary file added .archive/jekyll.zip
Binary file not shown.
3 changes: 3 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": "next/core-web-vitals"
}
5 changes: 5 additions & 0 deletions .firebaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"projects": {
"default": "amr-abed"
}
}
19 changes: 19 additions & 0 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Lint code

on:
push:
workflow_call:

jobs:
check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
- name: Install dependencies
run: make install
- name: Format and lint
run: make lint
54 changes: 54 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: Deploy to GitHub Pages
on:
pull_request:
types: [closed]
branches: [main]

permissions:
contents: read
pages: write
id-token: write

concurrency:
group: "pages"
cancel-in-progress: false

jobs:
check:
uses: ./.github/workflows/check.yml
build:
if: github.event.pull_request.merged == true
needs: [check]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
- name: Setup GitHuib Pages
uses: actions/configure-pages@v5
with:
static_site_generator: next
- name: Install dependencies
run: make install

- name: Build with Next.js
run: make build
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
path: ./out

deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}

runs-on: ubuntu-latest
needs: build

steps:
- name: Publish to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
41 changes: 39 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,43 @@
.idea/
Icon*
*.bak*

*.log
blog/
_site/
_site/
firebase-key.json
.firebase/

# dependencies
node_modules
/.pnp
.pnp.js
.yarn/install-state.gz

# testing
/coverage

# next.js
/.next/
/out/

# production
/build

# misc
.DS_Store
*.pem

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# local env files
.env*.local

# vercel
.vercel

# typescript
*.tsbuildinfo
next-env.d.ts
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
pnpm-lock.yaml
package-lock.json
firebase.json
.github/
5 changes: 5 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"plugins": ["@trivago/prettier-plugin-sort-imports"],
"importOrder": ["^[react]", "^@(?!/)", "^@/", "^[./]"],
"importOrderSeparation": true
}
11 changes: 0 additions & 11 deletions .travis.yml

This file was deleted.

20 changes: 20 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
install:
npm install

format:
npm run format

lint:
npm run lint

local:
npm run dev

build:
npm run build

deploy: build
firebase deploy --only hosting

clean:
rm -rf node_modules .next out
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
## Amr Abed's Personal Website
## Amr Abed's Personal Website

[![Website](https://img.shields.io/website-up-down-brightgreen-red/https/amrabed.com.svg?label=amrabed.com)](https://amrabed.com)
[![Build Status](https://travis-ci.org/amrabed/amrabed.github.io.svg?branch=master)](https://travis-ci.org/amrabed/amrabed.github.io)
[![](https://sonarcloud.io/api/project_badges/measure?project=amrabed.github.io&metric=alert_status)](https://sonarcloud.io/dashboard?id=amrabed.github.io)
Expand Down
20 changes: 0 additions & 20 deletions _config.yml

This file was deleted.

95 changes: 0 additions & 95 deletions _layouts/default.html

This file was deleted.

75 changes: 0 additions & 75 deletions about/index.html

This file was deleted.

2 changes: 0 additions & 2 deletions about/index.js

This file was deleted.

1 change: 0 additions & 1 deletion assets/css/amrabed.min.css

This file was deleted.

5 changes: 0 additions & 5 deletions assets/css/creative.min.css

This file was deleted.

Loading
Loading