Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
525 commits
Select commit Hold shift + click to select a range
c8469ec
fix: feed admin action
maximeroucher Aug 12, 2025
6b8b5a6
Merge pull request #27 from ProximApp/fix--feed-admin-action
maximeroucher Aug 12, 2025
2152c94
feat: use new mypayment url (#25)
Rotheem Aug 13, 2025
15a565e
Implement vertical clip scroll (#26)
foucblg Aug 15, 2025
f129ce5
fix: announcer bar overflow (#28)
maximeroucher Aug 17, 2025
cf207da
Account deletion and disconnect (#32)
foucblg Aug 17, 2025
daa0845
remove navbar on keyboard opening
foucblg Aug 15, 2025
98b0fe9
Merge pull request #31 from ProximApp/remove-navbar-with-keyboard
maximeroucher Aug 17, 2025
10abc93
Remove useless provider
foucblg Aug 15, 2025
064d11e
authorize edition of my adverts
foucblg Aug 15, 2025
792c272
remove tags
foucblg Aug 15, 2025
518f5a6
Merge pull request #29 from ProximApp/fix-admin-advert
maximeroucher Aug 17, 2025
7f9d6b2
Association
foucblg Aug 15, 2025
7b766d4
wrong branch
foucblg Aug 15, 2025
df098c3
Association adding part.1
foucblg Aug 17, 2025
8ce6383
create association part.2
foucblg Aug 17, 2025
db79bfb
association logo
foucblg Aug 17, 2025
3accb11
association edition
foucblg Aug 17, 2025
f0de2c3
optimization
foucblg Aug 17, 2025
7447b59
comment delete button
foucblg Aug 17, 2025
0eb756c
rm association deletion
foucblg Aug 17, 2025
699390c
translations
foucblg Aug 17, 2025
65a5246
missing translations
foucblg Aug 17, 2025
141abf7
Merge pull request #30 from ProximApp/admin-association-management
maximeroucher Aug 17, 2025
102d417
add super admin in module list (#35)
foucblg Aug 19, 2025
605580f
Add navbar on feed scroll
foucblg Aug 19, 2025
840e7d9
fix : settings refresher
foucblg Aug 19, 2025
5b05b04
Merge pull request #36 from ProximApp/navbar-on-feed-scroll
maximeroucher Aug 19, 2025
dd562d6
fix : don't switch module in navbar
foucblg Aug 19, 2025
bce3af0
lint
foucblg Aug 19, 2025
9eb1489
Merge pull request #38 from ProximApp/fix-settings-refresher
maximeroucher Aug 19, 2025
2f4de27
Merge pull request #37 from ProximApp/fix-navbar
maximeroucher Aug 19, 2025
eb819ca
wip
foucblg Aug 18, 2025
84f5a2c
wip
foucblg Aug 18, 2025
20a9b8c
change permissions
foucblg Aug 18, 2025
b8d571c
feat: adding event to feed
maximeroucher Aug 19, 2025
68db821
feat: handling feed admin action based on right
maximeroucher Aug 19, 2025
f24fd35
feat: default feed background
maximeroucher Aug 19, 2025
a4fa96a
feat: news image handling
maximeroucher Aug 19, 2025
e17176b
fix: missing import
maximeroucher Aug 19, 2025
18265a6
fix: event card overflow
maximeroucher Aug 19, 2025
6179df7
fix: nullable fields
maximeroucher Aug 19, 2025
a083191
fix: nullable date entry
maximeroucher Aug 19, 2025
baaae0b
feat: ticket url
maximeroucher Aug 19, 2025
5bb84e9
fix: gradient fallback
maximeroucher Aug 19, 2025
da4f82a
lint: applying linter
maximeroucher Aug 19, 2025
b2a7f21
Merge pull request #33 from ProximApp/feed-with-backend
armanddidierjean Aug 20, 2025
9be962d
feat: modular base_school_name (#22)
Rotheem Aug 20, 2025
446e7ce
Remove pages
foucblg Aug 20, 2025
42636b2
Remove useless pages
foucblg Aug 20, 2025
778818c
feat: update web login page and add change password in settings
Rotheem Aug 20, 2025
090bc4c
feat: new background color
maximeroucher Aug 20, 2025
6fcee93
feat: new color for web login
maximeroucher Aug 20, 2025
d3ed917
Merge branch 'remove-account-creation' of https://github.com/ProximAp…
maximeroucher Aug 20, 2025
bb8f163
feat: removing unused page
maximeroucher Aug 20, 2025
c9a8d76
fix: remove unused routes
Rotheem Aug 20, 2025
56b4fbf
Merge pull request #40 from ProximApp/remove-account-creation
armanddidierjean Aug 21, 2025
b92408c
fix event handling page
foucblg Aug 20, 2025
05ff191
manage event image
foucblg Aug 20, 2025
d246a7f
remove useless import
foucblg Aug 20, 2025
831493f
sg date can be empty
foucblg Aug 20, 2025
a8dd07b
adapt advert with association
foucblg Aug 20, 2025
6e81d0b
add bool postToFeed
foucblg Aug 20, 2025
8a69115
Add update list on clic
foucblg Aug 20, 2025
79ec76f
remove print
foucblg Aug 20, 2025
55bd42f
Scroll to hide navbar
foucblg Aug 20, 2025
90ae81b
ui check box
foucblg Aug 20, 2025
99be51c
feat: adding association logo
maximeroucher Aug 20, 2025
6a6d45e
fix: checkbox
maximeroucher Aug 20, 2025
bf074ba
fix: removing comment
maximeroucher Aug 20, 2025
33f1f93
fix: linter and comment
maximeroucher Aug 20, 2025
179319f
feat: hiding button based on status
maximeroucher Aug 20, 2025
3632141
fix: admin actions
maximeroucher Aug 20, 2025
4c31e43
Merge pull request #42 from ProximApp/adapt-advert
armanddidierjean Aug 21, 2025
3af0522
Various fixes (#46)
foucblg Aug 21, 2025
55025c6
feat: adding refresh button
maximeroucher Aug 20, 2025
6ed025c
fix: laggy behavior
maximeroucher Aug 21, 2025
24d433a
fix rebase
foucblg Aug 21, 2025
e4505be
Merge pull request #43 from ProximApp/feed-refresh-button
maximeroucher Aug 21, 2025
6d0cc80
Feed fix (#47)
maximeroucher Aug 21, 2025
259500f
Fix phonebook (#48)
Rotheem Aug 21, 2025
fa5ca76
fix shotgun (#50)
maximeroucher Aug 21, 2025
06d3b5f
PROXI-79: mypayment invoices (#39)
Rotheem Aug 23, 2025
6d7ddc3
feat: all module page spacing
maximeroucher Aug 23, 2025
be18c0f
feat: admin home page spacing
maximeroucher Aug 23, 2025
510979b
feat: group page spacing
maximeroucher Aug 23, 2025
7e858c6
feat: administration title style
maximeroucher Aug 23, 2025
27b78bf
feat: better searchbar ui
maximeroucher Aug 23, 2025
40ee459
feat: space before searchbar
maximeroucher Aug 23, 2025
f71453e
feat: padding in edit group
maximeroucher Aug 23, 2025
5e77bce
feat: search user modal
maximeroucher Aug 23, 2025
545d53e
feat: group notification spacing
maximeroucher Aug 23, 2025
8202c00
feat: better search user
maximeroucher Aug 23, 2025
39663b7
feat: displaying current selected manager
maximeroucher Aug 23, 2025
844365e
feat: payment page spacing
maximeroucher Aug 23, 2025
4c4ee87
feat: reordering search modal
maximeroucher Aug 23, 2025
2493283
fix: removing useless row
maximeroucher Aug 23, 2025
066e5c1
feat: better add membership modal
maximeroucher Aug 23, 2025
ea87bdc
feat: better membership page
maximeroucher Aug 23, 2025
253e2dd
feat: membership pages ui
maximeroucher Aug 23, 2025
1bfbdcc
feat: association pages ui
maximeroucher Aug 23, 2025
8ac317a
feat: phonebook ui fixups
maximeroucher Aug 23, 2025
adfd14c
feat: settings ui fixups
maximeroucher Aug 23, 2025
6ec7dfe
feat: payment fixups
maximeroucher Aug 23, 2025
d4b3078
feat: vote ui adaptation
maximeroucher Aug 23, 2025
b476a53
fix: missing part of rebase
maximeroucher Aug 24, 2025
9ba6793
fix: linter
maximeroucher Aug 24, 2025
079a328
Merge pull request #53 from ProximApp/ui-fixups
maximeroucher Aug 24, 2025
b5720df
fix: limit app name to half the screen width
maximeroucher Aug 21, 2025
81c7fac
fix: space for title
maximeroucher Aug 22, 2025
9dc0aeb
move refresh
foucblg Aug 24, 2025
74ca42d
part 1
foucblg Aug 24, 2025
56cca58
part 2
foucblg Aug 24, 2025
281e45e
english translations
foucblg Aug 24, 2025
10f3d0b
fix
foucblg Aug 24, 2025
1975e75
rebase
foucblg Aug 24, 2025
5d5ae0e
sg translations
foucblg Aug 24, 2025
7eb019d
missing transliations
foucblg Aug 24, 2025
1f5e57a
useless variable
foucblg Aug 24, 2025
821c48f
fix: removing default size
maximeroucher Aug 24, 2025
9340caf
fix: missing maxlines
maximeroucher Aug 24, 2025
fabe3b5
feat: missing trads
maximeroucher Aug 24, 2025
717cecf
fix: linter
maximeroucher Aug 24, 2025
7db2edb
feat: new toast (#56)
maximeroucher Aug 24, 2025
e199e0d
Merge pull request #51 from ProximApp/title-taking-too-much-space
maximeroucher Aug 24, 2025
6a58103
Merge pull request #49 from ProximApp/translations
maximeroucher Aug 24, 2025
cb3c991
feat: add emlyon login assets
Rotheem Aug 24, 2025
a2f0408
feat: translations an clean up
Rotheem Aug 24, 2025
6ea78ac
Merge pull request #52 from ProximApp/emlyon-login
maximeroucher Aug 24, 2025
2e443ce
fix: use new return type
Rotheem Aug 24, 2025
bf7a823
fix: adapt admin to new endpoint
Rotheem Aug 24, 2025
14bcaa2
Merge pull request #55 from ProximApp/fix-mypayment-invoices
maximeroucher Aug 24, 2025
5b56f22
fix: add host on main url scheme
Rotheem Aug 23, 2025
8079473
fix: import and translation
Rotheem Aug 23, 2025
61afbed
fix: AndroidManifest comment about url scheme
armanddidierjean Aug 24, 2025
17863a6
Merge pull request #54 from ProximApp/fix-url-scheme
maximeroucher Aug 24, 2025
85e4e92
fix: hide admin button
maximeroucher Aug 24, 2025
fd99827
fix: catching error
maximeroucher Aug 24, 2025
0166ee9
feat: date and currency formatting based on locale
maximeroucher Aug 24, 2025
ac4b51f
fix: date modal colors
maximeroucher Aug 24, 2025
943af31
feat: missing locale based formatting
maximeroucher Aug 24, 2025
e41ba77
fix: linter
maximeroucher Aug 24, 2025
33dd622
fix: closing modal when notification sent
maximeroucher Aug 24, 2025
01b180d
fix: capitalizing group notification
maximeroucher Aug 24, 2025
ac2d647
fix: no content or body notification
maximeroucher Aug 24, 2025
07b9c42
feat: adding clickable link on advert content
maximeroucher Aug 24, 2025
9a772b3
Format
armanddidierjean Aug 24, 2025
cc1b868
Merge pull request #57 from ProximApp/fixups-follow-up
armanddidierjean Aug 24, 2025
3168de9
fix: using system locale as default
maximeroucher Aug 24, 2025
6d967a3
fix: clean up
Rotheem Aug 24, 2025
6e5cbe6
Merge pull request #59 from ProximApp/fix--default-locale
armanddidierjean Aug 24, 2025
f43ff3f
feat: adding version in settings page
maximeroucher Aug 25, 2025
0c1e461
fix: reordering list icon
maximeroucher Aug 25, 2025
a672bf0
fix: linter
maximeroucher Aug 25, 2025
22619c2
feat: better trad
maximeroucher Aug 25, 2025
d155c88
fix: date formatting
maximeroucher Aug 25, 2025
05b9fbb
fix: missing generated trads
maximeroucher Aug 25, 2025
d4a60b2
fix: sign in loading color
maximeroucher Aug 25, 2025
7735db2
feat: hiding association bar when only one association
maximeroucher Aug 25, 2025
6bd386c
fix: toast translation
maximeroucher Aug 25, 2025
be67b65
fix: no image fallback
maximeroucher Aug 25, 2025
59357d4
fix: phonebook association edit assocaiton bar alignment
maximeroucher Aug 25, 2025
1b1a807
fix: linter
maximeroucher Aug 25, 2025
021a606
fix: capitalization on each sentence start
maximeroucher Aug 25, 2025
d10cab1
fix: pluralize advert module name
maximeroucher Aug 25, 2025
6730608
feat: adaptive color based on background image
maximeroucher Aug 25, 2025
f2254f9
feat: performance and ui fixup
maximeroucher Aug 25, 2025
0b4ee20
fix: forgotten prints
maximeroucher Aug 26, 2025
10b4ff5
fix: CI
maximeroucher Aug 26, 2025
da378b1
Merge pull request #60 from ProximApp/ui-fixups-follow-ups
maximeroucher Aug 26, 2025
15f1fc9
Use parametrized name and id in dart code
armanddidierjean Aug 26, 2025
7b53f85
feat: translate description
Rotheem Aug 26, 2025
8b44914
feat: update web release
Rotheem Aug 26, 2025
cbf4f64
bump version to 165
Rotheem Aug 26, 2025
e28ac9d
Merge pull request #62 from ProximApp/parametrized-name
maximeroucher Aug 26, 2025
c82c058
fix: use dotenv for variables (#63)
Rotheem Aug 26, 2025
1d46c98
feat: improve web build (#64)
Rotheem Aug 26, 2025
7ecc735
feat: gitignore secrets
armanddidierjean Aug 26, 2025
8ae239b
Merge pull request #65 from ProximApp/git-ignore-secrets
armanddidierjean Aug 26, 2025
1372f8a
feat: add emlyon icons and web config (#66)
Rotheem Aug 26, 2025
68acee8
Fix better web 2 (#67)
Rotheem Aug 27, 2025
8e88b37
fix: correct user csv import and titan url
Rotheem Aug 27, 2025
002ab96
remove print
Rotheem Aug 27, 2025
b192e77
Merge pull request #68 from ProximApp/fix-user-invitation
armanddidierjean Aug 27, 2025
3eb68d9
fix: reloading when going back from event handling
maximeroucher Aug 27, 2025
5726290
fix: text color based on background image
maximeroucher Aug 27, 2025
dca8329
fix: loader deforming button
maximeroucher Aug 27, 2025
1f48c44
feat: saving last used store for scanning
maximeroucher Aug 27, 2025
a2648a5
fix: linter
maximeroucher Aug 27, 2025
91de0e2
Merge pull request #69 from ProximApp/fixes
maximeroucher Aug 27, 2025
ac1e36c
Fixes follow up (#71)
maximeroucher Aug 28, 2025
4321ec0
Refacto core groups (#72)
Rotheem Aug 29, 2025
b904816
fix: make whole user line clickable
Rotheem Aug 29, 2025
816b2a7
Merge pull request #73 from ProximApp/PROXI-130-add-user-to-group
armanddidierjean Aug 30, 2025
eee90d3
fix: redirect to feed on disconnect
Rotheem Aug 29, 2025
c729972
Merge pull request #74 from ProximApp/PROXI-120-logout-redirection
armanddidierjean Aug 30, 2025
9370258
feat: changing type to immersive
maximeroucher Aug 28, 2025
9982456
Merge pull request #70 from ProximApp/fix--hiding-os-bar-when-on-app
armanddidierjean Aug 30, 2025
1ac62ba
bump titan version to 2.1.1 (#75)
Rotheem Sep 2, 2025
648f29b
fix: migrating to new key encoding (#77)
maximeroucher Sep 6, 2025
6312105
feat: resizing feed cards
maximeroucher Sep 5, 2025
aa48c91
feat: resized advert
maximeroucher Sep 5, 2025
b0fc042
feat: navbar renaming
maximeroucher Sep 5, 2025
487838c
fix: translation
maximeroucher Sep 6, 2025
5634c94
feat: notification parameters
maximeroucher Sep 6, 2025
8f17aa3
fix: returning full date
maximeroucher Sep 6, 2025
ee84b4c
fix: advert date handling
maximeroucher Sep 6, 2025
71ddbd6
feat: adding overflow ellipsis
maximeroucher Sep 6, 2025
6fb4876
fix: downgrading for CI
maximeroucher Sep 6, 2025
baaa87a
feat: adding bottom padding
maximeroucher Sep 6, 2025
0641a85
Merge pull request #76 from ProximApp/requested-fixups
maximeroucher Sep 6, 2025
11f213a
feat: bump version to 2.1.1 (#78)
Rotheem Sep 8, 2025
f3e056f
middleware mistake (#79)
foucblg Sep 8, 2025
28261cd
Event edition (#80)
Rotheem Sep 9, 2025
8f6fa73
Fix group scroll (#81)
foucblg Sep 10, 2025
03b2101
Phonebook permissions (#82)
Rotheem Sep 10, 2025
6e8bfd4
group list scrollable (#84)
foucblg Sep 10, 2025
95c99ae
Feed text outside image (#85)
foucblg Sep 11, 2025
da71ecf
max 30 char (#86)
foucblg Sep 11, 2025
fc6e5e4
Remove Positionned in Column (#87)
foucblg Sep 11, 2025
de4436a
Various fixes (#89)
foucblg Sep 15, 2025
f2e9797
Various fixes 2 (#91)
foucblg Sep 16, 2025
f6ec8c4
fix: navbar reappear after delay (#94)
maximeroucher Oct 24, 2025
49e8541
fix: text overflow (#96)
maximeroucher Oct 24, 2025
fc0c7c5
bump scanner
foucblg Sep 12, 2025
ee87fd0
Merge pull request #88 from ProximApp/bump-scanner-(16ko)
armanddidierjean Oct 24, 2025
fb3d130
Fastlane and parametrized iOS and Android build configuration (#34)
armanddidierjean Nov 23, 2025
c432347
feat : opening browser directly
foucblg Nov 22, 2025
3b090ad
fix : remove previous tests
foucblg Nov 23, 2025
2207d9c
fix : error while changing branch
foucblg Nov 23, 2025
1cbe221
feat : disable button when signing in
foucblg Nov 23, 2025
53355a7
feat : remove blank page when before login
foucblg Nov 23, 2025
4dbcda7
fix : format
foucblg Nov 23, 2025
b3c0262
Merge pull request #97 from ProximApp/fix-login
armanddidierjean Nov 25, 2025
2aae1ea
feat(fastlane): get name and prefix from config json file
armanddidierjean Nov 24, 2025
38e328f
fixup
armanddidierjean Nov 24, 2025
f2aa8ea
Merge pull request #98 from ProximApp/fastlane-fix
armanddidierjean Nov 25, 2025
8d3e8bb
Try to fix automatic login on android (#99)
foucblg Jan 3, 2026
075d6a2
Flutter 3.38.9 and Google Font 8.0.1
armanddidierjean Feb 6, 2026
12922de
Merge pull request #101 from ProximApp/flutter-3.38.9-ggfont-8.0.1
armanddidierjean Feb 7, 2026
3823490
feat: adding paymennt delegate modal
maximeroucher Feb 14, 2026
2643ead
feat: adding payment modal
maximeroucher Mar 6, 2026
c22f5df
feat: adding payment classes
maximeroucher Mar 31, 2026
72d5067
feat(repository): adding payment repo
maximeroucher Mar 31, 2026
e408f25
feat(provider): adding request provider
maximeroucher Mar 31, 2026
fee058a
feat: adding api call to the payment modal
maximeroucher Mar 31, 2026
0d37dfd
feat: triggering modal when a request exists
maximeroucher Mar 31, 2026
7a71393
feat(trads): adding translation for the modal
maximeroucher Mar 31, 2026
f5dbe47
fix: format
maximeroucher Apr 6, 2026
a3119a4
Merge pull request #103 from ProximApp/adding-payment-modal
maximeroucher Apr 6, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 5 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,11 @@ jobs:
- name: Get Packages
run: flutter pub get

- name: Configure Dev env
run: echo DEV_HOST=$DEV_HOST >> .env
- name: Configure Dev config.json
run: |
printf "%s" "$CONFIG" > config.json
env:
DEV_HOST: ${{ vars.DEV_HOST }}
CONFIG: ${{ vars.DEV_CONFIG }}

- name: Add Firebase configuration for Dev
run: |
Expand All @@ -72,7 +73,7 @@ jobs:
GOOGLE_SERVICES_DEV_JSON_BASE64: ${{ secrets.GOOGLE_SERVICES_DEV_JSON_BASE64 }}

- name: Build Dev 🔧
run: flutter build ${{ matrix.target }}
run: flutter build ${{ matrix.target }} --dart-define-from-file=config.json

- name: Upload Artifacts
uses: actions/upload-artifact@v4
Expand Down
26 changes: 9 additions & 17 deletions .github/workflows/release-mobile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,27 +71,19 @@ jobs:
- name: Get Packages
run: flutter pub get

- name: Configure Alpha env
- name: Configure Alpha config.json
if: needs.extract-version.outputs.isAlpha == 'true'
run: |
echo ALPHA_HOST=$ALPHA_HOST >> .env
echo PLAUSIBLE_HOST=$PLAUSIBLE_HOST >> .env
echo PLAUSIBLE_DOMAIN=$PLAUSIBLE_DOMAIN >> .env
printf "%s" "$CONFIG" > config.json
env:
ALPHA_HOST: ${{ vars.ALPHA_HOST }}
PLAUSIBLE_HOST: ${{ secrets.PLAUSIBLE_ALPHA_HOST }}
PLAUSIBLE_DOMAIN: ${{ secrets.PLAUSIBLE_ALPHA_DOMAIN }}

- name: Configure production env
CONFIG: ${{ vars.ALPHA_CONFIG }}

- name: Configure Alpha config.json
if: needs.extract-version.outputs.isAlpha == 'false'
run: |
echo PROD_HOST=$PROD_HOST >> .env
echo PLAUSIBLE_HOST=$PLAUSIBLE_HOST >> .env
echo PLAUSIBLE_DOMAIN=$PLAUSIBLE_DOMAIN >> .env
printf "%s" "$CONFIG" > config.json
env:
PROD_HOST: ${{ vars.PROD_HOST }}
PLAUSIBLE_HOST: ${{ secrets.PLAUSIBLE_HOST }}
PLAUSIBLE_DOMAIN: ${{ secrets.PLAUSIBLE_DOMAIN }}
CONFIG: ${{ vars.PROD_CONFIG }}

- name: Add Firebase configuration for Alpha
if: needs.extract-version.outputs.isAlpha == 'true'
Expand Down Expand Up @@ -127,11 +119,11 @@ jobs:

- name: Build Alpha 🔧
if: needs.extract-version.outputs.isAlpha == 'true'
run: flutter build ${{ matrix.target }} --flavor=alpha --release --build-name ${{ needs.extract-version.outputs.versionName }} --build-number ${{ needs.extract-version.outputs.versionCode }}
run: flutter build ${{ matrix.target }} --flavor=alpha --dart-define-from-file=config.json --release --build-name ${{ needs.extract-version.outputs.versionName }} --build-number ${{ needs.extract-version.outputs.versionCode }}

- name: Build production 🔧
if: needs.extract-version.outputs.isAlpha == 'false'
run: flutter build ${{ matrix.target }} --flavor=prod --release --build-name ${{ needs.extract-version.outputs.versionName }} --build-number ${{ needs.extract-version.outputs.versionCode }}
run: flutter build ${{ matrix.target }} --flavor=prod --dart-define-from-file=config.json --release --build-name ${{ needs.extract-version.outputs.versionName }} --build-number ${{ needs.extract-version.outputs.versionCode }}

- name: Upload Artifacts
uses: actions/upload-artifact@v4
Expand Down
71 changes: 55 additions & 16 deletions .github/workflows/release-web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,31 +54,65 @@ jobs:
- name: Get Packages
run: flutter pub get

- name: Configure web files
run: |
sed -i 's|{{ APP_NAME }}|'"$APP_NAME"'|g' web/index.html
sed -i 's|{{ SCHOOL_NAME }}|'"$SCHOOL_NAME"'|g' web/index.html
sed -i 's|{{ ENTITY_NAME }}|'"$ENTITY_NAME"'|g' web/index.html
env:
APP_NAME: ${{ vars.APP_NAME }}
SCHOOL_NAME: ${{ vars.SCHOOL_NAME }}
ENTITY_NAME: ${{ vars.ENTITY_NAME }}

- name: Move assets
run: |
cp -r -f $LOGIN_ASSET_PATH assets/images/login.webp
cp -r -f $BACK_ASSET_PATH assets/web/back.webp
cp -r -f $LOGO_ASSET_PATH assets/images/logo_prod.png
cp -r -f $ICON_ASSET_PATH assets/images/icon_prod.png
cp -r -f $ICON_ANDROID_PATH/* android/app/src/prod/
cp -r -f $ICON_IOS_PATH/* ios/Runner/Assets.xcassets/AppIcon-Prod.appiconset/
cp -r -f $ICON_WEB_PATH/* web/Prod/
env:
LOGIN_ASSET_PATH: ${{ vars.LOGIN_ASSET_PATH }}
BACK_ASSET_PATH: ${{ vars.BACK_ASSET_PATH }}
LOGO_ASSET_PATH: ${{ vars.LOGO_ASSET_PATH }}
ICON_ASSET_PATH: ${{ vars.ICON_ASSET_PATH }}
ICON_ANDROID_PATH: ${{ vars.ICON_ANDROID_PATH }}
ICON_IOS_PATH: ${{ vars.ICON_IOS_PATH }}
ICON_WEB_PATH: ${{ vars.ICON_WEB_PATH }}

- name: Configure env
run: |
echo PROD_HOST=$PROD_HOST >> .env
echo ALPHA_HOST=$ALPHA_HOST >> .env
echo PAYMENT_NAME=$PAYMENT_NAME >> .env
echo SCHOOL_NAME=$SCHOOL_NAME >> .env
echo APP_NAME=$APP_NAME >> .env
echo APP_ID_PREFIX=$APP_ID_PREFIX >> .env
echo TITAN_URL=$TITAN_URL >> .env
env:
PROD_HOST: ${{ vars.PROD_HOST }}
ALPHA_HOST: ${{ vars.ALPHA_HOST }}
PAYMENT_NAME: ${{ vars.PAYMENT_NAME }}
SCHOOL_NAME: ${{ vars.SCHOOL_NAME }}
APP_NAME: ${{ vars.APP_NAME }}
APP_ID_PREFIX: ${{ vars.APP_ID_PREFIX }}
TITAN_URL: ${{ vars.TITAN_URL }}

- name: Configure Alpha env
if: needs.extract-version.outputs.isAlpha == 'true'
run: |
echo PLAUSIBLE_HOST=$PLAUSIBLE_ALPHA_HOST >> .env
echo PLAUSIBLE_DOMAIN=$PLAUSIBLE_ALPHA_DOMAIN >> .env
printf "%s" "$CONFIG" > config.json
env:
PLAUSIBLE_ALPHA_HOST: ${{ secrets.PLAUSIBLE_ALPHA_HOST }}
PLAUSIBLE_ALPHA_DOMAIN: ${{ secrets.PLAUSIBLE_ALPHA_DOMAIN }}
CONFIG: ${{ vars.ALPHA_CONFIG }}

- name: Configure Prod env
- name: Configure Prod config.json
if: needs.extract-version.outputs.isAlpha == 'false'
run: |
echo PLAUSIBLE_HOST=$PLAUSIBLE_PROD_HOST >> .env
echo PLAUSIBLE_DOMAIN=$PLAUSIBLE_PROD_DOMAIN >> .env
printf "%s" "$CONFIG" > config.json
env:
PLAUSIBLE_PROD_HOST: ${{ secrets.PLAUSIBLE_HOST }}
PLAUSIBLE_PROD_DOMAIN: ${{ secrets.PLAUSIBLE_DOMAIN }}
CONFIG: ${{ vars.PROD_CONFIG }}

- name: Set Alpha icons
if: needs.extract-version.outputs.isAlpha == 'true'
Expand All @@ -90,15 +124,20 @@ jobs:
if: needs.extract-version.outputs.isAlpha == 'false'
run: |
cp -f web/Prod/favicon.png web/favicon.png
mkdir -p web/icons
cp -f web/Prod/icons/* web/icons/

- name: Build Alpha 🔧
if: needs.extract-version.outputs.isAlpha == 'true'
run: flutter build web --release --dart-define=flavor=alpha

- name: Build Prod 🔧
if: needs.extract-version.outputs.isAlpha == 'false'
run: flutter build web --release --dart-define=flavor=prod
- name: Replace variables in index.html and manifest.json
run: |
APP_NAME=$(cat config.json | jq -r '.APP_NAME')
SCHOOL_NAME=$(cat config.json | jq -r '.SCHOOL_NAME')
sed -i "s/{{APP_NAME}}/$APP_NAME/g" web/index.html
sed -i "s/{{SCHOOL_NAME}}/$SCHOOL_NAME/g" web/index.html
sed -i "s/{{APP_NAME}}/$APP_NAME/g" web/manifest.json
sed -i "s/{{SCHOOL_NAME}}/$SCHOOL_NAME/g" web/manifest.json

- name: Build 🔧
run: flutter build web --release --dart-define-from-file=config.json

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
Expand Down
31 changes: 29 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,13 @@ app.*.map.json
/android/app/profile
/android/app/release

# env
.env
# Config
config/*
!config/config-template.json

# Firebase
google-services.json
GoogleService-Info.plist
android/app/src/alpha/google-services.json
android/app/src/dev/google-services.json
android/app/src/prod/google-services.json
Expand All @@ -63,3 +66,27 @@ coverage/

# Platforms not supported by this project
/windows/

# Missing translations
missing.txt

# Fastlane
android/fastlane/metadata
android/fastlane/report.xml
ios/fastlane/report.xml
android/fastlane-service-account.json
ios/app-store-connect-api.p8

# Generated xcode configuration from dart defines
Dart-Defines.xcconfig

# Config
config/
!config/config-template.json

# Folder to store various keys and secrets
keys

MainActivity.kt

.env
12 changes: 4 additions & 8 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
"args": [
"--flavor",
"dev",
"--dart-define",
"flavor=dev",
"--dart-define-from-file=config/config-dev.json",
"--web-port",
"3000"
]
Expand All @@ -25,8 +24,7 @@
"args": [
"--flavor",
"dev",
"--dart-define",
"flavor=dev",
"--dart-define-from-file=config/config-dev.json",
"--web-port",
"3000"
]
Expand All @@ -38,8 +36,7 @@
"args": [
"--flavor",
"alpha",
"--dart-define",
"flavor=alpha",
"--dart-define-from-file=config/config-alpha.json",
"--web-port",
"3000"
]
Expand All @@ -51,8 +48,7 @@
"args": [
"--flavor",
"prod",
"--dart-define",
"flavor=prod",
"--dart-define-from-file=config/config-prod.json",
"--web-port",
"3000"
]
Expand Down
4 changes: 4 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
source "https://rubygems.org"

gem "abbrev"
gem "fastlane"
Loading
Loading