From e81bcf229971558caca52b3d592f7f7c241d145e Mon Sep 17 00:00:00 2001 From: Ethan Date: Wed, 21 Sep 2022 21:07:22 +0100 Subject: [PATCH 1/7] Added prettier --- .prettierrc | 18 ++++++++++++++++++ package-lock.json | 26 ++++++++++++++++++++++++-- package.json | 6 +++++- 3 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 .prettierrc diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..d5ecd84 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,18 @@ +{ + "arrowParens": "always", + "bracketSpacing": true, + "htmlWhitespaceSensitivity": "css", + "insertPragma": false, + "jsxBracketSameLine": false, + "jsxSingleQuote": false, + "printWidth": 100, + "proseWrap": "always", + "quoteProps": "as-needed", + "requirePragma": false, + "semi": true, + "singleQuote": false, + "tabWidth": 2, + "trailingComma": "none", + "useTabs": false, + "vueIndentScriptAndStyle": false +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index b105781..d2dca46 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,10 +1,10 @@ { - "name": "remix-app-template", + "name": "personal-site", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "remix-app-template", + "name": "personal-site", "hasInstallScript": true, "dependencies": { "@prisma/client": "^3.8.1", @@ -21,6 +21,7 @@ "@remix-run/dev": "^1.1.3", "@types/react": "^17.0.24", "@types/react-dom": "^17.0.9", + "prettier": "^2.7.1", "prisma": "^3.8.1", "typescript": "^4.1.2" }, @@ -4301,6 +4302,21 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, + "node_modules/prettier": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", + "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", + "dev": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/pretty-ms": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz", @@ -8612,6 +8628,12 @@ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true }, + "prettier": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", + "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", + "dev": true + }, "pretty-ms": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz", diff --git a/package.json b/package.json index 883b59c..48be0ab 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,10 @@ "scripts": { "build": "remix build", "dev": "remix dev", - "postinstall": "remix setup node" + "postinstall": "remix setup node", + "prettier": "prettier --ignore-path .gitignore \"**/*.+(js|json|ts|tsx|jsx|css|mdx|md)\"", + "format": "npm run prettier -- --write", + "check-format": "npm run prettier -- --list-different" }, "dependencies": { "@prisma/client": "^3.8.1", @@ -23,6 +26,7 @@ "@remix-run/dev": "^1.1.3", "@types/react": "^17.0.24", "@types/react-dom": "^17.0.9", + "prettier": "^2.7.1", "prisma": "^3.8.1", "typescript": "^4.1.2" }, -- 2.51.2 From ec9274f4a3c3cc91a74c82061b5679b0e0eef84e Mon Sep 17 00:00:00 2001 From: Ethan Date: Wed, 21 Sep 2022 21:08:39 +0100 Subject: [PATCH 2/7] Removed database files --- app/routes/posts/$postId.tsx | 51 ------------------------------------ app/utils/db.server.ts | 23 ---------------- prisma/schema.prisma | 23 ---------------- 3 files changed, 97 deletions(-) delete mode 100644 app/routes/posts/$postId.tsx delete mode 100644 app/utils/db.server.ts delete mode 100644 prisma/schema.prisma diff --git a/app/routes/posts/$postId.tsx b/app/routes/posts/$postId.tsx deleted file mode 100644 index bc18c9c..0000000 --- a/app/routes/posts/$postId.tsx +++ /dev/null @@ -1,51 +0,0 @@ -import { LinksFunction, LoaderFunction, useLoaderData } from "remix"; -import { marked } from "marked"; -import HeaderBar from "~/components/HeaderBar"; -import { db } from "~/utils/db.server"; - -import postStylesUrl from "~/styles/posts.css"; - -type Post = { - id: number; - description: string; - title: string; - content: string; -}; - -type LoaderData = { post: Post }; - -export const links: LinksFunction = () => { - return [ - { - rel: "stylesheet", - href: postStylesUrl, - }, - ]; -}; - -export const loader: LoaderFunction = async ({ params }) => { - if (!params.postId) throw new Error("No postId provided"); - const postId = parseInt(params.postId); - - const post = await db.post.findUnique({ - where: { id: postId }, - select: { id: true, title: true, description: true, content: true }, - }); - - if (!post) throw new Error("Post not found"); - let data: LoaderData = { post }; - - const cleanedContent = data.post.content.replace(/\\n/g, "\n"); - data.post.content = marked.parse(cleanedContent); - return data; -}; - -export default function PostRoute() { - const data = useLoaderData(); - return ( -
- -
-
- ); -} diff --git a/app/utils/db.server.ts b/app/utils/db.server.ts deleted file mode 100644 index 82e785a..0000000 --- a/app/utils/db.server.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { PrismaClient } from "@prisma/client"; - -let db: PrismaClient; - -declare global { - var __db: PrismaClient | undefined; -} - -// this is needed because in development we don't want to restart -// the server with every change, but we want to make sure we don't -// create a new connection to the DB with every change either. -if (process.env.NODE_ENV === "production") { - db = new PrismaClient(); - db.$connect(); -} else { - if (!global.__db) { - global.__db = new PrismaClient(); - global.__db.$connect(); - } - db = global.__db; -} - -export { db }; diff --git a/prisma/schema.prisma b/prisma/schema.prisma deleted file mode 100644 index c6e9668..0000000 --- a/prisma/schema.prisma +++ /dev/null @@ -1,23 +0,0 @@ -// This is your Prisma schema file, -// learn more about it in the docs: https://pris.ly/d/prisma-schema - -generator client { - provider = "prisma-client-js" - previewFeatures = ["referentialIntegrity"] -} - -datasource db { - provider = "mysql" - url = env("DATABASE_URL") - shadowDatabaseUrl = env("SHADOW_DATABASE_URL") - referentialIntegrity = "prisma" -} - -model Post { - id Int @default(autoincrement()) @id - createdAt DateTime @default(now()) - updatedAt DateTime @updatedAt - title String @db.VarChar(255) - description String @db.VarChar(255) - content String @db.LongText -} \ No newline at end of file -- 2.51.2 From 7c482d99203734f946339695822668f2aee809a2 Mon Sep 17 00:00:00 2001 From: Ethan Date: Wed, 21 Sep 2022 21:09:31 +0100 Subject: [PATCH 3/7] Added webstorm project files --- .idea/.gitignore | 5 +++++ .idea/codeStyles/codeStyleConfig.xml | 5 +++++ .idea/modules.xml | 8 ++++++++ .idea/personal-site.iml | 12 ++++++++++++ .idea/prettier.xml | 7 +++++++ .idea/vcs.xml | 6 ++++++ 6 files changed, 43 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/personal-site.iml create mode 100644 .idea/prettier.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..ea7ed09 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,5 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..df5f35d --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..e965fd7 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/personal-site.iml b/.idea/personal-site.iml new file mode 100644 index 0000000..ff88395 --- /dev/null +++ b/.idea/personal-site.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/prettier.xml b/.idea/prettier.xml new file mode 100644 index 0000000..e62d19b --- /dev/null +++ b/.idea/prettier.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..9661ac7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file -- 2.51.2 From 2100e886ec8358f6b0b8ee3c24f1de359ba97eb9 Mon Sep 17 00:00:00 2001 From: Ethan Date: Wed, 21 Sep 2022 21:10:30 +0100 Subject: [PATCH 4/7] Moved posts into separate mdx files --- app/routes/posts.tsx | 20 ++++ app/routes/posts/great-arm-migration.mdx | 130 +++++++++++++++++++++++ app/routes/posts/setting-up-git.mdx | 34 ++++++ app/routes/posts/welcome.mdx | 18 ++++ app/routes/thoughts.tsx | 54 ++++------ 5 files changed, 222 insertions(+), 34 deletions(-) create mode 100644 app/routes/posts.tsx create mode 100644 app/routes/posts/great-arm-migration.mdx create mode 100644 app/routes/posts/setting-up-git.mdx create mode 100644 app/routes/posts/welcome.mdx diff --git a/app/routes/posts.tsx b/app/routes/posts.tsx new file mode 100644 index 0000000..33f6ca9 --- /dev/null +++ b/app/routes/posts.tsx @@ -0,0 +1,20 @@ +import { LinksFunction, Outlet } from "remix"; + +import styles from "../styles/posts.css"; + +export const links: LinksFunction = () => { + return [ + { + rel: "stylesheet", + href: styles + } + ]; +}; + +export default function PostRoute() { + return ( +
+ +
+ ); +} diff --git a/app/routes/posts/great-arm-migration.mdx b/app/routes/posts/great-arm-migration.mdx new file mode 100644 index 0000000..ae46287 --- /dev/null +++ b/app/routes/posts/great-arm-migration.mdx @@ -0,0 +1,130 @@ +--- +meta: + title: The great ARM migration + description: Some thoughts on Apples move from intel to ARM for Macs. +--- + +import HeaderBar from "~/components/HeaderBar"; + + + +Apple are reportedly going to be transitioning from using Intel processors to their own custom ARM +processors for their Mac lineup, due to be announced at WWDC next week. I find this incredibly +exciting and just want to run through some of my thoughts about this. + +## Why are Apple moving to ARM? + +Why have Apple decided to migrate to using their own processors? Well there are a few reasons for +why Apple might want to do this. + +The first being that in recent years Intel have really been dropping the ball with their iterative +improvements and delays to their own product roadmap which have impacted Apple and resulted in not +the most amazing year-on-year performance improvements (CPU wise) for the Mac. Apple producing their +own processors for the Mac would remove this dependency and allow Apple to exert greater control +over the direct performance improvements they provide to their computers allowing for potentially +better performance just as they have done with the iPhone which thoroughly smashes every other +smartphone when comparing CPU power. + +The second reason is Apple's seemingly continuous obsession with trying to develop every bit of +hardware they use themselves allowing them to be less reliant on other companies and this has been +shown by how more and more of the iPhone over the years has slowly been using more in house hardware +components, most notably being Apple’s very own A series processors that are used in the iPhone and +things like the T2 security chip. + +## Effects of the move to ARM + +The effects of this move will probably be quite profound as for Mac users it could result in much +more power efficient Macs due to ARM’s architecture but also potentially more powerful Macs +depending on how well Apple’s custom processors perform in a Mac. They have already proved that they +can make amazing processors for the iPhone and iPad, so it will be interesting to see how well they +fare with something like a Macbook which has a very different cooling system and a bigger device +footprint for them to work with. + +However not everything about this move is likely to be sunshine and rainbows as the likelihood is +that when Apple releases the first ARM powered Mac the software support from third party developers +might not be there. It's going to take effort from developers to port their apps to the new +architecture which costs time and money, so it's unlikely that everyone's favorite apps and services +will be available on day one. Some developers may even use it as an opportunity to drop support for +the Mac and older legacy apps which may not be in active development anymore and so may be left +behind forever. + +Although maybe Apple will surprise me, and it will be as simple as clicking a button in Xcode and +your app will be ready for the ARM revolution, knowing Apple it probably won't be that simple +however we will have to wait for WWDC to find out. + +## How will this affect the wider industry? + +Apple is very much a trend setter. When Apple removed the headphone jack, everyone removed the +headphone jack, some even ripped Apple for it only to remove it the next year (looking at you +Google). When Apple added a notch to the iPhone, everyone added a notch to their phones. When Apple +released the airpods people laughed at them however they are now very much a fashion symbol spurring +massive growth for Apple’s wearables business and companies are shamelessly ripping them off all +over the place. + +Apple moving to ARM could signal a similar move for the wider industry. We already have windows on +ARM and Chrome OS on ARM and pretty much all smartphones and mobile platforms run on ARM chips +already. This move could very well result in the desktop and laptop world moving to produce more ARM +laptops and could potentially mean companies start to try and invest in their own processors in an +effort to try and beat Apple at their own game. There are already rumours around +[Google](https://www.theverge.com/2020/4/14/21221062/google-processor-pixels-chromebooks-whitechapel-samsung-qualcomm) +developing their own ARM processors potentially for the Pixel phones but also maybe for their +chromebooks as well. A product area they are increasingly trying to market as actual laptops. + +Although Apple moving away from Intel isn't the end of the world for Intel considering how small Mac +market share is for global PC sales, the impact of a general shift to ARM for the wider industry +could be fairly damaging to the company. Intel hasn't been having a fun time in recent years by +being absolutely destroyed by AMD product wise in the CPU market and having lots of manufacturing +trouble trying to perfect their own 10nm process. More manufacturers leaving them for ARM will be +damaging to their bottom line however on a positive note maybe it will get them to get off their +backside and make some better CPU’s. + +## Dunking on people's opinions + +I just want to take a moment to dunk on some peoples opinions around this whole subject around ARM +on the Mac. A fairly common outlook on this that I seem to see mainly from Apple fanboys is that +Apple’s move to ARM for the Mac is going to be amazing, “DON'T BUY A MAC NOW WAIT FOR ARM”, “AN ARM +MAC IS AN INSTANT BUY” and similar statements and phrases are generally being thrown around. + +Although im really excited for this move and am incredibly interested in how it all unfolds I think +it's a bit stupid to say that there is no point buying a Mac now BeCaUsE ArM Is aRoUnD ThE CoRnEr as +the fact is this is not a move that going to happen overnight. 2021 seems the earliest that we will +be getting an actual ARM Mac for consumers and even then for professionals and developers the +software and tools they use may not even be available on ARM Macs yet. And even if all the software +support was there on day one they are not going to drop support overnight for 2-year-old Macs. +(Watch Apple go and prove me wrong now) + +## The future of Mac + +Another interesting thing with Apple at the moment is their insistence on making the iPad more of a +laptop so people can use it more like a 2 in 1 such as the Microsoft Surface. This leaves the Mac in +a very interesting situation because if Apple wants people to buy iPads and use them instead of a +laptop why would someone ever buy a Mac? And to be honest most people don't need a Mac, an iPad can +do everything that they would ever need to do and its capabilities keep on increasing with each +update (e.g. recent mouse and trackpad support) leaving really only power users, enthusiasts and +professionals who will keep buying Macs because they can't get all of their work done on an iPad, +yet. + +This makes Apple's move to ARM more interesting as I could very much see this as a way of slowly +moving more Mac users to the iPad before eventually replacing the Mac altogether. Big statement I +know but hear me out. By Apple transitioning to ARM that will mean that all software running on the +Mac will be built to run on their very own ARM processors, the same sort of processors that Apple +uses in the iPad. Apple has also been pushing SwiftUI which is a development framework that allows +devs to create apps that function and scale across Apples portfolio of products. This could +eventually lead to the apps on iPad and the apps on Mac converging to the point where both devices +literally run the same software. In some ways this is already happening with catalysts which allows +devs to port their iPad apps to Mac. + +Maybe I'm reading too much into this but over the years Apple has increasingly been neglecting the +Mac line and has instead continuously been trying to push the iPad as a real computer and I feel +that maybe in the next ten years we could see the end of the Mac… or maybe things will continue on +as they always have, the iPad will be used by most people but the Mac will still be used by people +that actually want to get work done and this convergence never happens. I guess we will have to wait +and see. + +## The end + +In conclusion Apple moving from intel to ARM is very exciting but not without its ups and downs. +Only time will tell how it ends up. And with only a few days to go to WWDC where it's been rumoured +that they are going to announce this move it seems it won't be long until we find out, unless of +course the leaks were wrong and Apple does not move to ARM and then me and a load of other people +are going to look like a bunch of idiots. diff --git a/app/routes/posts/setting-up-git.mdx b/app/routes/posts/setting-up-git.mdx new file mode 100644 index 0000000..9844cd8 --- /dev/null +++ b/app/routes/posts/setting-up-git.mdx @@ -0,0 +1,34 @@ +--- +meta: + title: Setting up Git + description: How to set up Git on Windows. +--- + +import HeaderBar from "~/components/HeaderBar"; + + + +## Useful Links 🙌 + +- [Download Git](https://git-scm.com/downloads) + +- [Git Documentation](https://git-scm.com/doc) + +## Download Git + +Fist navigate to the download section of the official Git site here. Then select the download for +your operating system of choice. As I am using windows that is the option that I will be selecting. + +## Install + +Now that the Git installer has been downloaded, run the installer on your machine. Follow the setup +until you reach the option to select which editor you want to use. For this option it's up to you, I +personally prefer nano, but you can use what you want. For the rest of the options you can just +leave them on the defaults as that should be fine for most people and then press install. + +## Your Done! 😎 + +Now open your terminal of choice and run the command git --version to check if git is installed +correctly. Now you can start using Git! Its also worth noting that by installing Git you will now +also have access to git-bash on your computer if you are on Windows, allowing the user to have a +terminal that is more inline with what you might find on Linux and macOS. diff --git a/app/routes/posts/welcome.mdx b/app/routes/posts/welcome.mdx new file mode 100644 index 0000000..c1ae4da --- /dev/null +++ b/app/routes/posts/welcome.mdx @@ -0,0 +1,18 @@ +--- +meta: + title: Welcome to my Site + description: Something I will redesign hundreds of times only to make two posts. +--- + +import HeaderBar from "~/components/HeaderBar"; + + + +Welcome to my blog that I have been creating over the past couple of weeks. + +This is the place where I plan on posting all of my rants and raves about things as well as useful +guides and posts about what I have learnt over time. + +So if you are remotely interested in that sort of content then great this is the site for you +otherwise what are you doing here? Go watch [YouTube](https://www.youtube.com/watch?v=dQw4w9WgXcQ) +or something. 🦀 diff --git a/app/routes/thoughts.tsx b/app/routes/thoughts.tsx index 7e97a25..98b9dbd 100644 --- a/app/routes/thoughts.tsx +++ b/app/routes/thoughts.tsx @@ -1,32 +1,18 @@ -import { - Link, - LinksFunction, - LoaderFunction, - MetaFunction, - useLoaderData, -} from "remix"; +import { json, Link, LinksFunction, MetaFunction, useLoaderData } from "remix"; import HeaderBar from "~/components/HeaderBar"; -import { db } from "~/utils/db.server"; -import thoughtsStylesUrl from "../styles/thoughts.css"; +import * as postA from "./posts/welcome.mdx"; +import * as postB from "./posts/setting-up-git.mdx"; +import * as postC from "./posts/great-arm-migration.mdx"; -type Post = { - id: number; - createdAt: Date; - description: string; - title: string; -}; - -type LoaderData = { - postListItems: Array; -}; +import styles from "../styles/thoughts.css"; export const links: LinksFunction = () => { return [ { rel: "stylesheet", - href: thoughtsStylesUrl, - }, + href: styles + } ]; }; @@ -34,28 +20,28 @@ export const meta: MetaFunction = () => { return { title: "Ethan Anderson - Thoughts" }; }; -export const loader: LoaderFunction = async () => { - const data: LoaderData = { - postListItems: await db.post.findMany({ - select: { id: true, title: true, description: true, createdAt: true }, - orderBy: { createdAt: "desc" }, - }), +function postFromModule(mod: any) { + return { + slug: mod.filename.replace(/\.mdx?$/, ""), + ...mod.attributes.meta }; - return data; -}; +} + +export async function loader() { + return json([postFromModule(postC), postFromModule(postB), postFromModule(postA)]); +} export default function Thoughts() { - const data = useLoaderData(); + const data = useLoaderData(); return (
- {data.postListItems.map((post) => ( -
- {post.title} + {data.map((post: any) => ( +
+ {post.title}

{post.description}

))} -
); } -- 2.51.2 From 5dc5db818e3187808084feaabce3c0a6fe4b4566 Mon Sep 17 00:00:00 2001 From: Ethan Date: Wed, 21 Sep 2022 21:11:01 +0100 Subject: [PATCH 5/7] Ran prettier to fix formatting issues --- README.md | 3 ++- app/entry.server.tsx | 4 +--- app/root.tsx | 18 +++++------------- app/routes/index.tsx | 24 ++++++++++-------------- app/routes/now.tsx | 26 +++++++------------------- app/styles/global.css | 7 +++---- 6 files changed, 28 insertions(+), 54 deletions(-) diff --git a/README.md b/README.md index 475a83a..04d5021 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # ethana.dev -This is the latest iteration of my personal site built with [remix](https://remix.run/) and hosted on [vercel](https://vercel.com/). +This is the latest iteration of my personal site built with [remix](https://remix.run/) and hosted +on [vercel](https://vercel.com/). diff --git a/app/entry.server.tsx b/app/entry.server.tsx index 9749895..46d9f6b 100644 --- a/app/entry.server.tsx +++ b/app/entry.server.tsx @@ -8,9 +8,7 @@ export default function handleRequest( responseHeaders: Headers, remixContext: EntryContext ) { - const markup = renderToString( - - ); + const markup = renderToString(); responseHeaders.set("Content-Type", "text/html"); diff --git a/app/root.tsx b/app/root.tsx index 104e0db..4b7552b 100644 --- a/app/root.tsx +++ b/app/root.tsx @@ -1,11 +1,4 @@ -import { - Links, - LiveReload, - Meta, - Outlet, - Scripts, - ScrollRestoration, -} from "remix"; +import { Links, LiveReload, Meta, Outlet, Scripts, ScrollRestoration } from "remix"; import type { MetaFunction, LinksFunction } from "remix"; import globalStylesUrl from "./styles/global.css"; @@ -15,20 +8,19 @@ export const links: LinksFunction = () => { return [ { rel: "stylesheet", - href: globalStylesUrl, + href: globalStylesUrl }, { rel: "stylesheet", - href: rootStylesUrl, - }, + href: rootStylesUrl + } ]; }; export const meta: MetaFunction = () => { return { title: "Ethan Anderson", - description: - "Ethan is an apprentice applications developer at a company called PebblePad.", + description: "Ethan is an apprentice applications developer at a company called PebblePad." }; }; diff --git a/app/routes/index.tsx b/app/routes/index.tsx index 9f505dd..f255017 100644 --- a/app/routes/index.tsx +++ b/app/routes/index.tsx @@ -7,8 +7,8 @@ export const links: LinksFunction = () => { return [ { rel: "stylesheet", - href: indexStylesUrl, - }, + href: indexStylesUrl + } ]; }; @@ -24,13 +24,13 @@ export default function Index() { technology" />

- Hi I’m Ethan an apprentice applications developer at PebblePad. My - preferred area is frontend web development however I am also interested - in exploring building UI for mobile and desktop experiences. + Hi I’m Ethan an apprentice applications developer at PebblePad. My preferred area is + frontend web development however I am also interested in exploring building UI for mobile + and desktop experiences.

- When not working I’m either scrolling through twitter or smashing out - dev work for LinqEm an elegant link aggregation repository for the web. + When not working I’m either scrolling through twitter or smashing out dev work for LinqEm an + elegant link aggregation repository for the web.

Projects

@@ -39,16 +39,12 @@ export default function Index() { LinqEm

An elegant link aggregation repository for the web.

- + Project Fanta

- An instant and simple platform for anybody who wants to broadcast - messages to subscribers using SMS! + An instant and simple platform for anybody who wants to broadcast messages to subscribers + using SMS!

diff --git a/app/routes/now.tsx b/app/routes/now.tsx index 7199447..0fb6f55 100644 --- a/app/routes/now.tsx +++ b/app/routes/now.tsx @@ -7,8 +7,8 @@ export const links: LinksFunction = () => { return [ { rel: "stylesheet", - href: nowStylesUrl, - }, + href: nowStylesUrl + } ]; }; @@ -22,32 +22,20 @@ export default function Thoughts() {
  • - Currently helping to improve and enhance our platform at PebblePad in - an effort to meet our goal of creating beautifully crafted software + Currently helping to improve and enhance our platform at PebblePad in an effort to meet + our goal of creating beautifully crafted software
  • Collaborating with{" "} - + Kana Ki ,{" "} - + John Mason {" "} and{" "} - + Sylvan B {" "} on LinqEm diff --git a/app/styles/global.css b/app/styles/global.css index a15d05e..0251666 100644 --- a/app/styles/global.css +++ b/app/styles/global.css @@ -1,7 +1,6 @@ @font-face { font-family: "Inter"; - src: local("Inter") url("/fonts/Inter-VariableFont_slnt\,wght.ttf") - format("truetype"); + src: local("Inter") url("/fonts/Inter-VariableFont_slnt\,wght.ttf") format("truetype"); } @font-face { @@ -13,8 +12,8 @@ color-scheme: dark; /* Fonts */ - --main-font: "Inter", "Segoe UI", -apple-system, BlinkMacSystemFont, - "Fira Sans", "Helvetica Neue", sans-serif; + --main-font: "Inter", "Segoe UI", -apple-system, BlinkMacSystemFont, "Fira Sans", "Helvetica Neue", + sans-serif; --secondary-font: "Lora", serif; /* Colours */ -- 2.51.2 From 73b57381f04271a06615359a26c0f895256130f8 Mon Sep 17 00:00:00 2001 From: Ethan Date: Wed, 21 Sep 2022 21:17:04 +0100 Subject: [PATCH 6/7] Updated some wording --- app/routes/index.tsx | 6 +++--- app/routes/now.tsx | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/routes/index.tsx b/app/routes/index.tsx index f255017..7c9766f 100644 --- a/app/routes/index.tsx +++ b/app/routes/index.tsx @@ -24,9 +24,9 @@ export default function Index() { technology" />

    - Hi I’m Ethan an apprentice applications developer at PebblePad. My preferred area is - frontend web development however I am also interested in exploring building UI for mobile - and desktop experiences. + Hi I’m Ethan an applications developer at PebblePad. My preferred area is frontend web + development however I am also interested in exploring building UI for mobile and desktop + experiences.

    When not working I’m either scrolling through twitter or smashing out dev work for LinqEm an diff --git a/app/routes/now.tsx b/app/routes/now.tsx index 0fb6f55..b11c35f 100644 --- a/app/routes/now.tsx +++ b/app/routes/now.tsx @@ -40,11 +40,10 @@ export default function Thoughts() { {" "} on LinqEm

    • -
  • Working towards completing my apprenticship
  • Trying to read more books
  • Working on various side projects
-

Last updated on the 20th Janurary 2022

+

Last updated on the 21st September 2022

); } -- 2.51.2 From a237319170f023679c86316ac33885504996d2a3 Mon Sep 17 00:00:00 2001 From: Ethan Date: Wed, 21 Sep 2022 21:21:33 +0100 Subject: [PATCH 7/7] Removed reference to being an apprentice in meta tag --- app/root.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/root.tsx b/app/root.tsx index 4b7552b..49b8fed 100644 --- a/app/root.tsx +++ b/app/root.tsx @@ -20,7 +20,7 @@ export const links: LinksFunction = () => { export const meta: MetaFunction = () => { return { title: "Ethan Anderson", - description: "Ethan is an apprentice applications developer at a company called PebblePad." + description: "Ethan is an applications developer at a company called PebblePad." }; }; -- 2.51.2