diff --git a/adminapi/www/adminapx/schema/conf.json b/adminapi/schema/conf.json
similarity index 100%
rename from adminapi/www/adminapx/schema/conf.json
rename to adminapi/schema/conf.json
diff --git a/adminapi/www/adminapx/schema/lg/nations_fr.json b/adminapi/schema/lg/nations_fr.json
similarity index 100%
rename from adminapi/www/adminapx/schema/lg/nations_fr.json
rename to adminapi/schema/lg/nations_fr.json
diff --git a/adminapi/www/adminapx/schema/lg/pagans_fr.json b/adminapi/schema/lg/pagans_fr.json
similarity index 100%
rename from adminapi/www/adminapx/schema/lg/pagans_fr.json
rename to adminapi/schema/lg/pagans_fr.json
diff --git a/adminapi/www/adminapx/schema/lg/person_fr.json b/adminapi/schema/lg/person_fr.json
similarity index 100%
rename from adminapi/www/adminapx/schema/lg/person_fr.json
rename to adminapi/schema/lg/person_fr.json
diff --git a/adminapi/www/adminapx/schema/lg/recoveryauth_fr.json b/adminapi/schema/lg/recoveryauth_fr.json
similarity index 100%
rename from adminapi/www/adminapx/schema/lg/recoveryauth_fr.json
rename to adminapi/schema/lg/recoveryauth_fr.json
diff --git a/adminapi/www/adminapx/schema/nations.json b/adminapi/schema/nations.json
similarity index 97%
rename from adminapi/www/adminapx/schema/nations.json
rename to adminapi/schema/nations.json
index 6b1ae18..58db9ac 100644
--- a/adminapi/www/adminapx/schema/nations.json
+++ b/adminapi/schema/nations.json
@@ -16,7 +16,7 @@
"title":"Creation date",
"description":"Nation date of creation",
"type": "string",
- "format":"datetime"
+ "format":"date-time"
},
"contracts":{
"title":"Social contract of the nation",
diff --git a/adminapi/www/adminapx/schema/pagans.json b/adminapi/schema/pagans.json
similarity index 100%
rename from adminapi/www/adminapx/schema/pagans.json
rename to adminapi/schema/pagans.json
diff --git a/adminapi/www/adminapx/schema/person.json b/adminapi/schema/person.json
similarity index 95%
rename from adminapi/www/adminapx/schema/person.json
rename to adminapi/schema/person.json
index e38b851..323fca7 100755
--- a/adminapi/www/adminapx/schema/person.json
+++ b/adminapi/schema/person.json
@@ -17,20 +17,20 @@
},
"dt_create": {
"type": "string",
- "format": "datetime",
+ "format": "date-time",
"default": "dayjs.now()"
},
"dt_update": {
"type": "string",
- "format": "datetime"
+ "format": "date-time"
},
"dt_lastlogin": {
"type": "string",
- "format": "datetime"
+ "format": "date-time"
},
"dt_close": {
"type": "string",
- "format": "datetime"
+ "format": "date-time"
},
"recoveryauth": {
"type": "object",
diff --git a/adminapi/www/adminapx/schema/recoveryauth.json b/adminapi/schema/recoveryauth.json
similarity index 100%
rename from adminapi/www/adminapx/schema/recoveryauth.json
rename to adminapi/schema/recoveryauth.json
diff --git a/adminapi/www/adminapx/schema/recruiter.json b/adminapi/schema/recruiter.json
similarity index 100%
rename from adminapi/www/adminapx/schema/recruiter.json
rename to adminapi/schema/recruiter.json
diff --git a/adminapi/www/adminapx/schema/seeker.json b/adminapi/schema/seeker.json
similarity index 91%
rename from adminapi/www/adminapx/schema/seeker.json
rename to adminapi/schema/seeker.json
index 36bd444..7bf0909 100644
--- a/adminapi/www/adminapx/schema/seeker.json
+++ b/adminapi/schema/seeker.json
@@ -9,6 +9,7 @@
"mainlivinglocation":{"type":"object","$ref":"https://schema.org/PostalAddress"},
"secondlivinglocation":{"type":"object","$ref":"https://schema.org/PostalAddress"},
"thirdlivinglocation":{"type":"object","$ref":"https://schema.org/PostalAddress"},
+ "fourthlivinglocation":{"type":"object","$ref":"https://schema.org/PostalAddress"},
"seekcriterias":{"type":"array","$ref":"schema/seekcriteria.json"},
"skills":{"type":"array","$ref":"schema/skills.json"},
"educations":{"type":"array","$ref":"schema/educations.json"},
diff --git a/adminapi/www/adminapx/schema/towns.json b/adminapi/schema/towns.json
similarity index 96%
rename from adminapi/www/adminapx/schema/towns.json
rename to adminapi/schema/towns.json
index cf215cd..eb9c0ff 100644
--- a/adminapi/www/adminapx/schema/towns.json
+++ b/adminapi/schema/towns.json
@@ -21,10 +21,9 @@
"default": "active",
"type": "string",
"enum":["chain","unchain","tochain"]
- }
},
"dns": {
- "type": "array"
+ "type": "string"
}
},
"required": ["townId", "status", "nationId", "dns"],
@@ -34,4 +33,4 @@
{ "key": "nationId", "value": "townId" },
{ "key": "townId", "value": [] }
]
-}
+}
\ No newline at end of file
diff --git a/adminapi/www/adminapx/schema/tribes.json b/adminapi/schema/tribes.json
similarity index 90%
rename from adminapi/www/adminapx/schema/tribes.json
rename to adminapi/schema/tribes.json
index 1a26f60..a3d3f70 100644
--- a/adminapi/www/adminapx/schema/tribes.json
+++ b/adminapi/schema/tribes.json
@@ -17,10 +17,9 @@
"type": "string",
"$ref": "nationchains/nations/idx/nations_uuid_uuid.json"
},
- "status": {
- "default": "unchain",
+ "druidId": {
"type": "string",
- "enum": ["chain","tochain","unchain"]
+ "$ref": "nationchains/pagans/idx/alias_all.json"
},
"dns": {
"type": "array",
diff --git a/adminapi/www/adminapx/schema/www.json b/adminapi/schema/www.json
similarity index 100%
rename from adminapi/www/adminapx/schema/www.json
rename to adminapi/schema/www.json
diff --git a/adminapi/www/adminapx/conf/nginxmodelwebsite.conf.mustache b/adminapi/www/adminapx/conf/nginxmodelwebsite.conf.mustache
index 96f506c..c8f2077 100755
--- a/adminapi/www/adminapx/conf/nginxmodelwebsite.conf.mustache
+++ b/adminapi/www/adminapx/conf/nginxmodelwebsite.conf.mustache
@@ -9,7 +9,7 @@ root {{{dirapi}}}/;
location ~* /nationchains/schema/ {
#outside of nationchains for git purpose
rewrite /nationchains/schema/(.*$) /$1 break;
-root {{{dirapi}}}/adminapi/www/adminapx/schema/;
+root {{{dirapi}}}/adminapi/schema/;
}
# /plugins/pluginame/components/xxx?plugin=pluginname&pluginkey=key
# acess if exist pluginkey
diff --git a/adminapi/www/adminapx/index_en.html b/adminapi/www/adminapx/index_en.html
index e881095..b647ccb 100644
--- a/adminapi/www/adminapx/index_en.html
+++ b/adminapi/www/adminapx/index_en.html
@@ -9,6 +9,8 @@
+
+
+