PolyPaw/habitica-sync
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/SuperChamp234/habitica-sync into dev

Browse source
This commit is contained in:
ransurf 2021-11-20 23:40:02 -08:00
commit dfc4e55cb5
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main.ts
View file

@ -34,7 +34,7 @@ export default class HabiticaSync extends Plugin {
this.activateView(); this.activateView();
} }
}); });
this.activateView(); // this.activateView();
} }
async loadSettings() { async loadSettings() {
@ -45,7 +45,7 @@ export default class HabiticaSync extends Plugin {
} }
async onunload() { async onunload() {
// await this.view.onClose(); await this.view.onClose();
this.app.workspace this.app.workspace
.getLeavesOfType(VIEW_TYPE) .getLeavesOfType(VIEW_TYPE)

4
src/view/App.tsx
View file

@ -195,8 +195,12 @@ class App extends React.Component<any, any> {
return (<div className="plugin-root"> return (<div className="plugin-root">
{content} {content}
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" /> <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
<<<<<<< HEAD
<Taskview data={this.state.tasks} handleChangeTodos={this.handleChangeTodos} settings = {this.props.plugin.settings} handleChangeDailys={this.handleChangeDailys} handleChangeHabits={this.handleChangeHabits} handleChangeRewards={this.handleChangeRewards}/> <Taskview data={this.state.tasks} handleChangeTodos={this.handleChangeTodos} settings = {this.props.plugin.settings} handleChangeDailys={this.handleChangeDailys} handleChangeHabits={this.handleChangeHabits} handleChangeRewards={this.handleChangeRewards}/>
<div></div> <div></div>
=======
<Taskview data={this.state.tasks} handleChangeTodos={this.handleChangeTodos} handleChangeDailys={this.handleChangeDailys} handleChangeHabits={this.handleChangeHabits} handleChangeRewards={this.handleChangeRewards}/>
>>>>>>> 54e6000eb8811968a7e3082a4995c6e40f96654e
<Statsview user_data={this.state.user_data} /> <Statsview user_data={this.state.user_data} />
</div> </div>
); );

1
styles.css
View file

@ -90,6 +90,7 @@ input[type=checkbox]:focus {
.plugin-root { .plugin-root {
min-width: 260px; min-width: 260px;
display: grid; display: grid;
grid-template-rows: auto 1fr auto;
height: inherit; height: inherit;
} }