arnaucube
/
openEventsPlatformApp
mirror of https://github.com/arnaucube/openEventsPlatformApp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

main updated, new sections added to the app, layout of events updated

master
arnaucode 7 years ago
parent
65f69551d0
commit
21ef03b997
9 changed files with 191 additions and 22 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +128
    -0
      www/css/colors.css
  2. +8
    -1
      www/css/style.css
  3. +3
    -3
      www/js/app.js
  4. +1
    -1
      www/templates/event.html
  5. +24
    -6
      www/templates/events.html
  6. +14
    -7
      www/templates/main.html
  7. +10
    -1
      www/templates/menu.html
  8. +2
    -2
      www/templates/user.html
  9. +1
    -1
      www/templates/users.html

+ 128
- 0
www/css/colors.css
View File

@ -129,6 +129,91 @@
color: #3F51B5!important; color: #3F51B5!important;
} }
/* blue */
.c_blue50{
background: #E3F2FD;
color: #000000;
}
.c_blue100{
background: #BBDEFB;
color: #000000;
}
.c_blue200{
background: #90CAF9;
color: #000000;
}
.c_blue300{
background: #64B5F6;
color: #ffffff;
}
.c_blue400{
background: #42A5F5;
color: #ffffff;
}
.c_blue500{
background: #2196F3;
color: #ffffff;
}
.c_blue600{
background: #1E88E5;
color: #ffffff;
}
.c_blue700{
background: #1976D2;
color: #ffffff;
}
.c_blue800{
background: #1565C0;
color: #ffffff;
}
.c_blue900{
background: #0D47A1;
color: #ffffff;
}
/* cyan */
.c_cyan50{
background: #E0F7FA;
color: #000000;
}
.c_cyan100{
background: #B2EBF2;
color: #000000;
}
.c_cyan200{
background: #80DEEA;
color: #000000;
}
.c_cyan300{
background: #4DD0E1;
color: #ffffff;
}
.c_cyan400{
background: #26C6DA;
color: #ffffff;
}
.c_cyan500{
background: #00BCD4;
color: #ffffff;
}
.c_cyan600{
background: #00ACC1;
color: #ffffff;
}
.c_cyan700{
background: #0097A7;
color: #ffffff;
}
.c_cyan800{
background: #00838F;
color: #ffffff;
}
.c_cyan900{
background: #006064;
color: #ffffff;
}
/* green */ /* green */
.c_green50{ .c_green50{
background: #E8F5E9; background: #E8F5E9;
@ -254,3 +339,46 @@
background: #E65100; background: #E65100;
color: #ffffff; color: #ffffff;
} }
/* blue grey */
.c_blueGrey50{
background: #ECEFF1;
color: #000000;
}
.c_blueGrey100{
background: #CFD8DC;
color: #000000;
}
.c_blueGrey200{
background: #B0BEC5;
color: #000000;
}
.c_blueGrey300{
background: #90A4AE;
color: #ffffff;
}
.c_blueGrey400{
background: #78909C;
color: #ffffff;
}
.c_blueGrey500{
background: #607D8B;
color: #ffffff;
}
.c_blueGrey600{
background: #546E7A;
color: #ffffff;
}
.c_blueGrey700{
background: #455A64;
color: #ffffff;
}
.c_blueGrey800{
background: #37474F;
color: #ffffff;
}
.c_blueGrey900{
background: #263238;
color: #ffffff;
}

+ 8
- 1
www/css/style.css
View File

@ -1,6 +1,6 @@
/* Empty. Add your own CSS if you like */ /* Empty. Add your own CSS if you like */
.o_mainOptionRow{ .o_mainOptionRow{
height: calc(100%/4);
height: calc(103%/4);
display: table; display: table;
padding: 0; padding: 0;
} }
@ -11,3 +11,10 @@
width: 50%; width: 50%;
font-size: 300%; font-size: 300%;
} }
.o_floatRight{
float: right;
}
.o_textRight{
text-align: right;
}

+ 3
- 3
www/js/app.js
View File

