Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
c47c4d5
chore: add communities module
Jun 25, 2025
852a793
chore: import communities client
Jun 25, 2025
bad4d81
chore: install -rn
Jun 25, 2025
9e3c7b6
chore: something about ts client
Jun 25, 2025
fb8bf23
chore: clean list screen
Jun 30, 2025
e0ad2c4
chore: fix type issue
Jun 30, 2025
10dc0bc
chore: fix navigation on communities
Jun 30, 2025
0d21d42
adding main screens with navigation
francoisTouchardEdifice Jun 30, 2025
8b19682
adding navParams type for home screen
francoisTouchardEdifice Jun 30, 2025
ad5baed
chore: update ts-client communities
Jul 1, 2025
4fa583e
Merge branch 'dev/1.14.1' into dev/peda
francoisTouchardEdifice Jul 2, 2025
381b74f
Merge branch 'dev/peda' into feat/peda/communities
francoisTouchardEdifice Jul 2, 2025
64faa31
chore: yarn cache update
Jul 2, 2025
cd4e03e
chore: PEDAGO-2924 new client api factory
Jul 2, 2025
d45c6ad
chore: upgrade scaffolders
Jul 7, 2025
211cfb6
chore: PEDAGO-2935 session-screen framework component
Jul 8, 2025
2247d1e
feat: PEDAGO-2887 implement <PaginatedList/> component + use in docum…
Jul 9, 2025
fca18ce
chore: document usage of PaginatedList
Jul 11, 2025
bfe7272
feat(communities): PEDAGO-2854 adding CommunityCardSmall
francoisTouchardEdifice Jul 2, 2025
3d592df
feat(communities): PEDAGO-2852 adding list to communitiesListScreen
francoisTouchardEdifice Jul 10, 2025
af907be
feat(communities): PEDAGO-2865 adding list empty screen
francoisTouchardEdifice Jul 15, 2025
f436b0a
feat(communities): PEDAGO-2851 : adding navbar button
francoisTouchardEdifice Jul 15, 2025
66029f5
Yarn cache update
francoisTouchardEdifice Jul 16, 2025
bdf0587
release: 1.14.1-peda.1(1140101)
francoisTouchardEdifice Jul 16, 2025
0fd4960
release: 1.14.1-alpha.1(1140102)
francoisTouchardEdifice Jul 16, 2025
16a88b9
release: 1.14.1-peda.2(1140103)
francoisTouchardEdifice Jul 16, 2025
8d45756
release: 1.14.1-peda.3(1140104)
francoisTouchardEdifice Jul 16, 2025
324308e
release: 1.14.1-peda.4(1140105)
francoisTouchardEdifice Jul 16, 2025
ba04840
release: 1.14.1-peda.5(1140106)
francoisTouchardEdifice Jul 16, 2025
6bd386e
Merge branch 'dev/1.14.1' into feat/peda/communities
francoisTouchardEdifice Jul 17, 2025
d3d2c4b
Merge branch 'feat/peda/communities' (with 1.14.1) into dev/peda
francoisTouchardEdifice Jul 17, 2025
b2628e3
Squashed commit of the following:
thegdznet Jul 18, 2025
728710a
Merge commit 'f4b8a8b229fad542c7ef29cc70f40891cc9f3c7b' into dev/peda
Jul 22, 2025
c93330b
chore: yarn cache update
Jul 22, 2025
e95e429
chore: handle global application colors & icons in theme
Jul 23, 2025
1dcbb37
chore: PEDAGO-2990 apps in theme + get color in communities
Jul 23, 2025
790b8ee
chore: remove refreshControl prop in PaginatedList
Jul 23, 2025
a113cee
feat(communities): PEDAGO-2989 folder card in explorer
francoisTouchardEdifice Jul 23, 2025
702f200
fix(explorer): optional chaining for item date
Jul 24, 2025
7efcb64
chore(communities): changes after review, will be interactively rebased
francoisTouchardEdifice Jul 24, 2025
961c79a
Merge branch 'dev/peda' into feat/peda/communities
Jul 24, 2025
913e2f3
Merge branch 'dev/peda' into feat/peda/communities
Jul 24, 2025
9e6a443
chore(communities) : fix module-config
francoisTouchardEdifice Jul 28, 2025
1758945
chore: update communities client version
Aug 5, 2025
5f62e3e
feat: PEDAGO-2887, PEDAGO-2888, PEDAGO-2889, PEDAGO-2890 implement do…
Aug 4, 2025
3be8df4
feat: PEDAGO-2891 implement app intent except workspace
Aug 7, 2025
8f57aaf
fix: typescript things
Aug 8, 2025
a231a74
feat: PEDAGO-2891 implement open media form communities
Aug 8, 2025
1602d1e
feat: PEDAGO-2891 implement open unknown media in browser
Aug 8, 2025
7456dc8
release: 1.14.2-peda.6(1140201)
vmourot Aug 8, 2025
6910e70
release: 1.14.2-peda.7(1140202)
vmourot Aug 9, 2025
347f4c8
chore: yarn cache update
vmourot Aug 9, 2025
d91276a
release: 1.14.2-peda.8(1140203)
vmourot Aug 9, 2025
c8d6c5a
chore: increase java heap size
vmourot Aug 9, 2025
56caf92
release: 1.14.2-peda.9(1140204)
vmourot Aug 9, 2025
c27e67f
release: 1.14.2-peda.10(1140205)
vmourot Aug 9, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ android {
applicationId APPID
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1140200
versionCode 1140205
versionName "1.14.2"
manifestPlaceholders.applicationName = APPNAME
buildConfigField "String", "BundleVersionOverride", "\"${APPOVERRIDE}\""
buildConfigField "String", "BundleVersionType", "\"\""
buildConfigField "String", "BundleVersionType", "\"peda.10\""
resValue "string", "app_name", "${APPNAME}"
ndk {
debugSymbolLevel 'FULL'
Expand Down
2 changes: 1 addition & 1 deletion android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
android.enableJetifier=true
android.useAndroidX=true

org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=512m

AsyncStorage_db_size_in_MB=32
hermesEnabled=true
Expand Down
6 changes: 6 additions & 0 deletions assets/i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,12 @@
"common-save": "Enregistrer",
"common-send": "Envoyer",
"common-space": " ",
"communities-list-title": "Communautés",
"communities-list-empty-text": "Vous ne faites encore partie d'aucune communauté.",
"communities-list-empty-title": "C'est calme... pour l'instant !",
"communities-member": "membre",
"communities-members": "membres",
"communities-badge-new": "Nouveau",
"competences-assessment-levellegendmodal-title": "Légende",
"competences-home-averages": "Moyennes",
"competences-home-colors": "Couleurs",
Expand Down
4 changes: 2 additions & 2 deletions assets/icons/uiIcons/folder.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions assets/icons/uiIcons/members.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions assets/icons/uiIcons/user-join.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions cli/last-build.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"WARNING": "¡¡¡ USED AND UPDATED BY prepare-build.js - DO NOT EDIT MANUALLY !!!",
"last": "2025-07-17 09:30:26",
"notes": "update(stack): yarn cache update\nfix(wayf): SUPPORT-3004, Add e-primo && educ to android network config\nupdate(stack): yarn cache update\nchore(android): change target sdk version according to google guidelines\nupdate(stack): yarn cache update\nupdate(stack): yarn cache update\nchore(imports): PEDAGO-2864 rewriting absolute imports\nfix(splashads): trailing / addition\nchore(build): android build error fix\nchore(i18n): Prepare Phrase for 1.14.1\nSquashed commit of the following:",
"version": "1.14.1-rc.1(1140101)"
"last": "2025-08-09 11:57:14",
"notes": "release: 1.14.2-peda.9(1140204)",
"version": "1.14.2-peda.10(1140205)"
}
4 changes: 2 additions & 2 deletions cli/prepare-build.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"WARNING": "¡¡¡ USED AND UPDATED BY prepare-build.js - DO NOT EDIT MANUALLY !!!",
"alpha": 0,
"build": 0,
"build": 5,
"comm": 0,
"major": 1,
"minor": 14,
"peda": 0,
"peda": 10,
"poc": 0,
"rc": 0,
"rev": 2
Expand Down
45 changes: 11 additions & 34 deletions cli/scaffold.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,14 @@ async function useScaffoldScreen(template, vars) {
);
}

