Skip to content
This repository has been archived by the owner on Oct 1, 2020. It is now read-only.

Commit

Permalink
show images over http
Browse files Browse the repository at this point in the history
  • Loading branch information
@seiyria
seiyria committed Oct 15, 2016
1 parent 755a104 commit a1006ea
Show file tree
Hide file tree
Showing 8 changed files with 112 additions and 104 deletions.
193 changes: 98 additions & 95 deletions config.xml
View file
@@ -1,96 +1,99 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<widget id="events.tabletop.app" version="0.0.1" android-versionCode="1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Tabletop.Events</name>
<description>An app for tabletop.events.</description>
<author email="kyle@wickedwebwizardry.com" href="http://wickedwebwizardry.com/">Wicked Web Wizardry</author>
<content src="index.html"/>
<access origin="*" subdomains="true"/>
<allow-intent href="http://*/*"/>
<allow-intent href="https://*/*"/>
<allow-intent href="tel:*"/>
<allow-intent href="sms:*"/>
<allow-intent href="mailto:*"/>
<allow-intent href="geo:*"/>
<platform name="android">
<allow-intent href="market:*"/>
<icon src="resources/android/icon/drawable-ldpi-icon.png" density="ldpi"/>
<icon src="resources/android/icon/drawable-mdpi-icon.png" density="mdpi"/>
<icon src="resources/android/icon/drawable-hdpi-icon.png" density="hdpi"/>
<icon src="resources/android/icon/drawable-xhdpi-icon.png" density="xhdpi"/>
<icon src="resources/android/icon/drawable-xxhdpi-icon.png" density="xxhdpi"/>
<icon src="resources/android/icon/drawable-xxxhdpi-icon.png" density="xxxhdpi"/>
<splash src="resources/android/splash/drawable-land-ldpi-screen.png" density="land-ldpi"/>
<splash src="resources/android/splash/drawable-land-mdpi-screen.png" density="land-mdpi"/>
<splash src="resources/android/splash/drawable-land-hdpi-screen.png" density="land-hdpi"/>
<splash src="resources/android/splash/drawable-land-xhdpi-screen.png" density="land-xhdpi"/>
<splash src="resources/android/splash/drawable-land-xxhdpi-screen.png" density="land-xxhdpi"/>
<splash src="resources/android/splash/drawable-land-xxxhdpi-screen.png" density="land-xxxhdpi"/>
<splash src="resources/android/splash/drawable-port-ldpi-screen.png" density="port-ldpi"/>
<splash src="resources/android/splash/drawable-port-mdpi-screen.png" density="port-mdpi"/>
<splash src="resources/android/splash/drawable-port-hdpi-screen.png" density="port-hdpi"/>
<splash src="resources/android/splash/drawable-port-xhdpi-screen.png" density="port-xhdpi"/>
<splash src="resources/android/splash/drawable-port-xxhdpi-screen.png" density="port-xxhdpi"/>
<splash src="resources/android/splash/drawable-port-xxxhdpi-screen.png" density="port-xxxhdpi"/>
</platform>
<platform name="ios">
<allow-intent href="itms:*"/>
<allow-intent href="itms-apps:*"/>
<icon src="resources/ios/icon/icon.png" width="57" height="57"/>
<icon src="resources/ios/icon/icon@2x.png" width="114" height="114"/>
<icon src="resources/ios/icon/icon-40.png" width="40" height="40"/>
<icon src="resources/ios/icon/icon-40@2x.png" width="80" height="80"/>
<icon src="resources/ios/icon/icon-40@3x.png" width="120" height="120"/>
<icon src="resources/ios/icon/icon-50.png" width="50" height="50"/>
<icon src="resources/ios/icon/icon-50@2x.png" width="100" height="100"/>
<icon src="resources/ios/icon/icon-60.png" width="60" height="60"/>
<icon src="resources/ios/icon/icon-60@2x.png" width="120" height="120"/>
<icon src="resources/ios/icon/icon-60@3x.png" width="180" height="180"/>
<icon src="resources/ios/icon/icon-72.png" width="72" height="72"/>
<icon src="resources/ios/icon/icon-72@2x.png" width="144" height="144"/>
<icon src="resources/ios/icon/icon-76.png" width="76" height="76"/>
<icon src="resources/ios/icon/icon-76@2x.png" width="152" height="152"/>
<icon src="resources/ios/icon/icon-83.5@2x.png" width="167" height="167"/>
<icon src="resources/ios/icon/icon-small.png" width="29" height="29"/>
<icon src="resources/ios/icon/icon-small@2x.png" width="58" height="58"/>
<icon src="resources/ios/icon/icon-small@3x.png" width="87" height="87"/>
<splash src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" height="1136"/>
<splash src="resources/ios/splash/Default-667h.png" width="750" height="1334"/>
<splash src="resources/ios/splash/Default-Landscape-736h.png" width="2208" height="1242"/>
<splash src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" height="1536"/>
<splash src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" height="768"/>
<splash src="resources/ios/splash/Default-Portrait~ipad.png" width="768" height="1024"/>
<splash src="resources/ios/splash/Default@2x~iphone.png" width="640" height="960"/>
<splash src="resources/ios/splash/Default~iphone.png" width="320" height="480"/>
</platform>
<platform name="wp8">
<icon src="resources/wp8/icon/ApplicationIcon.png" width="99" height="99"/>
<icon src="resources/wp8/icon/Background.png" width="159" height="159"/>
<splash src="resources/wp8/splash/SplashScreenImage.png" width="768" height="1280"/>
</platform>
<preference name="android-minSdkVersion" value="14"/>
<preference name="android-targetSdkVersion" value="23"/>
<preference name="webviewbounce" value="false"/>
<preference name="UIWebViewBounce" value="false"/>
<preference name="DisallowOverscroll" value="true"/>
<preference name="android-minSdkVersion" value="16"/>
<preference name="BackupWebStorage" value="none"/>
<preference name="SplashScreenDelay" value="0"/>
<preference name="FadeSplashScreen" value="false"/>
<preference name="FadeSplashScreenDuration" value="0"/>
<preference name="SplashScreenBackgroundColor" value="0xFFFFFFFF"/>
<preference name="SplashScreen" value="screen"/>
<preference name="AllowInlineMediaPlayback" value="true"/>
<feature name="StatusBar">
<param name="ios-package" onload="true" value="CDVStatusBar"/>
</feature>
<plugin name="cordova-plugin-device" spec="~1.1.3"/>
<plugin name="cordova-plugin-console" spec="~1.0.4"/>
<plugin name="cordova-plugin-whitelist" spec="~1.3.0"/>
<plugin name="cordova-plugin-splashscreen" spec="~4.0.0"/>
<plugin name="cordova-plugin-statusbar" spec="~2.2.0"/>
<plugin name="ionic-plugin-keyboard" spec="~2.2.1"/>
<plugin name="phonegap-plugin-push" spec="~1.8.3">
<variable name="SENDER_ID" value="296816125466"/>
</plugin>
<icon src="resources/android/icon/drawable-xhdpi-icon.png"/>
<?xml version='1.0' encoding='utf-8'?>
<widget android-versionCode="1" id="events.tabletop.app" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Tabletop.Events</name>
<description>An app for tabletop.events.</description>
<author email="kyle@wickedwebwizardry.com" href="http://wickedwebwizardry.com/">Wicked Web Wizardry</author>
<content src="index.html" />
<access origin="*" subdomains="true" />
<allow-intent href="http://*/*" />
<allow-intent href="https://*/*" />
<allow-intent href="tel:*" />
<allow-intent href="sms:*" />
<allow-intent href="mailto:*" />
<allow-intent href="geo:*" />
<allow-navigation href="*://s3.amazonaws.com/*" />
<platform name="android">
<allow-intent href="market:*" />
<icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
<icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" />
<icon density="hdpi" src="resources/android/icon/drawable-hdpi-icon.png" />
<icon density="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png" />
<icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png" />
<icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
<splash density="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png" />
<splash density="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png" />
<splash density="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png" />
<splash density="land-xhdpi" src="resources/android/splash/drawable-land-xhdpi-screen.png" />
<splash density="land-xxhdpi" src="resources/android/splash/drawable-land-xxhdpi-screen.png" />
<splash density="land-xxxhdpi" src="resources/android/splash/drawable-land-xxxhdpi-screen.png" />
<splash density="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.png" />
<splash density="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.png" />
<splash density="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.png" />
<splash density="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png" />
<splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png" />
<splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
</platform>
<platform name="ios">
<allow-intent href="itms:*" />
<allow-intent href="itms-apps:*" />
<icon height="57" src="resources/ios/icon/icon.png" width="57" />
<icon height="114" src="resources/ios/icon/icon@2x.png" width="114" />
<icon height="40" src="resources/ios/icon/icon-40.png" width="40" />
<icon height="80" src="resources/ios/icon/icon-40@2x.png" width="80" />
<icon height="120" src="resources/ios/icon/icon-40@3x.png" width="120" />
<icon height="50" src="resources/ios/icon/icon-50.png" width="50" />
<icon height="100" src="resources/ios/icon/icon-50@2x.png" width="100" />
<icon height="60" src="resources/ios/icon/icon-60.png" width="60" />
<icon height="120" src="resources/ios/icon/icon-60@2x.png" width="120" />
<icon height="180" src="resources/ios/icon/icon-60@3x.png" width="180" />
<icon height="72" src="resources/ios/icon/icon-72.png" width="72" />
<icon height="144" src="resources/ios/icon/icon-72@2x.png" width="144" />
<icon height="76" src="resources/ios/icon/icon-76.png" width="76" />
<icon height="152" src="resources/ios/icon/icon-76@2x.png" width="152" />
<icon height="167" src="resources/ios/icon/icon-83.5@2x.png" width="167" />
<icon height="29" src="resources/ios/icon/icon-small.png" width="29" />
<icon height="58" src="resources/ios/icon/icon-small@2x.png" width="58" />
<icon height="87" src="resources/ios/icon/icon-small@3x.png" width="87" />
<splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" />
<splash height="1334" src="resources/ios/splash/Default-667h.png" width="750" />
<splash height="1242" src="resources/ios/splash/Default-Landscape-736h.png" width="2208" />
<splash height="1536" src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" />
<splash height="768" src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" />
<splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768" />
<splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640" />
<splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
</platform>
<platform name="wp8">
<icon height="99" src="resources/wp8/icon/ApplicationIcon.png" width="99" />
<icon height="159" src="resources/wp8/icon/Background.png" width="159" />
<splash height="1280" src="resources/wp8/splash/SplashScreenImage.png" width="768" />
</platform>
<preference name="android-minSdkVersion" value="14" />
<preference name="android-targetSdkVersion" value="23" />
<preference name="webviewbounce" value="false" />
<preference name="UIWebViewBounce" value="false" />
<preference name="DisallowOverscroll" value="true" />
<preference name="android-minSdkVersion" value="16" />
<preference name="BackupWebStorage" value="none" />
<preference name="SplashScreenDelay" value="0" />
<preference name="FadeSplashScreen" value="false" />
<preference name="FadeSplashScreenDuration" value="0" />
<preference name="SplashScreenBackgroundColor" value="0xFFFFFFFF" />
<preference name="SplashScreen" value="screen" />
<preference name="AllowInlineMediaPlayback" value="true" />
<preference name="RecentsBackgroundColor" value="#00aeed" />
<feature name="StatusBar">
<param name="ios-package" onload="true" value="CDVStatusBar" />
</feature>
<plugin name="cordova-plugin-device" spec="~1.1.3" />
<plugin name="cordova-plugin-console" spec="~1.0.4" />
<plugin name="cordova-plugin-whitelist" spec="~1.3.0" />
<plugin name="cordova-plugin-splashscreen" spec="~4.0.0" />
<plugin name="cordova-plugin-statusbar" spec="~2.2.0" />
<plugin name="cordova-plugin-recentscontrol" spec="~1.1.0" />
<plugin name="ionic-plugin-keyboard" spec="~2.2.1" />
<plugin name="phonegap-plugin-push" spec="~1.8.3">
<variable name="SENDER_ID" value="296816125466" />
</plugin>
<icon src="resources/android/icon/drawable-xhdpi-icon.png" />
</widget>
4 changes: 3 additions & 1 deletion package.json
View file
Expand Up @@ -32,6 +32,7 @@
"cordova-plugin-whitelist",
"cordova-plugin-splashscreen",
"cordova-plugin-statusbar",
"cordova-plugin-recentscontrol",
"ionic-plugin-keyboard"
],
"cordovaPlatforms": [
Expand All @@ -40,6 +41,7 @@
"platform": "ios",
"version": "",
"locator": "ios"
}
},
"android"
]
}
7 changes: 4 additions & 3 deletions src/app/app.component.ts
View file
Expand Up @@ -10,6 +10,8 @@ import { AppState } from './services/appstate';

