diff --git a/app/Home.js b/app/Home.js index c833dbc..824c65a 100644 --- a/app/Home.js +++ b/app/Home.js @@ -381,6 +381,8 @@ function HomeStack() { function HomeScreen (props) { console.log(props.studentData) + var showStudent = true + if (props.studentData.length==0) {showStudent = false} const iconURI = null //const iconURI = props.studentData.image !== undefined?`data:image/png;charset=utf-8;base64,${props.studentData.image}`:`data:image/png;base64,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`; global.headerHeight = useHeaderHeight(); @@ -461,7 +463,7 @@ function HomeScreen (props) { />} - + {showStudent? {I18n.t('home.SOTW')} @@ -476,7 +478,7 @@ function HomeScreen (props) { - + : } ) } diff --git a/app/StudentWeek.js b/app/StudentWeek.js index 255327d..2476f6e 100644 --- a/app/StudentWeek.js +++ b/app/StudentWeek.js @@ -68,56 +68,64 @@ class StudentWeek extends React.Component { if (this.state.isLoading) { return } else { - console.log(this.state.data[this.state.data.length-1].image) - const iconURI = this.state.data[this.state.data.length-1].image !== undefined?`data:image/png;charset=utf-8;base64,${this.state.data[this.state.data.length-1].image}`:''; - const hobbyText = ({this.state.data[this.state.data.length-1].hobbies}) - const achievementText = ({this.state.data[this.state.data.length-1].achievements}) - const messageText = ({this.state.data[this.state.data.length-1].messages}) - return ( - - - + if (this.state.data.length==0) { + return ( + + No student of the week - {this.state.data[this.state.data.length-1].name} - {I18n.t('student.Grade')} {this.state.data[this.state.data.length-1].grade} - - - - - - - {I18n.t('student.Hobbies')} - {this.state.hobbyExpanded?:} + ) + } else { + console.log(this.state.data[this.state.data.length-1].image) + const iconURI = this.state.data[this.state.data.length-1].image !== undefined?`data:image/png;charset=utf-8;base64,${this.state.data[this.state.data.length-1].image}`:''; + const hobbyText = ({this.state.data[this.state.data.length-1].hobbies}) + const achievementText = ({this.state.data[this.state.data.length-1].achievements}) + const messageText = ({this.state.data[this.state.data.length-1].messages}) + return ( + + + + + {this.state.data[this.state.data.length-1].name} + {I18n.t('student.Grade')} {this.state.data[this.state.data.length-1].grade} + + + + + + + {I18n.t('student.Hobbies')} + {this.state.hobbyExpanded?:} + - - {this.state.hobbyExpanded?hobbyText:<>} - - - - - - {I18n.t('student.Achievements')} - {this.state.achievementExpanded?:} + {this.state.hobbyExpanded?hobbyText:<>} + + + + + + {I18n.t('student.Achievements')} + {this.state.achievementExpanded?:} + - - {this.state.achievementExpanded?achievementText:<>} - - - - - - {I18n.t('student.Messages')} - {this.state.messageExpanded?:} + {this.state.achievementExpanded?achievementText:<>} + + + + + + {I18n.t('student.Messages')} + {this.state.messageExpanded?:} + - - {this.state.messageExpanded?messageText:<>} - + {this.state.messageExpanded?messageText:<>} + + + - - - - ) + + ) + } } } } diff --git a/cms/static/utils.js b/cms/static/utils.js index 34440a4..338e9fa 100644 --- a/cms/static/utils.js +++ b/cms/static/utils.js @@ -3,6 +3,7 @@ function forwardForImage(id, postloc) { console.log("askldjf"); let form_elem = document.getElementById(id).children; let data = []; + var base64="" for (i = 0; i < form_elem.length; i++) { console.log(form_elem[i]); if (form_elem[i].type == "text") { @@ -12,20 +13,36 @@ function forwardForImage(id, postloc) { data.push(form_elem[i].name + "=" + encodeURIComponent(form_elem[i].value)); } if (form_elem[i].type == "file") { - var file = document.getElementById(form_elem[i].id).files[0]; - getBase64(file, form_elem, i, data, function(form_elem, i, data, res) { - data.push(form_elem[i].name + "=" + encodeURIComponent(res)); - }); + var file = document.querySelector('input[type=file]')['files'][0] + var reader = new FileReader(); + reader.readAsDataURL(file) + reader.onload=function() { + base64 = reader.result + }; + reader.onerror = function (error) { + console.log('Error: ', error); + }; } } + + var file = document.querySelector('input[type=file]')['files'][0] + var reader = new FileReader(); + reader.readAsDataURL(file) + reader.onload=function() { + data.push(reader.result) + console.log(data) + var params = data.join("&"); + var xhr = new XMLHttpRequest(); + xhr.open("POST", postloc); + console.log(params); + xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); + xhr.send(params); + }; + reader.onerror = function (error) { + console.log('Error: ', error); + }; console.log(data); - console.log(data[3]); - var params = data.join("&"); - var xhr = new XMLHttpRequest(); - xhr.open("POST", postloc); - console.log(params); - xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); - xhr.send(params); + } function getBase64(file, form_elem, i, data, callback) { diff --git a/cms/templates/announcements.html.hbs b/cms/templates/announcements.html.hbs index 411ba88..c387a39 100644 --- a/cms/templates/announcements.html.hbs +++ b/cms/templates/announcements.html.hbs @@ -49,7 +49,7 @@
- @@ -62,7 +62,7 @@

Teacher

- +
@@ -71,7 +71,7 @@

Message

- +
@@ -80,7 +80,7 @@

Date of Submission

- +
@@ -89,7 +89,7 @@

Time of Submission

- +
@@ -105,13 +105,13 @@

ID of announcement to update

- +
- @@ -124,7 +124,7 @@

Teacher

- +
@@ -133,7 +133,7 @@

Message

- +
@@ -142,7 +142,7 @@

Date of Submission

- +
@@ -151,7 +151,7 @@

Time of Submission

- +
diff --git a/cms/templates/challenge.html.hbs b/cms/templates/challenge.html.hbs index d918bbf..ab09a59 100644 --- a/cms/templates/challenge.html.hbs +++ b/cms/templates/challenge.html.hbs @@ -49,7 +49,7 @@
- @@ -62,7 +62,7 @@

Title

- +
@@ -71,7 +71,7 @@

Information

- +
@@ -80,7 +80,7 @@

Link to Challenge

- +
@@ -96,13 +96,13 @@

ID of challenge to update

- +
- @@ -115,7 +115,7 @@

Title

- +
@@ -124,7 +124,7 @@

Information

- +
@@ -133,7 +133,7 @@

Link to Challenge

- +
diff --git a/cms/templates/clubs.html.hbs b/cms/templates/clubs.html.hbs index 51b03ff..c31a7e7 100644 --- a/cms/templates/clubs.html.hbs +++ b/cms/templates/clubs.html.hbs @@ -50,7 +50,7 @@
- @@ -63,7 +63,7 @@

Name

- +
@@ -72,7 +72,7 @@

Meeting Date and Time

- +
@@ -81,7 +81,7 @@

Meeting Location

- +
@@ -90,7 +90,7 @@

Sponsor

- +
@@ -106,13 +106,13 @@

ID of club to update

- +
- @@ -125,7 +125,7 @@

Name

- +
@@ -134,7 +134,7 @@

Meeting Date and Time

- +
@@ -143,7 +143,7 @@

Meeting Location

- +
@@ -152,7 +152,7 @@

Sponsor

- +
diff --git a/cms/templates/events.html.hbs b/cms/templates/events.html.hbs index 6a75197..b6ed3b8 100644 --- a/cms/templates/events.html.hbs +++ b/cms/templates/events.html.hbs @@ -50,7 +50,7 @@
- @@ -63,7 +63,7 @@

Title

- +
@@ -72,7 +72,7 @@

Location

- +
@@ -81,7 +81,7 @@

Information

- +
@@ -90,7 +90,7 @@

Date

- +
@@ -99,7 +99,7 @@

Teacher/Organizer

- +
@@ -108,7 +108,7 @@

Teacher/Organizer Email

- +
@@ -124,13 +124,13 @@

ID of event to update

- +
- @@ -143,7 +143,7 @@

Title

- +
@@ -152,7 +152,7 @@

Location

- +
@@ -161,7 +161,7 @@

Information

- +
@@ -170,7 +170,7 @@

Date

- +
@@ -179,7 +179,7 @@

Teacher/Organizer

- +
@@ -188,7 +188,7 @@

Teacher/Organizer Email

- +
diff --git a/cms/templates/important.html.hbs b/cms/templates/important.html.hbs deleted file mode 100644 index 2d7d780..0000000 --- a/cms/templates/important.html.hbs +++ /dev/null @@ -1,167 +0,0 @@ -{{! vim: set ft=html: }} - - - - - - - - - - -
-

- Admin Panel -

-
- -
- -
-

Important

- -
- {{#each ctx}} -
- ID: {{id}} | LANG: {{lang}} -

{{name}}

-

{{meeting}}

-

{{link}}

-

Sponsor: {{sponsor}}

- -
- -
- - -
- {{/each}} -
-
- - -
-

Clubs Actions

- -
- -
-

Add Club

-
-
-
-

Lang

- -
-
- -
-
- -
-
-

Name

-
-
- -
-
- -
-
-

Meeting

-
-
- -
-
- -
-
-

Link

-
-
- -
-
- -
-
-

Sponsor

-
-
- -
-
- - -
-
- -
-

Update Club

-
-
-
-

ID of club to update

-
-
- -
-
- -
-
-

Lang

- -
-
- -
-
- -
-
-

Name

-
-
- -
-
- -
-
-

Meeting

-
-
- -
-
- -
-
-

Link

-
-
- -
-
- -
-
-

Sponsor

-
-
- -
-
- - -
-
- -
-
-
- - \ No newline at end of file diff --git a/cms/templates/lunch_events.html.hbs b/cms/templates/lunch_events.html.hbs index ec6d70f..ffb7847 100644 --- a/cms/templates/lunch_events.html.hbs +++ b/cms/templates/lunch_events.html.hbs @@ -28,7 +28,7 @@

{{text}}

{{location}}

{{time}}

-
+
@@ -50,7 +50,7 @@
- @@ -63,7 +63,7 @@

Title

- +
@@ -72,7 +72,7 @@

Information

- +
@@ -81,7 +81,7 @@

Location

- +
@@ -90,7 +90,7 @@

Time of event

- +
@@ -106,12 +106,12 @@

ID of lunch event to update

- +
-
+
+
@@ -134,7 +134,7 @@

Information

- +
@@ -143,7 +143,7 @@

Location

- +
@@ -152,7 +152,7 @@

Time of event

- +
diff --git a/cms/templates/new.html.hbs b/cms/templates/new.html.hbs index a6d7529..f10a7d5 100644 --- a/cms/templates/new.html.hbs +++ b/cms/templates/new.html.hbs @@ -3,9 +3,148 @@ + + + + - +
+

+ Admin Panel +

+
+ +
+ +
+

What's New

+ +
+ {{#each ctx}} +
+ ID: {{id}} | LANG: {{lang}} +

{{name}}

+

{{image}}

+

{{new_date}}

+ +
+ +
+ + +
+ {{/each}} +
+
+ + +
+

What's New Actions

+ +
+ +
+

Add New Item

+
+
+
+ +
+
+ +
+
+

What's New Item Image

+
+
+ +
+
+ +
+
+

Information

+
+
+ +
+
+ +
+
+

Date of What's New Item

+
+
+ +
+
+ + +
+
+ +
+

Update What's New Item

+
+
+
+

ID of announcement to update

+
+
+ +
+
+ +
+
+ +
+
+ +
+
+

What's New Item Image

+
+
+ +
+
+ +
+
+

Information

+
+
+ +
+
+ +
+
+

Date of What's New Item

+
+
+ +
+
+ +
+
+ +
+
+
+ diff --git a/cms/templates/polls.html.hbs b/cms/templates/polls.html.hbs index 885905e..30de472 100644 --- a/cms/templates/polls.html.hbs +++ b/cms/templates/polls.html.hbs @@ -47,7 +47,7 @@
- @@ -60,7 +60,7 @@

URL of poll

- +
@@ -76,13 +76,13 @@

ID of Poll to update

- +
- @@ -95,7 +95,7 @@

URL of poll

- +
diff --git a/cms/templates/student.html.hbs b/cms/templates/student.html.hbs index ed379b5..bcd52f5 100644 --- a/cms/templates/student.html.hbs +++ b/cms/templates/student.html.hbs @@ -29,7 +29,7 @@

Message: {{messages}}

Hobbies: {{hobbies}}

Achievements: {{achievements}}

- +
@@ -51,7 +51,7 @@
- @@ -64,7 +64,7 @@

Student Name

- +
@@ -73,7 +73,7 @@

Student Picture

- +
@@ -82,7 +82,7 @@

Grade

- +
@@ -91,7 +91,7 @@

Message

- +
@@ -100,7 +100,7 @@

Hobbies

- +
@@ -109,7 +109,7 @@

Achievements

- +
@@ -125,13 +125,13 @@

ID of SOTW to update

- +
- @@ -144,7 +144,7 @@

Student Name

- +
@@ -153,7 +153,7 @@

Student Picture

- +
@@ -162,7 +162,7 @@

Grade

- +
@@ -171,7 +171,7 @@

Message

- +
@@ -180,7 +180,7 @@

Hobbies

- +
@@ -189,7 +189,7 @@

Achievements

- +
diff --git a/cms/templates/teachers.html.hbs b/cms/templates/teachers.html.hbs index 3a3a6b1..6f4a201 100644 --- a/cms/templates/teachers.html.hbs +++ b/cms/templates/teachers.html.hbs @@ -49,7 +49,7 @@

Add Staff

-
+
+
@@ -72,7 +72,7 @@

Email

- +
@@ -81,7 +81,7 @@

Phone

- +
@@ -90,7 +90,7 @@

Position

- +
@@ -99,7 +99,7 @@

Staff Picture

- +
@@ -115,13 +115,13 @@

ID of staff to update

- +
- @@ -134,7 +134,7 @@

Name

- +
@@ -143,7 +143,7 @@

Email

- +
@@ -152,7 +152,7 @@

Phone

- +
@@ -161,7 +161,7 @@

Position

- +
@@ -170,7 +170,7 @@

Staff Picture

- +