Browse Source

rename organization to dao

pull/18/head
Sun 4 years ago
parent
commit
345dc13fb0
  1. 4
      Cargo.toml
  2. 0
      assets/logo/logo_dao.png
  3. 8
      lib/apps/dao/detail.dart
  4. 0
      lib/apps/dao/tmp/add.dart
  5. 0
      lib/apps/dao/tmp/detail.dart
  6. 0
      lib/apps/dao/tmp/list.dart
  7. 0
      lib/apps/dao/tmp/models.dart
  8. 0
      lib/apps/dao/tmp/provider.dart
  9. 14
      lib/apps/service/models.dart
  10. 0
      lib/apps/service/provider.dart
  11. 4
      lib/l10n/localizations.dart
  12. 4
      lib/l10n/localizations_en.dart
  13. 4
      lib/l10n/localizations_zh.dart
  14. 2
      pubspec.yaml
  15. 6
      src/apps.rs
  16. 0
      src/apps/dao/layer.rs
  17. 4
      src/apps/dao/mod.rs
  18. 0
      src/apps/dao/models.rs
  19. 0
      src/apps/dao/models/consensus.rs
  20. 0
      src/apps/dao/models/group.rs
  21. 0
      src/apps/dao/models/member.rs
  22. 0
      src/apps/dao/models/message.rs
  23. 0
      src/apps/dao/models/provider.rs
  24. 0
      src/apps/dao/models/request.rs
  25. 0
      src/apps/dao/rpc.rs
  26. 18
      src/migrate.rs
  27. 2
      src/migrate/account.rs
  28. 9
      src/migrate/dao.rs
  29. 8
      src/storage.rs

4
Cargo.toml

@ -44,10 +44,10 @@ chat_types = { git = "https://github.com/cympletech/esse_types", branch="main" } @@ -44,10 +44,10 @@ chat_types = { git = "https://github.com/cympletech/esse_types", branch="main" }
group_types = { git = "https://github.com/cympletech/esse_types", branch="main" }
cloud_types = { git = "https://github.com/cympletech/esse_types", branch="main" }
domain_types = { git = "https://github.com/cympletech/esse_types", branch="main" }
organization_types = { git = "https://github.com/cympletech/esse_types", branch="main" }
dao_types = { git = "https://github.com/cympletech/esse_types", branch="main" }
#chat_types = { path = "../esse_types/chat" }
#group_types = { path = "../esse_types/group" }
#organization_types = { path = "../esse_types/organization" }
#dao_types = { path = "../esse_types/dao" }
#domain_types = { path = "../esse_types/domain" }
#cloud_types = { path = "../esse_types/cloud" }

0
assets/logo/logo_organization.png → assets/logo/logo_dao.png

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

8
lib/apps/organization/detail.dart → lib/apps/dao/detail.dart

