mirror of
https://github.com/bonfire-networks/bonfire-app.git
synced 2024-05-18 00:52:40 +00:00
simplify
This commit is contained in:
parent
acee501ec6
commit
112ce7c732
|
@ -11,10 +11,12 @@ This app is part of the [Bonfire](https://bonfirenetworks.org/) and [ValueFlows]
|
|||
- [Bonfire:Geolocate](https://github.com/bonfire-ecosystem/bonfire_geolocate) - places
|
||||
- [Bonfire:Quantify](https://github.com/bonfire-ecosystem/bonfire_quantify) - units & measures
|
||||
- [Bonfire:ValueFlows](https://github.com/bonfire-ecosystem/bonfire_valueflows) - economic activities with ValueFlows
|
||||
- [Bonfire:UI:ValueFlows](https://github.com/bonfire-networks/bonfire_ui_social) - reusable frontend components for economic activities
|
||||
- [Bonfire:ValueFlows:Observe](https://github.com/bonfire-ecosystem/bonfire_valueflows_observe) - observation of economic resources
|
||||
- [Bonfire:API:GraphQL](https://github.com/bonfire-ecosystem/bonfire_api_graphql) - a GraphQL client API
|
||||
- [Bonfire:RecyclApp](https://github.com/bonfire-ecosystem/bonfire_recyclapp) - interface for ValueFlows-based recycling apps
|
||||
- [Bonfire:UI:ValueFlows](https://github.com/bonfire-networks/bonfire_ui_social) - reusable frontend components for economic activities
|
||||
- [Bonfire:UI:Reflow](https://github.com/bonfire-networks/bonfire_ui_social) - frontend for the Reflow project
|
||||
- [Bonfire:BreadPub](https://github.com/bonfire-ecosystem/bonfire_breadpub) - mutual aid, offers/needs, etc
|
||||
- [Bonfire:RecyclApp](https://github.com/bonfire-ecosystem/bonfire_recyclapp) - ValueFlows-based recycling app
|
||||
|
||||
|
||||
## Handy commands
|
||||
|
|
|
@ -5,15 +5,9 @@ config :bonfire, :ui,
|
|||
Bonfire.UI.Social.SidebarNavigationLive,
|
||||
Bonfire.UI.Reflow.SidebarNavigationLive
|
||||
],
|
||||
profile_navigation: [
|
||||
timeline: "timeline",
|
||||
posts: "posts",
|
||||
boosts: "boosts",
|
||||
inventory: "inventory"
|
||||
],
|
||||
profile_sections: [
|
||||
private: Bonfire.UI.Social.PrivateLive,
|
||||
timeline: Bonfire.UI.Social.ProfileTimelineLive,
|
||||
private: Bonfire.UI.Social.PrivateLive,
|
||||
posts: Bonfire.UI.Social.ProfilePostsLive,
|
||||
boosts: Bonfire.UI.Social.ProfileBoostsLive,
|
||||
followers: Bonfire.UI.Social.ProfileFollowersLive,
|
||||
|
|
|
@ -4,22 +4,26 @@ DIR="${1:-$PWD}"
|
|||
echo Checking for changes in $DIR
|
||||
|
||||
cd $DIR
|
||||
git config core.fileMode false
|
||||
|
||||
# have to add/commit before being able to rebase
|
||||
git add .
|
||||
git commit -a
|
||||
|
||||
# fetch and rebase remote changes
|
||||
git pull --rebase
|
||||
|
||||
set +e # Grep succeeds with nonzero exit codes to show results.
|
||||
if git status | grep -q -E 'modified|ahead'
|
||||
then
|
||||
set -e
|
||||
echo Publishing changes
|
||||
|
||||
git config core.fileMode false
|
||||
|
||||
# have to add/commit before being able to rebase
|
||||
git add .
|
||||
git commit -a
|
||||
|
||||
# fetch and rebase remote changes
|
||||
git pull --rebase
|
||||
|
||||
echo Publishing changes!
|
||||
git push
|
||||
|
||||
else
|
||||
set -e
|
||||
echo No local changes since last run
|
||||
#echo No local changes since last run
|
||||
git pull
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue