19 Commits

Author SHA1 Message Date
02845772fe Update Node 2022-09-29 14:14:42 +00:00
4a5b773ef6 Update Packages 2022-09-29 14:09:48 +00:00
70612a88aa Merge pull request #30 from Fluttershub/dependabot/docker/node-18.7.0
Bump node from 18.6 to 18.7.0
2022-07-28 09:24:30 +01:00
8bdf65a19b Update snyk-container.yml 2022-07-28 08:57:43 +01:00
dependabot[bot]
a5900e6d90 Bump node from 18.6 to 18.7.0
Bumps node from 18.6 to 18.7.0.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-28 06:55:12 +00:00
38a35cbe30 Merge pull request #29 from Fluttershub/add-email
Add email
2022-07-23 10:14:12 +01:00
854a845ac6 Add Email 2022-07-23 10:12:05 +01:00
1468fd3afb Update package.json and remove node engine limit. 2022-07-23 10:11:58 +01:00
28ed9a1d2d Merge pull request #27 from Fluttershub/dependabot/docker/nginx-1.23.1-alpine
Bump nginx from 1.23.0-alpine to 1.23.1-alpine
2022-07-21 03:23:25 +01:00
dependabot[bot]
576d24ff5d Bump nginx from 1.23.0-alpine to 1.23.1-alpine
Bumps nginx from 1.23.0-alpine to 1.23.1-alpine.