@ -16,14 +16,14 @@ import 'package:esse/global.dart'; @@ -16,14 +16,14 @@ import 'package:esse/global.dart';
import 'package:esse/options.dart';
import 'package:esse/rpc.dart';
class OrganizationDetail extends StatefulWidget {
const OrganizationDetail({Key? key}) : super(key: key);
class DaoDetail extends StatefulWidget {
const DaoDetail({Key? key}) : super(key: key);
@override
_OrganizationDetailState createState() => _OrganizationDetailState();
_DaoDetailState createState() => _DaoDetailState();
}
class _OrganizationDetailState extends State<OrganizationDetail> {
class _DaoDetailState extends State<DaoDetail> {
final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
@override

0
lib/apps/organization/tmp/add.dart → lib/apps/dao/tmp/add.dart

0
lib/apps/organization/tmp/detail.dart → lib/apps/dao/tmp/detail.dart

0
lib/apps/organization/tmp/list.dart → lib/apps/dao/tmp/list.dart

0
lib/apps/organization/tmp/models.dart → lib/apps/dao/tmp/models.dart

0
lib/apps/organization/tmp/provider.dart → lib/apps/dao/tmp/provider.dart

14
lib/apps/service/models.dart

@ -7,14 +7,14 @@ import 'package:esse/apps/group/list.dart'; @@ -7,14 +7,14 @@ import 'package:esse/apps/group/list.dart';
import 'package:esse/apps/domain/page.dart';
import 'package:esse/apps/chat/list.dart';
import 'package:esse/apps/wallet/page.dart';
import 'package:esse/apps/organization/detail.dart';
import 'package:esse/apps/dao/detail.dart';
import 'package:esse/apps/cloud/page.dart';
const List<InnerService> INNER_SERVICES = [
InnerService.Wallet,
InnerService.Chat,
InnerService.GroupChat,
InnerService.Organization,
InnerService.Dao,
InnerService.Jarvis,
InnerService.Domain,
InnerService.Cloud,
@ -26,7 +26,7 @@ enum InnerService { @@ -26,7 +26,7 @@ enum InnerService {
Jarvis,
Domain,
Wallet,
Organization,
Dao,
Cloud,
}
@ -43,8 +43,8 @@ extension InnerServiceExtension on InnerService { @@ -43,8 +43,8 @@ extension InnerServiceExtension on InnerService {
return [lang.domain, lang.domainIntro, 'assets/logo/logo_domain.png'];
case InnerService.Wallet:
return [lang.wallet, lang.walletIntro, 'assets/logo/logo_wallet.png'];
case InnerService.Organization:
return [lang.organization, lang.organizationIntro, 'assets/logo/logo_organization.png'];
case InnerService.Dao:
return [lang.dao, lang.daoIntro, 'assets/logo/logo_dao.png'];
case InnerService.Cloud:
return [lang.cloud, lang.cloudIntro, 'assets/logo/logo_cloud.png'];
}
@ -62,8 +62,8 @@ extension InnerServiceExtension on InnerService { @@ -62,8 +62,8 @@ extension InnerServiceExtension on InnerService {
return DomainDetail();
case InnerService.Wallet:
return WalletDetail();
case InnerService.Organization:
return OrganizationDetail();
case InnerService.Dao:
return DaoDetail();
case InnerService.Cloud:
return CloudPage();
}

0
lib/apps/service/provider.dart

4
lib/l10n/localizations.dart

@ -273,8 +273,8 @@ abstract class AppLocalizations { @@ -273,8 +273,8 @@ abstract class AppLocalizations {
String get setMain;
String get transfer;
String get organization;
String get organizationIntro;
String get dao;
String get daoIntro;
}
class _AppLocalizationsDelegate

4
lib/l10n/localizations_en.dart

@ -449,7 +449,7 @@ class AppLocalizationsEn extends AppLocalizations { @@ -449,7 +449,7 @@ class AppLocalizationsEn extends AppLocalizations {
String get transfer => 'Transfer';
@override
String get organization => 'Organization';
String get dao => 'DAO';
@override
String get organizationIntro => 'DAO groups and channels';
String get daoIntro => 'DAO groups and channels';
}

4
lib/l10n/localizations_zh.dart

@ -449,7 +449,7 @@ class AppLocalizationsZh extends AppLocalizations { @@ -449,7 +449,7 @@ class AppLocalizationsZh extends AppLocalizations {
String get transfer => '转账';
@override
String get organization => '群组';
String get dao => '群组';
@override
String get organizationIntro => '去中心化群聊与组织';
String get daoIntro => '去中心化群聊与组织';
}

2
pubspec.yaml

@ -80,7 +80,7 @@ flutter: @@ -80,7 +80,7 @@ flutter:
- assets/logo/logo_jarvis.png
- assets/logo/logo_group.png
- assets/logo/logo_domain.png
- assets/logo/logo_organization.png
- assets/logo/logo_dao.png
- assets/logo/logo_cloud.png
- assets/logo/logo_wallet.png
- assets/logo/logo_eth.png

6
src/apps.rs

@ -17,7 +17,7 @@ pub(crate) mod domain; @@ -17,7 +17,7 @@ pub(crate) mod domain;
pub(crate) mod file;
pub(crate) mod group;
pub(crate) mod jarvis;
//pub(crate) mod organization;
//pub(crate) mod dao;
pub(crate) mod wallet;
pub(crate) fn app_rpc_inject(handler: &mut RpcHandler<RpcState>) {
@ -28,7 +28,7 @@ pub(crate) fn app_rpc_inject(handler: &mut RpcHandler<RpcState>) { @@ -28,7 +28,7 @@ pub(crate) fn app_rpc_inject(handler: &mut RpcHandler<RpcState>) {
file::new_rpc_handler(handler);
group::new_rpc_handler(handler);
wallet::new_rpc_handler(handler);
//organization::new_rpc_handler(handler);
//dao::new_rpc_handler(handler);
cloud::new_rpc_handler(handler);
}
@ -41,7 +41,7 @@ pub(crate) async fn app_layer_handle( @@ -41,7 +41,7 @@ pub(crate) async fn app_layer_handle(
match (fgid, mgid) {
(group::GROUP_ID, _) => group::handle_peer(layer, mgid, msg).await,
(_, group::GROUP_ID) => group::handle_server(layer, fgid, msg).await,
//(organization::GROUP_ID, _) => organization::handle(layer, fgid, mgid, false, msg).await,
//(dao::GROUP_ID, _) => dao::handle(layer, fgid, mgid, false, msg).await,
(domain::GROUP_ID, _) => domain::handle(layer, mgid, msg).await,
(cloud::GROUP_ID, _) => cloud::handle(layer, mgid, msg).await,
_ => chat::handle(layer, fgid, mgid, msg).await,

0
src/apps/organization/layer.rs → src/apps/dao/layer.rs

4
src/apps/organization/mod.rs → src/apps/dao/mod.rs

@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
mod layer;
mod models;
pub use organization_types::ORGANIZATION_ID as GROUP_ID;
pub use dao_types::DAO_ID as GROUP_ID;
use tdn::types::{group::GroupId, message::SendType, primitive::HandleResult};
/// Send to organization service.
/// Send to dao service.
#[inline]
pub(crate) fn add_layer(results: &mut HandleResult, gid: GroupId, msg: SendType) {
results.layers.push((gid, GROUP_ID, msg));

0
src/apps/organization/models.rs → src/apps/dao/models.rs

0
src/apps/organization/models/consensus.rs → src/apps/dao/models/consensus.rs

0
src/apps/organization/models/group.rs → src/apps/dao/models/group.rs

0
src/apps/organization/models/member.rs → src/apps/dao/models/member.rs

0
src/apps/organization/models/message.rs → src/apps/dao/models/message.rs

0
src/apps/organization/models/provider.rs → src/apps/dao/models/provider.rs

0
src/apps/organization/models/request.rs → src/apps/dao/models/request.rs

0
src/apps/organization/rpc.rs → src/apps/dao/rpc.rs

18
src/migrate.rs

@ -7,11 +7,11 @@ pub mod consensus; @@ -7,11 +7,11 @@ pub mod consensus;
mod account;
mod chat;
mod cloud;
mod dao;
mod domain;
mod file;
mod group;
mod jarvis;
mod organization;
mod service;
mod session;
mod wallet;
@ -20,11 +20,11 @@ use account::ACCOUNT_VERSIONS; @@ -20,11 +20,11 @@ use account::ACCOUNT_VERSIONS;
use chat::CHAT_VERSIONS;
use cloud::CLOUD_VERSIONS;
use consensus::CONSENSUS_VERSIONS;
use dao::DAO_VERSIONS;
use domain::DOMAIN_VERSIONS;
use file::FILE_VERSIONS;
use group::GROUP_VERSIONS;
use jarvis::JARVIS_VERSIONS;
use organization::ORGANIZATION_VERSIONS;
use service::SERVICE_VERSIONS;
use session::SESSION_VERSIONS;
use wallet::WALLET_VERSIONS;
@ -53,8 +53,8 @@ pub(crate) const JARVIS_DB: &'static str = "jarvis.db"; @@ -53,8 +53,8 @@ pub(crate) const JARVIS_DB: &'static str = "jarvis.db";
/// Account's group chat database name
pub(crate) const GROUP_DB: &'static str = "group.db";
/// Account's organization database name
pub(crate) const ORGANIZATION_DB: &'static str = "organization.db";
/// Account's dao database name
pub(crate) const DAO_DB: &'static str = "dao.db";
/// Account's domain database name
pub(crate) const DOMAIN_DB: &'static str = "domain.db";
@ -131,7 +131,7 @@ pub(crate) fn main_migrate(path: &PathBuf) -> Result<()> { @@ -131,7 +131,7 @@ pub(crate) fn main_migrate(path: &PathBuf) -> Result<()> {
SERVICE_DB => SERVICE_VERSIONS.as_ref(),
JARVIS_DB => JARVIS_VERSIONS.as_ref(),
GROUP_DB => GROUP_VERSIONS.as_ref(),
ORGANIZATION_DB => ORGANIZATION_VERSIONS.as_ref(),
DAO_DB => DAO_VERSIONS.as_ref(),
CHAT_DB => CHAT_VERSIONS.as_ref(),
DOMAIN_DB => DOMAIN_VERSIONS.as_ref(),
WALLET_DB => WALLET_VERSIONS.as_ref(),
@ -215,8 +215,8 @@ pub(crate) fn main_migrate(path: &PathBuf) -> Result<()> { @@ -215,8 +215,8 @@ pub(crate) fn main_migrate(path: &PathBuf) -> Result<()> {
db.update(&format!(
"UPDATE migrates SET version = {} where db_name = '{}'",
ORGANIZATION_VERSIONS.len(),
ORGANIZATION_DB,
DAO_VERSIONS.len(),
DAO_DB,
))?;
db.update(&format!(
@ -299,9 +299,9 @@ pub(crate) fn account_init_migrate(path: &PathBuf) -> Result<()> { @@ -299,9 +299,9 @@ pub(crate) fn account_init_migrate(path: &PathBuf) -> Result<()> {
db.close()?;
let mut db_path = path.clone();
db_path.push(ORGANIZATION_DB);
db_path.push(DAO_DB);
let db = DStorage::open(db_path)?;
for i in &ORGANIZATION_VERSIONS {
for i in &DAO_VERSIONS {
db.execute(i)?;
}
db.close()?;

2
src/migrate/account.rs

@ -26,9 +26,9 @@ pub(super) const ACCOUNT_VERSIONS: [&str; 13] = [ @@ -26,9 +26,9 @@ pub(super) const ACCOUNT_VERSIONS: [&str; 13] = [
"INSERT INTO migrates (db_name, version) values ('file.db', 0)",
"INSERT INTO migrates (db_name, version) values ('jarvis.db', 0)",
"INSERT INTO migrates (db_name, version) values ('group.db', 0)",
"INSERT INTO migrates (db_name, version) values ('organization.db', 0)",
"INSERT INTO migrates (db_name, version) values ('chat.db', 0)",
"INSERT INTO migrates (db_name, version) values ('domain.db', 0)",
"INSERT INTO migrates (db_name, version) values ('wallet.db', 0)",
"INSERT INTO migrates (db_name, version) values ('cloud.db', 0)",
"INSERT INTO migrates (db_name, version) values ('dao.db', 0)",
];

9
src/migrate/organization.rs → src/migrate/dao.rs

@ -1,6 +1,11 @@ @@ -1,6 +1,11 @@
#[rustfmt::skip]
pub(super) const ORGANIZATION_VERSIONS: [&str; 8] = [
"CREATE TABLE IF NOT EXISTS organizations(
pub(super) const DAO_VERSIONS: [&str; 0] = [
];
#[rustfmt::skip]
pub(super) const _DAO_VERSIONS: [&str; 8] = [
"CREATE TABLE IF NOT EXISTS daos(
id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
height INTEGER NOT NULL,
owner TEXT NOT NULL,

8
src/storage.rs

@ -8,8 +8,8 @@ use tdn::types::{group::GroupId, primitive::Result}; @@ -8,8 +8,8 @@ use tdn::types::{group::GroupId, primitive::Result};
use tdn_storage::local::DStorage;
use crate::migrate::{
account_init_migrate, ACCOUNT_DB, CHAT_DB, CLOUD_DB, CONSENSUS_DB, DOMAIN_DB, FILE_DB,
GROUP_DB, JARVIS_DB, ORGANIZATION_DB, SERVICE_DB, SESSION_DB, WALLET_DB,
account_init_migrate, ACCOUNT_DB, CHAT_DB, CLOUD_DB, CONSENSUS_DB, DAO_DB, DOMAIN_DB, FILE_DB,
GROUP_DB, JARVIS_DB, SERVICE_DB, SESSION_DB, WALLET_DB,
};
const FILES_DIR: &'static str = "files";
@ -392,10 +392,10 @@ pub(crate) fn group_db(base: &PathBuf, gid: &GroupId) -> Result<DStorage> { @@ -392,10 +392,10 @@ pub(crate) fn group_db(base: &PathBuf, gid: &GroupId) -> Result<DStorage> {
}
#[inline]
pub(crate) fn organization_db(base: &PathBuf, gid: &GroupId) -> Result<DStorage> {
pub(crate) fn dao_db(base: &PathBuf, gid: &GroupId) -> Result<DStorage> {
let mut db_path = base.clone();
db_path.push(gid.to_hex());
db_path.push(ORGANIZATION_DB);
db_path.push(DAO_DB);
DStorage::open(db_path)
}

Loading…
Cancel
Save