Skip to content

Commit

Permalink
uppdaterat news & contact
Browse files Browse the repository at this point in the history
  • Loading branch information
hattfan committed Apr 12, 2018
1 parent 2500936 commit b41806c
Show file tree
Hide file tree
Showing 25 changed files with 921 additions and 180 deletions.
18 changes: 10 additions & 8 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,27 @@ app.use(express.static(__dirname + '/script'));
//Store all JS and CSS in Scripts folder.

app.get('/',function(req,res){
// res.sendFile('index.html');
res.render('index.ejs');
//It will find and locate index.html from View or Scripts
});

app.get('/pure',function(req,res){
// res.sendFile('index.html');
res.render('pure.ejs');
//It will find and locate index.html from View or Scripts
});
app.get('/slider',function(req,res){
// res.sendFile('index.html');
res.render('slider.ejs');
//It will find and locate index.html from View or Scripts
});
app.get('/contact',function(req,res){
res.render('contact.ejs');
});

app.get('/news',function(req,res){
res.render('news.ejs');
});

// app.listen(3001, process.env.IP, function() {
// app.listen(3001, process.env.IP, function() {
var portSettings = process.env.PORT
// var portSettings = 8080;
// var portSettings = process.env.PORT
var portSettings = 3030;

app.listen(portSettings, process.env.IP, function() {
var appConsoleMsg = 'Hemsidan startad: ';
Expand Down
127 changes: 127 additions & 0 deletions views/contact.ejs
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
<% include ./partials/cssLinks %>
<%include ./partials/header %>
<link href="css/contact.css" rel="stylesheet">
<section id="contact">
<!-- TEST CONTACT -->
<div class="container">
<div class="row">
<div class="col-md-4">
<div class="card">
<div class="card-header">
<h2>
<strong>Adress & Fakturaadress</strong>
</h2>
</div>
<div>
<div class="card-body bg-grey">
Brandeye Sales & Partner
<br> Ladugatan 13
<br> 25448 Helsingborg
</div>
</div>
<div id="map1" class="map">
</div>
</div>
</div>
<div class="col-md-4">
<div class="card">
<div class="card-header">
<h2>
<strong>Kontakta oss</strong>
</h2>
</div>
<div class="card-body">
<p class="mb-5">Vid frågor om våra produkter och eventuella kontakter, hör av er till oss genom mail eller telefon. Vi svarar
på alla frågor!
<div class="ml-auto text-center">
<a href="tel:+46739173488">
<i class="fa fa-phone fa-3x mb-3 sr-contact"></i>
</a>
<br>
<!-- <p>+46 (0)73 917 3488</p> -->
<a href="tel:+46739173488">+46 (0)73 917 3488</a>
<br>
<hr>
</div>
<div class="mr-auto text-center">
<a href="mailto:[email protected]">
<i class="fa fa-envelope-o fa-3x mb-3 sr-contact"></i>
</a>
<p>
<a href="mailto:[email protected]">Henrik Mauritzon</a>
</p>
</div>
</div>
</div>
</div>
<div class="col-md-4">
<div class="card">
<div class="card-header">
<h2>
<strong>Teamet</strong>
</h2>
</div>
<div class="card-body">
<p class="mb-5">
<div class=" text-center">
<img id="henrik" src="img/henrik.jpg" alt="Henrik" srcset="">
<hr>
<p class="mb-5">VD och grundare </p>
</div>
</div>
</div>
</div>
</div>
</div>
</section>
<style>
.map {
min-width: 300px;
min-height: 300px;
width: 100%;
height: 100%;
}
.header {
background-color: #F5F5F5;
color: #36A0FF;
height: 70px;
font-size: 27px;
padding: 10px;
}
</style>
<!-- Bootstrap core JavaScript -->
<script src="vendor/jquery/jquery.min.js"></script>
<script src="vendor/bootstrap/js/bootstrap.bundle.min.js"></script>

<!-- Plugin JavaScript -->
<script src="vendor/jquery-easing/jquery.easing.min.js"></script>
<script src="vendor/scrollreveal/scrollreveal.min.js"></script>
<script src="vendor/magnific-popup/jquery.magnific-popup.min.js"></script>

<!-- Custom scripts for this template -->
<script src="js/creative.min.js"></script>

<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
<script src="js/map.js"></script>
<script type="text/javascript">
jQuery(function ($) {
function init_map1() {
var myLocation = new google.maps.LatLng(56.0813249, 12.7021321);
var mapOptions = {
center: myLocation,
zoom: 16
};
var marker = new google.maps.Marker({
position: myLocation,
title: "Property Location"
});
var map = new google.maps.Map(document.getElementById("map1"),
mapOptions);
marker.setMap(map);
}
init_map1();
});
</script>

<%include ./partials/footer %>
147 changes: 147 additions & 0 deletions views/css/contact.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
body,
html {
width: 100%;
height: 100%;
}

body {
font-family: 'Merriweather', 'Helvetica Neue', Arial, sans-serif;
}

hr {
max-width: 50px;
border-width: 3px;
border-color: #F05F40;
}

hr.light {
border-color: #fff;
}

a {
color: #F05F40;
-webkit-transition: all 0.2s;
-moz-transition: all 0.2s;
transition: all 0.2s;
}

a:hover {
color: #f05f40;
}

h1,
h2,
h3,
h4,
h5,
h6 {
font-family: 'Open Sans', 'Helvetica Neue', Arial, sans-serif;
}

.bg-primary {
background-color: #F05F40 !important;
}

.bg-dark {
background-color: #212529 !important;
}

.text-faded {
color: rgba(255, 255, 255, 0.7);
}

section {
padding: 8rem 0;
}


#mainNav {
border-bottom: 1px solid rgba(33, 37, 41, 0.1);
background-color: #fff;
font-family: 'Open Sans', 'Helvetica Neue', Arial, sans-serif;
-webkit-transition: all 0.2s;
-moz-transition: all 0.2s;
transition: all 0.2s;
}

#mainNav .navbar-brand {
font-weight: 700;
text-transform: uppercase;
color: #F05F40;
font-family: 'Open Sans', 'Helvetica Neue', Arial, sans-serif;
}

