diff --git a/src/app/app.firebaseconfig.ts b/src/app/app.firebaseconfig.ts index d8da0cfa..ce7afb15 100644 --- a/src/app/app.firebaseconfig.ts +++ b/src/app/app.firebaseconfig.ts @@ -1,19 +1,19 @@ //using the Implemented Database -export var config = { - apiKey: "AIzaSyC_FMJcswceJB7ZYlzaRwKW1ij7kn8K6w4", - authDomain: "myapp-93470.firebaseapp.com", - databaseURL: "https://myapp-93470.firebaseio.com", - projectId: "myapp-93470", - storageBucket: "myapp-93470.appspot.com", - messagingSenderId: "412208839835" - }; - -//using the Test Database //export var config = { -// apiKey: "AIzaSyAQD8TaZnXghoRbTE-7_b9LWBK4g3T6hUQ", -// authDomain: "dynamics1app.firebaseapp.com", -// databaseURL: "https://dynamics1app.firebaseio.com", -// projectId: "dynamics1app", -// storageBucket: "dynamics1app.appspot.com", -// messagingSenderId: "365540790494" +// apiKey: "AIzaSyC_FMJcswceJB7ZYlzaRwKW1ij7kn8K6w4", +// authDomain: "myapp-93470.firebaseapp.com", +// databaseURL: "https://myapp-93470.firebaseio.com", +// projectId: "myapp-93470", +// storageBucket: "myapp-93470.appspot.com", +// messagingSenderId: "412208839835" // }; + +//using the Test Database +export var config = { + apiKey: "AIzaSyAQD8TaZnXghoRbTE-7_b9LWBK4g3T6hUQ", + authDomain: "dynamics1app.firebaseapp.com", + databaseURL: "https://dynamics1app.firebaseio.com", + projectId: "dynamics1app", + storageBucket: "dynamics1app.appspot.com", + messagingSenderId: "365540790494" + }; diff --git a/src/app/app.scss b/src/app/app.scss index 1392a6e2..dd11af66 100644 --- a/src/app/app.scss +++ b/src/app/app.scss @@ -14,3 +14,13 @@ // To declare rules for a specific mode, create a child rule // for the .md, .ios, or .wp mode classes. The mode class is // automatically applied to the element in the app. + +ion-label{ + white-space:normal !important; +} + +.alert-md .alert-radio-label, +.alert-ios .alert-radio-label +{ + white-space:normal !important; +} diff --git a/src/pages/comments/comments.html b/src/pages/comments/comments.html index 67589ee1..97071ce6 100644 --- a/src/pages/comments/comments.html +++ b/src/pages/comments/comments.html @@ -26,7 +26,7 @@ - + @@ -40,7 +40,7 @@ Student who posted {{ ago(comment.data().created.toDate()) }} ago

{{ comment.data().text }}

- + @@ -49,7 +49,7 @@ Helpful Student {{ ago(comment.data().created.toDate()) }} ago

{{ comment.data().text }}

- + @@ -58,7 +58,7 @@ {{ comment.data().owner_name }} - Tutor {{ ago(comment.data().created.toDate()) }} ago

{{ comment.data().text }}

- + @@ -68,7 +68,7 @@ Me {{ ago(comment.data().created.toDate()) }} ago

{{ comment.data().text }}

- + @@ -81,11 +81,12 @@ - - - - - +
+ + +
|| Private Policy

@@ -154,7 +157,5 @@ -

|| Private Policy

+ diff --git a/src/pages/feed/feed.ts b/src/pages/feed/feed.ts index 0323de52..f6755cd8 100644 --- a/src/pages/feed/feed.ts +++ b/src/pages/feed/feed.ts @@ -469,7 +469,6 @@ PostSure(){ ViewPhoto(url: string) { - //this.image = this.photoViewer.show(url, '', {share: true}); } @@ -683,6 +682,12 @@ settings(post){ const actionSheet = this.actionSheetCtrl.create({ title: 'Post Settings', buttons: [ + { + text: 'View Comments', + handler: () => { + this.comment(post); + } + }, { text: 'Edit Post', handler: () => { @@ -718,7 +723,8 @@ deletePost(post){ removePhoto() { //very ugly way of doing it, because text erased. - this.appCtrl.getRootNav().setRoot(FeedPage); - console.log('remove Pic') + //this.appCtrl.getRootNav().setRoot(FeedPage); + this.image=null; + console.log('remove FeedPic') } } diff --git a/src/pages/login/login.html b/src/pages/login/login.html index 196f6116..bfe7ff0d 100644 --- a/src/pages/login/login.html +++ b/src/pages/login/login.html @@ -13,6 +13,7 @@

Dynamics App

+
Learning Support for MEC2023S
@@ -36,11 +37,11 @@

Dynamics App

--> - - diff --git a/src/pages/login/login.scss b/src/pages/login/login.scss index 69cc4b76..ded784db 100644 --- a/src/pages/login/login.scss +++ b/src/pages/login/login.scss @@ -12,8 +12,8 @@ page-login { .logo{ font-size: 25vh; - margin-top: 5px; - margin-bottom: 10px; + margin-top: 0px; + margin-bottom: 0px; } h1, h6 { @@ -21,7 +21,7 @@ page-login { font-size: 1em; } - .button { + .but { font-size: 15px; } diff --git a/src/pages/passwordreset/passwordreset.html b/src/pages/passwordreset/passwordreset.html index 6f7ac7dd..6ff3ce4e 100644 --- a/src/pages/passwordreset/passwordreset.html +++ b/src/pages/passwordreset/passwordreset.html @@ -32,7 +32,7 @@

Password Reset