Skip to content

Commit

Permalink
created new directives/ new route path
Browse files Browse the repository at this point in the history
new directives less html
  • Loading branch information
oeloe100 committed Jun 11, 2017
1 parent 3b32b3c commit 6ebed03
Show file tree
Hide file tree
Showing 9 changed files with 255 additions and 109 deletions.
5 changes: 5 additions & 0 deletions public/static/html/dir-html/banner.pug
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<div class="banner_outer bg_opacity">
<div class="banner_middle">
<span class="banner_text"> {{shorty}} </span>
</div>
</div>
1 change: 1 addition & 0 deletions public/static/html/dir-html/csbutton.pug
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<button class="cs4-button" > {{cs4_button}} </button>
12 changes: 12 additions & 0 deletions public/static/html/dir-html/feedback.pug
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<div ng-repeat="index in array" class="fb-wrapper">
<section>
<div class="fb-comment-wrapper">
<span>
<q><em> {{comment}} </em></q>
</span>
</div>
<div class="fb-bottom">
<cite>-Somebody famous</cite>
</div>
</section>
</div>
4 changes: 4 additions & 0 deletions public/static/html/dir-html/section-title.pug
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<h2 class="{{home_welcome_class}} text-center" ng-model="title">
<span style="{{validColours[0]}};" class="p1"> {{v1}} </span>
<span style="{{validColours[1]}};" class="p2"> {{v2}} </span>
</h2>
8 changes: 8 additions & 0 deletions public/static/html/dir-html/showcase.pug
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<th ng-repeat="index in array" class="no_offset w3-animate-right">
<div class="url_container">
<div id="url_{{index}}" class="element_icon icon_alignment"></div>
<span class="element_description"> {{sub_title[index]}}</span>
</div>

<span class="element_text"> {{element_desc}} </span>
</th>
21 changes: 14 additions & 7 deletions public/static/html/home.pug
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<main ng-controller="home_controller">
<h2 class="{{title_model_class}}" ng-model="title">
<span class="p1" >What we</span> <span class="p2">stand for</span>
</h2>

<showcase class="element_container"></showcase>
<section>
<h2 class="{{title_model_class}}" ng-model="title">
<span class="p1">What</span> <span class="p2">matters!</span>
</h2>
<showcase class="element_container"></showcase>
</section>

<section class="banner bg-layer offset" banner-dir></section>
<section ng-controller="banner_controller" class="banner bg-layer offset"></section>

<section class="sc_3 offset" ng-controller="expand_2bottom">
<h2 class="{{title_model_class}}" ng-model="title">
Expand Down Expand Up @@ -93,7 +94,13 @@
<div id="wrapper-absolute" class="xl-indicator" csbutton></div>
</section>

<feedback class="fb-container"></feedback>
<section class="fb-container">
<h2 class="{{title_model_class}}" ng-model="title">
<span style="color:white;" class="p1">Some</span>
<span style="color:#3dff84;" class="p2">feedback</span>
</h2>
<feedback></feedback>
</section>

<!--WW = WORLD WIDE-->
<section class="ww-section">
Expand Down
65 changes: 61 additions & 4 deletions public/static/js/controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,32 @@ function HeaderController($scope){
$scope.banner_info = header_bInfo;
}

//------------------------------------SCROLL DOWN (IN PROGRESS)--------------------------------------\\

function ScrollController($scope, $location, $anchorScroll){
$scope.setScroller = function(){
$location.hash('scroll_anchor');
$anchorScroll();
}
}

//-----------------------------------------ABOUT CONTROLLER------------------------------------------\\

function AboutController($scope){
$scope.title = "About"
$scope.about_welcome_class = "about_title"
}

//-----------------------------------------HOME CONTROLLER-------------------------------------------\\

function HomeController($scope){
$scope.placeHolder = pc;

$scope.shorty = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula egetdolor. Aenean massa.";

$scope.title_model_class = 'welcome_center';
}

//---------------------------------SWITCH MOBILE/TABLET > DESKTOP------------------------------------\\

function SetResponsiveWindow($window, $rootScope){
//set window innerwidth at page load
$rootScope.windowWidth = window.innerWidth / 2;
Expand All @@ -37,7 +43,6 @@ function SetResponsiveWindow($window, $rootScope){
});
}


function MakeResponsive($rootScope){
if (window.innerWidth <= 720){
$rootScope.isResponsive = true;
Expand All @@ -46,12 +51,16 @@ function MakeResponsive($rootScope){
}
}

//----------------------------------EXPAND NAV WHILE RESPONSIVE--------------------------------------\\

function ClickRegister($scope){
$scope.open_nav = function(){
$scope.isNative = !$scope.isNative;
}
}

//-----------------------------EXPAND ANIMATION CONTROLLER PROPERTIES--------------------------------\\

function Expand($scope, $element){
var el_controller = $element;

Expand All @@ -68,6 +77,8 @@ function Expand($scope, $element){
};
}

//------------------------------------SET PORTFOLIO PROPERTIES---------------------------------------\\

function PH($scope, $element){
var el = $element;
var el_banner = angular.element(el).find('div')[2];
Expand All @@ -87,4 +98,50 @@ function PH($scope, $element){
angular.element(el_banner).
addClass('pi_inner_banner_'+v+'');
};
}
}

//--------------------------------------SET BANNER PROPERTIES----------------------------------------\\

function SetBannerHTML($scope, $compile, $element, _HTML){
_HTML.then(function(data){
$scope.data = data;

var el = $element[0];
var appender = $compile($scope.data)($scope);
el.append(appender[0]);
});
}

//-------------------------------------SET SHOWCASE PROPERTIES---------------------------------------\\

function SetShowcaseLength(){
return 5;
}

function ShowcaseURL(){
return 'showcase.pug';
}

function IsXL(){
return true;
}

function Subtitle_collection(){
return ['', 'Innovation', 'Clean Code', 'Great Service', 'Using the latest techniques'];
}

//-------------------------------------SET FEEDBACK PROPERTIES---------------------------------------\\

function SetFeedbackLength(){
return 4;
}

function FeedbackURL(){
return 'feedback.pug';
}

//-----------------------------------------FOR LATER USE---------------------------------------------\\

/*function ColourCollection(){
return ['color:#d86c56;', 'color:#3d4154;', 'color:white;'];
}*/
Loading

0 comments on commit 6ebed03

Please sign in to comment.