Skip to content

Commit

Permalink
Feedback changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Pratikshakhandagale committed Sep 5, 2024
1 parent 2cbaf53 commit f6af397
Show file tree
Hide file tree
Showing 69 changed files with 509 additions and 367 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ span {
right: 0;
top: -0.5rem;
width: 7rem;
cursor: pointer;
}

ion-title {
Expand Down Expand Up @@ -174,4 +175,4 @@ ion-title {
align-items: center;
flex-direction: column;
margin: 0.5rem 1.5rem;
}
}
11 changes: 11 additions & 0 deletions src/app/components/bot-messages/bot-messages.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,21 @@ export class BotMessagesComponent implements OnInit, AfterViewInit {
}

let textMsg;

if (this.config.type == 'story') {
textMsg = this.configVariables[this.language].storyBotMsg ? this.configVariables[this.language].storyBotMsg : "";
} else if (this.config.type == 'parent') {
textMsg = this.configVariables[this.language].parentBotMsg ? this.configVariables[this.language].parentBotMsg : "";
} else if (this.config.type == 'teacher') {
textMsg = this.configVariables[this.language].teacherBotMsg ? this.configVariables[this.language].teacherBotMsg : "";
}

if(!textMsg){
// let textMsg = `WELCOME_TO_${this.config.type.toUpperCase()}_SAKHI`;
this.translate.get(`WELCOME_TO_${this.config.type.toUpperCase()}_SAKHI`).subscribe((res: string) => {
textMsg = res.replace('${botName}', botName);
});
}



Expand Down
137 changes: 62 additions & 75 deletions src/assets/appConfig/localhost.json
Original file line number Diff line number Diff line change
@@ -1,62 +1,54 @@
{
"tenantLogo": "assets/school/DL_128x128.svg",
"siteName": "Dharma Life",
"tenantLogo": "assets/school/GEMS.svg",
"siteName": "Garhwal English Medium",
"siteByLine": "Listen, Learn & Grow !!!",
"splashImage": "assets/school/DL_152x152.png",
"bots": ["teacher"],
"splashImage": "assets/school/GEMS.jpeg",
"bots": ["story", "parent", "teacher"],
"defaultContentFilter": [{
"agegroup": ["3-6", "6-8"],
"language":["English", "Hindi"]

"defaultContentFilter": [
{
"agegroup": [
"3-6",
"6-8"
],
"language":["English", "Hindi"]

}
],
"headerFilters": [
{
"defaultFilter": {
"id": "All",
"label": "All",
"query": "",
"filters": "All"
}],
"headerFilters": [{
"defaultFilter": {
"id": "All",
"label": "All",
"query": "",
"filters": "All"
},
"additionalFilters": [
{
"id": "Stories",
"label": "Stories",
"query": "Stories",
"filters": "Stories"
},
"additionalFilters": [
{
"id": "Stories",
"label": "Stories",
"query": "Stories",
"filters": "Stories"
},
{
"id": "Activities",
"label": "Activities",
"query": "Activities",
"filters": "Activities"
},
{
"id": "Songs",
"label": "Songs",
"query": "Songs",
"filters": "Songs"
},
{
"id": "Audio Books",
"label": "Audio Books",
"query": "Audio Books",
"filters": "Audio Books"
},
{
"id": "Handbooks",
"label": "Handbooks",
"query": "Handbooks",
"filters": "Handbooks"
}
]
}
],
{
"id": "Activities",
"label": "Activities",
"query": "Activities",
"filters": "Activities"
},
{
"id": "Songs",
"label": "Songs",
"query": "Songs",
"filters": "Songs"
},
{
"id": "Audio Books",
"label": "Audio Books",
"query": "Audio Books",
"filters": "Audio Books"
},
{
"id": "Handbooks",
"label": "Handbooks",
"query": "Handbooks",
"filters": "Handbooks"
}
]
}],
"languages": [
{
"id": "en",
Expand All @@ -70,26 +62,21 @@
}
],
"titleCode": [
"en",
"hi"
],
"en", "hi"
],
"en": {
"teacherTaraBotName": "Pre-School Teachers"
},
"hi": {
"teacherTaraBotName": "पूर्व-स्कूल शिक्षक"
},
"kathaSakhiBotName": "Story GEMS",
"parentTaraBotName": "Parent GEMS",
"teacherTaraBotName": "Teacher GEMS"
},
"hi": {
"kathaSakhiBotName": "कथा GEMS",
"parentTaraBotName": "पेरेंट GEMS",
"teacherTaraBotName": "टीचर GEMS"
},
"footerText": "Developed with ❤️ by Tekdi Technologies ",
"headerColor": "#e98021ff",
"headerColor": "brown",
"headerFontSize": "16",
"footerColor": "#e98021ff",
"footerFontSize": "16",
"primaryCss" : {
"primary": "#e98021ff",
"shade": "#186aaaff"
},
"secondaryCss" : {
"secondary": "#186aaaff",
"shade": "#e98021ff"
}
}
"footerColor": "brown",
"footerFontSize": "16"
}
11 changes: 8 additions & 3 deletions src/assets/appConfig/sols-arc.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,18 @@
"titleCode": [ "en",
"hi", "mr"],
"en": {
"teacherTaraBotName": "Teachers"
"teacherTaraBotName": "Teachers",
"teacherBotMsg": "Hi, it's <b>IncluEd</b> here \n \n Need tips on <b>understanding disabilities, managing behaviour, or making learning more inclusive</b>? Just ask! I'll share <b>quick<b/> and <b>easy advice to support every student</b>. Let's make teaching a bit easier together!"
},
"hi": {
"teacherTaraBotName": "टीचर"
"teacherTaraBotName": "टीचर",
"teacherBotMsg": "नमस्ते, यह <b>IncluEd</b> है \n \n <b>विकलांगताओं को समझने, व्यवहार प्रबंधन</b> या <b>अधिक समावेशी शिक्षण</b> पर सुझाव चाहिए? बस पूछें! मैं <b>शीघ्र</b> और <b>आसान सलाह साझा करूंगा जिससे हर छात्र को समर्थन मिलेगा</b>. चलिए, मिलकर शिक्षण को थोड़ा आसान बनाते हैं!"

},
"mr": {
"teacherTaraBotName": "शिक्षक"
"teacherTaraBotName": "शिक्षक",
"teacherBotMsg": "हाय, इथे <b>IncluEd</b> आहे \n \n <b>विकलांगतेचा समजून घेणे, वर्तन व्यवस्थापन</b> किंवा <b>अधिक समावेशक शिक्षण</b> याबाबत टिप्स पाहिजेत का? फक्त विचारा! मी <b>लवकर</b> आणि <b>सोपे सल्ले देईन जे प्रत्येक विद्यार्थ्याला मदत करतील</b>. चला, एकत्रितपणे शिक्षण थोडे सोपे करूया!"

},
"footerText": "Developed with ❤️ by Tekdi Technologies ",
"headerColor": "#A71028",
Expand Down
28 changes: 14 additions & 14 deletions src/assets/icon/book.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions src/assets/icon/book1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit f6af397

Please sign in to comment.