Skip to content

Commit

Permalink
Merge pull request HikkaTown#46 from HikkaTown/pravki_product_page
Browse files Browse the repository at this point in the history
Pravki product page
  • Loading branch information
HikkaTown authored Jun 15, 2022
2 parents 6193bc4 + 09db98a commit d471471
Show file tree
Hide file tree
Showing 10 changed files with 145 additions and 5 deletions.
121 changes: 121 additions & 0 deletions frontend/configNginx.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
server {
listen 80;
server_name 1ppc.ru www.1ppc.ru;
location / {
proxy_pass http://localhost:3000;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
proxy_set_header Host $host;
proxy_cache_bypass $http_upgrade;
}

location /foto.php {
return 301 /catalog?id=1;
}

location /pechati.php {
return 301 /catalog?id=3;
}
location /kontakti.php {
return 301 /contacts;
}
location /kopir.php {
return 301 /catalog/kopi;
}
location /vizitki.php {
return 301 /catalog?id=2;
}
location /pechat_foto.php {
return 301 /catalog/pechat_foto;
}
location /pereplet.php {
return 301 /catalog?id=8;
}
location /shirokoformatnaya_pechat.php {
return 301 /catalog/shirokoformatnaya_pechat;
}
location /foto_na_dokumenti.php {
return 301 /catalog/foto_na_dokumenti;
}
location /foto_na_visu.php {
return 301 /catalog/foto_na_visu;
}
location /foto_na_pasport.php {
return 301 /catalog/foto_na_pasport;
}
location /tablichki.php {
return 301 /catalog?id=9;
}
location /pechat_novaya.php {
return 301 /catalog/novaya_pechat;
}
location /pechat_ottisku.php {
return 301 /catalog/po-ottisku;
}
location /pechat_srochno.php {
return 301 /catalog/srochnaya_pechat;
}
location /shtamp_noviy.php {
return 301 /catalog/shtamp_noviy;
}
location /shtamp_faksimilye.php {
return 301 /catalog/shtamp_faksimilye;
}
location /shtamp_ottisku.php {
return 301 /catalog/shtemp-ottisk;
}
location /vizitki_sifrovaya.php {
return 301 /catalog/vizitki_sifrovaya;
}
location /vizitki_ofsetnaya.php {
return 301 /catalog/vizitki_ofsetnaya;
}
location /vizitki_shelkografiya.php {
return 301 /catalog/vizitki_shelkografiya;
}
location /vizitki_tisneniya.php {
return 301 /catalog/vizitki_tisneniya;
}
location /vizitki_uf_pechat.php {
return 301 /catalog/vizitki_uf_pechat;
}
location /listovki.php {
return 301 /catalog?id=10;
}
location /laminir.php {
return 301 /catalog/lampaketnoe;
}

listen 443 ssl; # managed by Certbot
ssl_certificate /etc/letsencrypt/live/1ppc.ru/fullchain.pem; # managed by Certbot
ssl_certificate_key /etc/letsencrypt/live/1ppc.ru/privkey.pem; # managed by Certbot
include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot

}

server {
listen 80 default_server;
listen [::]:80 default_server;
server_name api.1ppc.ru;

# Proxy Config
location / {
proxy_pass http://localhost:1337;

proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
proxy_set_header Host $host;
proxy_cache_bypass $http_upgrade;
}

listen [::]:443 ssl ipv6only=on; # managed by Certbot
listen 443 ssl; # managed by Certbot
ssl_certificate /etc/letsencrypt/live/1ppc.ru/fullchain.pem; # managed by Certbot
ssl_certificate_key /etc/letsencrypt/live/1ppc.ru/privkey.pem; # managed by Certbot
include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot

}
File renamed without changes
File renamed without changes
13 changes: 10 additions & 3 deletions frontend/src/pages/_document.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from "react";
import Document, { Html, Head, Main, NextScript } from "next/document";
import { DOMAIN } from "@/lib/const";