async function useScaffoldTemplate(template, vars) {
async function useScaffoldNotifications(template, vars) {
const varsArray = Object.entries(vars).map(([k, v]) => `${k}=${v}`);
await cmd(
'node_modules/scaffolder-cli/dist/index.js',
'create',
template,
'--path-prefix',
`/src/framework/modules/${vars.moduleName}/templates`,
'-f',
vars.screenName,
`/src/framework/modules/${vars.moduleName}`,
...varsArray,
);
}
Expand Down Expand Up @@ -126,27 +124,25 @@ function screenCommandYargs(command, help) {
];
}

function templateCommandYargs(command, help) {
function notificationsCommandYargs(command, help) {
return [
`${command} <module-name> <screen-name>`,
`${command} <module-name>`,
help,
yargs => {
yargs.positional('moduleName', {
type: 'string',
describe: 'what module name the new screen belongs to. Use kebab-case.',
});
yargs.positional('screenName', {
type: 'string',
describe: 'what module screen to create. Use kebab-case.',
describe: 'in which existing module to create the notification handler. Use kebab-case (the module\'s folder name).',
});
},
async function (argv) {
try {
await useScaffoldTemplate(command, { moduleName: argv.moduleName, screenName: argv.screenName });
await useScaffoldNotifications(command, { moduleName: argv.moduleName });

console.info(
`\x1b[32mTemplate \`${argv.screenName}\` created in module \`${argv.moduleName}\`. You have to add it manually to a module screen to make it visible in the app. \x1b[0m`,
`\x1b[32mNotifcation handler for module \`${argv.moduleName}\` created. You have to import it manually from module's \`index.ts\` to make it work. \x1b[0m`,
);
console.info(`\x1b[32mCopy the following line in \`~/framework/modules/${argv.moduleName}/index.ts\`:\x1b[0m`);
console.info(`\x1b[1m\x1b[35m\n import setupNotifications '~/framework/modules/${argv.moduleName}/notif-handler';\n\n setupNotifications();\n\x1b[0m`);
} catch {
console.error(`\x1b[1m\x1b[31mAn error has occured. See the error message above. \n\x1b[0m`);
}
Expand All @@ -163,28 +159,9 @@ const main = () => {
require('yargs')
.showHelpOnFail(true, 'Specify --help for available options')
.scriptName('scaffold')
.command(...moduleCommandYargs('module-tab', 'Generates module <module-name> that will be displyed in the tab bar.'))
.command(
...moduleCommandYargs(
'module-tab-redux',
'Generates module <module-name> with redux integration that will be displyed in the tab bar.',
),
)
.command(...moduleCommandYargs('module-myapps', 'Generates module <module-name> that will be displyed in My Apps screen.'))
.command(
...moduleCommandYargs(
'module-myapps-redux',
'Generates module <module-name> with redux integration that will be displyed in My Apps screen.',
),
)
.command(...moduleCommandYargs('module', 'Generates module <module-name> that will be displyed in My Apps screen.'))
.command(...screenCommandYargs('screen', 'Generates screen <screen-name> in module <module-name>.'))
.command(
...screenCommandYargs('screen-redux', 'Generates screen <screen-name> in module <module-name> with redux integration.'),
)
.command(...templateCommandYargs('template', 'Generates template <screen-name> in module <module-name>.'))
.command(
...templateCommandYargs('template-redux', 'Generates template <screen-name> in module <module-name> with redux integration.'),
)
.command(...notificationsCommandYargs('notifications', 'Generates notif-handler in module <module-name>.'))
.help()
.demandCommand().argv;
};
Expand Down
4 changes: 2 additions & 2 deletions ios/appe/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>BundleVersionOverride</key>
<string>empty</string>
<key>BundleVersionType</key>
<string></string>
<string>peda.10</string>
<key>CFBundleDevelopmentRegion</key>
<string>fr_FR</string>
<key>CFBundleDisplayName</key>
Expand All @@ -25,7 +25,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1140200</string>
<string>1140205</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>http</string>
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
},
"dependencies": {
"@bam.tech/react-native-image-resizer": "3.0.11",
"@edifice.io/community-client-rest-rn": "1.0.0-develop-pedago.12",
"@emotion/native": "11.11.0",
"@emotion/react": "11.13.5",
"@flyerhq/react-native-android-uri-path": "2.3.0",
Expand Down Expand Up @@ -140,6 +141,7 @@
"react-native-document-picker": "9.3.1",
"react-native-draggable-flatlist": "4.0.1",
"react-native-dropdown-picker": "5.4.7-beta.1",
"react-native-error-boundary": "2.0.0",
"react-native-fast-image": "8.6.3",
"react-native-file-viewer": "2.1.5",
"react-native-fs": "2.20.0",
Expand Down Expand Up @@ -303,4 +305,4 @@
}
},
"packageManager": "yarn@4.3.1"
}
}
15 changes: 0 additions & 15 deletions scaffolder/module-myapps-redux/actions/index.ts

This file was deleted.

17 changes: 0 additions & 17 deletions scaffolder/module-myapps-redux/module-config.ts

This file was deleted.

11 changes: 0 additions & 11 deletions scaffolder/module-myapps-redux/navigation/index.ts

This file was deleted.

19 changes: 0 additions & 19 deletions scaffolder/module-myapps-redux/navigation/navigator.tsx

This file was deleted.

34 changes: 0 additions & 34 deletions scaffolder/module-myapps-redux/notif-handler.ts

This file was deleted.

57 changes: 0 additions & 57 deletions scaffolder/module-myapps-redux/reducer/index.ts

This file was deleted.

Loading