const MAX_ITEMS = 100;

declare var cordova: any;

@Component({
templateUrl: 'app.html'
})
Expand All @@ -21,7 +23,7 @@ export class MyApp {
conMenu: ConventionModel | any;

pages: Array<{title: string, component: any}>;
conPages: Array<{title: string, show?: (ConventionModel) => boolean|number, badge?: (ConventionModel) => number}>;
conPages: Array<{title: string, show?: (ConventionModel) => boolean|number, badge?: (ConventionModel) => string}>;

constructor(
public platform: Platform,
Expand Down Expand Up @@ -69,7 +71,7 @@ export class MyApp {

initializeApp() {
this.platform.ready().then(() => {
if(!window.cordova) return;
if(!cordova) return;

this.platform.registerBackButtonAction(() => {
if(!this.nav.canGoBack()) return;
Expand All @@ -91,7 +93,6 @@ export class MyApp {
});
alert.present();
});

});
}

Expand Down
2 changes: 1 addition & 1 deletion src/app/services/api.ts
View file
Expand Up @@ -130,7 +130,7 @@ export class API {
});
}

singleConventionPrototypeDetailsImages(prototypeId: string) : Promise<any> {
singleConventionPrototypeDetailsImages(prototypeId: string) : Observable<any> {
return this.http.get(`${this.baseUrl}/prototype/${prototypeId}/images?_items_per_page=100&_order_by=date_updated`)
.map((res:Response) => res.json())
.catch((error:any) => Observable.throw(error.json().error || 'Server error'));
Expand Down
4 changes: 3 additions & 1 deletion src/index.html
View file
Expand Up @@ -6,11 +6,13 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
<meta name="format-detection" content="telephone=no">
<meta name="msapplication-tap-highlight" content="no">
<meta http-equiv="Content-Security-Policy" content="font-src 'self' data:;img-src * data:; default-src * 'unsafe-eval' 'unsafe-inline'">
<meta http-equiv="Content-Security-Policy" content="font-src 'self' data:; img-src * data: s3.amazonaws.com; default-src * 'unsafe-eval' 'unsafe-inline'">

<link rel="icon" type="image/x-icon" href="assets/icon/favicon.ico">
<link rel="manifest" href="assets/manifest.json">
<meta name="theme-color" content="#00aeed">
<meta name="msapplication-navbutton-color" content="#00aeed">
<meta name="apple-mobile-web-app-status-bar-style" content="#00aeed">

<!-- un-comment this code to enable service worker
<script>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/convention/events/event/event.ts
View file
@@ -1,4 +1,4 @@
import { Component, Input } from '@angular/core';
import { Component } from '@angular/core';
import { DomSanitizer } from '@angular/platform-browser';

import { Event as EventModel, fixEvent } from '../../../../app/models/event';
Expand Down
2 changes: 1 addition & 1 deletion src/pages/convention/prototypes/prototype/prototype.html
View file
Expand Up @@ -61,7 +61,7 @@
<ion-card-header>Pictures</ion-card-header>
<ion-slides [options]="imageSliderOptions">
<ion-slide *ngFor="let image of prototype._images">
<img src="{{image.image_uri}}" />
<img src="http:{{image.image_uri}}" />
</ion-slide>
</ion-slides>
</ion-card>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/convention/prototypes/prototype/prototype.ts
View file
@@ -1,4 +1,4 @@
import { Component, Input } from '@angular/core';
import { Component } from '@angular/core';

import { Prototype as PrototypeModel } from '../../../../app/models/prototype';

Expand Down

0 comments on commit a1006ea

Please sign in to comment.