Merge branch 'main' into j285he-pie-chart

This commit is contained in:
Jared He 2022-07-13 20:04:07 -04:00
commit 27582e0e01
4 changed files with 22 additions and 8 deletions

View File

@ -1,2 +1,5 @@
FROM nginx
COPY ./out /usr/share/nginx/html
COPY staging-nginx.conf /etc/nginx/conf.d
RUN rm /etc/nginx/conf.d/default.conf

View File

@ -1,6 +1,7 @@
/** @type {import('next').NextConfig} */
const nextConfig = {
reactStrictMode: true,
trailingSlash: true,
}
module.exports = nextConfig

View File

@ -5,7 +5,7 @@
font-weight: 200;
src: local(''),
url('../public/fonts/inconsolata-v30-latin-200.woff2') format('woff2'),
url('../public/fonts/inconsolata-v30-latin-200.woff') format('woff'),
url('../public/fonts/inconsolata-v30-latin-200.woff') format('woff');
}
/* inconsolata-300 - latin */
@ -15,7 +15,7 @@
font-weight: 300;
src: local(''),
url('../public/fonts/inconsolata-v30-latin-300.woff2') format('woff2'),
url('../public/fonts/inconsolata-v30-latin-300.woff') format('woff'),
url('../public/fonts/inconsolata-v30-latin-300.woff') format('woff');
}
/* inconsolata-regular - latin */
@ -25,7 +25,7 @@
font-weight: 400;
src: local(''),
url('../public/fonts/inconsolata-v30-latin-regular.woff2') format('woff2'),
url('../public/fonts/inconsolata-v30-latin-regular.woff') format('woff'),
url('../public/fonts/inconsolata-v30-latin-regular.woff') format('woff');
}
/* inconsolata-500 - latin */
@ -35,7 +35,7 @@
font-weight: 500;
src: local(''),
url('../public/fonts/inconsolata-v30-latin-500.woff2') format('woff2'),
url('../public/fonts/inconsolata-v30-latin-500.woff') format('woff'),
url('../public/fonts/inconsolata-v30-latin-500.woff') format('woff');
}
/* inconsolata-600 - latin */
@ -46,7 +46,7 @@
src: local(''),
url('../public/fonts/inconsolata-v30-latin-600.woff2') format('woff2'),
/* Super Modern Browsers */
url('../public/fonts/inconsolata-v30-latin-600.woff') format('woff'),
url('../public/fonts/inconsolata-v30-latin-600.woff') format('woff');
}
/* inconsolata-700 - latin */
@ -56,7 +56,7 @@
font-weight: 700;
src: local(''),
url('../public/fonts/inconsolata-v30-latin-700.woff2') format('woff2'),
url('../public/fonts/inconsolata-v30-latin-700.woff') format('woff'),
url('../public/fonts/inconsolata-v30-latin-700.woff') format('woff');
}
/* inconsolata-800 - latin */
@ -66,7 +66,7 @@
font-weight: 800;
src: local(''),
url('../public/fonts/inconsolata-v30-latin-800.woff2') format('woff2'),
url('../public/fonts/inconsolata-v30-latin-800.woff') format('woff'),
url('../public/fonts/inconsolata-v30-latin-800.woff') format('woff');
}
/* inconsolata-900 - latin */
@ -76,5 +76,5 @@
font-weight: 900;
src: local(''),
url('../public/fonts/inconsolata-v30-latin-900.woff2') format('woff2'),
url('../public/fonts/inconsolata-v30-latin-900.woff') format('woff'),
url('../public/fonts/inconsolata-v30-latin-900.woff') format('woff');
}

10
staging-nginx.conf Normal file
View File

@ -0,0 +1,10 @@
server {
listen 80;
location / {
root /usr/share/nginx/html;
index index.html index.htm;
try_files $uri $uri/ $uri.html $uri.html/ /index.html;
}
error_page 404 /index.html;
}