class MyDocument extends Document {
render() {
Expand All @@ -8,13 +9,19 @@ class MyDocument extends Document {
<Head itemScope itemType="http://schema.org/WPHeader">
<meta property="og:type" content="website" />
<meta property="og:locale" content="ru_RU" />
<meta property="og:image:type" content="image/jpeg" />
<meta property="og:image" content={"/assets/preview_l.png"} />
<meta property="og:image" content={"/assets/preview_s.png"} />
<meta property="og:image:type" content="image/png" />
<meta property="og:image" content={"/preview_l.png"} />
<meta property="og:image" content={"/preview_s.png"} />
<meta property="og:image:width" content="1080" />
<meta property="og:image:height" content="1080" />
<meta property="og:image:width" content="1080" />
<meta property="og:image:height" content="565" />
<link
rel="alternate"
type="application/rss+xml"
title={"Блог"}
href={DOMAIN + "/rss.xml"}
/>
<link
rel="apple-touch-icon"
sizes="72x72"
Expand Down
6 changes: 4 additions & 2 deletions frontend/src/pages/blog/[id].jsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ export default function Index({ pageData, news, footerLinks }) {
/>
<meta property="og:description" content={pageData.metaDescription} />
<meta property="og:site_name" content="Первый печатный" />
<meta property="og:url" content={DOMAIN + "/blog"} />
<link rel="canonical" href={DOMAIN + "/blog"} />
<meta property="og:url" content={DOMAIN + "/blog/" + pageData.url} />
<link rel="canonical" href={DOMAIN + "/blog/" + pageData.url} />
<meta name="author" content="Первый печатный" />
<meta name="publisher" content={DOMAIN} />
</Head>
<Layout footerLinks={footerLinks}>
<CustomBreadrcumbs titlePage={pageData.postName} />
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/pages/blog/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import Head from "next/head";
import Layout from "@/components/Layout/Layout";
import NewsPageSection from "@/components/NewsPageSection/NewsPageSection";
import { getAllNews, getNewsPage, getProductLinks } from "@/lib/apiFunctions";
import { DOMAIN } from "@/lib/const";

export default function Index({ news, pageData, footerLinks }) {
return (
Expand All @@ -15,6 +16,7 @@ export default function Index({ news, pageData, footerLinks }) {
content={pageData.metaDescription}
/>
<meta property="og:description" content={pageData.metaHead} />
<meta property="og:url" content={DOMAIN + "/blog"} />
</Head>
<Layout footerLinks={footerLinks}>
<NewsPageSection data={news} header={pageData.header} />
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/pages/catalog/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
getReviews,
getServicesList,
} from "../../lib/apiFunctions";
import { DOMAIN } from "@/lib/const";

export default function Index({
tabs,
Expand All @@ -32,6 +33,7 @@ export default function Index({
content={pageData.metaDescription}
/>
<meta property="og:description" content={pageData.metaDescription} />
<meta property="og:url" content={DOMAIN + "/contacts"} />
</Head>
<Layout footerLinks={footerLinks}>
<CatalogPage tabs={tabs} header={pageData.header} id={id} />
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/pages/contacts/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
getContactPage,
getProductLinks,
} from "@/lib/apiFunctions";
import { DOMAIN } from "@/lib/const";

export default function Index({ pageData, cards, footerLinks }) {
const [mapUrl, setMapUrl] = useState(pageData.mapUrl);
Expand All @@ -29,6 +30,7 @@ export default function Index({ pageData, cards, footerLinks }) {
content={pageData.metaDescription}
/>
<meta property="og:description" content={pageData.metaDescription} />
<meta property="og:url" content={DOMAIN + "/contacts"} />
</Head>
<Layout footerLinks={footerLinks}>
<ContactPageSection
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/pages/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
getReviews,
getServicesList,
} from "@/lib/apiFunctions";
import { DOMAIN } from "@/lib/const";

export default function Index({ res, reviews, news, services, footerLinks }) {
const { pageData, seoBlock, shortDescription } = res;
Expand All @@ -28,6 +29,7 @@ export default function Index({ res, reviews, news, services, footerLinks }) {
content={pageData.metaDescription}
/>
<meta property="og:description" content={pageData.metaDescription} />
<meta property="og:url" content={DOMAIN} />
</Head>
<Layout footerLinks={footerLinks}>
<HeroMainSection data={pageData} />
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/pages/projects/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
getProjectPage,
getProjectTabs,
} from "@/lib/apiFunctions";
import { DOMAIN } from "@/lib/const";

export default function Index({ pageData, tabs, cards, footerLinks }) {
return (
Expand All @@ -21,6 +22,7 @@ export default function Index({ pageData, tabs, cards, footerLinks }) {
content={pageData.metaDescription}
/>
<meta property="og:description" content={pageData.metaDescription} />
<meta property="og:url" content={DOMAIN + "/projects"} />
</Head>
<Layout footerLinks={footerLinks}>
<ProjectsPageSection
Expand Down

0 comments on commit d471471

Please sign in to comment.