Skip to content

Commit

Permalink
Content, host prep + bug fix
Browse files Browse the repository at this point in the history
Moved draft content into a separate folder to be added in later.

Added a GitHub action to host the site on github pages

Fixed a bug where non-markdown files would attempt to render in the portfolio
  • Loading branch information
Jordan-Morrison committed Nov 7, 2023
1 parent 357f885 commit 7f46099
Show file tree
Hide file tree
Showing 17 changed files with 114 additions and 27 deletions.
95 changes: 95 additions & 0 deletions .github/workflows/nextjs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
# Sample workflow for building and deploying a Next.js site to GitHub Pages
#
# To get started with Next.js see: https://nextjs.org/docs/getting-started
#
name: Deploy Next.js site to Pages

on:
# Runs on pushes targeting the default branch
push:
branches: ["master"]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
# Build job
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Detect package manager
id: detect-package-manager
run: |
if [ -f "${{ github.workspace }}/yarn.lock" ]; then
echo "manager=yarn" >> $GITHUB_OUTPUT
echo "command=install" >> $GITHUB_OUTPUT
echo "runner=yarn" >> $GITHUB_OUTPUT
exit 0
elif [ -f "${{ github.workspace }}/package.json" ]; then
echo "manager=npm" >> $GITHUB_OUTPUT
echo "command=ci" >> $GITHUB_OUTPUT
echo "runner=npx --no-install" >> $GITHUB_OUTPUT
exit 0
else
echo "Unable to determine package manager"
exit 1
fi
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: "16"
cache: ${{ steps.detect-package-manager.outputs.manager }}
- name: Setup Pages
uses: actions/configure-pages@v3
with:
# Automatically inject basePath in your Next.js configuration file and disable
# server side image optimization (https://nextjs.org/docs/api-reference/next/image#unoptimized).
#
# You may remove this line if you want to manage the configuration yourself.
static_site_generator: next
- name: Restore cache
uses: actions/cache@v3
with:
path: |
.next/cache
# Generate a new cache whenever packages or source files change.
key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
# If source files changed but packages didn't, rebuild from a prior cache.
restore-keys: |
${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}-
- name: Install dependencies
run: ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }}
- name: Build with Next.js
run: ${{ steps.detect-package-manager.outputs.runner }} next build
- name: Static HTML export with Next.js
run: ${{ steps.detect-package-manager.outputs.runner }} next export
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
with:
path: ./out

# Deployment job
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
needs: build
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
30 changes: 11 additions & 19 deletions components/data/projects/gcTortilla.md
Original file line number Diff line number Diff line change
@@ -1,33 +1,25 @@
---
title: GC Tortilla
techStack: []
index: 999
title: GC-Tortilla
techStack: [React]
index: 31
images: [
{
url: /images/projects/gcTortilla/defaultSplashScreen.png,
altTxt: a screenshot of the homepage for Jordan Morrison's photography portfolio
altTxt: a screenshot of the default splash screen component in the GC-Tortilla library
},
{
url: /images/projects/gcTortilla/logoSplashScreen.png,
altTxt: a screenshot of the homepage for Jordan Morrison's photography portfolio
},
{
url: /images/projects/gcTortilla/header.png,
altTxt: a screenshot of the homepage for Jordan Morrison's photography portfolio
},
{
url: /images/projects/gcTortilla/footerLightTheme.png,
altTxt: a screenshot of the homepage for Jordan Morrison's photography portfolio
},
{
url: /images/projects/gcTortilla/footerLinks.png,
altTxt: a screenshot of the homepage for Jordan Morrison's photography portfolio
altTxt: a screenshot showing a customized version of the splash screen component in GC-Tortilla
},
{
url: /images/projects/gcTortilla/headerAndFooter.png,
altTxt: a screenshot of the homepage for Jordan Morrison's photography portfolio
altTxt: a screenshot showcasing the header and footer components in GC-Tortilla
},
{
url: /images/projects/gcTortilla/npm.png,
altTxt: a screenshot of GC-Tortilla on NPM
}
]
---

Enter description here
[GC-Tortilla](https://www.npmjs.com/package/gc-tortilla) is a React library designed to help speed up the development of Government of Canada applications by providing pre-approved branded components. All elements in the components are fully customizable so they can be used by different teams with their own branding as needed. With GC-Tortilla you get a Splash Screen, Header Brand Bar and a Footer all of which are brand ready. The splash screen is unique in that it will use LocalStorage so that once the user set's their initial language preference they will not be forced to re-visit the splash screen every time they access the app. You can utilize all components pre-packaged together by importing GC-Tortilla or you have the option to import GCSplashScreen, GCHeader and GCFooter separately to use them on their own. This library is hosted on NPM and showcases my ability to write clear & concise documentation.
2 changes: 0 additions & 2 deletions components/molecules/SocialLinks.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import styles from '@/styles/SocialLinks.module.css';

export default function SocialLinks(props) {

console.log(data);

return (
<div className={styles.socials}>
{data.map(social =>
Expand Down
14 changes: 8 additions & 6 deletions pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ export async function getStaticProps() {
let projects = [];

fs.readdirSync(path).forEach(file => {
let fileContents = fs.readFileSync(`${path}/${file}`);
fileContents = fm(fileContents.toString());
projects.push({
data: fileContents.attributes,
description: fileContents.body
});
if (file.slice(-3) === ".md"){
let fileContents = fs.readFileSync(`${path}/${file}`);
fileContents = fm(fileContents.toString());
projects.push({
data: fileContents.attributes,
description: fileContents.body
});
}
});

projects.sort(function(x, y) {
Expand Down
Binary file not shown.
Binary file removed public/images/projects/gcTortilla/footerLinks.png
Binary file not shown.
Binary file removed public/images/projects/gcTortilla/header.png
Binary file not shown.
Binary file added public/images/projects/gcTortilla/npm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7f46099

Please sign in to comment.