---
updated-dependencies:
- dependency-name: nginx
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-20 06:43:03 +00:00
14240fee26 Revert some changes made with "Switch nodejs to use alpine and update both alpine images. (#26)" 2022-07-15 16:31:07 +01:00
28101779ee Add packages for building node_modules with ARM64 2022-07-15 16:09:55 +01:00
6f39048036 Switch nodejs to use alpine and update both alpine images. (#26) 2022-07-15 16:05:29 +01:00
8340a42f4d Fluttershub.com does not currently run on the ARM Node. 2022-07-11 12:11:50 +01:00
e67c0699a7 This check prevents new images from being deployed, logic was flawed. 2022-07-11 12:04:34 +01:00
0a4a6f12e2 Update Links 2022-07-11 11:03:24 +01:00
0a2c6ba099 Merge pull request #23 from Fluttershub/dependabot/docker/node-18.5.0
Bump node from 18.4.0 to 18.5.0
2022-07-11 10:32:18 +01:00
dependabot[bot]
0d11da55e1 Bump node from 18.4.0 to 18.5.0
Bumps node from 18.4.0 to 18.5.0.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-11 09:30:42 +00:00
9c46033ab4 Updated Parcel and added missing packages. 2022-07-11 10:24:14 +01:00
10 changed files with 1049 additions and 560 deletions

View File

@@ -72,7 +72,7 @@ jobs:
Deploy: Deploy:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: Build_ARM64 needs: Build_x86
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Run Ansible playbook - name: Run Ansible playbook

View File

@@ -14,13 +14,9 @@
name: Snyk Container name: Snyk Container
on: on:
push:
branches: [ main ]
pull_request: pull_request:
# The branches below must be a subset of the branches above # The branches below must be a subset of the branches above
branches: [ main ] branches: [ main ]
schedule:
- cron: '18 21 * * 3'
permissions: permissions:
contents: read contents: read

View File

@@ -1,7 +1,10 @@
FROM node:18.4.0 AS base FROM node:18.10.0 AS base
LABEL version="4.1.0" LABEL version="4.1.0"
LABEL description="" LABEL description=""
RUN apt-get update && apt-get upgrade -y \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /usr/src/app WORKDIR /usr/src/app
COPY ["package.json", "./"] COPY ["package.json", "./"]
COPY ["yarn.lock", "./"] COPY ["yarn.lock", "./"]
@@ -11,7 +14,10 @@ RUN yarn install
COPY ["src/", "./src"] COPY ["src/", "./src"]
RUN npm run Prod RUN npm run Prod
FROM nginx:1.23.0-alpine as Web FROM nginx:1.23.1-alpine as Web
RUN apk --update --no-cache upgrade
LABEL maintainer="Phoenix (https://github.com/HotaruBlaze)" LABEL maintainer="Phoenix (https://github.com/HotaruBlaze)"
COPY docker/nginx.conf /etc/nginx/nginx.conf COPY docker/nginx.conf /etc/nginx/nginx.conf
COPY docker/web.conf /etc/nginx/conf.d/web.conf COPY docker/web.conf /etc/nginx/conf.d/web.conf

View File

@@ -2,7 +2,7 @@ version: "3"
services: services:
fluttershub.com: fluttershub.com:
image: ghcr.io/fluttershub/homepage:arm64-latest image: ghcr.io/fluttershub/homepage:x64-latest
restart: always restart: always
networks: networks:
- external - external

View File

@@ -7,7 +7,7 @@
"author": "HotaruBlaze", "author": "HotaruBlaze",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git@github.com:github/Fluttershub.git" "url": "git@github.com:Fluttershub/Homepage.git"
}, },
"scripts": { "scripts": {
"preinit": "npx npm-force-resolutions", "preinit": "npx npm-force-resolutions",
@@ -17,10 +17,9 @@
"Prod": "npm run Cleanup && npm run Init && parcel build src/index.pug --dist-dir build" "Prod": "npm run Cleanup && npm run Init && parcel build src/index.pug --dist-dir build"
}, },
"devDependencies": { "devDependencies": {
"parcel": "^2.6.1" "@parcel/transformer-pug": "2.7.0",
}, "@parcel/transformer-sass": "2.7.0",
"engines": { "parcel": "^2.7.0"
"node": "^18.*"
}, },
"resolutions": { "resolutions": {
"node-forge": "0.10.0" "node-forge": "0.10.0"

View File

@@ -18,7 +18,6 @@
mode: '0755' mode: '0755'
loop: loop:
- docker-compose.yml - docker-compose.yml
register: compose
- name: deploy Docker Compose stack if updated - name: deploy Docker Compose stack if updated
community.docker.docker_compose: community.docker.docker_compose:
@@ -26,4 +25,3 @@
pull: true pull: true
files: files:
- docker-compose.yml - docker-compose.yml
when: compose.changed

View File

@@ -14,7 +14,7 @@ html(lang='en')
.container .container
.pod .pod
.glow .glow
img#profile_pic(src='https://img.fluttershub.com/VjpiMs7xp60yEcAH.png', alt='') img#profile_pic(src='https://s3.fluttershub.com/fluttershub-com/public/profile_pic.png', alt='')
h1.welcome_text.text-flicker.text-flicker-1 Phoenix/Hotaru h1.welcome_text.text-flicker.text-flicker-1 Phoenix/Hotaru
p.about_me.standard_text.text-box-glow p.about_me.standard_text.text-box-glow
.pod .pod
@@ -22,6 +22,8 @@ html(lang='en')
a.standard_text.text-flicker-2(href="https://twitter.com/HotaruBlaze") Twitter a.standard_text.text-flicker-2(href="https://twitter.com/HotaruBlaze") Twitter
a.standard_text.text-flicker-2(href="https://github.com/HotaruBlaze") Github a.standard_text.text-flicker-2(href="https://github.com/HotaruBlaze") Github
a.standard_text.text-flicker-2(href="https://gitlab.com/HotaruBlaze") Gitlab a.standard_text.text-flicker-2(href="https://gitlab.com/HotaruBlaze") Gitlab
a.standard_text.text-flicker-2(href="mailto:hotarublaze@gmail.com") Email
footer.standard_text.footer-slide footer.standard_text.footer-slide
.creator .creator
a.build_text(href="https://img.fluttershub.com/EgOwhwrHyHWw.png") Cookie? 🍪 a.build_text(href="https://www.youtube.com/watch?v=5DWFZhAVI3s") Cookie?
a.cookie(href="https://img.fluttershub.com/pdDK7pdVJZU3d9UI.jpg") 🍪

View File

@@ -2,5 +2,5 @@ meta(property='og:url', content='https://fluttershub.com')
meta(property='og:type', content='website') meta(property='og:type', content='website')
meta(property='og:title', content='Phoenix\'s Personal Website') meta(property='og:title', content='Phoenix\'s Personal Website')
meta(property='og:description', content='We got cookies and milk!') meta(property='og:description', content='We got cookies and milk!')
meta(property='og:image', content='http://storage.googleapis.com/api.fluttershub.com/images/public/profile_pic.jpg') meta(property='og:image', content='http://s3.fluttershub.com/fluttershub-com/public/profile_pic.png')
meta(property='og:image:secure_url', content='https://storage.googleapis.com/api.fluttershub.com/images/public/profile_pic.jpg') meta(property='og:image:secure_url', content='https://s3.fluttershub.com/fluttershub-com/public/profile_pic.png')

View File

@@ -60,6 +60,9 @@ body,html, .container {
-moz-user-select: text; -moz-user-select: text;
text-decoration: none; text-decoration: none;
} }
.cookie {
text-decoration: none !important;
}
.no_hightnight a:link, a{ .no_hightnight a:link, a{
color: inherit; color: inherit;

1567
yarn.lock

File diff suppressed because it is too large Load Diff