diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..c257e67 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +*.psd filter=lfs diff=lfs merge=lfs -text +*.mp4 filter=lfs diff=lfs merge=lfs -text diff --git a/cdn/video/ledCube.MP4 b/cdn/video/ledCube.MP4 new file mode 100644 index 0000000..f45e5dc --- /dev/null +++ b/cdn/video/ledCube.MP4 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:769188788e5e4ed765ed9493318799f8da5f5838dd6838411c69c377ed15f6d7 +size 80651090 diff --git a/cdn/video/overwatch_clips.mp4 b/cdn/video/overwatch_clips.mp4 new file mode 100644 index 0000000..701e98a --- /dev/null +++ b/cdn/video/overwatch_clips.mp4 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6af006d6b5601c69db1fee6c3858ea644790c5e7a2048a8a33186d4d96c93981 +size 104627339 diff --git a/cdn/video/streamClips.mp4 b/cdn/video/streamClips.mp4 new file mode 100644 index 0000000..a937bd9 --- /dev/null +++ b/cdn/video/streamClips.mp4 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4d381971f1ba7be31d94fba2c2697aeb86bd030615a94165df315f646f2c33c +size 200001826 diff --git a/package-lock.json b/package-lock.json index ca40449..93fa964 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "TODO", + "name": "WompMacho.com", "version": "0.0.1", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index bd379bc..171f3f2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "TODO", - "description": "TODO", + "name": "WompMacho.com", + "description": "Personal Website for WompMacho", "version": "0.0.1", "scripts": { "dev": "sapper dev", diff --git a/src/components/Footer.svelte b/src/components/Footer.svelte new file mode 100644 index 0000000..312d133 --- /dev/null +++ b/src/components/Footer.svelte @@ -0,0 +1,14 @@ + + + \ No newline at end of file diff --git a/src/components/Nav.svelte b/src/components/Nav.svelte index 49a94ed..039d3c4 100644 --- a/src/components/Nav.svelte +++ b/src/components/Nav.svelte @@ -1,9 +1,12 @@ - - - home - about + + + Menu + + + + + WompMacho + about + Live Stream + esports + videography - - blog - + + projects + + + diff --git a/src/components/Social.svelte b/src/components/Social.svelte new file mode 100644 index 0000000..6f17c1c --- /dev/null +++ b/src/components/Social.svelte @@ -0,0 +1,20 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/static/logo-192.png b/src/node_modules/images/logo-192.png similarity index 100% rename from static/logo-192.png rename to src/node_modules/images/logo-192.png diff --git a/static/logo-512.png b/src/node_modules/images/logo-512.png similarity index 100% rename from static/logo-512.png rename to src/node_modules/images/logo-512.png diff --git a/src/routes/_layout.svelte b/src/routes/_layout.svelte index 8432299..5ba5dbe 100644 --- a/src/routes/_layout.svelte +++ b/src/routes/_layout.svelte @@ -1,22 +1,25 @@ - + - + - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/routes/blog/_posts.js b/src/routes/blog/_posts.js deleted file mode 100644 index 7791a21..0000000 --- a/src/routes/blog/_posts.js +++ /dev/null @@ -1,92 +0,0 @@ -// Ordinarily, you'd generate this data from markdown files in your -// repo, or fetch them from a database of some kind. But in order to -// avoid unnecessary dependencies in the starter template, and in the -// service of obviousness, we're just going to leave it here. - -// This file is called `_posts.js` rather than `posts.js`, because -// we don't want to create an `/blog/posts` route — the leading -// underscore tells Sapper not to do that. - -const posts = [ - { - title: 'What is Sapper?', - slug: 'what-is-sapper', - html: ` - First, you have to know what Svelte is. Svelte is a UI framework with a bold new idea: rather than providing a library that you write code with (like React or Vue, for example), it's a compiler that turns your components into highly optimized vanilla JavaScript. If you haven't already read the introductory blog post, you should! - - Sapper is a Next.js-style framework (more on that here) built around Svelte. It makes it embarrassingly easy to create extremely high performance web apps. Out of the box, you get: - - - Code-splitting, dynamic imports and hot module replacement, powered by webpack - Server-side rendering (SSR) with client-side hydration - Service worker for offline support, and all the PWA bells and whistles - The nicest development experience you've ever had, or your money back - - - It's implemented as Express middleware. Everything is set up and waiting for you to get started, but you keep complete control over the server, service worker, webpack config and everything else, so it's as flexible as you need it to be. - ` - }, - - { - title: 'How to use Sapper', - slug: 'how-to-use-sapper', - html: ` - Step one - Create a new project, using degit: - - npx degit "sveltejs/sapper-template#rollup" my-app - cd my-app - npm install # or yarn! - npm run dev - - - Step two - Go to localhost:3000. Open my-app in your editor. Edit the files in the src/routes directory or add new ones. - - Step three - ... - - Step four - Resist overdone joke formats. - ` - }, - - { - title: 'Why the name?', - slug: 'why-the-name', - html: ` - In war, the soldiers who build bridges, repair roads, clear minefields and conduct demolitions — all under combat conditions — are known as sappers. - - For web developers, the stakes are generally lower than those for combat engineers. But we face our own hostile environment: underpowered devices, poor network connections, and the complexity inherent in front-end engineering. Sapper, which is short for Svelte app maker, is your courageous and dutiful ally. - ` - }, - - { - title: 'How is Sapper different from Next.js?', - slug: 'how-is-sapper-different-from-next', - html: ` - Next.js is a React framework from Vercel, and is the inspiration for Sapper. There are a few notable differences, however: - - - It's powered by Svelte instead of React, so it's faster and your apps are smaller - Instead of route masking, we encode route parameters in filenames. For example, the page you're looking at right now is src/routes/blog/[slug].svelte - As well as pages (Svelte components, which render on server or client), you can create server routes in your routes directory. These are just .js files that export functions corresponding to HTTP methods, and receive Express request and response objects as arguments. This makes it very easy to, for example, add a JSON API such as the one powering this very page - Links are just <a> elements, rather than framework-specific <Link> components. That means, for example, that this link right here, despite being inside a blob of HTML, works with the router as you'd expect. - - ` - }, - - { - title: 'How can I get involved?', - slug: 'how-can-i-get-involved', - html: ` - We're so glad you asked! Come on over to the Svelte and Sapper repos, and join us in the Discord chatroom. Everyone is welcome, especially you! - ` - } -]; - -posts.forEach(post => { - post.html = post.html.replace(/^\t{3}/gm, ''); -}); - -export default posts; diff --git a/src/routes/esports.svelte b/src/routes/esports.svelte new file mode 100644 index 0000000..0cf519e --- /dev/null +++ b/src/routes/esports.svelte @@ -0,0 +1,7 @@ + + esports + + +Esports Page + +This is the 'esports' page. \ No newline at end of file diff --git a/src/routes/index.svelte b/src/routes/index.svelte index e582dcc..737829e 100644 --- a/src/routes/index.svelte +++ b/src/routes/index.svelte @@ -1,5 +1,7 @@ - Sapper project template + WompMacho.com Great success! - + + + + Have fun with Sapper! + + -Try editing this file (src/routes/index.svelte) to test live reloading. + +Try editing this file goteem to test live reloading. + + diff --git a/src/routes/livestream.svelte b/src/routes/livestream.svelte new file mode 100644 index 0000000..9856143 --- /dev/null +++ b/src/routes/livestream.svelte @@ -0,0 +1,7 @@ + + Live Stream + + +Stream Page + +Stream Stuff Lives Here \ No newline at end of file diff --git a/src/routes/blog/[slug].json.js b/src/routes/projects/[slug].json.js similarity index 100% rename from src/routes/blog/[slug].json.js rename to src/routes/projects/[slug].json.js diff --git a/src/routes/blog/[slug].svelte b/src/routes/projects/[slug].svelte similarity index 95% rename from src/routes/blog/[slug].svelte rename to src/routes/projects/[slug].svelte index 84e8084..53fd4ab 100644 --- a/src/routes/blog/[slug].svelte +++ b/src/routes/projects/[slug].svelte @@ -2,7 +2,7 @@ export async function preload({ params }) { // the `slug` parameter is available because // this file is called [slug].svelte - const res = await this.fetch(`blog/${params.slug}.json`); + const res = await this.fetch(`projects/${params.slug}.json`); const data = await res.json(); if (res.status === 200) { diff --git a/src/routes/projects/_posts.js b/src/routes/projects/_posts.js new file mode 100644 index 0000000..cddc3c7 --- /dev/null +++ b/src/routes/projects/_posts.js @@ -0,0 +1,59 @@ +// Ordinarily, you'd generate this data from markdown files in your +// repo, or fetch them from a database of some kind. But in order to +// avoid unnecessary dependencies in the starter template, and in the +// service of obviousness, we're just going to leave it here. + +// This file is called `_posts.js` rather than `posts.js`, because +// we don't want to create an `/projects/posts` route — the leading +// underscore tells Sapper not to do that. + +const posts = [ + { + title: 'WompMacho.com', + slug: 'this-website', + html: ` + About This Site goes here + ` + }, + { + title: 'Django Site', + slug: 'django', + html: ` + About Django Site goes here + ` + }, + { + title: 'Tuner', + slug: 'tuner', + html: ` + About Tuner JS goes here + ` + }, + { + title: 'Sound Visualizer', + slug: 'sound-visualizer', + html: ` + About Sound Visualizer JS goes here + ` + }, + { + title: 'Fractal Tree App', + slug: 'fractal-tree-java-applet', + html: ` + About Fractal Tree Java Applet App goes here + ` + }, + { + title: 'Wompchat Chrome Extension', + slug: 'wompchat', + html: ` + About Wompchat Chrome Extension goes here + ` + } +]; + +posts.forEach(post => { + post.html = post.html.replace(/^\t{3}/gm, ''); +}); + +export default posts; diff --git a/src/routes/blog/index.json.js b/src/routes/projects/index.json.js similarity index 100% rename from src/routes/blog/index.json.js rename to src/routes/projects/index.json.js diff --git a/src/routes/blog/index.svelte b/src/routes/projects/index.svelte similarity index 71% rename from src/routes/blog/index.svelte rename to src/routes/projects/index.svelte index 2b7d64c..394327f 100644 --- a/src/routes/blog/index.svelte +++ b/src/routes/projects/index.svelte @@ -1,6 +1,6 @@ + + + - - %sapper.scripts% + + + + + + - - %sapper.styles% + + %sapper.scripts% - - %sapper.head% - - - - %sapper.html% - + + %sapper.styles% + + + %sapper.head% + + + + %sapper.html% + + + + + + + +
First, you have to know what Svelte is. Svelte is a UI framework with a bold new idea: rather than providing a library that you write code with (like React or Vue, for example), it's a compiler that turns your components into highly optimized vanilla JavaScript. If you haven't already read the introductory blog post, you should!
Sapper is a Next.js-style framework (more on that here) built around Svelte. It makes it embarrassingly easy to create extremely high performance web apps. Out of the box, you get:
It's implemented as Express middleware. Everything is set up and waiting for you to get started, but you keep complete control over the server, service worker, webpack config and everything else, so it's as flexible as you need it to be.
Create a new project, using degit:
npx degit "sveltejs/sapper-template#rollup" my-app - cd my-app - npm install # or yarn! - npm run dev -
Go to localhost:3000. Open my-app in your editor. Edit the files in the src/routes directory or add new ones.
my-app
src/routes
...
Resist overdone joke formats.
In war, the soldiers who build bridges, repair roads, clear minefields and conduct demolitions — all under combat conditions — are known as sappers.
For web developers, the stakes are generally lower than those for combat engineers. But we face our own hostile environment: underpowered devices, poor network connections, and the complexity inherent in front-end engineering. Sapper, which is short for Svelte app maker, is your courageous and dutiful ally.
Next.js is a React framework from Vercel, and is the inspiration for Sapper. There are a few notable differences, however:
src/routes/blog/[slug].svelte
routes
.js
request
response
<a>
<Link>
We're so glad you asked! Come on over to the Svelte and Sapper repos, and join us in the Discord chatroom. Everyone is welcome, especially you!
This is the 'esports' page.
Try editing this file (src/routes/index.svelte) to test live reloading.
Try editing this file goteem to test live reloading.
Stream Stuff Lives Here