Skip to content

Commit

Permalink
Add link for princials of safer space
Browse files Browse the repository at this point in the history
  • Loading branch information
rottabonus committed May 12, 2024
1 parent 072bd97 commit 78a3d77
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 15 deletions.
21 changes: 11 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,17 @@ cp config.template.ios.json config.json

You can edit the config file as suited:

| Parameter | Description |
| -------------- | ------------------------ |
| `baseUrl` | Ylitse API base URL |
| `loginUrl` | Ylitse service login URL |
| `feedBackUrl` | Feedback form URL |
| `termsUrl` | Terms and conditions URL |
| `userGuideUrl` | User's manual URL |
| `apuuUrl` | Apuu-chat URL |
| `sekasinUrl` | Sekasin-chat URL |
| `messageFetchDelay`| Delay between polling |
| Parameter | Description |
| -------------- | ---------------------------------|
| `baseUrl` | Ylitse API base URL |
| `loginUrl` | Ylitse service login URL |
| `feedBackUrl` | Feedback form URL |
| `termsUrl` | Terms and conditions URL |
| `userGuideUrl` | User's manual URL |
| `apuuUrl` | Apuu-chat URL |
| `sekasinUrl` | Sekasin-chat URL |
| `saferSpaceUrl` | Principals of a safer space URL |
| `messageFetchDelay`| Delay between polling |


### Running on iOS
Expand Down
1 change: 1 addition & 0 deletions appcenter-pre-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ tee config.json > /dev/null <<EOF
"userGuideUrl": "$YLITSE_USERGUIDEURL",
"apuuUrl": "$YLITSE_APUUURL",
"sekasinUrl": "$YLITSE_SEKASINURL",
"saferSpaceUrl": "$YLITSE_SAFERSPACEURL",
"messageFetchDelay": $YLITSE_MESSAGEFETCHDELAY
}
EOF
1 change: 1 addition & 0 deletions config.template.android.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
"userGuideUrl": "http://10.0.2.2:3000",
"apuuUrl": "http://10.0.2.2:3000",
"sekasinUrl": "http://10.0.2.2:3000",
"saferSpaceUrl": "http://10.0.2.2:3000",
"messageFetchDelay": 2000
}
1 change: 1 addition & 0 deletions config.template.ios.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
"userGuideUrl": "http://localhost:3000",
"apuuUrl": "http://localhost:3000",
"sekasinUrl": "http://localhost:3000",
"saferSpaceUrl": "http://10.0.2.2:3000",
"messageFetchDelay": 2000
}
18 changes: 13 additions & 5 deletions src/Screens/Main/Settings/BottomCard/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,27 @@ export default ({ navigateToDeleteAccount, navigateToLogout }: Props) => {
style={styles.accountSettingsText}
id="main.settings.other.title"
/>
<Message style={styles.fieldName} id="main.settings.other.feedBack" />
<Link
style={styles.link}
linkName="main.settings.other.feedBackLink"
url={config.feedBackUrl}
/>
<Message style={styles.fieldName} id="main.settings.other.whatToAgree" />
<Message style={styles.fieldName} id="main.settings.other.feedBack" />
<Link
style={styles.link}
linkName="main.settings.other.termsLink"
url={config.termsUrl}
/>
<Message style={styles.fieldName} id="main.settings.other.whatToAgree" />
<Link
style={styles.link}
linkName="main.settings.other.saferSpaceLink"
url={config.saferSpaceUrl}
/>
<Message
style={styles.fieldName}
id="main.settings.other.principalsForSaferSpace"
/>
<MessageButton
style={styles.logOutButton}
onPress={navigateToLogout}
Expand Down Expand Up @@ -67,15 +76,14 @@ const styles = RN.StyleSheet.create({
accountSettingsText: {
...fonts.titleBold,
color: colors.darkestBlue,
marginBottom: 24,
},
fieldName: {
...fonts.regular,
color: colors.blueGray,
},
link: {
marginTop: 8,
marginBottom: 24,
marginTop: 24,
marginBottom: 8,
},
buttonText: {
...fonts.largeBold,
Expand Down
1 change: 1 addition & 0 deletions src/api/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ export const userGuideUrl = config.userGuideUrl;
export const feedBackUrl = config.feedBackUrl;
export const apuuUrl = config.apuuUrl;
export const sekasinUrl = config.sekasinUrl;
export const saferSpaceUrl = config.saferSpaceUrl;
export const messageFetchDelay = config.messageFetchDelay;
3 changes: 3 additions & 0 deletions src/localization/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,9 @@ export const messages: { [key in MessageId]: string } = {
'main.settings.other.feedBack': 'Give us feedback : )',
'main.settings.other.feedBackLink': 'Feedback form',
'main.settings.other.howTo': 'How should I use this application?',
'main.settings.other.principalsForSaferSpace':
"You can read the principles of creating a safer space for digital work at SOS Children's Village from the link.",
'main.settings.other.saferSpaceLink': 'Principals for a safer space',
'main.settings.other.termsLink': 'Terms and conditions',
'main.settings.other.title': 'Other',
'main.settings.other.userGuide': 'Mentoring guide (in Finnish)',
Expand Down
3 changes: 3 additions & 0 deletions src/localization/fi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,9 @@ export const messages = {
'main.settings.other.feedBack': 'Anna palautetta : )',
'main.settings.other.feedBackLink': 'Palautelomake',
'main.settings.other.howTo': 'Kuinka tätä käytetään?',
'main.settings.other.principalsForSaferSpace':
'Linkistä pääset lukemaan SOS-Lapsikylän digityön turvallisemman tilan periaatteet.',
'main.settings.other.saferSpaceLink': 'Turvallisemman tilan periaatteet',
'main.settings.other.termsLink': 'Yksityisyydensuoja',
'main.settings.other.title': 'Muuta',
'main.settings.other.userGuide': 'Opas mentoreille',
Expand Down

0 comments on commit 78a3d77

Please sign in to comment.