Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitfbbcf64

Browse files
committed
Show version info in settings
1 parent5d896ae commitfbbcf64

File tree

8 files changed

+252
-151
lines changed

8 files changed

+252
-151
lines changed

‎assets/bindata.go‎

Lines changed: 116 additions & 116 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎client/css/style.css‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -812,6 +812,11 @@ input.message-input-nick.invalid {
812812
text-align: center;
813813
}
814814

815+
.settings-version {
816+
color:#999;
817+
font-size:12px;
818+
}
819+
815820
.suspense-fallback {
816821
display: flex;
817822
align-items: center;

‎client/js/components/pages/Settings.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import FileInput from 'components/ui/FileInput';
77
constSettings=({
88
settings,
99
installable,
10+
version,
1011
setSetting,
1112
onCertChange,
1213
onKeyChange,
@@ -71,6 +72,13 @@ const Settings = ({
7172
{error ?<pclassName="error">{error}</p> :null}
7273
</div>
7374
</div>
75+
{version&&(
76+
<divclassName="settings-version">
77+
<p>{version.tag}</p>
78+
<p>Commit:{version.commit}</p>
79+
<p>Build Date:{version.date}</p>
80+
</div>
81+
)}
7482
</div>
7583
</div>
7684
);

‎client/js/containers/Settings.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ import connect from 'utils/connect';
1212

1313
constmapState=createStructuredSelector({
1414
settings:getSettings,
15-
installable:state=>state.app.installable
15+
installable:state=>state.app.installable,
16+
version:state=>state.app.version
1617
});
1718

1819
constmapDispatch={

‎client/js/modules/initialState.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@ import { replace } from 'utils/router';
1111

1212
functionloadState({ store},env){
1313
store.dispatch(setConnectDefaults(env.defaults));
14-
store.dispatch(appSet('hexIP',env.hexIP));
14+
store.dispatch(
15+
appSet({
16+
hexIP:env.hexIP,
17+
version:env.version
18+
})
19+
);
1520
store.dispatch(setSettings(env.settings,true));
1621

1722
if(env.servers){

‎client/js/state/app.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
importassignfrom'lodash/assign';
12
importcreateReducerfrom'utils/createReducer';
23
import*asactionsfrom'./actions';
34

@@ -29,7 +30,11 @@ const initialState = {
2930

3031
exportdefaultcreateReducer(initialState,{
3132
[actions.APP_SET](state,{ key, value}){
32-
state[key]=value;
33+
if(typeofkey==='object'){
34+
assign(state,key);
35+
}else{
36+
state[key]=value;
37+
}
3338
},
3439

3540
[actions.UPDATE_MESSAGE_HEIGHT](state,action){

‎server/index_data.go‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"strings"
77

88
"github.com/khlieng/dispatch/storage"
9+
"github.com/khlieng/dispatch/version"
910
"github.com/spf13/viper"
1011
)
1112

@@ -20,11 +21,18 @@ type connectDefaults struct {
2021
ShowDetailsbool
2122
}
2223

24+
typedispatchVersionstruct {
25+
Tagstring
26+
Commitstring
27+
Datestring
28+
}
29+
2330
typeindexDatastruct {
2431
DefaultsconnectDefaults
2532
Servers []Server
2633
Channels []*storage.Channel
2734
HexIPbool
35+
VersiondispatchVersion
2836

2937
Settings*storage.ClientSettings
3038

@@ -38,6 +46,11 @@ type indexData struct {
3846
funcgetIndexData(r*http.Request,pathstring,state*State)*indexData {
3947
data:=indexData{
4048
HexIP:viper.GetBool("hexIP"),
49+
Version:dispatchVersion{
50+
Tag:version.Tag,
51+
Commit:version.Commit,
52+
Date:version.Date,
53+
},
4154
}
4255

4356
data.Defaults=connectDefaults{

‎server/index_data_easyjson.go‎

Lines changed: 96 additions & 32 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp