16,187 WebAppFinal/AdsMasterProj/public/js/d3.js
View file

Large diffs are not rendered by default.

8 WebAppFinal/AdsMasterProj/public/js/d3.min.js
View file

Large diffs are not rendered by default.

20 WebAppFinal/AdsMasterProj/public/modules/homeModule.js
View file
@@ -108,13 +108,17 @@ homeModule.controller('statsCtrl',function ($scope, $filter,ngTableParams, serve
$scope.budgetPieData = [];
$scope.adsPieData = [];
$scope.ownersColors = [];
$scope.colors = ["#1abc9c", "#00b0ff", "#27ae60", "#ff9e80", "#ce93d8", "#f48fb1", "#7e57c2", "#f0f4c3"];
$scope.adsDataSet=[];
$scope.budgetDataSet=[];
$scope.colors = ["#DAF7A6", "#FFC300", "#FF5733", "#C70039", "#900C3F","#581845"];

serverApi.registerListener(serverApi.serverEvent_OwnersDataResponse, function (data) {
$scope.ownersData = data;
$scope.budgetPieData = [];
$scope.adsPieData = [];
$scope.budgetDataSet=[];
$scope.ownersColors = [];
$scope.adsDataSet=[];

$scope.ownersData.forEach(function(owner){
$scope.budgetPieData.push(
@@ -131,9 +135,17 @@ homeModule.controller('statsCtrl',function ($scope, $filter,ngTableParams, serve
{
name: owner.owner,
color: $scope.colors[$scope.ownersColors.length % $scope.colors.length]
}
);

});
$scope.adsDataSet.push(
{
label: owner.owner,
count: owner.count
});
$scope.budgetDataSet.push(
{
label: owner.owner,
count: owner.moneyInvested
});
});

$scope.tableParams.reload();
BIN -33.8 MB WebAppFinal/AdsMasterProj/public/video/Tips.mp4
View file
Binary file not shown.
20 WebAppFinal/AdsMasterProj/public/views/display/DisplayAds.html
View file
@@ -17,22 +17,4 @@ <h4 class="head-text"> {{text.text}} </h4>
<img src="{{image.url}}" width="300" height="300" style="margin:20px">
</div>
</div>
</div>
<!--
<div class="row">
<div class="main-chart">
<div class="col-md-4 mb" style="padding-top: 5px">
<span ng-repeat="text in displayedAd.texts">
<h4 class="head-h"> {{text.text}} </h4>
</span>
</div>
<div ng-repeat="image in displayedAd.images" class="col-md-4 mb">
<div>
<div style="margin-left: 5px; margin-right: 5px;">
<img src="{{image.url}}" width="300" height="300" style="margin:20px">
</div>
</div>
</div>
</div>
</div>
-->
</div>
10 WebAppFinal/AdsMasterProj/public/views/home/AboutUs.html
View file
@@ -1,19 +1,19 @@
<h3 class="head-h"> About Ads With Us!</h3>

<div id="aboutText">
<h4>WHO WE ARE</h4>
<div id="aboutText" class="head-h">
<h4 class="head-l">WHO WE ARE</h4>

We are the Champions <br/>

<h4>WHAT WE DO</h4>
<h4 class="head-l">WHAT WE DO</h4>

A lot of cool staff<br/>

<h4>HOW WE’RE DIFFERENT</h4>
<h4 class="head-l">HOW WE’RE DIFFERENT</h4>

actually.. we are not<br/>

<h4>WHY YOU SHOULD CHOOSE US</h4>
<h4 class="head-l">WHY YOU SHOULD CHOOSE US</h4>

because it's will help us a lot!<br/>
</div>
36 WebAppFinal/AdsMasterProj/public/views/home/ContactUs.html
View file
@@ -1,15 +1,27 @@
<h3 class="head-h"> Contact Us</h3>

<div id="contactText">
<h4>Email</h4>
assaf6654@gmail.com<br/>
orly.gabay25@gmail.com<br/><br/>

<h4>Address</h4>
Holon, israel<br/>
Hod hasharon, israel<br/><br/>

<h4>Phone</h4>
0528849889 - orly<br/>
0509920924 - asaf<br/>
<div id="contactText" class="head-h">
<h4 class="head-l">Us</h4>
Asaf Azar<br/>
Orly Gabay<br/>
Ishai Shor<br/>
Einav Zeira<br/><br/>

<h4 class="head-l">Email</h4>
assaf6654@gmail.com<br/>
orly.gabay25@gmail.com<br/>
ishaish103@gmail.com</br>
einavzeira@gmail.com</br><br/>

<h4 class="head-l">Address</h4>
Hod haSharon, israel<br/>
Holon, israel<br/>
Kiryat Gat, israel<br/>
Rishon leTzion, israel<br/><br/>

<h4 class="head-l">Phone</h4>
0509920924 - Asaf<br/>
0528849889 - Orly<br/>
0543985292 - Ishai<br/>
0542228311 - Einat<br/>
</div>
14 WebAppFinal/AdsMasterProj/public/views/home/Stats.html
View file
@@ -20,24 +20,26 @@ <h4 class="head-h"> Total number of owners is {{ownersData.length}} </h4>
<div hidden class="row charts-content">
<div class="showback">
<span ng-repeat="own in ownersColors" class="badge" style="background: {{own.color}}; margin-left: 10px">{{own.name}}</span>
<input id="ownerColors" type="hidden" value="{{ownersColors}}">
</div><!-- /showback -->

<div class="col-lg-6">
<input id="myHiddenBudgetPie" type="hidden" value="{{budgetPieData}}">
<input id="adsChart" type="hidden" value="{{adsDataSet}}">
<div class="content-panel">
<h4 class="head-h"> Budget Per Owner </h4>
<h4 class="head-h"> Ads Per Owner </h4>
<div class="panel-body text-center">
<canvas id="budgetPie" height="300" width="400"></canvas>
<div id="adsChartPie" height="300" width="400"></div>
</div>
</div>
</div>
<div class="col-lg-6">
<input id="myHiddenAdsPie" type="hidden" value="{{adsPieData}}">
<input id="budgetChart" type="hidden" value="{{budgetDataSet}}">
<div class="content-panel">
<h4 class="head-h"> Ads Per Owner </h4>
<h4 class="head-h"> Budget Per Owner </h4>
<div class="panel-body text-center">
<canvas id="adsPie" height="300" width="400"></canvas>
<div id="budgetChartPie" height="300" width="400"></div>
</div>
</div>
</div>

</div>
2 WebAppFinal/AdsMasterProj/public/views/home/Tips.html
View file
@@ -1,4 +1,4 @@
<h3 class="head-h"><i class="fa fa-circle">What If There Was No Advertising</i></h3>
<h3 class="head-h">What If There Was No Advertising</h3>

<video style="position: absolute; width: 100%; height: 90%" controls>
<source src="../video/What_if_there_was_no_advertising.mp4" type="video/mp4">
2 WebAppFinal/AdsMasterProj/public/views/manage/EditAd.html
View file
@@ -17,8 +17,6 @@ <h3 class="head-h"> Edit Ad </h3>
<label for="usr"> Text 1 : </label> <input type="text" class="form-control" ng-model="ad.texts[0].text" /><br />
<label for="usr"> Text 2 : </label> <input type="text" class="form-control" ng-model="ad.texts[1].text" /><br />
<label for="usr"> Text 3 : </label> <input type="text" class="form-control" ng-model="ad.texts[2].text" /><br />
<label for="usr"> Text 4 : </label> <input type="text" class="form-control" ng-model="ad.texts[3].text" /><br />
<label for="usr"> Text 5 : </label> <input type="text" class="form-control" ng-model="ad.texts[4].text" /><br />
</accordion-group>
<accordion-group heading="Images">
<label for="usr"> Image 1 : </label> <input type="text" class="form-control" ng-model="ad.images[0].url" /><br />
1 WebAppFinal/AdsMasterProj/public/views/manage/ManageIndex.html
View file
@@ -3,6 +3,7 @@ <h3 class="head-h"> Manage Your Ads</h3>
<div class="col-md-12">
<div class="content-panel">
<h4 class="head-h"></i> Managing {{ads.length}} Ads Total </h4>
<h5 class="head-l"><a href="#/manage/createAd/">Create new ad</a></h5>
<hr>
<table ng-table="tableParams" show-filter="true" class="table table-hover my-table">
<!-- Data rows -->
81 WebAppFinal/ads.json
View file
@@ -48,6 +48,33 @@
endDate:"2019-04-30"
}
}

{
stationId: '5',
name: 'NIKE free',
owner: 'Nike',
fields: 'sport',
moneyInvested: 500,
texts: [
{
text: 'NIKE Free'
},
{
text: 'free yourself'
}
],
images: [
{
url: 'https://s-media-cache-ak0.pinimg.com/236x/5b/27/68/5b276841706f2c156a3a33fd4cad019f.jpg'
}
],
timeFrame:
{
startDate:"2014-03-01",
endDate:"2019-04-30"
}
}

{
stationId: '3',
name: 'adidas',
@@ -98,7 +125,7 @@
}
{
stationId: '3',
name: 'SAMSUNG',
name: 'GALAXY S3',
owner: 'SAMSUNG',
fields:'phones',
moneyInvested: 450,
@@ -120,6 +147,58 @@
endDate:"2017-04-30"
}
}

{
stationId: '3',
name: 'Gear S2',
owner: 'SAMSUNG',
fields:'watches',
moneyInvested: 450,
texts: [
{
text: 'SAMSUNG'
},
{
text: 'Gear S2'
}
],
images: [
{
url: 'http://www.gadgety.co.il/wp-content/themes/main/thumbs/2015/09/Samsung-Gear-S2-21.jpg'
}
],
timeFrame:{
startDate:"2014-03-01",
endDate:"2015-04-30"
}
}

{
stationId: '6',
name: 'GALAXY S6',
owner: 'SAMSUNG',
fields:'phones',
moneyInvested: 450,
texts: [
{
text: 'SAMSUNG'
},
{
text: 'GALAXY S6'
}
],
images: [
{
url: 'http://www.gadgetdeals.co.il/UploadImages/000719/4325504.JPG'
}
],
timeFrame:{
startDate:"2014-03-01",
endDate:"2018-04-30"
}
}


{
stationId: '1',
name: 'PANDORA',