#mainNav .navbar-brand:focus, #mainNav .navbar-brand:hover {
color: #f05f40;
}

#mainNav .navbar-nav > li.nav-item > a.nav-link,
#mainNav .navbar-nav > li.nav-item > a.nav-link:focus {
font-size: .9rem;
font-weight: 700;
text-transform: uppercase;
color: #212529;
}

#mainNav .navbar-nav > li.nav-item > a.nav-link:hover,
#mainNav .navbar-nav > li.nav-item > a.nav-link:focus:hover {
color: #F05F40;
}

#mainNav .navbar-nav > li.nav-item > a.nav-link.active,
#mainNav .navbar-nav > li.nav-item > a.nav-link:focus.active {
color: #F05F40 !important;
background-color: transparent;
}

#mainNav .navbar-nav > li.nav-item > a.nav-link.active:hover,
#mainNav .navbar-nav > li.nav-item > a.nav-link:focus.active:hover {
background-color: transparent;
}

.text-primary {
color: #F05F40 !important;
}

#mainNav .navbar-nav > li.nav-item > a.nav-link {
padding: 0.5rem 1rem;
}

.btn {
font-weight: 700;
text-transform: uppercase;
border: none;
border-radius: 300px;
font-family: 'Open Sans', 'Helvetica Neue', Arial, sans-serif;
}

.btn-xl {
padding: 1rem 2rem;
}

.btn-primary {
background-color: #F05F40;
border-color: #F05F40;
}

.btn-primary:hover, .btn-primary:focus, .btn-primary:active {
color: #fff;
background-color: #ee4b28 !important;
}

.btn-primary:active, .btn-primary:focus {
box-shadow: 0 0 0 0.2rem rgba(240, 95, 64, 0.5) !important;
}

a {
color: black;
-webkit-transition: all 0.2s;
-moz-transition: all 0.2s;
transition: all 0.2s;
text-decoration: none;
}

#henrik {
border-radius: 50%;
width: 50%;
}
9 changes: 9 additions & 0 deletions views/css/news.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
footer {
position: absolute;
left: 0;
bottom: 0;
width: 100%;
background-color: red;
color: white;
text-align: center;
}
37 changes: 30 additions & 7 deletions views/css/slider.css
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,17 @@ h6 {
}

section {
padding: 8rem 0;
padding: 4rem 0;
}


#mainNav {
border-bottom: 1px solid rgba(33, 37, 41, 0.1);
background-color: #fff;
font-family: 'Open Sans', 'Helvetica Neue', Arial, sans-serif;
-webkit-transition: all 0.2s;
-moz-transition: all 0.2s;
transition: all 0.2s;
position: fixed;
}

#mainNav .navbar-brand {
Expand Down Expand Up @@ -94,11 +94,6 @@ section {
background-color: transparent;
}

#mainNav .navbar-nav > li.nav-item > a.nav-link.active:hover,
#mainNav .navbar-nav > li.nav-item > a.nav-link:focus.active:hover {
background-color: transparent;
}

.text-primary {
color: #F05F40 !important;
}
Expand Down Expand Up @@ -152,3 +147,31 @@ section {
opacity: 50%;
min-width: 100px;
}

.carousel-caption {
top: 0;
bottom: auto;
}

body {
padding-top: 55px;
}

html, body {
min-height: 100%;
}

footer {
/* position: absolute; */
/* left: 0; */
/* bottom: 0; */
width: 100%;
background-color: red;
color: white;
text-align: center;
}

.fb-page {
margin: 0 auto;

}
Binary file removed views/img/IMG_9933.jpg
Binary file not shown.
Binary file removed views/img/IMG_9966.jpg
Binary file not shown.
Binary file removed views/img/IMG_9999.jpg
Binary file not shown.
Binary file added views/img/henrik.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit b41806c

Please sign in to comment.