@ -1,5 +1,5 @@
//var urlapi = "http://localhost:3000/api/";
var urlapi = "http://192.168.1.35:3000/api/";
var urlapi = "http://localhost:3000/api/";
//var urlapi = "http://192.168.1.35:3000/api/";
@ -89,7 +89,7 @@ angular.module('app', [
}); });
// if none of the above states are matched, use this as the fallback // if none of the above states are matched, use this as the fallback
$urlRouterProvider.otherwise('/app/events');
$urlRouterProvider.otherwise('/app/main');
}) })
/* translator */ /* translator */
.config(['$translateProvider', function($translateProvider) { .config(['$translateProvider', function($translateProvider) {

+ 1
- 1
www/templates/event.html
View File

@ -3,7 +3,7 @@
<a class="item item-avatar" ng-href="#/app/users/{{event.user._id}}"> <a class="item item-avatar" ng-href="#/app/users/{{event.user._id}}">
<img ng-src="{{event.user.img}}"> <img ng-src="{{event.user.img}}">
<h2>{{event.user.username}}</h2> <h2>{{event.user.username}}</h2>
<p>{{event.user.description}}</p>
<p>{{event.user.shortDescription}}</p>
</a> </a>
<div class="item item-image"> <div class="item item-image">
<img ng-src="{{event.img}}"> <img ng-src="{{event.img}}">

+ 24
- 6
www/templates/events.html
View File

@ -1,17 +1,35 @@
<ion-view view-title="Events"> <ion-view view-title="Events">
<ion-content> <ion-content>
<ion-refresher
pulling-text="{{'Pull_to_refresh' | translate}}..."
on-refresh="doRefresh()">
</ion-refresher>
<ion-refresher pulling-text="{{'Pull_to_refresh' | translate}}..." on-refresh="doRefresh()">
</ion-refresher>
<a class="item item-thumbnail-left" href="#/app/events/{{event._id}}"
<!--<a class="item item-thumbnail-left" href="#/app/events/{{event._id}}"
ng-repeat="event in events"> ng-repeat="event in events">
<img ng-src="{{event.img}}"> <img ng-src="{{event.img}}">
<div class="badge item-note">{{event.user.username}}</div> <div class="badge item-note">{{event.user.username}}</div>
<h2>{{event.title}}</h2> <h2>{{event.title}}</h2>
<p>{{event.description}}</p> <p>{{event.description}}</p>
<p>{{event.date | date: 'HH:mm, dd/MM/yyyy'}}</p> <p>{{event.date | date: 'HH:mm, dd/MM/yyyy'}}</p>
</a>
</a>-->
<div ng-repeat="event in events">
<a class="item item-avatar" ng-href="#/app/users/{{event.user._id}}">
<img ng-src="{{event.user.img}}">
<h2>{{event.user.username}}</h2>
<p>{{event.user.shortDescription}}</p>
</a>
<a ng-href="#/app/events/{{event._id}}" class="item item-image">
<img ng-src="{{event.img}}">
<h2>{{event.title}}</h2>
<p>{{event.description}}</p>
<p>{{event.date | date: 'HH:mm, dd/MM/yyyy'}}</p>
<a class="item item-icon-left ct_indigo500" ng-click="share()">
<i class="icon ion-android-share-alt"></i> Share
</a>
<div class="item"></div>
</a>
</div>
</ion-content> </ion-content>
</ion-view> </ion-view>

+ 14
- 7
www/templates/main.html
View File

@ -2,28 +2,35 @@
<ion-content> <ion-content>
<div class="row o_mainOptionRow"> <div class="row o_mainOptionRow">
<a class="col c_pink400" ng-href="#/app/events"> <a class="col c_pink400" ng-href="#/app/events">
<i class="icon ion-calendar"></i>
<i class="icon ion-clipboard"></i><!--events-->
</a> </a>
<a class="col c_indigo400" ng-href="#/app/users"> <a class="col c_indigo400" ng-href="#/app/users">
<i class="icon ion-person-stalker"></i> <i class="icon ion-person-stalker"></i>
</a> </a>
</div> </div>
<div class="row o_mainOptionRow"> <div class="row o_mainOptionRow">
<a class="col c_green400" ng-href="#/app/search">
<i class="icon ion-ios-location"></i>
</a>
<a class="col c_orange400" ng-href="#/app/settings">
<i class="icon ion-ios-color-filter"></i>
<a class="col c_green400" ng-href="#/app/byplace">
<i class="icon ion-ios-location"></i><!--by place-->
</a> </a>
<a class="col c_orange400" ng-href="#/app/bydate">
<i class="icon ion-calendar"></i><!--by date-->
</a>
</div> </div>
<div class="row o_mainOptionRow"> <div class="row o_mainOptionRow">
<a class="col c_yellow600" ng-href="#/app/search"> <a class="col c_yellow600" ng-href="#/app/search">
<i class="icon ion-search"></i> <i class="icon ion-search"></i>
</a> </a>
<a class="col c_cyan400" ng-href="#/app/bycategories">
<i class="icon ion-pound"></i><!--by categories-->
</a>
</div>
<div class="row o_mainOptionRow">
<a class="col c_deepPurple400" ng-href="#/app/settings"> <a class="col c_deepPurple400" ng-href="#/app/settings">
<i class="icon ion-ios-gear"></i> <i class="icon ion-ios-gear"></i>
</a> </a>
<a class="col c_blueGrey300" ng-href="#/app/settings">
<i class="icon ion-code"></i>
</a>
</div> </div>
</ion-content> </ion-content>
</ion-view> </ion-view>

+ 10
- 1
www/templates/menu.html
View File

@ -22,11 +22,20 @@
<i class="icon ion-home"></i> {{'Main' | translate }} <i class="icon ion-home"></i> {{'Main' | translate }}
</a> </a>
<a class="item item-icon-left" menu-close href="#/app/events"> <a class="item item-icon-left" menu-close href="#/app/events">
<i class="icon ion-calendar"></i> Events
<i class="icon ion-clipboard"></i> Events
</a> </a>
<a class="item item-icon-left" menu-close href="#/app/users"> <a class="item item-icon-left" menu-close href="#/app/users">
<i class="icon ion-person-stalker"></i> Users <i class="icon ion-person-stalker"></i> Users
</a> </a>
<a class="item item-icon-left" menu-close href="#/app/events">
<i class="icon ion-pound"></i> By Categories
</a>
<a class="item item-icon-left" menu-close href="#/app/events">
<i class="icon ion-ios-location"></i> By Place
</a>
<a class="item item-icon-left" menu-close href="#/app/events">
<i class="icon ion-calendar"></i> By Date
</a>
<a class="item item-icon-left" menu-close href="#/app/search"> <a class="item item-icon-left" menu-close href="#/app/search">
<i class="icon ion-search"></i> Search <i class="icon ion-search"></i> Search
</a> </a>

+ 2
- 2
www/templates/user.html
View File

@ -8,10 +8,10 @@
</span> </span>
</div> </div>
<h2>{{user.username}}</h2> <h2>{{user.username}}</h2>
<p>{{user.email}}</p>
<p>{{user.shortDescription}}</p>
</div> </div>
<div class="item item-body"> <div class="item item-body">
asdf asdflk jasdfljashd fljkas dflka shdfklasd {{user.description}}
{{user.description}}
</div> </div>
<leaflet width="100%" height="40%" markers="markers" center="center" <leaflet width="100%" height="40%" markers="markers" center="center"

+ 1
- 1
www/templates/users.html
View File

@ -9,7 +9,7 @@
ng-repeat="user in users" type="item-text-wrap" href="#/app/users/{{user._id}}"> ng-repeat="user in users" type="item-text-wrap" href="#/app/users/{{user._id}}">
<img ng-src="{{user.img}}"> <img ng-src="{{user.img}}">
<h2>{{user.username}}</h2> <h2>{{user.username}}</h2>
<p>{{user.email}}</p>
<p>{{user.shortDescription}}</p>
<span class="badge badge-balanced">Following</span> <span class="badge badge-balanced">Following</span>
</ion-item> </ion-item>

Write Preview
Loading…
Cancel
Save