Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: 🎸 Added privacy policy and changed price to 12 #41

Merged
merged 5 commits into from
Feb 7, 2021
Merged

feat: 🎸 Added privacy policy and changed price to 12 #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
34b1a3c
feat: 🎸 Added privacy policy and changed price to 12
JohanObrink Feb 7, 2021
343a98e
fix: 🐛 Spelling
JohanObrink Feb 7, 2021
4518ae7
fix: 🐛 Time to read testimonials
JohanObrink Feb 7, 2021
f4b9538
fix: 🐛 Rensade länkar
JohanObrink Feb 7, 2021
53a9425
fix: 🐛 Fixed links when navigating other url:s
JohanObrink Feb 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/site/assets/css/custom.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,9 @@
Custom Stylesheet (Any custom styling you want to apply should be defined here).
====================================================================================*/

.contrast {
background-color: rgba(255, 255, 255, 0.6);
margin: -25px;
padding: 25px;
border-radius: 50px;
}
2 changes: 1 addition & 1 deletion packages/site/components/AppShots.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const AppShots = () => {
},
}
return (
<section className="pt-120 pb-155 app-shot-one" id="app">
<section className="pt-120 pb-155 app-shot-one" id="screenshots">
<Container>
<Row className="justify-content-center">
<Col md={12} lg={8}>
Expand Down
27 changes: 17 additions & 10 deletions packages/site/components/Banner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ const Banner = () => {

<h1>Öppna Skolplattformen</h1>
<p>
Oavsett om du har tre eller sju barn - det är mycket att hålla
reda på. Stövlarna. Frånvaroanmälan nummer 17 i februari. Vad
vikarien heter den här veckan. En dåligt fungerande
Oavsett om du har tre eller sju barn – det är mycket att hålla
reda på. Frånvaroanmälan nummer 17 i februari. Vad
vikarien heter den här veckan. Gympakläderna. En dåligt fungerande
Skolplattform som äter tid och ork? Det finns inte plats för
det. Så vi har byggt en bättre. Med all information du behöver
som förälder. Snabbare och framförallt - mycket mindre
som förälder. Snabbare och framförallt – mycket mindre
krångel.
</p>
<p>
Expand All @@ -75,12 +75,19 @@ const Banner = () => {
Google Play Store vilken dag som helst.
</b>
</p>
<a href="#" className="btn">
App Store
</a>
<a href="#" className="btn">
Mer info
</a>
<p>
<a href="#" className="btn">
App Store
</a>
<a href="#" className="btn">
Google Play Store
</a>
</p>
<p>
<a href="/integritet" className="btn">
Integritetspolicy
</a>
</p>
</div>
</Col>
<Col md={4} lg={5} className=" offset-lg-1 offse-xl-2">
Expand Down
2 changes: 1 addition & 1 deletion packages/site/components/Features.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const Features = () => {
},
}
return (
<section className="pb-110" id="features">
<section className="pb-110" id="funktioner">
<Container>
<Row className="justify-content-center">
<Col md={12} lg={8}>
Expand Down
36 changes: 4 additions & 32 deletions packages/site/components/Footer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ const Footer = () => {
<div className="col-lg-3 col-sm-6">
<div className="footer-widget">
<div className="widget-header">
<h5>Extra Links</h5>
<h5>Länkar</h5>
</div>
</div>

Expand All @@ -102,40 +102,12 @@ const Footer = () => {
<div className="link-left">
<ul>
<li>
<a href="#">About</a>
</li>
<li>
<a href="#">Our Team</a>
</li>
<li>
<a href="#">Features</a>
</li>
<li>
<a href="#">Blog</a>
</li>
<li>
<a href="#">How It Works</a>
<a href="/integritet">Integritetspolicy</a>
</li>
</ul>
</div>
<div className="link-right">
<ul>
<li>
<a href="#">Help</a>
</li>
<li>
<a href="#">Support</a>
</li>
<li>
<a href="#">Clients</a>
</li>
<li>
<a href="#">Blog</a>
</li>
<li>
<a href="#">Contact</a>
</li>
</ul>

</div>
</div>
</div>
Expand Down Expand Up @@ -164,7 +136,7 @@ const Footer = () => {
</div>
<div className="footer-bottom">
<div className="footer-text text-center">
<p>© copyright 2021 by not free beer HB</p>
<p>© copyright 2021 by Not free beer HB</p>
</div>
</div>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion packages/site/components/FunFacts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const FUNFACTS_DATA = [
title: 'år att utveckla',
},
{
count: '10',
count: '12',
title: 'kronor kostar vår app :)',
},
{
Expand Down
85 changes: 30 additions & 55 deletions packages/site/components/NavLinks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,72 +1,47 @@
import Link from 'next/link'
import NavLink from 'next/link'
import { useRouter } from 'next/router'
import React from 'react'
import { Link as ScrollLink } from 'react-scroll'

const NavLinks = () => {
// const [dropdownStatus, setDropdownStatus] = useState(false);
const handleDropdownStatus = (e) => {
// setDropdownStatus(!dropdownStatus);
let clickedItem = e.currentTarget.parentNode
clickedItem.querySelector('.dropdown-list').classList.toggle('show')
const { pathname } = useRouter()

const path = (href) => {
const hashIndex = href.indexOf('#')
if (hashIndex < 0) return href
return href.substring(0, hashIndex)
}
const Link = ({ href, to, children }) => (
(path(href) === pathname) ? (
<ScrollLink
activeClass="current"
to={to}
spy={true}
smooth={true}
offset={-70}
duration={500}>
<a>{children}</a>
</ScrollLink>
) : (
<NavLink href={href}>
<a>{children}</a>
</NavLink>
)
)

return (
<ul className="main-nav__navigation-box">
<li className="dropdown">
<Link href="/">
<>
<a>Hem</a>
<i className="fa fa-angle-down" onClick={handleDropdownStatus}></i>
</>
</Link>
<ul className="dropdown-list">
<li>
<Link href="/">
<a>Home One</a>
</Link>
</li>
<li>
<Link href="/index-2">
<a>Home Two</a>
</Link>
</li>
</ul>
<Link to="wrapper" href="/#">Hem</Link>
</li>
<li>
<ScrollLink
activeClass="current"
to="features"
spy={true}
smooth={true}
offset={-70}
duration={500}
>
Funktioner
</ScrollLink>
<Link to="funktioner" href="/#funktioner">Funktioner</Link>
</li>

<li>
<ScrollLink
activeClass="current"
to="app"
spy={true}
smooth={true}
offset={-70}
duration={500}
>
Screenshots
</ScrollLink>
<Link to="screenshots" href="/#screenshots">Screenshots</Link>
</li>
<li>
<ScrollLink
activeClass="current"
to="pricing"
spy={true}
smooth={true}
offset={-70}
duration={500}
>
Vad kostar det?
</ScrollLink>
<Link to="vad-kostar-det" href="/#vad-kostar-det">Vad kostar det?</Link>
</li>
</ul>
)
Expand Down
10 changes: 6 additions & 4 deletions packages/site/components/Pricing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,19 @@ import { formatPrice } from '../utils/intl'
const Pricing = () => {
const [pricing] = useState(false)

const price = 12

return (
<section className="pb-90" id="pricing">
<section className="pb-90" id="vad-kostar-det">
<div className="container">
<div className="row justify-content-center">
<div className="col-md-12 col-lg-8">
<div className="col-md-12 col-lg-12">
<div className="section-title text-center">
<h2>Vad kostar det och varför är det inte gratis?</h2>
<p>
Vi som bygger appen vill gärna fortsätta vidareutveckla den och
även ha möjlighet att ge ersättning till de som hjälper till.
Därför kostar det {formatPrice(10)} att ladda ner appen. Det är
Därför kostar det {formatPrice(price)} att ladda ner appen. Det är
en engångskostnad och hjälper oss att göra appen bättre.
</p>
</div>
Expand All @@ -30,7 +32,7 @@ const Pricing = () => {
<div className="single-price-plan text-center">
<div className="single-price-top">
<h4>Engångskostnad</h4>
<span>{formatPrice(10)}</span>
<span>{formatPrice(price)}</span>
</div>
<div className="single-price-body">
<div className="price-list">
Expand Down
Loading