From 91b0441759ae26c2a1e19db008045eae3380d11e Mon Sep 17 00:00:00 2001 From: mwinter Date: Wed, 28 Jun 2023 11:44:41 +0200 Subject: [PATCH] ready for launch with titles and routes --- docker-compose.yml | 18 +++++++++--------- nginx/vhost.d/gitea.unboundedpress.org | 10 ---------- nginx/vhost.d/unboundedpress.org | 10 ---------- portfolio-nuxt/Dockerfile | 4 ++-- portfolio-nuxt/layouts/default.vue | 2 +- portfolio-nuxt/nuxt.config.ts | 4 ++++ portfolio-nuxt/pages/[files]/[filename].vue | 3 +++ portfolio-nuxt/pages/about.vue | 12 ++++++++---- portfolio-nuxt/pages/events.vue | 4 ++++ portfolio-nuxt/pages/index.vue | 8 ++++++-- 10 files changed, 37 insertions(+), 38 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 09045d5..3f4d4bd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -65,8 +65,8 @@ services: - VIRTUAL_PATH=/legacy - VIRTUAL_DEST=/legacy - VIRTUAL_PORT=3000 - - LETSENCRYPT_HOST=${DOMAIN},www.${DOMAIN},gitea.${DOMAIN} #this last one is for legacy support - - LETSENCRYPT_EMAIL=${EMAIL} + #- LETSENCRYPT_HOST=${DOMAIN},www.${DOMAIN},gitea.${DOMAIN} #this last one is for legacy support + #- LETSENCRYPT_EMAIL=${EMAIL} ports: - "3000:3000" restart: always @@ -84,11 +84,11 @@ services: container_name: portfolio-nuxt build: ./portfolio-nuxt # To rebuild the site and the server run this - #command: bash -c "npm run build && node .output/server/index.mjs" + command: bash -c "npm run build && node .output/server/index.mjs" # To just start the server run this - # command: bash -c "node .output/server/index.mjs" + #command: bash -c "node .output/server/index.mjs" # To start the server in dev mode - command: bash -c "npm run dev -o" + #command: bash -c "npm run dev -o" volumes: - portfolio-nuxt:/src/node_modules - ./portfolio-nuxt:/src @@ -99,11 +99,11 @@ services: # For subdirectory baseURL needs to be set in nuxt config #- VIRTUAL_PATH=/dev #- VIRTUAL_DEST=/dev - - VIRTUAL_PORT=4000 - #- LETSENCRYPT_HOST=${DOMAIN},www.${DOMAIN},gitea.${DOMAIN} #this last one is for legacy support - #- LETSENCRYPT_EMAIL=${EMAIL} + - VIRTUAL_PORT=5000 + - LETSENCRYPT_HOST=${DOMAIN},www.${DOMAIN},gitea.${DOMAIN} #this last one is for legacy support + - LETSENCRYPT_EMAIL=${EMAIL} ports: - - "4000:4000" + - "5000:5000" restart: always #depends_on: #mongo: diff --git a/nginx/vhost.d/gitea.unboundedpress.org b/nginx/vhost.d/gitea.unboundedpress.org index 3fc47aa..972d3c2 100644 --- a/nginx/vhost.d/gitea.unboundedpress.org +++ b/nginx/vhost.d/gitea.unboundedpress.org @@ -1,13 +1,3 @@ -## Start of configuration add by letsencrypt container -location ^~ /.well-known/acme-challenge/ { - auth_basic off; - auth_request off; - allow all; - root /usr/share/nginx/html; - try_files $uri =404; - break; -} -## End of configuration add by letsencrypt container # This is needed for legacy support location = / { rewrite ^ http://gitea.unboundedpress.org/code/mwinter/ redirect; diff --git a/nginx/vhost.d/unboundedpress.org b/nginx/vhost.d/unboundedpress.org index 501ab9a..2a6f4ec 100644 --- a/nginx/vhost.d/unboundedpress.org +++ b/nginx/vhost.d/unboundedpress.org @@ -1,13 +1,3 @@ -## Start of configuration add by letsencrypt container -location ^~ /.well-known/acme-challenge/ { - auth_basic off; - auth_request off; - allow all; - root /usr/share/nginx/html; - try_files $uri =404; - break; -} -## End of configuration add by letsencrypt container # The following are all for collabora routing diff --git a/portfolio-nuxt/Dockerfile b/portfolio-nuxt/Dockerfile index 2c09b33..99c2f63 100644 --- a/portfolio-nuxt/Dockerfile +++ b/portfolio-nuxt/Dockerfile @@ -10,8 +10,8 @@ RUN apk add bash RUN npm install ENV NITRO_HOST=0.0.0.0 -ENV NITRO_PORT=4000 +ENV NITRO_PORT=5000 -EXPOSE 4000 +EXPOSE 5000 # ENTRYPOINT ["npm", "run", "build", "node", ".output/server/index.mjs"] \ No newline at end of file diff --git a/portfolio-nuxt/layouts/default.vue b/portfolio-nuxt/layouts/default.vue index 6ecb74a..b4b52af 100644 --- a/portfolio-nuxt/layouts/default.vue +++ b/portfolio-nuxt/layouts/default.vue @@ -11,7 +11,7 @@
- Welcome to the new front-end of my website, which is still in development. It functions similar to the former site. In case you cannot find something here, you can still view the old front-end by clicking on the "legacy" link in the menu below. If you have any questions or find any problems please contact me at the email link in the about section. + Welcome to the new front-end of my website, which is still in development. It functions similar to the former site. In case you cannot find something here, you can still view the old front-end by clicking on the "legacy" link in the menu below. If you have any questions or find any problems please contact, me at the email link in the about section.
diff --git a/portfolio-nuxt/nuxt.config.ts b/portfolio-nuxt/nuxt.config.ts index 95274dd..720746b 100644 --- a/portfolio-nuxt/nuxt.config.ts +++ b/portfolio-nuxt/nuxt.config.ts @@ -18,6 +18,10 @@ export default defineNuxtConfig({ version: 2 }, }, + routeRules: { + '/cv': { redirect: '/legacy/cv' }, + '/works_list': { redirect: '/legacy/works_list' }, + }, nitro: { prerender: { crawlLinks: true} }, diff --git a/portfolio-nuxt/pages/[files]/[filename].vue b/portfolio-nuxt/pages/[files]/[filename].vue index 6da0992..438973c 100644 --- a/portfolio-nuxt/pages/[files]/[filename].vue +++ b/portfolio-nuxt/pages/[files]/[filename].vue @@ -17,4 +17,7 @@ const { data: metadata } = await useFetch('https://unboundedpress.org/api/' + ro } }) + useHead({ + titleTemplate: 'Michael Winter - Files - ' + route.params.filename + }) \ No newline at end of file diff --git a/portfolio-nuxt/pages/about.vue b/portfolio-nuxt/pages/about.vue index 447e607..0bdbdef 100644 --- a/portfolio-nuxt/pages/about.vue +++ b/portfolio-nuxt/pages/about.vue @@ -12,7 +12,7 @@
- Email + Contact
@@ -21,19 +21,19 @@
CV
- +

Works List with Presentation History
- +


-
+
@@ -69,6 +69,10 @@ const { data: gallery } = await useFetch('https://unboundedpress.org/api/my_imag return gallery //.sort((a,b) => a.priority - b.priority) } }) + +useHead({ + titleTemplate: 'Michael Winter - About - Short Bio, Contact, CV, Works List, and Mailing List' + })