mirror of
https://github.com/LaconicNetwork/laconic.com.git
synced 2026-01-19 19:54:09 +00:00
fixed conflicts
This commit is contained in:
oriofir
commit
a546119151
10
package.json
10
package.json
@ -37,17 +37,20 @@
|
||||
"keen-slider": "^6.6.9",
|
||||
"lodash": "^4.17.21",
|
||||
"marked": "^4.0.14",
|
||||
"next": "^12.2.5",
|
||||
"next": "^12.1.5",
|
||||
"next-real-viewport": "^0.7.0",
|
||||
"next-seo": "^5.4.0",
|
||||
"next-themes": "^0.2.0",
|
||||
"react": "^18.2.0",
|
||||
"react": "^18.0.0",
|
||||
"react-datocms": "^3.0.12",
|
||||
"react-device-detect": "^2.2.2",
|
||||
"react-dom": "^18.2.0",
|
||||
"react-dom": "^18.0.0",
|
||||
"react-fast-marquee": "^1.3.1",
|
||||
<<<<<<< HEAD
|
||||
"react-google-recaptcha": "^2.1.0",
|
||||
"react-google-recaptcha-v3": "^1.10.0",
|
||||
=======
|
||||
>>>>>>> 4a203339c5143fd20a785d9ad1153afb4a02b7fe
|
||||
"react-hook-form": "^7.30.0",
|
||||
"react-mailchimp-subscribe": "^2.1.3",
|
||||
"react-merge-refs": "^1.1.0",
|
||||
@ -66,7 +69,6 @@
|
||||
"@types/node": "^17.0.25",
|
||||
"@types/react": "^17.0.43",
|
||||
"@types/react-dom": "^17.0.14",
|
||||
"@types/react-google-recaptcha": "^2.1.5",
|
||||
"@types/tiny-json-http": "^7.3.1",
|
||||
"@typescript-eslint/eslint-plugin": "^5.20.0",
|
||||
"@typescript-eslint/parser": "^5.20.0",
|
||||
|
||||
@ -1,16 +1,17 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:news="http://www.google.com/schemas/sitemap-news/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:mobile="http://www.google.com/schemas/sitemap-mobile/1.0" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1" xmlns:video="http://www.google.com/schemas/sitemap-video/1.1">
|
||||
<url><loc>https://laconic.com</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-08-26T16:25:20.005Z</lastmod></url>
|
||||
<url><loc>https://laconic.com/about</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-08-26T16:25:20.005Z</lastmod></url>
|
||||
<url><loc>https://laconic.com/blog</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-08-26T16:25:20.006Z</lastmod></url>
|
||||
<url><loc>https://laconic.com/careers</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-08-26T16:25:20.006Z</lastmod></url>
|
||||
<url><loc>https://laconic.com/community</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-08-26T16:25:20.006Z</lastmod></url>
|
||||
<url><loc>https://laconic.com/contact</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-08-26T16:25:20.006Z</lastmod></url>
|
||||
<url><loc>https://laconic.com/partners</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-08-26T16:25:20.006Z</lastmod></url>
|
||||
<url><loc>https://laconic.com/press</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-08-26T16:25:20.006Z</lastmod></url>
|
||||
<url><loc>https://laconic.com/privacy-policy</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-08-26T16:25:20.006Z</lastmod></url>
|
||||
<url><loc>https://laconic.com/products</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-08-26T16:25:20.006Z</lastmod></url>
|
||||
<url><loc>https://laconic.com/terms-of-use</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-08-26T16:25:20.006Z</lastmod></url>
|
||||
<url><loc>https://laconic.com/blog/introducing-laconic-network</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-08-26T16:25:20.006Z</lastmod></url>
|
||||
<url><loc>https://laconic.com/blog/how-laconic-different</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-08-26T16:25:20.006Z</lastmod></url>
|
||||
<url><loc>https://laconic.com</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-07-14T18:37:48.828Z</lastmod></url>
|
||||
<url><loc>https://laconic.com/about</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-07-14T18:37:48.829Z</lastmod></url>
|
||||
<url><loc>https://laconic.com/blog</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-07-14T18:37:48.829Z</lastmod></url>
|
||||
<url><loc>https://laconic.com/careers</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-07-14T18:37:48.829Z</lastmod></url>
|
||||
<url><loc>https://laconic.com/community</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-07-14T18:37:48.829Z</lastmod></url>
|
||||
<url><loc>https://laconic.com/contact</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-07-14T18:37:48.829Z</lastmod></url>
|
||||
<url><loc>https://laconic.com/partners</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-07-14T18:37:48.829Z</lastmod></url>
|
||||
<url><loc>https://laconic.com/press</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-07-14T18:37:48.829Z</lastmod></url>
|
||||
<url><loc>https://laconic.com/privacy-policy</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-07-14T18:37:48.829Z</lastmod></url>
|
||||
<url><loc>https://laconic.com/products</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-07-14T18:37:48.829Z</lastmod></url>
|
||||
<url><loc>https://laconic.com/terms-of-use</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-07-14T18:37:48.829Z</lastmod></url>
|
||||
<url><loc>https://laconic.com/blog/introducing-laconic-network</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-07-14T18:37:48.829Z</lastmod></url>
|
||||
<url><loc>https://laconic.com/blog/how-laconic-different</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-07-14T18:37:48.829Z</lastmod></url>
|
||||
<url><loc>https://laconic.com/blog/how-laconic-network-uses-ipld</loc><changefreq>daily</changefreq><priority>0.7</priority><lastmod>2022-07-14T18:37:48.829Z</lastmod></url>
|
||||
</urlset>
|
||||
@ -9,6 +9,12 @@
|
||||
padding-right: 0;
|
||||
}
|
||||
|
||||
.blog_img__eo9Jb {
|
||||
object-fit: cover;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
h1 {
|
||||
margin-top: tovw(124px, 'default', 72px);
|
||||
font-family: var(--font-arthemys);
|
||||
@ -145,7 +151,6 @@
|
||||
|
||||
> img {
|
||||
object-fit: cover;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
import type { NextRequest } from 'next/server'
|
||||
import { NextResponse } from 'next/server'
|
||||
|
||||
// This function can be marked `async` if using `await` inside
|
||||
export function middleware(request: NextRequest) {
|
||||
return NextResponse.redirect(new URL('/about-2', request.url))
|
||||
}
|
||||
|
||||
// See "Matching Paths" below to learn more
|
||||
export const config = {
|
||||
matcher: '/about/:path*'
|
||||
}
|
||||
@ -24,5 +24,5 @@
|
||||
"incremental": true
|
||||
},
|
||||
"exclude": ["node_modules"],
|
||||
"include": ["**/*.ts", "**/*.tsx", "src/middleware.js"]
|
||||
"include": ["**/*.ts", "**/*.tsx"]
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user